From 5dcd3008dbae88d2e9d90c748b802702c676647a Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Fri, 15 May 2009 16:43:48 +0000
Subject: Restored xml test cases to unminimized tags

---
 test/files/jvm/interpreter.check  |  2 +-
 test/files/jvm/t0632.check        | 24 ++++++++--------
 test/files/jvm/unittest_xml.scala |  2 +-
 test/files/jvm/xml01.check        |  4 +--
 test/files/jvm/xml02.scala        |  2 +-
 test/files/jvm/xml03syntax.check  |  4 +--
 test/files/run/docgenerator.check | 60 +++++++++++++++++++--------------------
 test/files/run/t0663.check        |  2 +-
 test/files/run/t1620.check        |  4 +--
 9 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/test/files/jvm/interpreter.check b/test/files/jvm/interpreter.check
index 86d6adbbec..cd55922604 100644
--- a/test/files/jvm/interpreter.check
+++ b/test/files/jvm/interpreter.check
@@ -173,7 +173,7 @@ scala>
 scala> 
 scala>      |      |      |      | res3: scala.xml.Elem = 
 <a>
-       <b d="dd" c="c"/></a>
+       <b d="dd" c="c"></b></a>
 
 scala> 
 scala> 
diff --git a/test/files/jvm/t0632.check b/test/files/jvm/t0632.check
index 681bc9da92..3185410a75 100644
--- a/test/files/jvm/t0632.check
+++ b/test/files/jvm/t0632.check
@@ -1,12 +1,12 @@
-<foo x="&amp;"/>
-<foo x="&amp;"/>
-<foo x="&amp;"/>
-<foo x="&amp;"/>
-<foo x="&amp;amp;"/>
-<foo x="&amp;amp;"/>
-<foo x="&amp;amp;"/>
-<foo x="&amp;amp;"/>
-<foo x="&amp;&amp;"/>
-<foo x="&amp;&amp;"/>
-<foo x="&amp;&amp;"/>
-<foo x="&amp;&amp;"/>
+<foo x="&amp;"></foo>
+<foo x="&amp;"></foo>
+<foo x="&amp;"></foo>
+<foo x="&amp;"></foo>
+<foo x="&amp;amp;"></foo>
+<foo x="&amp;amp;"></foo>
+<foo x="&amp;amp;"></foo>
+<foo x="&amp;amp;"></foo>
+<foo x="&amp;&amp;"></foo>
+<foo x="&amp;&amp;"></foo>
+<foo x="&amp;&amp;"></foo>
+<foo x="&amp;&amp;"></foo>
diff --git a/test/files/jvm/unittest_xml.scala b/test/files/jvm/unittest_xml.scala
index 9f6dd3183d..63375cd15a 100644
--- a/test/files/jvm/unittest_xml.scala
+++ b/test/files/jvm/unittest_xml.scala
@@ -90,7 +90,7 @@ object Test {
 	val q = xml.Utility.sort(<a g='3' j='2' oo='2' a='2'/>)
 	assertEquals("sort attrib"+xml.Utility.sort(q.attributes).toString, " a=\"2\" g=\"3\" j=\"2\" oo=\"2\"", xml.Utility.sort(q.attributes).toString)
 	 val pp = new xml.PrettyPrinter(80,5)
-	assertEquals("pretty print sorted attrib:"+pp.format(q), "<a a=\"2\" g=\"3\" j=\"2\" oo=\"2\"/>", pp.format(q))
+	assertEquals("pretty print sorted attrib:"+pp.format(q), "<a a=\"2\" g=\"3\" j=\"2\" oo=\"2\"></a>", pp.format(q))
 
     <hi>
       <there/>
diff --git a/test/files/jvm/xml01.check b/test/files/jvm/xml01.check
index d78e6df410..5e82e9a729 100644
--- a/test/files/jvm/xml01.check
+++ b/test/files/jvm/xml01.check
@@ -3,6 +3,6 @@ xpath \
 xpath \\ DESCENDANTS
 <book><author>Peter Buneman</author><author>Dan Suciu</author><title>Data on ze web</title></book>
 -- group nodes
-<f><a/><b/><c/></f>
-<a/><f><a/><b/><c/></f><a/><b/><c/>
+<f><a></a><b></b><c></c></f>
+<a></a><f><a></a><b></b><c></c></f><a></a><b></b><c></c>
 attribute value normalization
diff --git a/test/files/jvm/xml02.scala b/test/files/jvm/xml02.scala
index ed29868898..0cbeb27ce2 100644
--- a/test/files/jvm/xml02.scala
+++ b/test/files/jvm/xml02.scala
@@ -22,7 +22,7 @@ object Test extends TestConsoleMain {
       assertTrue("@two",       ax \ "@foo" == xml.Text("bar"))    // dto.
       assertTrue("@three",     bx \ "@foo" == "bar&x")            // dto.
       assertTrue  ("@four", (bx \ "@foo") sameElements List(xml.Text("bar&x")))
-      assertEquals("@five",  "<hello foo=\"bar&amp;x\"/>", bx.toString)
+      assertEquals("@five",  "<hello foo=\"bar&amp;x\"></hello>", bx.toString)
     }
   }
 
