Merge pull request #2866 from retronym/ticket/7269

SI-7269 Rework MapLike#retains to account for desugaring change

1 files changed, 32 insertions, 0 deletions

diff --git a/test/files/run/t7269.scala b/test/files/run/t7269.scala
new file mode 100644
index 0000000000..d22e57dfee
--- /dev/null
+++ b/test/files/run/t7269.scala
@@ -0,0 +1,32 @@
+import scala.collection.JavaConversions._
+import scala.collection.mutable
+
+object Test extends App {
+
+  def testMap(): Unit = {
+    val mapJ = new java.util.HashMap[Int, String]
+    val mapS: mutable.Map[Int, String] = mapJ
+
+    (10 to 20).foreach(i => mapS += ((i, i.toString)))
+    assert(11 == mapS.size)
+
+    // ConcurrentModificationException thrown in the following line
+    mapS.retain((i, str) => i % 2 == 0)
+    assert(6 == mapS.size)
+  }
+
+  def testSet(): Unit = {
+    val mapJ = new java.util.HashSet[Int]
+    val mapS: mutable.Set[Int] = mapJ
+
+    (10 to 20).foreach(i => mapS += i)
+    assert(11 == mapS.size)
+
+    // ConcurrentModificationException thrown in the following line
+    mapS.retain((i) => i % 2 == 0)
+    assert(6 == mapS.size)
+  }
+
+  testSet()
+  testMap()
+}