From c3d19c58d8a94b7232718321f6994c001257cc96 Mon Sep 17 00:00:00 2001
From: Aleksandar Prokopec <axel22@gmail.com>
Date: Thu, 2 Feb 2012 14:05:26 +0100
Subject: Incorporate Ctrie into standard library.

Implemented Ctrie serialization. Improved hashcode computation.
---
 test/files/jvm/serialization.check | 4 ++++
 test/files/jvm/serialization.scala | 7 ++++++-
 test/files/run/ctries/lnode.scala  | 5 ++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'test/files')

diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check
index f58f763a76..cdfc100e0d 100644
--- a/test/files/jvm/serialization.check
+++ b/test/files/jvm/serialization.check
@@ -192,6 +192,10 @@ x = TreeSet(1, 2, 3)
 y = TreeSet(1, 2, 3)
 x equals y: true, y equals x: true
 
+x = Ctrie(1 -> one, 2 -> two, 3 -> three)
+y = Ctrie(1 -> one, 2 -> two, 3 -> three)
+x equals y: true, y equals x: true
+
 x =  xml:src="hello"
 y =  xml:src="hello"
 x equals y: true, y equals x: true
diff --git a/test/files/jvm/serialization.scala b/test/files/jvm/serialization.scala
index 73bed2d46b..4e1ff368ab 100644
--- a/test/files/jvm/serialization.scala
+++ b/test/files/jvm/serialization.scala
@@ -286,7 +286,7 @@ object Test3_mutable {
   import scala.collection.mutable.{
     ArrayBuffer, ArrayBuilder, ArraySeq, ArrayStack, BitSet, DoubleLinkedList,
     HashMap, HashSet, History, LinkedList, ListBuffer, Publisher, Queue,
-    Stack, StringBuilder, WrappedArray, TreeSet}
+    Stack, StringBuilder, WrappedArray, TreeSet, Ctrie}
 
   // in alphabetic order
   try {
@@ -385,6 +385,11 @@ object Test3_mutable {
     val ts1 = TreeSet[Int]() ++= Array(1, 2, 3)
     val _ts1: TreeSet[Int] = read(write(ts1))
     check(ts1, _ts1)
+    
+    // Ctrie
+    val ct1 = Ctrie[Int, String]() ++= Array(1 -> "one", 2 -> "two", 3 -> "three")
+    val _ct1: Ctrie[Int, String] = read(write(ct1))
+    check(ct1, _ct1)
   }
   catch {
     case e: Exception =>
diff --git a/test/files/run/ctries/lnode.scala b/test/files/run/ctries/lnode.scala
index 28da4cc62f..88cbeed1f6 100644
--- a/test/files/run/ctries/lnode.scala
+++ b/test/files/run/ctries/lnode.scala
@@ -25,7 +25,10 @@ object LNodeSpec extends Spec {
     "remove elements with the same hash codes" in {
       val ct = new Ctrie[DumbHash, Int]
       for (i <- 0 until initsz) ct.update(new DumbHash(i), i)
-      for (i <- 0 until initsz) assert(ct.remove(new DumbHash(i)) == Some(i))
+      for (i <- 0 until initsz) {
+        val remelem = ct.remove(new DumbHash(i))
+        assert(remelem == Some(i), "removing " + i + " yields " + remelem)
+      }
       for (i <- 0 until initsz) assert(ct.get(new DumbHash(i)) == None)
     }
     
-- 
cgit v1.2.3