From 4ca63897c92b1456ee37d6a525f67d5939954b84 Mon Sep 17 00:00:00 2001
From: Rex Kerr <ichoran@gmail.com>
Date: Wed, 26 Nov 2014 16:52:35 -0800
Subject: 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.
---
 .../convert/WrapperSerializationTest.scala         | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 test/junit/scala/collection/convert/WrapperSerializationTest.scala

(limited to 'test/junit')

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) )
+  }
+}
-- 
cgit v1.2.3