diff options
Diffstat (limited to 'test')
| -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 | ||||
| -rw-r--r-- | test/files/jvm5/interpreter.check | 2 | ||||
| -rw-r--r-- | test/files/run/docgenerator.check | 60 | ||||
| -rw-r--r-- | test/files/run/t0663.check | 2 | ||||
| -rw-r--r-- | test/files/run/t1620.check | 4 |
10 files changed, 54 insertions, 54 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 diff --git a/test/files/jvm5/interpreter.check b/test/files/jvm5/interpreter.check index cd55922604..86d6adbbec 100644 --- a/test/files/jvm5/interpreter.check +++ b/test/files/jvm5/interpreter.check @@ -173,7 +173,7 @@ scala> scala> scala> | | | | res3: scala.xml.Elem = <a> - <b d="dd" c="c"></b></a> + <b d="dd" c="c"/></a> scala> scala> diff --git a/test/files/run/docgenerator.check b/test/files/run/docgenerator.check index dbb7eeed28..b1565edae5 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><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script> + <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"/> </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><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script> + <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"/> </head> <frameset cols="25%, 75%"> <frameset rows="50%, 28, 50%"> - <frame src="modules.html" name="modulesFrame"></frame> - <frame src="nav-classes.html" name="navigationFrame"></frame> - <frame src="all-classes.html" name="classesFrame"></frame> + <frame src="modules.html" name="modulesFrame"/> + <frame src="nav-classes.html" name="navigationFrame"/> + <frame src="all-classes.html" name="classesFrame"/> </frameset> - <frame src="root-content.html" name="contentFrame"></frame> + <frame src="root-content.html" name="contentFrame"/> </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><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script> + <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"/> </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><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script> + <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"/> </head> <frameset cols="25%, 75%"> <frameset rows="50%, 28, 50%"> - <frame src="modules.html" name="modulesFrame"></frame> - <frame src="nav-classes.html" name="navigationFrame"></frame> - <frame src="all-classes.html" name="classesFrame"></frame> + <frame src="modules.html" name="modulesFrame"/> + <frame src="nav-classes.html" name="navigationFrame"/> + <frame src="all-classes.html" name="classesFrame"/> </frameset> - <frame src="root-content.html" name="contentFrame"></frame> + <frame src="root-content.html" name="contentFrame"/> </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><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script> + <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"/> </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><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script> + <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"/> </head> <frameset cols="25%, 75%"> <frameset rows="50%, 28, 50%"> - <frame src="modules.html" name="modulesFrame"></frame> - <frame src="nav-classes.html" name="navigationFrame"></frame> - <frame src="all-classes.html" name="classesFrame"></frame> + <frame src="modules.html" name="modulesFrame"/> + <frame src="nav-classes.html" name="navigationFrame"/> + <frame src="all-classes.html" name="classesFrame"/> </frameset> - <frame src="root-content.html" name="contentFrame"></frame> + <frame src="root-content.html" name="contentFrame"/> </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><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script> + <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"/> </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><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script> + <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"/> </head> <frameset cols="25%, 75%"> <frameset rows="50%, 28, 50%"> - <frame src="modules.html" name="modulesFrame"></frame> - <frame src="nav-classes.html" name="navigationFrame"></frame> - <frame src="all-classes.html" name="classesFrame"></frame> + <frame src="modules.html" name="modulesFrame"/> + <frame src="nav-classes.html" name="navigationFrame"/> + <frame src="all-classes.html" name="classesFrame"/> </frameset> - <frame src="root-content.html" name="contentFrame"></frame> + <frame src="root-content.html" name="contentFrame"/> </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><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script> + <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"/> </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><meta content="scaladoc" name="generator"></meta><link href="style.css" type="text/css" rel="stylesheet"></link><script type="text/javascript" src="script.js"></script> + <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"/> </head> <frameset cols="25%, 75%"> <frameset rows="50%, 28, 50%"> - <frame src="modules.html" name="modulesFrame"></frame> - <frame src="nav-classes.html" name="navigationFrame"></frame> - <frame src="all-classes.html" name="classesFrame"></frame> + <frame src="modules.html" name="modulesFrame"/> + <frame src="nav-classes.html" name="navigationFrame"/> + <frame src="all-classes.html" name="classesFrame"/> </frameset> - <frame src="root-content.html" name="contentFrame"></frame> + <frame src="root-content.html" name="contentFrame"/> </frameset> </html> diff --git a/test/files/run/t0663.check b/test/files/run/t0663.check index 22b68b7f57..dd9be2af70 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 979efc8227..afa1e6acd5 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/> |