From 3e32cdc3ca73b39f662eb02cf4c33bb7544a48a1 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Mon, 20 May 2019 12:03:13 +0200
Subject: [PATCH] fix ByteStringSpec for Scala 2.13, #26956

* simply ignore that compat test for 2.13 because the only reason for
  testing Java serialization compat is that in Akka 2.4 it used
  Java serialization (and in 2.5 when additional-serialization-bindings
  was disabled)
---
 .../test/scala/akka/util/ByteStringSpec.scala  | 18 +++++++++---------
 .../PrimitivesSerializationSpec.scala          |  6 ++++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala b/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
index 180d79b1ce..55e4e95ba6 100644
--- a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
@@ -894,17 +894,17 @@ class ByteStringSpec extends WordSpec with Matchers with Checkers {
     }
 
     "serialize correctly" when {
-      "parsing regular ByteString1C as compat" in {
-        val oldSerd =
-          if (util.Properties.versionNumberString.startsWith("2.12"))
+      // note that this is serialization with Java serialization
+      // real serialization is in akka-remote
+      if (util.Properties.versionNumberString.startsWith("2.12")) {
+        "parsing regular ByteString1C as compat" in {
+          val oldSerd =
             "aced000573720021616b6b612e7574696c2e42797465537472696e672442797465537472696e67314336e9eed0afcfe4a40200015b000562797465737400025b427872001b616b6b612e7574696c2e436f6d7061637442797465537472696e67fa2925150f93468f0200007870757200025b42acf317f8060854e002000078700000000a74657374737472696e67"
-          else
-            // The data is the same, but the class hierarchy changed in 2.13:
-            "aced000573720021616b6b612e7574696c2e42797465537472696e672442797465537472696e67314336e9eed0afcfe4a40200015b000562797465737400025b427872001b616b6b612e7574696c2e436f6d7061637442797465537472696e676c083a30328adea002000078720014616b6b612e7574696c2e42797465537472696e67e54813305c6d95cc0200007870757200025b42acf317f8060854e002000078700000000a74657374737472696e67"
-        val bs = ByteString("teststring", "UTF8")
-        val str = hexFromSer(bs)
+          val bs = ByteString("teststring", "UTF8")
+          val str = hexFromSer(bs)
 
-        str should be(oldSerd)
+          str should be(oldSerd)
+        }
       }
 
       "given all types of ByteString" in {
diff --git a/akka-remote/src/test/scala/akka/remote/serialization/PrimitivesSerializationSpec.scala b/akka-remote/src/test/scala/akka/remote/serialization/PrimitivesSerializationSpec.scala
index 14d8b0771d..2921b7b2e5 100644
--- a/akka-remote/src/test/scala/akka/remote/serialization/PrimitivesSerializationSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/serialization/PrimitivesSerializationSpec.scala
@@ -27,7 +27,7 @@ object PrimitivesSerializationSpec {
 class PrimitivesSerializationSpec extends AkkaSpec(PrimitivesSerializationSpec.testConfig) {
 
   val buffer = {
-    val b = ByteBuffer.allocate(1024)
+    val b = ByteBuffer.allocate(4096)
     b.order(ByteOrder.LITTLE_ENDIAN)
     b
   }
@@ -119,7 +119,9 @@ class PrimitivesSerializationSpec extends AkkaSpec(PrimitivesSerializationSpec.t
       "empty string" -> ByteString.empty,
       "simple content" -> ByteString("hello"),
       "concatenated content" -> (ByteString("hello") ++ ByteString("world")),
-      "sliced content" -> ByteString("helloabc").take(5)).foreach {
+      "sliced content" -> ByteString("helloabc").take(5),
+      "large concatenated" ->
+      (ByteString(Array.fill[Byte](1000)(1)) ++ ByteString(Array.fill[Byte](1000)(2)))).foreach {
       case (scenario, item) =>
         s"resolve serializer for [$scenario]" in {
           val serializer = SerializationExtension(system)