diff --git a/test/files/jvm/xml03syntax.check b/test/files/jvm/xml03syntax.check
index ec00119211..fd1e10cac9 100644
--- a/test/files/jvm/xml03syntax.check
+++ b/test/files/jvm/xml03syntax.check
@@ -13,5 +13,5 @@
 2
 4
 
-node=<elem key="<b>hello</b>"/>, key=Some(<b>hello</b>)
-node=<elem />, key=None
+node=<elem key="<b>hello</b>"></elem>, key=Some(<b>hello</b>)
+node=<elem ></elem>, key=None
diff --git a/test/files/run/docgenerator.check b/test/files/run/docgenerator.check
index b1565edae5..dbb7eeed28 100644
--- a/test/files/run/docgenerator.check
+++ b/test/files/run/docgenerator.check
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
         <head><title>List of all classes and objects</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"/><meta content="scaladoc" name="generator"/><link href="style.css" type="text/css" rel="stylesheet"/><script type="text/javascript" src="script.js"/>
+        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script>
         </head>
         <body onload="init()"><div><div class="kinds" id="Classes">Classes</div><ul class="list">
         <li id="Classes_C"><a href="examples/C0.html" target="contentFrame">C0</a></li>
@@ -23,22 +23,22 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
         <head><title>Scala 2</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"/><meta content="scaladoc" name="generator"/><link href="style.css" type="text/css" rel="stylesheet"/><script type="text/javascript" src="script.js"/>
+        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script>
         </head>
         <frameset cols="25%, 75%">
     <frameset rows="50%, 28, 50%">
-    <frame src="modules.html" name="modulesFrame"/>
-    <frame src="nav-classes.html" name="navigationFrame"/>
-    <frame src="all-classes.html" name="classesFrame"/>
+    <frame src="modules.html" name="modulesFrame"></frame>
+    <frame src="nav-classes.html" name="navigationFrame"></frame>
+    <frame src="all-classes.html" name="classesFrame"></frame>
     </frameset>
-    <frame src="root-content.html" name="contentFrame"/>
+    <frame src="root-content.html" name="contentFrame"></frame>
     </frameset>
       </html>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
         <head><title>List of all classes and objects</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"/><meta content="scaladoc" name="generator"/><link href="style.css" type="text/css" rel="stylesheet"/><script type="text/javascript" src="script.js"/>
+        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script>
         </head>
         <body onload="init()"><div><div class="kinds" id="Classes">Classes</div><ul class="list">
         <li id="Classes_C"><a href="examples/C0.html" target="contentFrame">C0</a></li>
@@ -52,22 +52,22 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
         <head><title>Scala 2</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"/><meta content="scaladoc" name="generator"/><link href="style.css" type="text/css" rel="stylesheet"/><script type="text/javascript" src="script.js"/>
+        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script>
         </head>
         <frameset cols="25%, 75%">
     <frameset rows="50%, 28, 50%">
-    <frame src="modules.html" name="modulesFrame"/>
-    <frame src="nav-classes.html" name="navigationFrame"/>
-    <frame src="all-classes.html" name="classesFrame"/>
+    <frame src="modules.html" name="modulesFrame"></frame>
+    <frame src="nav-classes.html" name="navigationFrame"></frame>
+    <frame src="all-classes.html" name="classesFrame"></frame>
     </frameset>
-    <frame src="root-content.html" name="contentFrame"/>
+    <frame src="root-content.html" name="contentFrame"></frame>
     </frameset>
       </html>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
         <head><title>List of all classes and objects</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"/><meta content="scaladoc" name="generator"/><link href="style.css" type="text/css" rel="stylesheet"/><script type="text/javascript" src="script.js"/>
+        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script>
         </head>
         <body onload="init()"><div><div class="kinds" id="Classes">Classes</div><ul class="list">
         <li id="Classes_C"><a href="examples/C0.html" target="contentFrame">C0</a></li>
