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

=all #3837 Make akkaScalaNightly compile on scala 2.11.0-M8

Browse source
This commit is contained in:
Björn Antonsson 2014-01-31 11:14:13 +01:00
parent 85698688e4
commit 179faba453
82 changed files with 651 additions and 643 deletions
Download patch file Download diff file Expand all files Collapse all files

10
akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala
View file

@ -13,12 +13,10 @@ import java.io._
import scala.concurrent.Await
import akka.util.Timeout
import scala.concurrent.duration._
import scala.reflect.BeanInfo
import com.google.protobuf.Message
import scala.beans.BeanInfo
import com.typesafe.config._
import akka.pattern.ask
import org.apache.commons.codec.binary.Hex.{ encodeHex, decodeHex }
import akka.OnlyCauseStackTrace
import org.apache.commons.codec.binary.Hex.encodeHex
object SerializationTests {
@ -250,7 +248,7 @@ class SerializeSpec extends AkkaSpec(SerializationTests.serializeConf) {
intercept[IllegalArgumentException] {
byteSerializer.toBinary("pigdog")
}.getMessage should equal("ByteArraySerializer only serializes byte arrays, not [pigdog]")
}.getMessage should be("ByteArraySerializer only serializes byte arrays, not [pigdog]")
}
}
}
@ -326,7 +324,7 @@ class SerializationCompatibilitySpec extends AkkaSpec(SerializationTests.mostlyR
"Cross-version serialization compatibility" must {
def verify(obj: SystemMessage, asExpected: String): Unit =
String.valueOf(ser.serialize(obj).map(encodeHex).get) should equal(asExpected)
String.valueOf(ser.serialize(obj).map(encodeHex).get) should be(asExpected)
"be preserved for the Create SystemMessage" in {
// Using null as the cause to avoid a large serialized message and JDK differences