diff options
author | Rex Kerr <ichoran@gmail.com> | 2014-11-26 16:52:35 -0800 |
---|---|---|
committer | Rex Kerr <ichoran@gmail.com> | 2015-07-19 13:48:08 -0700 |
commit | 4ca63897c92b1456ee37d6a525f67d5939954b84 (patch) | |
tree | 4c145aa86e83fbbcbb951058cff183dc13a76b02 /test/junit | |
parent | 8f0c4b42617903ef974e25ff45250a34e93f40e7 (diff) | |
download | scala-4ca63897c92b1456ee37d6a525f67d5939954b84.tar.gz scala-4ca63897c92b1456ee37d6a525f67d5939954b84.tar.bz2 scala-4ca63897c92b1456ee37d6a525f67d5939954b84.zip |
SI-8911 scala.collection.convert.Wrappers$MapWrapper not serializable
Added `with Serializable` to `MapWrapper` and `SetWrapper`.
Test verifies that serialization works in the simplest case.
Also updated tests in t8549 to check that serialization works and doesn't change.
Diffstat (limited to 'test/junit')
-rw-r--r-- | test/junit/scala/collection/convert/WrapperSerializationTest.scala | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/test/junit/scala/collection/convert/WrapperSerializationTest.scala b/test/junit/scala/collection/convert/WrapperSerializationTest.scala new file mode 100644 index 0000000000..d398be806a --- /dev/null +++ b/test/junit/scala/collection/convert/WrapperSerializationTest.scala @@ -0,0 +1,29 @@ +package scala.collection.convert + +import org.junit.Assert._ +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 + +@RunWith(classOf[JUnit4]) +class WrapperSerializationTest { + def ser(a: AnyRef) = { + val baos = new java.io.ByteArrayOutputStream + (new java.io.ObjectOutputStream(baos)).writeObject(a) + baos + } + def des(baos: java.io.ByteArrayOutputStream): AnyRef = { + val bais = new java.io.ByteArrayInputStream(baos.toByteArray) + (new java.io.ObjectInputStream(bais)).readObject() + } + def serdes(a: AnyRef): Boolean = a == des(ser(a)) + + @Test + def test_SI8911() { + import scala.collection.JavaConverters._ + assert( serdes(scala.collection.mutable.ArrayBuffer(1,2).asJava) ) + assert( serdes(Seq(1,2).asJava) ) + assert( serdes(Set(1,2).asJava) ) + assert( serdes(Map(1 -> "one", 2 -> "two").asJava) ) + } +} |