diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-19 16:29:14 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-20 14:44:31 -0800 |
| commit | 733f7f086834b549e33a01b5d7504ac2d1353815 (patch) | |
| tree | 4f1e747756b33be13544fdd15e707ce7afdb17f8 /test/files/scalacheck/si4147.scala | |
| parent | c243435f113615b2f7407fbd683c93ec16c73749 (diff) | |
| download | scala-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/si4147.scala')
| -rw-r--r-- | test/files/scalacheck/si4147.scala | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/test/files/scalacheck/si4147.scala b/test/files/scalacheck/si4147.scala index 05507b1b18..72f6e9afd5 100644 --- a/test/files/scalacheck/si4147.scala +++ b/test/files/scalacheck/si4147.scala @@ -1,8 +1,6 @@ import org.scalacheck.Prop.{forAll, throws} import org.scalacheck.Properties -import org.scalacheck.ConsoleReporter.testStatsEx import org.scalacheck.Gen -import org.scalacheck.ConsoleReporter import collection.mutable @@ -66,5 +64,5 @@ object Test extends Properties("Mutable TreeSet") { } property("ordering must not be null") = - throws(mutable.TreeSet.empty[Int](null), classOf[NullPointerException]) + throws(classOf[NullPointerException])(mutable.TreeSet.empty[Int](null)) } |