1 files changed, 20 insertions, 1 deletions
diff --git a/test/junit/scala/collection/SetMapConsistencyTest.scala b/test/junit/scala/collection/SetMapConsistencyTest.scala
index 7bb8ca958b..0d6f43db06 100644
--- a/test/junit/scala/collection/SetMapConsistencyTest.scala
+++ b/test/junit/scala/collection/SetMapConsistencyTest.scala
@@ -478,7 +478,7 @@ class SetMapConsistencyTest {
   }
   
   @Test
-  def si8213() {
+  def testSI8213() {
     val am = new scala.collection.mutable.AnyRefMap[String, Int]
     for (i <- 0 until 1024) am += i.toString -> i
     am.getOrElseUpdate("1024", { am.clear; -1 })
@@ -488,4 +488,23 @@ class SetMapConsistencyTest {
     lm.getOrElseUpdate(1024, { lm.clear; -1 })
     assert(lm == scala.collection.mutable.LongMap(1024L -> -1))
   }
+  
+  // Mutating when an iterator is in the wild shouldn't produce random junk in the iterator
+  // Todo: test all sets/maps this way
+  @Test
+  def testSI8154() {
+    def f() = {
+      val xs = scala.collection.mutable.AnyRefMap[String, Int]("a" -> 1)
+      val it = xs.iterator
+      it.hasNext
+      xs.clear()
+    
+      if (it.hasNext) Some(it.next)
+      else None
+    }
+    assert(f() match {
+      case Some((a,b)) if (a==null || b==null) => false
+      case _ => true
+    })
+  }
 }