diff options
| author | Vojin Jovanovic <vojin.jovanovic@epfl.ch> | 2012-01-25 15:24:18 +0100 |
|---|---|---|
| committer | Vojin Jovanovic <vojin.jovanovic@epfl.ch> | 2012-01-25 15:24:18 +0100 |
| commit | f814d40ea917592f78d2e8ca4c78f34ce4b5f297 (patch) | |
| tree | cafac6a0d757419132fd75ab788f8163a619780b /test/files/jvm | |
| parent | 85daadef89a9ed5c3901a5822221366ee6746d49 (diff) | |
| parent | de2b0c68785afc0f801fbe8d2750366e90c9fa70 (diff) | |
| download | scala-f814d40ea917592f78d2e8ca4c78f34ce4b5f297.tar.gz scala-f814d40ea917592f78d2e8ca4c78f34ce4b5f297.tar.bz2 scala-f814d40ea917592f78d2e8ca4c78f34ce4b5f297.zip | |
Merge branch 'master' into execution-context
Diffstat (limited to 'test/files/jvm')
| -rw-r--r-- | test/files/jvm/serialization.check | 8 | ||||
| -rw-r--r-- | test/files/jvm/serialization.scala | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check index 15708f0c3b..f58f763a76 100644 --- a/test/files/jvm/serialization.check +++ b/test/files/jvm/serialization.check @@ -188,6 +188,10 @@ x = WrappedArray(1, 2, 3) y = WrappedArray(1, 2, 3) x equals y: true, y equals x: true +x = TreeSet(1, 2, 3) +y = TreeSet(1, 2, 3) +x equals y: true, y equals x: true + x = xml:src="hello" y = xml:src="hello" x equals y: true, y equals x: true @@ -202,7 +206,7 @@ x equals y: true, y equals x: true x = <html> <body> - <table cellspacing="0" cellpadding="2"> + <table cellpadding="2" cellspacing="0"> <tr> <th>Last Name</th> <th>First Name</th> @@ -222,7 +226,7 @@ x = <html> </html> y = <html> <body> - <table cellspacing="0" cellpadding="2"> + <table cellpadding="2" cellspacing="0"> <tr> <th>Last Name</th> <th>First Name</th> diff --git a/test/files/jvm/serialization.scala b/test/files/jvm/serialization.scala index 9391b60e46..73bed2d46b 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} + Stack, StringBuilder, WrappedArray, TreeSet} // in alphabetic order try { @@ -380,6 +380,11 @@ object Test3_mutable { val wa1 = WrappedArray.make(Array(1, 2, 3)) val _wa1: WrappedArray[Int] = read(write(wa1)) check(wa1, _wa1) + + // TreeSet + val ts1 = TreeSet[Int]() ++= Array(1, 2, 3) + val _ts1: TreeSet[Int] = read(write(ts1)) + check(ts1, _ts1) } catch { case e: Exception => |