From 25da86a228a3ae7aecaacdfd094812d53209aece Mon Sep 17 00:00:00 2001
From: Szabolcs Berecz <szabolcs.berecz@gmail.com>
Date: Thu, 12 Jan 2012 21:48:02 +0100
Subject: Cleanup after "Fixed equality and string representation of xml
 attributes with null value"

This commit reverts the following two commits:
5f2568e36b87d183fd4e4442d5c304db628846c4 - "Revert "Accept prefixed xml attributes with null value"
b00002f9049c034510438881b4a4449d73fe2f54 - "Disabling some scaladoc tests."
and fixes a scaladoc test broken by:
4787f883604d1344257c0b40c15790c3dde477f2 - "Fixed equality and string representation of xml attributes with null value"
---
 test/scaladoc/scala/html/HtmlFactoryTest.scala | 34 +++++++++++++-------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'test/scaladoc')

diff --git a/test/scaladoc/scala/html/HtmlFactoryTest.scala b/test/scaladoc/scala/html/HtmlFactoryTest.scala
index 7fed4ca027..d03094d0ab 100644
--- a/test/scaladoc/scala/html/HtmlFactoryTest.scala
+++ b/test/scaladoc/scala/html/HtmlFactoryTest.scala
@@ -185,18 +185,18 @@ object Test extends Properties("HtmlFactory") {
   property("Trac #4180") = {
     createTemplate("Trac4180.scala") != None
   }
-  // 
-  // property("Trac #4372") = {
-  //   createTemplate("Trac4372.scala") match {
-  //     case node: scala.xml.Node => {
-  //       val html = node.toString
-  //       html.contains("<span class=\"name\" title=\"gt4s: $plus$colon\">+:</span>") &&
-  //         html.contains("<span class=\"name\" title=\"gt4s: $minus$colon\">-:</span>") &&
-  //           html.contains("""<span class="params">(<span name="n">n: <span name="scala.Int" class="extype">Int</span></span>)</span><span class="result">: <span name="scala.Int" class="extype">Int</span></span>""")
-  //     }
-  //     case _ => false
-  //   }
-  // }
+
+  property("Trac #4372") = {
+    createTemplate("Trac4372.scala") match {
+      case node: scala.xml.Node => {
+        val html = node.toString
+        html.contains("<span title=\"gt4s: $plus$colon\" class=\"name\">+:</span>") &&
+          html.contains("<span title=\"gt4s: $minus$colon\" class=\"name\">-:</span>") &&
+            html.contains("""<span class="params">(<span name="n">n: <span name="scala.Int" class="extype">Int</span></span>)</span><span class="result">: <span name="scala.Int" class="extype">Int</span></span>""")
+      }
+      case _ => false
+    }
+  }
 
   property("Trac #4374 - public") = {
     val files = createTemplates("Trac4374.scala")
@@ -426,11 +426,11 @@ object Test extends Properties("HtmlFactory") {
     createTemplate("SI_4898.scala")
     true
   }
-  // 
-  // property("Use cases should override their original members") =
-  //    checkText1("SI_5054_q1.scala", """def test(): Int""") &&
-  //    !checkText1("SI_5054_q1.scala", """def test(implicit lost: Int): Int""")
-  // 
+  
+  property("Use cases should override their original members") =
+     checkText1("SI_5054_q1.scala", """def test(): Int""") &&
+     !checkText1("SI_5054_q1.scala", """def test(implicit lost: Int): Int""")
+  
 
   property("Use cases should keep their flags - final should not be lost") = 
     checkText1("SI_5054_q2.scala", """final def test(): Int""")
-- 
cgit v1.2.3