diff options
author | Alex Cruise <alex@metaforsoftware.com> | 2012-03-15 17:44:31 -0700 |
---|---|---|
committer | Alex Cruise <alex@metaforsoftware.com> | 2012-03-15 17:44:31 -0700 |
commit | 783c2c655f24c2e94f2d08614e5c6b3d7ffd2039 (patch) | |
tree | 12ed6a698245663450a557e4e0e656cabf450472 /test/files | |
parent | 57eaf9efbc4d52e1226d8fdccd2b274e860fc198 (diff) | |
download | scala-783c2c655f24c2e94f2d08614e5c6b3d7ffd2039.tar.gz scala-783c2c655f24c2e94f2d08614e5c6b3d7ffd2039.tar.bz2 scala-783c2c655f24c2e94f2d08614e5c6b3d7ffd2039.zip |
Fixed broken tests
Diffstat (limited to 'test/files')
-rwxr-xr-x | test/files/jvm/t1118.check | 3 | ||||
-rw-r--r-- | test/files/jvm/unittest_xml.scala | 2 | ||||
-rw-r--r-- | test/files/jvm/xml05.check | 2 | ||||
-rw-r--r-- | test/files/jvm/xmlattr.check | 4 | ||||
-rwxr-xr-x | test/files/run/t2125.check | 2 | ||||
-rw-r--r-- | test/files/run/xml-attribute.check | 24 |
6 files changed, 19 insertions, 18 deletions
diff --git a/test/files/jvm/t1118.check b/test/files/jvm/t1118.check index b246dc6fb9..d676b413c9 100755 --- a/test/files/jvm/t1118.check +++ b/test/files/jvm/t1118.check @@ -1,3 +1,4 @@ + <hi/> <!-- literal short --> <there></there> <!-- literal long --> <guys who="you all"></guys> <!-- literal long with attribute--> @@ -7,4 +8,4 @@ <emptiness></emptiness> <!--programmatic long--> <vide/> <!--programmatic short--> <elem attr="value"/> <!--programmatic short with attribute--> -<elem2 attr2="value2"></elem2> <!--programmatic long with attribute-->
\ No newline at end of file +<elem2 attr2="value2"></elem2> <!--programmatic long with attribute--> diff --git a/test/files/jvm/unittest_xml.scala b/test/files/jvm/unittest_xml.scala index c03695f5c6..106334e625 100644 --- a/test/files/jvm/unittest_xml.scala +++ b/test/files/jvm/unittest_xml.scala @@ -89,7 +89,7 @@ object Test { assert(" a=\"2\" g=\"3\" j=\"2\" oo=\"2\"" == xml.Utility.sort(q.attributes).toString) val pp = new xml.PrettyPrinter(80,5) - assert("<a a=\"2\" g=\"3\" j=\"2\" oo=\"2\"></a>" == pp.format(q)) + assert("<a a=\"2\" g=\"3\" j=\"2\" oo=\"2\"/>" == pp.format(q)) <hi> <there/> diff --git a/test/files/jvm/xml05.check b/test/files/jvm/xml05.check index 00e617c578..8d3e803bc8 100644 --- a/test/files/jvm/xml05.check +++ b/test/files/jvm/xml05.check @@ -4,7 +4,7 @@ Type :help for more information. scala> scala> <city name="San José"/> -res0: scala.xml.Elem = <city name="San José"></city> +res0: scala.xml.Elem = <city name="San José"/> scala> diff --git a/test/files/jvm/xmlattr.check b/test/files/jvm/xmlattr.check index af80b60fb2..a87420d86c 100644 --- a/test/files/jvm/xmlattr.check +++ b/test/files/jvm/xmlattr.check @@ -14,5 +14,5 @@ true true true true -<b x="&"></b> -<b x="&"></b> +<b x="&"/> +<b x="&"/> diff --git a/test/files/run/t2125.check b/test/files/run/t2125.check index 6ac26a2fe6..51b40469aa 100755 --- a/test/files/run/t2125.check +++ b/test/files/run/t2125.check @@ -1 +1 @@ -<p><lost/><q></q></p> +<p><lost/><q/></p> diff --git a/test/files/run/xml-attribute.check b/test/files/run/xml-attribute.check index 3ae2034684..3cfe3779fc 100644 --- a/test/files/run/xml-attribute.check +++ b/test/files/run/xml-attribute.check @@ -1,12 +1,12 @@ -<t></t> -<t></t> -<t></t> -<t></t> -<t></t> -<t b="1" d="2"></t> -<t b="1" d="2"></t> -<t b="1" d="2"></t> -<t a="1" d="2"></t> -<t b="1" d="2"></t> -<t a="1" b="2" c="3"></t> -<t g="1" e="2" p:a="3" f:e="4" mgruhu:ji="5"></t>
\ No newline at end of file +<t/> +<t/> +<t/> +<t/> +<t/> +<t b="1" d="2"/> +<t b="1" d="2"/> +<t b="1" d="2"/> +<t a="1" d="2"/> +<t b="1" d="2"/> +<t a="1" b="2" c="3"/> +<t g="1" e="2" p:a="3" f:e="4" mgruhu:ji="5"/> |