diff options
| author | Paul Phillips <paulp@improving.org> | 2009-05-15 16:43:48 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2009-05-15 16:43:48 +0000 |
| commit | 5dcd3008dbae88d2e9d90c748b802702c676647a (patch) | |
| tree | 15ee9facd920a896d32e52fd5ea648fe04b6d3bf /test/files/jvm | |
| parent | 2a3015a8837638abc7dd8456a87f42f2e600e7c2 (diff) | |
| download | scala-5dcd3008dbae88d2e9d90c748b802702c676647a.tar.gz scala-5dcd3008dbae88d2e9d90c748b802702c676647a.tar.bz2 scala-5dcd3008dbae88d2e9d90c748b802702c676647a.zip | |
Restored xml test cases to unminimized tags
Diffstat (limited to 'test/files/jvm')
| -rw-r--r-- | test/files/jvm/interpreter.check | 2 | ||||
| -rw-r--r-- | test/files/jvm/t0632.check | 24 | ||||
| -rw-r--r-- | test/files/jvm/unittest_xml.scala | 2 | ||||
| -rw-r--r-- | test/files/jvm/xml01.check | 4 | ||||
| -rw-r--r-- | test/files/jvm/xml02.scala | 2 | ||||
| -rw-r--r-- | test/files/jvm/xml03syntax.check | 4 |
6 files changed, 19 insertions, 19 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="&"/> -<foo x="&"/> -<foo x="&"/> -<foo x="&"/> -<foo x="&amp;"/> -<foo x="&amp;"/> -<foo x="&amp;"/> -<foo x="&amp;"/> -<foo x="&&"/> -<foo x="&&"/> -<foo x="&&"/> -<foo x="&&"/> +<foo x="&"></foo> +<foo x="&"></foo> +<foo x="&"></foo> +<foo x="&"></foo> +<foo x="&amp;"></foo> +<foo x="&amp;"></foo> +<foo x="&amp;"></foo> +<foo x="&amp;"></foo> +<foo x="&&"></foo> +<foo x="&&"></foo> +<foo x="&&"></foo> +<foo x="&&"></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&x\"/>", bx.toString) + assertEquals("@five", "<hello foo=\"bar&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 |