From a98d0903a8a02f806726a45b65842a0da21115b7 Mon Sep 17 00:00:00 2001
From: Antonio Cunei <antonio.cunei@epfl.ch>
Date: Mon, 17 Oct 2011 21:42:43 +0000
Subject: Reverting r25787 (caused test.scaladoc failures...

Reverting r25787 (caused test.scaladoc failures on certain systems)
---
 test/scaladoc/scala/IndexTest.scala | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

(limited to 'test/scaladoc')

diff --git a/test/scaladoc/scala/IndexTest.scala b/test/scaladoc/scala/IndexTest.scala
index ec8011bf41..7679bab0c6 100644
--- a/test/scaladoc/scala/IndexTest.scala
+++ b/test/scaladoc/scala/IndexTest.scala
@@ -5,23 +5,6 @@ import scala.tools.nsc.doc
 import scala.tools.nsc.doc.html.page.Index
 import java.net.URLClassLoader
 
-object XMLUtil {
-  import scala.xml._
-
-  def stripGroup(seq: Node): Node = {
-    seq match {
-      case group: Group => {
-        <div class="group">{ group.nodes.map(stripGroup _) }</div>
-      }
-      case e: Elem => {
-        val child = e.child.map(stripGroup _)
-        Elem(e.prefix, e.label, e.attributes, e.scope, child : _*)
-      }
-      case _ => seq
-    }
-  }
-}
-
 object Test extends Properties("Index") {
 
   def getClasspath = {
@@ -88,10 +71,10 @@ object Test extends Properties("Index") {
       case None => false
     }
   }
-  property("body contants a script element") = {
+  property("browser contants a script element") = {
     createIndex("src/compiler/scala/tools/nsc/doc/html/page/Index.scala") match {
       case Some(index) =>
-        (XMLUtil.stripGroup(index.body) \\ "script").size == 1
+        (index.browser \ "script").size == 1
 
       case None => false
     }
-- 
cgit v1.2.3