diff options
author | Seth Tisue <seth@tisue.net> | 2016-02-11 15:06:26 -0800 |
---|---|---|
committer | Seth Tisue <seth@tisue.net> | 2016-02-11 15:06:26 -0800 |
commit | 6d09a1ba5fffadd1d886afb66ab4496291fda3dd (patch) | |
tree | 802da9f49dab8905e94b033f21b3484c1bce35c8 /test | |
parent | b19e2535624de0907264a3c7710bf02b2fd0f952 (diff) | |
parent | 645506250208eb3fd75ce6ab925692adb068e553 (diff) | |
download | scala-6d09a1ba5fffadd1d886afb66ab4496291fda3dd.tar.gz scala-6d09a1ba5fffadd1d886afb66ab4496291fda3dd.tar.bz2 scala-6d09a1ba5fffadd1d886afb66ab4496291fda3dd.zip |
Merge pull request #4957 from retronym/topic/merge-2.11.x-to-2.12.x-20160210
Merge 2.11.x to 2.12.x [ci:last-only]
Diffstat (limited to 'test')
-rw-r--r-- | test/junit/scala/collection/IteratorTest.scala | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/test/junit/scala/collection/IteratorTest.scala b/test/junit/scala/collection/IteratorTest.scala index b0639ef365..4df29e36c0 100644 --- a/test/junit/scala/collection/IteratorTest.scala +++ b/test/junit/scala/collection/IteratorTest.scala @@ -186,4 +186,32 @@ class IteratorTest { assertEquals(1, y.next) assertFalse(x.hasNext) // was true, after advancing underlying iterator } + // SI-9623 + @Test def noExcessiveHasNextInJoinIterator: Unit = { + var counter = 0 + val exp = List(1,2,3,1,2,3) + def it: Iterator[Int] = new Iterator[Int] { + val parent = List(1,2,3).iterator + def next(): Int = parent.next + def hasNext: Boolean = { counter += 1; parent.hasNext } + } + // Iterate separately + val res = new mutable.ArrayBuffer[Int] + it.foreach(res += _) + it.foreach(res += _) + assertSameElements(exp, res) + assertEquals(8, counter) + // JoinIterator + counter = 0 + res.clear + (it ++ it).foreach(res += _) + assertSameElements(exp, res) + assertEquals(8, counter) // was 17 + // ConcatIterator + counter = 0 + res.clear + (Iterator.empty ++ it ++ it).foreach(res += _) + assertSameElements(exp, res) + assertEquals(8, counter) // was 14 + } } |