made semantics of MetaData append safer, fixed ...

made semantics of MetaData append safer, fixed test

1 files changed, 10 insertions, 3 deletions

diff --git a/test/files/jvm/xmlattr.scala b/test/files/jvm/xmlattr.scala
index 0e519f51df..a947adf231 100644
--- a/test/files/jvm/xmlattr.scala
+++ b/test/files/jvm/xmlattr.scala
@@ -2,7 +2,7 @@ import testing.SUnit.{Assert, TestCase, TestConsoleMain, TestSuite}
 import xml.{NodeSeq, Null, Text, UnprefixedAttribute}
 
 object Test extends TestConsoleMain {
-  def suite = new TestSuite()
+  def suite = new TestSuite(UnprefixedAttributeTest, AttributeWithOptionTest)
 
   object UnprefixedAttributeTest extends TestCase("UnprefixedAttribute") with Assert {
     override def runTest {
@@ -19,6 +19,13 @@ object Test extends TestConsoleMain {
 
       val z = new UnprefixedAttribute("foo", null:NodeSeq, x)
       assertEquals(None, z.get("foo"))
+
+      var appended = x append x append x append x
+      var len = 0; while (appended ne Null) {
+        appended = appended.next
+        len = len + 1
+      }
+      assertEquals("removal of duplicates for unprefixed attributes in append", 1, len)
     }
   }
 
@@ -39,8 +46,8 @@ object Test extends TestConsoleMain {
       assertEquals(None, y.attributes.get("bar"))
       assertEquals(null, y.attributes("bar"))
 
-      val z = new UnprefixedAttribute("bar", None, x)
-      assertEquals(z.get("foo"), None) // None
+      val z = new UnprefixedAttribute("foo", None, x)
+      assertEquals(None, z.get("foo")) // None
     }
   }