summaryrefslogtreecommitdiff
path: root/test/files/jvm
diff options
context:
space:
mode:
authorAleksandar Prokopec <axel22@gmail.com>2012-02-03 16:58:54 +0100
committerAleksandar Prokopec <axel22@gmail.com>2012-02-03 16:58:54 +0100
commita015c08fda8b8556345a802d60557a3ecd627ccc (patch)
treefcd177766e7a394116713b3d0464f012f7482f4d /test/files/jvm
parent86946630e9a1240fb9a378b2ec62e78b521f4320 (diff)
downloadscala-a015c08fda8b8556345a802d60557a3ecd627ccc.tar.gz
scala-a015c08fda8b8556345a802d60557a3ecd627ccc.tar.bz2
scala-a015c08fda8b8556345a802d60557a3ecd627ccc.zip
Add tests for parallel Ctrie.
Changed parameters in some tests to speed them up.
Diffstat (limited to 'test/files/jvm')
-rw-r--r--test/files/jvm/serialization.check4
-rw-r--r--test/files/jvm/serialization.scala5
2 files changed, 9 insertions, 0 deletions
diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check
index cdfc100e0d..67b77639a2 100644
--- a/test/files/jvm/serialization.check
+++ b/test/files/jvm/serialization.check
@@ -287,6 +287,10 @@ x = ParHashMap(1 -> 2, 2 -> 4)
y = ParHashMap(1 -> 2, 2 -> 4)
x equals y: true, y equals x: true
+x = ParCtrie(1 -> 2, 2 -> 4)
+y = ParCtrie(1 -> 2, 2 -> 4)
+x equals y: true, y equals x: true
+
x = ParHashSet(1, 2, 3)
y = ParHashSet(1, 2, 3)
x equals y: true, y equals x: true
diff --git a/test/files/jvm/serialization.scala b/test/files/jvm/serialization.scala
index 4e1ff368ab..75daa8903d 100644
--- a/test/files/jvm/serialization.scala
+++ b/test/files/jvm/serialization.scala
@@ -613,6 +613,11 @@ object Test9_parallel {
val _mpm: mutable.ParHashMap[Int, Int] = read(write(mpm))
check(mpm, _mpm)
+ // mutable.ParCtrie
+ val mpc = mutable.ParCtrie(1 -> 2, 2 -> 4)
+ val _mpc: mutable.ParCtrie[Int, Int] = read(write(mpc))
+ check(mpc, _mpc)
+
// mutable.ParHashSet
val mps = mutable.ParHashSet(1, 2, 3)
val _mps: mutable.ParHashSet[Int] = read(write(mps))