pull request feedback

10 files changed, 109 insertions, 5 deletions

diff --git a/test/files/jvm/serialization-new.check b/test/files/jvm/serialization-new.check
index fa51c6a879..f886cfe29c 100644
--- a/test/files/jvm/serialization-new.check
+++ b/test/files/jvm/serialization-new.check
@@ -168,6 +168,30 @@ x = History()
 y = History()
 x equals y: true, y equals x: true
 
+x = Map(Linked -> 1, Hash -> 2, Map -> 3)
+y = Map(Linked -> 1, Hash -> 2, Map -> 3)
+x equals y: true, y equals x: true
+
+x = ArrayBuffer((Linked,1), (Hash,2), (Map,3))
+y = ArrayBuffer((Linked,1), (Hash,2), (Map,3))
+x equals y: true, y equals x: true
+
+x = ArrayBuffer((Linked,1), (Hash,2), (Map,3))
+y = List((Linked,1), (Hash,2), (Map,3))
+x equals y: true, y equals x: true
+
+x = Set(layers, buffers, title)
+y = Set(layers, buffers, title)
+x equals y: true, y equals x: true
+
+x = ArrayBuffer(layers, buffers, title)
+y = ArrayBuffer(layers, buffers, title)
+x equals y: true, y equals x: true
+
+x = ArrayBuffer(layers, buffers, title)
+y = List(layers, buffers, title)
+x equals y: true, y equals x: true
+
 x = ListBuffer(white, black)
 y = ListBuffer(white, black)
 x equals y: true, y equals x: true
diff --git a/test/files/jvm/serialization-new.scala b/test/files/jvm/serialization-new.scala
index 91eb52928f..1522fc8e27 100644
--- a/test/files/jvm/serialization-new.scala
+++ b/test/files/jvm/serialization-new.scala
@@ -285,8 +285,8 @@ object Test3_mutable {
   import scala.reflect.ClassTag
   import scala.collection.mutable.{
     ArrayBuffer, ArrayBuilder, ArraySeq, ArrayStack, BitSet, DoubleLinkedList,
-    HashMap, HashSet, History, LinkedList, ListBuffer, Publisher, Queue,
-    Stack, StringBuilder, WrappedArray, TreeSet}
+    HashMap, HashSet, History, LinkedHashMap, LinkedHashSet, LinkedList, ListBuffer,
+    Publisher, Queue, Stack, StringBuilder, WrappedArray, TreeSet}
   import scala.collection.concurrent.TrieMap
 
   // in alphabetic order