@@ -89,22 +89,22 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
         <head><title>Scala 2</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"/><meta content="scaladoc" name="generator"/><link href="style.css" type="text/css" rel="stylesheet"/><script type="text/javascript" src="script.js"/>
+        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script>
         </head>
         <frameset cols="25%, 75%">
     <frameset rows="50%, 28, 50%">
-    <frame src="modules.html" name="modulesFrame"/>
-    <frame src="nav-classes.html" name="navigationFrame"/>
-    <frame src="all-classes.html" name="classesFrame"/>
+    <frame src="modules.html" name="modulesFrame"></frame>
+    <frame src="nav-classes.html" name="navigationFrame"></frame>
+    <frame src="all-classes.html" name="classesFrame"></frame>
     </frameset>
-    <frame src="root-content.html" name="contentFrame"/>
+    <frame src="root-content.html" name="contentFrame"></frame>
     </frameset>
       </html>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
         <head><title>List of all classes and objects</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"/><meta content="scaladoc" name="generator"/><link href="style.css" type="text/css" rel="stylesheet"/><script type="text/javascript" src="script.js"/>
+        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script>
         </head>
         <body onload="init()"><div><div class="kinds" id="Classes">Classes</div><ul class="list">
         <li id="Classes_C"><a href="examples/C0.html" target="contentFrame">C0</a></li>
@@ -130,22 +130,22 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
         <head><title>Scala 2</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"/><meta content="scaladoc" name="generator"/><link href="style.css" type="text/css" rel="stylesheet"/><script type="text/javascript" src="script.js"/>
+        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script>
         </head>
         <frameset cols="25%, 75%">
     <frameset rows="50%, 28, 50%">
-    <frame src="modules.html" name="modulesFrame"/>
-    <frame src="nav-classes.html" name="navigationFrame"/>
-    <frame src="all-classes.html" name="classesFrame"/>
+    <frame src="modules.html" name="modulesFrame"></frame>
+    <frame src="nav-classes.html" name="navigationFrame"></frame>
+    <frame src="all-classes.html" name="classesFrame"></frame>
     </frameset>
-    <frame src="root-content.html" name="contentFrame"/>
+    <frame src="root-content.html" name="contentFrame"></frame>
     </frameset>
       </html>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
         <head><title>List of all classes and objects</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"/><meta content="scaladoc" name="generator"/><link href="style.css" type="text/css" rel="stylesheet"/><script type="text/javascript" src="script.js"/>
+        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script>
         </head>
         <body onload="init()"><div><div class="kinds" id="Classes">Classes</div><ul class="list">
         <li id="Classes_B"><a href="annots/Bar.html" target="contentFrame">Bar</a></li>
@@ -163,15 +163,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
         <head><title>Scala 2</title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF8"/><meta content="scaladoc" name="generator"/><link href="style.css" type="text/css" rel="stylesheet"/><script type="text/javascript" src="script.js"/>
+        <meta http-equiv="content-type" content="text/html; charset=UTF8"></meta><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script>
         </head>
         <frameset cols="25%, 75%">
     <frameset rows="50%, 28, 50%">
-    <frame src="modules.html" name="modulesFrame"/>
-    <frame src="nav-classes.html" name="navigationFrame"/>
-    <frame src="all-classes.html" name="classesFrame"/>
+    <frame src="modules.html" name="modulesFrame"></frame>
+    <frame src="nav-classes.html" name="navigationFrame"></frame>
+    <frame src="all-classes.html" name="classesFrame"></frame>
     </frameset>
-    <frame src="root-content.html" name="contentFrame"/>
+    <frame src="root-content.html" name="contentFrame"></frame>
     </frameset>
       </html>
 
diff --git a/test/files/run/t0663.check b/test/files/run/t0663.check
index dd9be2af70..22b68b7f57 100644
--- a/test/files/run/t0663.check
+++ b/test/files/run/t0663.check
@@ -1 +1 @@
-<feed/>
+<feed></feed>
diff --git a/test/files/run/t1620.check b/test/files/run/t1620.check
index afa1e6acd5..979efc8227 100644
--- a/test/files/run/t1620.check
+++ b/test/files/run/t1620.check
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE foo PUBLIC "-//Foo Corp//DTD 1.0//EN" "foo.dtd">
-<foo/>
+<foo></foo>
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE foo PUBLIC "-//Foo Corp//DTD 1.0//EN">
-<foo/>
+<foo></foo>
-- 
cgit v1.2.3