From 415fced48d7ecb097eef257c1a737868acb82575 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Wed, 24 Feb 2010 02:27:03 +0000
Subject: Updated scalacheck jar to current trunk.

not being used. Updated partest with a --scalacheck option. Added
scalacheck tests to the ant build target. Still struggling with
ant/partest/classpaths so it's not on by default yet, but at least
./partest --scalacheck works. We... will... use... scalacheck. And we
will like it! No review.
---
 .../lib/scalacheck-1.7-SNAPSHOT.jar.desired.sha1   |  1 +
 test/files/scalacheck/array.scala                  | 46 +++++++++++-----------
 test/files/scalacheck/eqeq.scala                   | 17 ++++++++
 3 files changed, 40 insertions(+), 24 deletions(-)
 create mode 100644 test/files/lib/scalacheck-1.7-SNAPSHOT.jar.desired.sha1
 create mode 100644 test/files/scalacheck/eqeq.scala

(limited to 'test/files')

diff --git a/test/files/lib/scalacheck-1.7-SNAPSHOT.jar.desired.sha1 b/test/files/lib/scalacheck-1.7-SNAPSHOT.jar.desired.sha1
new file mode 100644
index 0000000000..05db91a921
--- /dev/null
+++ b/test/files/lib/scalacheck-1.7-SNAPSHOT.jar.desired.sha1
@@ -0,0 +1 @@
+b26553d1960ca15ac811008e47c0a43c105fc551 ?scalacheck-1.7-SNAPSHOT.jar
diff --git a/test/files/scalacheck/array.scala b/test/files/scalacheck/array.scala
index 2febca4447..3801f581fb 100644
--- a/test/files/scalacheck/array.scala
+++ b/test/files/scalacheck/array.scala
@@ -4,36 +4,34 @@ import Gen._
 import Arbitrary._
 import util._
 import Buildable._
+import scala.collection.mutable.GenericArray
 
 object Test extends Properties("Array") {
-  val myGens: Seq[Gen[Array[_]]] = List(
-    arbArray[Int],
-    arbArray[Array[Int]],
-    arbArray[List[String]],
-    arbArray[String],
-    arbArray[Boolean],
-    arbArray[AnyVal](arbAnyVal)
-  ) map (_.arbitrary)
+  /** At this moment the authentic scalacheck Array Builder/Arb bits are commented out.
+   */
+  implicit def arbArray[T](implicit a: Arbitrary[T], m: Manifest[T]): Arbitrary[Array[T]] =
+    Arbitrary(containerOf[List,T](arbitrary[T]) map (_.toArray))
+
+  val arrGen: Gen[Array[_]] = oneOf(
+    arbitrary[Array[Int]],
+    arbitrary[Array[Array[Int]]],
+    arbitrary[Array[List[String]]],
+    arbitrary[Array[String]],
+    arbitrary[Array[Boolean]],
+    arbitrary[Array[AnyVal]]
+  )
 
   // inspired by #1857 and #2352
-  property("eq/ne") =
-    forAll(oneOf(myGens: _*)) { c1 =>
-      forAll(oneOf(myGens: _*)) { c2 =>
-        (c1 eq c2) || (c1 ne c2)
-      }
-    }
+  property("eq/ne") = forAll(arrGen, arrGen) { (c1, c2) =>
+    (c1 eq c2) || (c1 ne c2)
+  }
 
-  def smallInt = choose(1, 10)
   // inspired by #2299
-  property("ofDim") = forAll(smallInt) { i1 =>
-    forAll(smallInt) { i2 =>
-      forAll(smallInt) { i3 =>
-        val arr = Array.ofDim[String](i1, i2, i3)
-        val flattened = arr flatMap (x => x) flatMap (x => x)
-
-        flattened.length == i1 * i2 * i3
-      }
-    }
+  def smallInt = choose(1, 10)
+  property("ofDim") = forAll(smallInt, smallInt, smallInt) { (i1, i2, i3) =>
+    val arr = Array.ofDim[String](i1, i2, i3)
+    val flattened = arr flatMap (x => x) flatMap (x => x)
+    flattened.length == i1 * i2 * i3
   }
 }
 
diff --git a/test/files/scalacheck/eqeq.scala b/test/files/scalacheck/eqeq.scala
new file mode 100644
index 0000000000..163f17d94c
--- /dev/null
+++ b/test/files/scalacheck/eqeq.scala
@@ -0,0 +1,17 @@
+import org.scalacheck._
+import Prop._
+import Gen._
+
+object Test extends Properties("==") {
+  property("reflexive") = forAll { (x: AnyVal, y: AnyVal) => (x == y) == (y == x) }
+  // property("hashCode") = forAll { (x
+
+  property("short/char") = forAll { (x: Short) => {
+      val ch: Char = x.toChar
+      (x == ch) == (ch == x) ||
+      // that's the whole test once it works, but since it doesn't yet:
+      x < 0
+    }
+  }
+}
+
-- 
cgit v1.2.3