raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Merge pull request #26969 from akka/wip-26956-ByteStringSpec-patriknw

Browse source 
fix ByteStringSpec for Scala 2.13, #26956
This commit is contained in:
Patrik Nordwall 2019-05-20 15:20:13 +02:00 • committed by GitHub
commit 9f76d55c2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
View file

@ -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 {

6
akka-remote/src/test/scala/akka/remote/serialization/PrimitivesSerializationSpec.scala
View file

@ -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)