summaryrefslogtreecommitdiff
path: root/test/files/scalacheck/treeset.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/treeset.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/treeset.scala')
-rw-r--r--test/files/scalacheck/treeset.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/scalacheck/treeset.scala b/test/files/scalacheck/treeset.scala
index 7fca3ed5e4..4b9b77dd7e 100644
--- a/test/files/scalacheck/treeset.scala
+++ b/test/files/scalacheck/treeset.scala
@@ -151,5 +151,5 @@ object Test extends Properties("TreeSet") {
}
property("ordering must not be null") =
- throws(TreeSet.empty[Int](null), classOf[NullPointerException])
+ throws(classOf[NullPointerException])(TreeSet.empty[Int](null))
}