summaryrefslogtreecommitdiff
path: root/test/files/scalacheck/parallel-collections
diff options
context:
space:
mode:
authorAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2011-04-13 16:32:01 +0000
committerAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2011-04-13 16:32:01 +0000
commit9334ad0db28f62c3e1d33d6b12e03720a76fb1eb (patch)
tree69e6c6eb0c6a9b714447cc8eaa2331cbd1233c33 /test/files/scalacheck/parallel-collections
parentaf358131de08e41bdb3d2bba46f309f0c03ab03b (diff)
downloadscala-9334ad0db28f62c3e1d33d6b12e03720a76fb1eb.tar.gz
scala-9334ad0db28f62c3e1d33d6b12e03720a76fb1eb.tar.bz2
scala-9334ad0db28f62c3e1d33d6b12e03720a76fb1eb.zip
Fixed some tests, renamed from Any to Gen.
No review.
Diffstat (limited to 'test/files/scalacheck/parallel-collections')
-rw-r--r--test/files/scalacheck/parallel-collections/ParallelIterableCheck.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/files/scalacheck/parallel-collections/ParallelIterableCheck.scala b/test/files/scalacheck/parallel-collections/ParallelIterableCheck.scala
index bdab66449d..ac3493e56c 100644
--- a/test/files/scalacheck/parallel-collections/ParallelIterableCheck.scala
+++ b/test/files/scalacheck/parallel-collections/ParallelIterableCheck.scala
@@ -71,11 +71,11 @@ abstract class ParallelIterableCheck[T](collName: String) extends Properties(col
(inst, fromTraversable(inst), modif)
}
- def areEqual(t1: AnyTraversable[T], t2: AnyTraversable[T]) = if (hasStrictOrder) {
+ def areEqual(t1: GenTraversable[T], t2: GenTraversable[T]) = if (hasStrictOrder) {
t1 == t2 && t2 == t1
} else (t1, t2) match { // it is slightly delicate what `equal` means if the order is not strict
- case (m1: AnyMap[_, _], m2: AnyMap[_, _]) => m1 == m2 && m2 == m1
- case (i1: AnyIterable[_], i2: AnyIterable[_]) =>
+ case (m1: GenMap[_, _], m2: GenMap[_, _]) => m1 == m2 && m2 == m1
+ case (i1: GenIterable[_], i2: GenIterable[_]) =>
val i1s = i1.toSet
val i2s = i2.toSet
i1s == i2s && i2s == i1s