diff options
| author | Paul Phillips <paulp@improving.org> | 2009-05-01 14:48:18 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2009-05-01 14:48:18 +0000 |
| commit | b17eed30473fef5693632f78296cabf341a5c92c (patch) | |
| tree | b3b7f3a93ba0882bde8d0f5a66c2f5c53a246c45 /test/files/jvm | |
| parent | 9b2908a5edfab7b289cd557b46df2af4b3ee3fca (diff) | |
| download | scala-b17eed30473fef5693632f78296cabf341a5c92c.tar.gz scala-b17eed30473fef5693632f78296cabf341a5c92c.tar.bz2 scala-b17eed30473fef5693632f78296cabf341a5c92c.zip | |
Modifications to the 10 failing test cases to m...
Modifications to the 10 failing test cases to make them passing test
cases in light of the patch from #1118.
Diffstat (limited to 'test/files/jvm')
| -rw-r--r--[-rwxr-xr-x] | test/files/jvm/serialization.check | 4 | ||||
| -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, 20 insertions, 20 deletions
diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check index 69405c4164..d6782410c8 100755..100644 --- a/test/files/jvm/serialization.check +++ b/test/files/jvm/serialization.check @@ -118,8 +118,8 @@ x = ListBuffer(white, black) y = ListBuffer(white, black) x equals y: true - y equals x: true -x = <html><title>title</title><body></body></html> -y = <html><title>title</title><body></body></html> +x = <html><title>title</title><body/></html> +y = <html><title>title</title><body/></html> x equals y: true - y equals x: true x = <html> diff --git a/test/files/jvm/t0632.check b/test/files/jvm/t0632.check index 3185410a75..681bc9da92 100644 --- a/test/files/jvm/t0632.check +++ b/test/files/jvm/t0632.check @@ -1,12 +1,12 @@ -<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> +<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="&&"/> diff --git a/test/files/jvm/unittest_xml.scala b/test/files/jvm/unittest_xml.scala index 63375cd15a..9f6dd3183d 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\"></a>", pp.format(q)) + assertEquals("pretty print sorted attrib:"+pp.format(q), "<a a=\"2\" g=\"3\" j=\"2\" oo=\"2\"/>", pp.format(q)) <hi> <there/> diff --git a/test/files/jvm/xml01.check b/test/files/jvm/xml01.check index 5e82e9a729..d78e6df410 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></a><b></b><c></c></f> -<a></a><f><a></a><b></b><c></c></f><a></a><b></b><c></c> +<f><a/><b/><c/></f> +<a/><f><a/><b/><c/></f><a/><b/><c/> attribute value normalization diff --git a/test/files/jvm/xml02.scala b/test/files/jvm/xml02.scala index 1c3f4c2599..52ce3a0060 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\"></hello>", bx.toString) + assertEquals("@five", "<hello foo=\"bar&x\"/>", bx.toString) } } diff --git a/test/files/jvm/xml03syntax.check b/test/files/jvm/xml03syntax.check index fd1e10cac9..ec00119211 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>"></elem>, key=Some(<b>hello</b>) -node=<elem ></elem>, key=None +node=<elem key="<b>hello</b>"/>, key=Some(<b>hello</b>) +node=<elem />, key=None |