summaryrefslogtreecommitdiff
path: root/test/files/scalacheck/CheckEither.scala
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-11-19 16:29:14 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-11-20 14:44:31 -0800
commit733f7f086834b549e33a01b5d7504ac2d1353815 (patch)
tree4f1e747756b33be13544fdd15e707ce7afdb17f8 /test/files/scalacheck/CheckEither.scala
parentc243435f113615b2f7407fbd683c93ec16c73749 (diff)
downloadscala-733f7f086834b549e33a01b5d7504ac2d1353815.tar.gz
scala-733f7f086834b549e33a01b5d7504ac2d1353815.tar.bz2
scala-733f7f086834b549e33a01b5d7504ac2d1353815.zip
Prepare upgrade to scalacheck 1.11.
Our scalacheck tests now compile against 1.10.1 and 1.11.0. They pass on 1.10.1, but fail on 1.11.0. Once (that)[https://github.com/rickynils/scalacheck/issues/79]'s fixed, and 1.11.1 released, we should be able to upgrade to it by simply changing scalacheck.version.number in versions.properties. The changes are mostly removing dead code (e.g., consolereporter business). Of interest: the type ascription for `oneOf`. I haven't quite investigated, but something seems to have changed between 1.10.1 and 1.11.0 that caused a different overload to be picked without the type ascription. Probably not a scalac bug, just a scalacheck api change.
Diffstat (limited to 'test/files/scalacheck/CheckEither.scala')
-rw-r--r--test/files/scalacheck/CheckEither.scala12
1 files changed, 2 insertions, 10 deletions
diff --git a/test/files/scalacheck/CheckEither.scala b/test/files/scalacheck/CheckEither.scala
index 4d0cab4693..48f732a22d 100644
--- a/test/files/scalacheck/CheckEither.scala
+++ b/test/files/scalacheck/CheckEither.scala
@@ -1,10 +1,8 @@
-import org.scalacheck.{ Arbitrary, ConsoleReporter, Prop, Properties }
+import org.scalacheck.{ Arbitrary, Prop, Properties }
import org.scalacheck.Arbitrary.{arbitrary, arbThrowable}
import org.scalacheck.Gen.oneOf
-import org.scalacheck.util.StdRand
import org.scalacheck.Prop._
-import org.scalacheck.Test.{Params, check}
-import org.scalacheck.ConsoleReporter.testStatsEx
+import org.scalacheck.Test.check
import Function.tupled
object Test extends Properties("Either") {
@@ -178,10 +176,4 @@ object Test extends Properties("Either") {
for ((label, prop) <- tests) {
property(label) = prop
}
-
- import org.scalacheck.{ Test => STest }
-
- def runTests() = {
- STest.checkProperties(STest.Params(testCallback = ConsoleReporter(0)), this)
- }
}