@@ -346,6 +346,26 @@ object Test3_mutable {
     val h1 = new History[String, Int]
     val _h1: History[String, Int] = read(write(h1))
     check(h1, _h1)
+
+    // LinkedHashMap
+    { val lhm1 = new LinkedHashMap[String, Int]
+      val list = List(("Linked", 1), ("Hash", 2), ("Map", 3))
+      lhm1 ++= list.iterator
+      val _lhm1: LinkedHashMap[String, Int] = read(write(lhm1))
+      check(lhm1, _lhm1)
+      check(lhm1.toSeq, _lhm1.toSeq) // check elements order
+      check(lhm1.toSeq, list) // check elements order
+    }
+
+    // LinkedHashSet
+    { val lhs1 = new LinkedHashSet[String]
+      val list = List("layers", "buffers", "title")
+      lhs1 ++= list.iterator
+      val _lhs1: LinkedHashSet[String] = read(write(lhs1))
+      check(lhs1, _lhs1)
+      check(lhs1.toSeq, _lhs1.toSeq) // check elements order
+      check(lhs1.toSeq, list) // check elements order
+    }
 /*
     // LinkedList
     val ll1 = new LinkedList[Int](2, null)
diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check
index fa51c6a879..f886cfe29c 100644
--- a/test/files/jvm/serialization.check
+++ b/test/files/jvm/serialization.check
@@ -168,6 +168,30 @@ x = History()
 y = History()
 x equals y: true, y equals x: true
 
+x = Map(Linked -> 1, Hash -> 2, Map -> 3)
+y = Map(Linked -> 1, Hash -> 2, Map -> 3)
+x equals y: true, y equals x: true
+
+x = ArrayBuffer((Linked,1), (Hash,2), (Map,3))
+y = ArrayBuffer((Linked,1), (Hash,2), (Map,3))
+x equals y: true, y equals x: true
+
+x = ArrayBuffer((Linked,1), (Hash,2), (Map,3))
+y = List((Linked,1), (Hash,2), (Map,3))
+x equals y: true, y equals x: true
+
+x = Set(layers, buffers, title)
+y = Set(layers, buffers, title)
+x equals y: true, y equals x: true
+
+x = ArrayBuffer(layers, buffers, title)
+y = ArrayBuffer(layers, buffers, title)
+x equals y: true, y equals x: true
+
+x = ArrayBuffer(layers, buffers, title)
+y = List(layers, buffers, title)
+x equals y: true, y equals x: true
+
 x = ListBuffer(white, black)
 y = ListBuffer(white, black)
 x equals y: true, y equals x: true
diff --git a/test/files/jvm/serialization.scala b/test/files/jvm/serialization.scala
index 9c2f2acdbf..34b64938b4 100644
--- a/test/files/jvm/serialization.scala
+++ b/test/files/jvm/serialization.scala
@@ -285,8 +285,8 @@ object Test3_mutable {
   import scala.reflect.ClassManifest
   import scala.collection.mutable.{
     ArrayBuffer, ArrayBuilder, ArraySeq, ArrayStack, BitSet, DoubleLinkedList,
-    HashMap, HashSet, History, LinkedList, ListBuffer, Publisher, Queue,
-    Stack, StringBuilder, WrappedArray, TreeSet}
+    HashMap, HashSet, History, LinkedHashMap, LinkedHashSet, LinkedList, ListBuffer,
+    Publisher, Queue, Stack, StringBuilder, WrappedArray, TreeSet}
   import scala.collection.concurrent.TrieMap
 
   // in alphabetic order
@@ -346,6 +346,26 @@ object Test3_mutable {
     val h1 = new History[String, Int]
     val _h1: History[String, Int] = read(write(h1))
     check(h1, _h1)
+
+    // LinkedHashMap
+    { val lhm1 = new LinkedHashMap[String, Int]
+      val list = List(("Linked", 1), ("Hash", 2), ("Map", 3))
+      lhm1 ++= list.iterator
+      val _lhm1: LinkedHashMap[String, Int] = read(write(lhm1))
+      check(lhm1, _lhm1)
+      check(lhm1.toSeq, _lhm1.toSeq) // check elements order
+      check(lhm1.toSeq, list) // check elements order
+    }
+
+    // LinkedHashSet
+    { val lhs1 = new LinkedHashSet[String]
+      val list = List("layers", "buffers", "title")
+      lhs1 ++= list.iterator
+      val _lhs1: LinkedHashSet[String] = read(write(lhs1))
+      check(lhs1, _lhs1)
+      check(lhs1.toSeq, _lhs1.toSeq) // check elements order
+      check(lhs1.toSeq, list) // check elements order
+    }
 /*
     // LinkedList
     val ll1 = new LinkedList[Int](2, null)
diff --git a/test/files/run/collections.check b/test/files/run/collections.check
index b87a5998c5..c24150b24d 100644
--- a/test/files/run/collections.check
+++ b/test/files/run/collections.check
@@ -2,6 +2,10 @@
 test1: 14005
 test2: 25005003, iters = 5000
 test3: 25005003
+***** mutable.LinkedHashSet:
+test1: 14005
+test2: 25005003, iters = 5000
+test3: 25005003
 ***** immutable.Set:
 test1: 14005
 test2: 25005003, iters = 5000
@@ -18,6 +22,10 @@ test3: 25005003
 test1: 14005
 test2: 25005003, iters = 5000
 test3: 25005003
+***** mutable.LinkedHashMap:
+test1: 14005
+test2: 25005003, iters = 5000
+test3: 25005003
 ***** immutable.Map:
 test1: 14005
 test2: 25005003, iters = 5000
diff --git a/test/files/run/collections.scala b/test/files/run/collections.scala
index 60f0765e6a..69c40fae80 100644
--- a/test/files/run/collections.scala
+++ b/test/files/run/collections.scala
@@ -106,10 +106,12 @@ object Test extends App {
   }
 
   test("mutable.HashSet", new mutable.HashSet[Int], 5000)
+  test("mutable.LinkedHashSet", new mutable.LinkedHashSet[Int], 5000)
   test("immutable.Set", immutable.Set[Int](), 5000)
   test("immutable.ListSet", new immutable.ListSet[Int], 5000)
   test("immutable.TreeSet", new immutable.TreeSet[Int], 5000)
   test("mutable.HashMap", new mutable.HashMap[Int, Int], 5000)
+  test("mutable.LinkedHashMap", new mutable.LinkedHashMap[Int, Int], 5000)
   test("immutable.Map", immutable.Map[Int, Int](), 5000)
   test("immutable.TreeMap", new immutable.TreeMap[Int, Int], 5000)
   test("immutable.ListMap", new immutable.ListMap[Int, Int], 3000)
diff --git a/test/files/run/colltest.check b/test/files/run/colltest.check
index 1ad81a1350..e5bb013ed7 100644
--- a/test/files/run/colltest.check
+++ b/test/files/run/colltest.check
@@ -5,3 +5,4 @@ false
 true
 false
 succeeded for 10 iterations.
+succeeded for 10 iterations.
diff --git a/test/files/run/colltest.scala b/test/files/run/colltest.scala
index ecd234bdd1..703e94a3c7 100644
--- a/test/files/run/colltest.scala
+++ b/test/files/run/colltest.scala
@@ -61,5 +61,6 @@ object Test extends App {
   }
   t3954
 
-  new TestSet(HashSet.empty, new scala.collection.mutable.LinkedHashSet)
+  new TestSet(HashSet.empty, new LinkedHashSet)
+  new TestSet(new ImmutableSetAdaptor(collection.immutable.Set.empty[Int]), new LinkedHashSet)
 }
diff --git a/test/files/run/colltest1.check b/test/files/run/colltest1.check
index 7377174281..5ec6286d9e 100644
--- a/test/files/run/colltest1.check
+++ b/test/files/run/colltest1.check
@@ -107,3 +107,5 @@ List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K)
 List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K), (L,L), (M,M), (N,N), (O,O), (P,P), (Q,Q), (R,R), (S,S), (T,T), (U,U), (V,V), (W,W), (X,X), (Y,Y), (Z,Z))
 List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K), (L,L), (M,M), (N,N), (O,O), (P,P), (Q,Q), (R,R), (S,S), (T,T), (U,U), (V,V), (W,W), (X,X), (Y,Y), (Z,Z))
 List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K), (L,L), (M,M), (N,N), (O,O), (P,P), (Q,Q), (R,R), (S,S), (T,T), (U,U), (V,V), (W,W), (X,X), (Y,Y), (Z,Z))
+List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K), (L,L), (M,M), (N,N), (O,O), (P,P), (Q,Q), (R,R), (S,S), (T,T), (U,U), (V,V), (W,W), (X,X), (Y,Y), (Z,Z))
+List((A,A), (B,B), (C,C), (D,D), (E,E), (F,F), (G,G), (H,H), (I,I), (J,J), (K,K), (L,L), (M,M), (N,N), (O,O), (P,P), (Q,Q), (R,R), (S,S), (T,T), (U,U), (V,V), (W,W), (X,X), (Y,Y), (Z,Z))
diff --git a/test/files/run/colltest1.scala b/test/files/run/colltest1.scala
index 1cbd932222..54adeb7cda 100644
--- a/test/files/run/colltest1.scala
+++ b/test/files/run/colltest1.scala
@@ -226,6 +226,7 @@ object Test extends App {
   setTest(mutable.Set())
   setTest(immutable.Set())
   setTest(mutable.HashSet())
+  setTest(mutable.LinkedHashSet())
   setTest(immutable.HashSet())
 
   mapTest(Map())
@@ -233,5 +234,6 @@ object Test extends App {
   mapTest(immutable.Map())
   mapTest(immutable.TreeMap())
   mutableMapTest(mutable.HashMap())
+  mutableMapTest(mutable.LinkedHashMap())
   mapTest(immutable.HashMap())
 }