summaryrefslogtreecommitdiff
path: root/test/files/scalacheck/parallel-collections/ParallelSeqCheck.scala
diff options
context:
space:
mode:
authorAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2010-10-28 12:09:49 +0000
committerAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2010-10-28 12:09:49 +0000
commitf388aaaf52dab4ceaf8e5f26c72eb4a0d1d3b3e7 (patch)
tree2a5770c3ca5f08410dd197035e3bae7a0b52ba23 /test/files/scalacheck/parallel-collections/ParallelSeqCheck.scala
parent4ddb4ce1e28afe15f9335a4bd51e07f68161b27c (diff)
downloadscala-f388aaaf52dab4ceaf8e5f26c72eb4a0d1d3b3e7.tar.gz
scala-f388aaaf52dab4ceaf8e5f26c72eb4a0d1d3b3e7.tar.bz2
scala-f388aaaf52dab4ceaf8e5f26c72eb4a0d1d3b3e7.zip
Mostly refactored existing test functionality f...
Mostly refactored existing test functionality for parallel collections. Added immutable hash set tests. No review.
Diffstat (limited to 'test/files/scalacheck/parallel-collections/ParallelSeqCheck.scala')
-rw-r--r--test/files/scalacheck/parallel-collections/ParallelSeqCheck.scala13
1 files changed, 12 insertions, 1 deletions
diff --git a/test/files/scalacheck/parallel-collections/ParallelSeqCheck.scala b/test/files/scalacheck/parallel-collections/ParallelSeqCheck.scala
index 1fda4eb906..5e84f6c73e 100644
--- a/test/files/scalacheck/parallel-collections/ParallelSeqCheck.scala
+++ b/test/files/scalacheck/parallel-collections/ParallelSeqCheck.scala
@@ -19,8 +19,19 @@ abstract class ParallelSeqCheck[T](collName: String) extends ParallelIterableChe
type CollType <: collection.parallel.ParSeq[T] with Sequentializable[T, Seq[T]]
- def instances(vals: Seq[Gen[T]]): Gen[Seq[T]]
+
+ def ofSize(vals: Seq[Gen[T]], sz: Int): Seq[T]
def fromSeq(s: Seq[T]): CollType
+
+ override def instances(vals: Seq[Gen[T]]): Gen[Seq[T]] = oneOf(
+ sized(
+ sz =>
+ ofSize(vals, sz)
+ ),
+ for (sz <- choose(1000, 2000)) yield ofSize(vals, sz)
+ )
+
+
def fromTraversable(t: Traversable[T]) = fromSeq(traversable2Seq(t))
def traversable2Seq(t: Traversable[T]): Seq[T] = {
if (t.isInstanceOf[Iterable[_]]) t.asInstanceOf[Iterable[T]].iterator.toList else t.toList