Merge pull request #2681 from soc/SI-7590

SI-7590 TreeSet should fail fast if Ordering is null

2 files changed, 7 insertions, 1 deletions

diff --git a/test/files/scalacheck/si4147.scala b/test/files/scalacheck/si4147.scala
index 1453440ef1..05507b1b18 100644
--- a/test/files/scalacheck/si4147.scala
+++ b/test/files/scalacheck/si4147.scala
@@ -1,4 +1,4 @@
-import org.scalacheck.Prop.forAll
+import org.scalacheck.Prop.{forAll, throws}
 import org.scalacheck.Properties
 import org.scalacheck.ConsoleReporter.testStatsEx
 import org.scalacheck.Gen
@@ -64,4 +64,7 @@ object Test extends Properties("Mutable TreeSet") {
       view.filter(_ < 50) == Set[Int]() && view.filter(_ >= 150) == Set[Int]()
     }
   }
+
+  property("ordering must not be null") =
+    throws(mutable.TreeSet.empty[Int](null), classOf[NullPointerException])
 }
diff --git a/test/files/scalacheck/treeset.scala b/test/files/scalacheck/treeset.scala
index 98e38c8219..018c1b9e29 100644
--- a/test/files/scalacheck/treeset.scala
+++ b/test/files/scalacheck/treeset.scala
@@ -149,4 +149,7 @@ object Test extends Properties("TreeSet") {
     val result = subject.foldLeft(subject)((acc, elt) => acc - elt)
     result.isEmpty
   }
+  
+  property("ordering must not be null") =
+    throws(TreeSet.empty[Int](null), classOf[NullPointerException])
 }