Skip to content

Commit 7913982

Browse files
paulpadriaanm
authored andcommitted
Restored xml test cases to unminimized tags
1 parent e18538b commit 7913982

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

test/files/jvm/interpreter.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ scala>
173173
scala>
174174
scala> | | | | res3: scala.xml.Elem =
175175
<a>
176-
<b d="dd" c="c"/></a>
176+
<b d="dd" c="c"></b></a>
177177

178178
scala>
179179
scala>

test/files/jvm/t0632.check

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<foo x="&amp;"/>
2-
<foo x="&amp;"/>
3-
<foo x="&amp;"/>
4-
<foo x="&amp;"/>
5-
<foo x="&amp;amp;"/>
6-
<foo x="&amp;amp;"/>
7-
<foo x="&amp;amp;"/>
8-
<foo x="&amp;amp;"/>
9-
<foo x="&amp;&amp;"/>
10-
<foo x="&amp;&amp;"/>
11-
<foo x="&amp;&amp;"/>
12-
<foo x="&amp;&amp;"/>
1+
<foo x="&amp;"></foo>
2+
<foo x="&amp;"></foo>
3+
<foo x="&amp;"></foo>
4+
<foo x="&amp;"></foo>
5+
<foo x="&amp;amp;"></foo>
6+
<foo x="&amp;amp;"></foo>
7+
<foo x="&amp;amp;"></foo>
8+
<foo x="&amp;amp;"></foo>
9+
<foo x="&amp;&amp;"></foo>
10+
<foo x="&amp;&amp;"></foo>
11+
<foo x="&amp;&amp;"></foo>
12+
<foo x="&amp;&amp;"></foo>

test/files/jvm/unittest_xml.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ object Test {
9090
val q = xml.Utility.sort(<a g='3' j='2' oo='2' a='2'/>)
9191
assertEquals("sort attrib"+xml.Utility.sort(q.attributes).toString, " a=\"2\" g=\"3\" j=\"2\" oo=\"2\"", xml.Utility.sort(q.attributes).toString)
9292
val pp = new xml.PrettyPrinter(80,5)
93-
assertEquals("pretty print sorted attrib:"+pp.format(q), "<a a=\"2\" g=\"3\" j=\"2\" oo=\"2\"/>", pp.format(q))
93+
assertEquals("pretty print sorted attrib:"+pp.format(q), "<a a=\"2\" g=\"3\" j=\"2\" oo=\"2\"></a>", pp.format(q))
9494

9595
<hi>
9696
<there/>

test/files/jvm/xml01.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ xpath \
33
xpath \\ DESCENDANTS
44
<book><author>Peter Buneman</author><author>Dan Suciu</author><title>Data on ze web</title></book>
55
-- group nodes
6-
<f><a/><b/><c/></f>
7-
<a/><f><a/><b/><c/></f><a/><b/><c/>
6+
<f><a></a><b></b><c></c></f>
7+
<a></a><f><a></a><b></b><c></c></f><a></a><b></b><c></c>
88
attribute value normalization

test/files/jvm/xml02.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ object Test extends TestConsoleMain {
2222
assertTrue("@two", ax \ "@foo" == xml.Text("bar")) // dto.
2323
assertTrue("@three", bx \ "@foo" == "bar&x") // dto.
2424
assertTrue ("@four", (bx \ "@foo") sameElements List(xml.Text("bar&x")))
25-
assertEquals("@five", "<hello foo=\"bar&amp;x\"/>", bx.toString)
25+
assertEquals("@five", "<hello foo=\"bar&amp;x\"></hello>", bx.toString)
2626
}
2727
}
2828

test/files/jvm/xml03syntax.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
2
1414
4
1515

16-
node=<elem key="<b>hello</b>"/>, key=Some(<b>hello</b>)
17-
node=<elem />, key=None
16+
node=<elem key="<b>hello</b>"></elem>, key=Some(<b>hello</b>)
17+
node=<elem ></elem>, key=None

test/files/run/t0663.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<feed/>
1+
<feed></feed>

test/files/run/t1620.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version='1.0' encoding='utf-8'?>
22
<!DOCTYPE foo PUBLIC "-//Foo Corp//DTD 1.0//EN" "foo.dtd">
3-
<foo/>
3+
<foo></foo>
44
<?xml version='1.0' encoding='utf-8'?>
55
<!DOCTYPE foo PUBLIC "-//Foo Corp//DTD 1.0//EN">
6-
<foo/>
6+
<foo></foo>

0 commit comments

Comments
 (0)