summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2014-10-20 14:44:08 +0200
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2014-10-20 14:44:08 +0200
commit767cc4495752ac0a103d68e59fbc3b8ee27c6395 (patch)
tree6ee364d78a4608bc67025ef37b039c90c056875c /test
parenteb15950e697eb77e52733f81c65e2d51951ad881 (diff)
parent38587c5db1d84b6aef9e85ce94d49548c7fa2c66 (diff)
downloadscala-767cc4495752ac0a103d68e59fbc3b8ee27c6395.tar.gz
scala-767cc4495752ac0a103d68e59fbc3b8ee27c6395.tar.bz2
scala-767cc4495752ac0a103d68e59fbc3b8ee27c6395.zip
Merge pull request #4048 from lrytz/t8899
[nomerge] SI-8899 Revert "SI-8627 make Stream.filterNot non-eager"
Diffstat (limited to 'test')
-rw-r--r--test/files/run/t4332.scala2
-rw-r--r--test/junit/scala/collection/immutable/StreamTest.scala18
2 files changed, 1 insertions, 19 deletions
diff --git a/test/files/run/t4332.scala b/test/files/run/t4332.scala
index 1c7e7d73de..5a67922911 100644
--- a/test/files/run/t4332.scala
+++ b/test/files/run/t4332.scala
@@ -12,7 +12,7 @@ object Test extends DirectTest {
}
def isExempt(sym: Symbol) = {
- val exempt = Set("view", "repr", "sliceWithKnownDelta", "sliceWithKnownBound", "transform", "filterImpl")
+ val exempt = Set("view", "repr", "sliceWithKnownDelta", "sliceWithKnownBound", "transform")
(exempt contains sym.name.decoded)
}
diff --git a/test/junit/scala/collection/immutable/StreamTest.scala b/test/junit/scala/collection/immutable/StreamTest.scala
deleted file mode 100644
index 6dc1c79a48..0000000000
--- a/test/junit/scala/collection/immutable/StreamTest.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-package scala.collection.immutable
-
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-import org.junit.Test
-import org.junit.Assert._
-
-@RunWith(classOf[JUnit4])
-class StreamTest {
-
- @Test
- def t6727_and_t6440(): Unit = {
- assertTrue(Stream.continually(()).filter(_ => true).take(2) == Seq((), ()))
- assertTrue(Stream.continually(()).filterNot(_ => false).take(2) == Seq((), ()))
- assertTrue(Stream(1,2,3,4,5).filter(_ < 4) == Seq(1,2,3))
- assertTrue(Stream(1,2,3,4,5).filterNot(_ > 4) == Seq(1,2,3,4))
- }
-}