xml improvements for 2.2.1 (see changes)

5 files changed, 22 insertions, 1 deletions

diff --git a/test/files/jvm/xml01.check b/test/files/jvm/xml01.check
index 5e9ee2aed0..2a8d2e5625 100644
--- a/test/files/jvm/xml01.check
+++ b/test/files/jvm/xml01.check
@@ -22,6 +22,9 @@ passed ok
 -- 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>
+passed ok
+passed ok
+passed ok
 attribute value normalization
 passed ok
 passed ok
diff --git a/test/files/jvm/xml01.scala b/test/files/jvm/xml01.scala
index 3558d95100..8c99cfd358 100644
--- a/test/files/jvm/xml01.scala
+++ b/test/files/jvm/xml01.scala
@@ -189,6 +189,15 @@ object Test {
     val zx2: Node = Group { List(<a/>,zy1,zx1) }
     Console println zx2.toString()
 
+    val zz1 = <xml:group><a/><b/><c/></xml:group>
+
+    assertTrue(zx1 == zz1)
+    assertTrue(zz1.length == 3)
+
+    // unparsed
+
+    val uup = <xml:unparsed>&<<>""^%@$!#</xml:unparsed>
+    assertTrue(uup == "&<<>\"\"^%@$!#")
     // test unicode escapes backslash u
 
   Console println ("attribute value normalization");
diff --git a/test/files/jvm/xml02.scala b/test/files/jvm/xml02.scala
index cbc9b5041b..d0d97e64eb 100644
--- a/test/files/jvm/xml02.scala
+++ b/test/files/jvm/xml02.scala
@@ -21,7 +21,8 @@ def main(args:Array[String]) = {
   Console.println("three");
   assertEquals(bx \ "@foo", "bar&x")
   Console.println("four");
-  assertSameElements(bx \ "@foo", List(xml.Text("bar"),xml.EntityRef("amp"),xml.Text("x")))
+  assertSameElements(bx \ "@foo", List(xml.Text("bar&x")))
+  //assertSameElements(bx \ "@foo", List(xml.Text("bar"),xml.EntityRef("amp"),xml.Text("x")))
 
   Console.println("five");
   assertEquals(bx.toString, "<hello foo=\"bar&amp;x\"></hello>")
diff --git a/test/files/jvm/xmlattr.check b/test/files/jvm/xmlattr.check
index a1841a78ef..bebcb45081 100644
--- a/test/files/jvm/xmlattr.check
+++ b/test/files/jvm/xmlattr.check
@@ -8,3 +8,5 @@ true
  
 None
 null
+<b x="&amp;"></b>
+<b x="&amp;"></b>
diff --git a/test/files/jvm/xmlattr.scala b/test/files/jvm/xmlattr.scala
index 9801e05357..c34f66eafc 100644
--- a/test/files/jvm/xmlattr.scala
+++ b/test/files/jvm/xmlattr.scala
@@ -20,4 +20,10 @@ object Test extends Application {
   Console.println(x.get("foo")) // None
   Console.println(x("foo")) // null
   }
+
+  val x1 = <b x="&amp;"/>
+  val x2 = <b x={"&"}/>
+  Console.println(x1)
+  Console.println(x2)
+
 }