diff options
author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-02-25 13:50:19 +0100 |
---|---|---|
committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-02-25 13:50:19 +0100 |
commit | 1ea43ffb2286d63e133839c1ea0b09449b0ac168 (patch) | |
tree | 2d003de0ec0e2687eaef214d65e46922b9e86264 /test | |
parent | 7c709e122f7471353749525cff15602783fb348c (diff) | |
parent | 12dc4a28da8d3631734603c896d2ee1ba21b31d6 (diff) | |
download | scala-1ea43ffb2286d63e133839c1ea0b09449b0ac168.tar.gz scala-1ea43ffb2286d63e133839c1ea0b09449b0ac168.tar.bz2 scala-1ea43ffb2286d63e133839c1ea0b09449b0ac168.zip |
Merge pull request #3566 from adriaanm/t6455
SI-6455 no longer rewrite .withFilter to .filter
Diffstat (limited to 'test')
-rw-r--r-- | test/files/neg/t6455.check | 4 | ||||
-rw-r--r-- | test/files/neg/t6455.flags | 1 | ||||
-rw-r--r-- | test/files/neg/t6455.scala | 6 | ||||
-rw-r--r-- | test/files/scalacheck/quasiquotes/TypecheckedProps.scala | 2 | ||||
-rw-r--r-- | test/junit/scala/util/TryTest.scala | 35 |
5 files changed, 47 insertions, 1 deletions
diff --git a/test/files/neg/t6455.check b/test/files/neg/t6455.check new file mode 100644 index 0000000000..8f2aad0b9e --- /dev/null +++ b/test/files/neg/t6455.check @@ -0,0 +1,4 @@ +t6455.scala:5: error: value withFilter is not a member of object O + O.withFilter(f => true) + ^ +one error found diff --git a/test/files/neg/t6455.flags b/test/files/neg/t6455.flags new file mode 100644 index 0000000000..112fc720a0 --- /dev/null +++ b/test/files/neg/t6455.flags @@ -0,0 +1 @@ +-Xfuture
\ No newline at end of file diff --git a/test/files/neg/t6455.scala b/test/files/neg/t6455.scala new file mode 100644 index 0000000000..ebbb37f1cd --- /dev/null +++ b/test/files/neg/t6455.scala @@ -0,0 +1,6 @@ +object O { def filter(p: Int => Boolean): O.type = this } + +class Test { + // should not compile because we no longer rewrite withFilter => filter under -Xfuture + O.withFilter(f => true) +}
\ No newline at end of file diff --git a/test/files/scalacheck/quasiquotes/TypecheckedProps.scala b/test/files/scalacheck/quasiquotes/TypecheckedProps.scala index 432c0959c9..7c4cb0306e 100644 --- a/test/files/scalacheck/quasiquotes/TypecheckedProps.scala +++ b/test/files/scalacheck/quasiquotes/TypecheckedProps.scala @@ -44,7 +44,7 @@ object TypecheckedProps extends QuasiquoteProperties("typechecked") { val enums = fq"foo <- new Foo" :: fq"if foo != null" :: Nil val body = q"foo" val q"$_; for(..$enums1) yield $body1" = typecheck(q""" - class Foo { def map(f: Any => Any) = this; def filter(cond: Any => Boolean) = this } + class Foo { def map(f: Any => Any) = this; def withFilter(cond: Any => Boolean) = this } for(..$enums) yield $body """) assert(enums1 ≈ enums) diff --git a/test/junit/scala/util/TryTest.scala b/test/junit/scala/util/TryTest.scala new file mode 100644 index 0000000000..03604a8065 --- /dev/null +++ b/test/junit/scala/util/TryTest.scala @@ -0,0 +1,35 @@ +package scala.util + +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 +import org.junit.Test +import org.junit.Assert._ + +/* Test Try's withFilter method, which was added along with the -Xfuture fix for SI-6455 */ +@RunWith(classOf[JUnit4]) +class TryTest { + @Test + def withFilterFail(): Unit = { + val fail = for (x <- util.Try(1) if x > 1) yield x + assert(fail.isFailure) + } + + @Test + def withFilterSuccess(): Unit = { + val success1 = for (x <- util.Try(1) if x >= 1) yield x + assertEquals(success1, util.Success(1)) + } + + @Test + def withFilterFlatMap(): Unit = { + val successFlatMap = for (x <- util.Try(1) if x >= 1; y <- util.Try(2) if x < y) yield x + assertEquals(successFlatMap, util.Success(1)) + } + + @Test + def withFilterForeach(): Unit = { + var ok = false + for (x <- util.Try(1) if x == 1) ok = x == 1 + assert(ok) + } +}
\ No newline at end of file |