Merge branch 'release/0.5.0'

Author: ianoc

.travis.yml

@@ -1,4 +1,4 @@
 language: scala
 scala:
-  - 2.10.3
-  - 2.9.3
+  - 2.10.4
+  - 2.11.2

CHANGES.md

@@ -1,5 +1,9 @@
 # chill #
 
+### 0.5.0
+* Move to211: https://github.com/twitter/chill/pull/197
+* Make 2.10.4 the default, move to scalatest: https://github.com/twitter/chill/pull/196
+
 ### 0.4.0
 * Support serializing asJavaIterable.: https://github.com/twitter/chill/pull/192
 * Remove a deprecation, that really should never have been there: https://github.com/twitter/chill/pull/189

chill-akka/src/test/scala/com/twitter/chill/akka/AkkaTests.scala

@@ -16,15 +16,13 @@ limitations under the License.
 
 package com.twitter.chill.akka
 
-import org.specs._
+import org.scalatest._
 
 import akka.actor.{ ActorRef, ActorSystem }
 import akka.serialization._
 import com.typesafe.config.ConfigFactory
 
-class AkkaTests extends Specification {
-
-  noDetailedDiffs() //Fixes issue for scala 2.9
+class AkkaTests extends WordSpec with Matchers {
 
   val system = ActorSystem("example", ConfigFactory.parseString("""
     akka.actor.serializers {
@@ -44,24 +42,24 @@ class AkkaTests extends Specification {
     "be selected for tuples" in {
       // Find the Serializer for it
       val serializer = serialization.findSerializerFor((1, 2, 3))
-      serializer.getClass.equals(classOf[AkkaSerializer]) must beTrue
+      serializer.getClass.equals(classOf[AkkaSerializer]) should equal(true)
     }
 
     "be selected for ActorRef" in {
       val serializer = serialization.findSerializerFor(system.actorFor("akka://test-system/test-actor"))
-      serializer.getClass.equals(classOf[AkkaSerializer]) must beTrue
+      serializer.getClass.equals(classOf[AkkaSerializer]) should equal(true)
     }
 
     "serialize and deserialize ActorRef successfully" in {
       val actorRef = system.actorFor("akka://test-system/test-actor")
 
       val serialized = serialization.serialize(actorRef)
-      serialized.isSuccess must beTrue
+      serialized.isSuccess should equal(true)
 
       val deserialized = serialization.deserialize(serialized.get, classOf[ActorRef])
-      deserialized.isSuccess must beTrue
+      deserialized.isSuccess should equal(true)
 
-      deserialized.get.equals(actorRef) must beTrue
+      deserialized.get.equals(actorRef) should equal(true)
     }
 
   }

chill-algebird/src/test/scala/com/twitter/chill/algebird/AlgebirdSerializersSpec.scala

@@ -18,9 +18,9 @@ package com.twitter.chill.algebird
 
 import com.twitter.chill.{ KSerializer, ScalaKryoInstantiator, KryoPool }
 import com.twitter.algebird.{ AveragedValue, DecayedValue, HyperLogLogMonoid, MomentsGroup, AdaptiveVector }
-import org.specs.Specification
+import org.scalatest._
 
-class AlgebirdSerializersSpec extends Specification {
+class AlgebirdSerializersSpec extends WordSpec with Matchers {
   val kryo = {
     val inst = () => {
       val newK = (new ScalaKryoInstantiator).newKryo
@@ -36,13 +36,14 @@ class AlgebirdSerializersSpec extends Specification {
     //println("bytes size : " + bytes.size)
     //println("bytes: " + new String(bytes, "UTF-8"))
     val result = kryo.fromBytes(bytes).asInstanceOf[X]
-    result must_== x
+    result should equal(x)
+
   }
 
   def roundtripNoEq[X](x: X)(f: X => Any) {
     val bytes = kryo.toBytesWithClass(x)
     val result = kryo.fromBytes(bytes).asInstanceOf[X]
-    f(result) must_== f(x)
+    f(result) should equal(f(x))
   }
 
   "kryo with AlgebirdRegistrar" should {

chill-avro/src/test/scala/com/twitter/chill/avro/AvroSerializerSpec.scala

@@ -14,7 +14,7 @@ limitations under the License.
 */
 package com.twitter.chill.avro
 
-import org.specs.Specification
+import org.scalatest._
 import com.twitter.chill.{ KSerializer, ScalaKryoInstantiator, KryoPool }
 import avro.FiscalRecord
 import org.apache.avro.generic.GenericRecordBuilder
@@ -25,7 +25,7 @@ import org.apache.avro.generic.GenericData.Record
  * @author Mansur Ashraf
  * @since 2/9/14.
  */
-object AvroSerializerSpec extends Specification {
+object AvroSerializerSpec extends WordSpec with Matchers {
 
   def getKryo[T: Manifest](k: KSerializer[T]) = {
     val inst = {
@@ -54,7 +54,7 @@ object AvroSerializerSpec extends Specification {
       val kryo = getKryo(AvroSerializer.SpecificRecordSerializer[FiscalRecord])
       val bytes = kryo.toBytesWithClass(testRecord)
       val result = kryo.fromBytes(bytes).asInstanceOf[FiscalRecord]
-      testRecord must_== result
+      testRecord should equal(result)
     }
   }
 
@@ -63,7 +63,7 @@ object AvroSerializerSpec extends Specification {
       val kryo = getKryo(AvroSerializer.SpecificRecordBinarySerializer[FiscalRecord])
       val bytes = kryo.toBytesWithClass(testRecord)
       val result = kryo.fromBytes(bytes).asInstanceOf[FiscalRecord]
-      testRecord must_== result
+      testRecord should equal(result)
     }
   }
 
@@ -72,7 +72,7 @@ object AvroSerializerSpec extends Specification {
       val kryo = getKryo(AvroSerializer.SpecificRecordJsonSerializer[FiscalRecord](FiscalRecord.SCHEMA$))
       val bytes = kryo.toBytesWithClass(testRecord)
       val result = kryo.fromBytes(bytes).asInstanceOf[FiscalRecord]
-      testRecord must_== result
+      testRecord should equal(result)
     }
   }
 
@@ -81,13 +81,13 @@ object AvroSerializerSpec extends Specification {
       val kryo = getKryo(AvroSerializer.GenericRecordSerializer[Record]())
       val userBytes = kryo.toBytesWithClass(user)
       val userResult = kryo.fromBytes(userBytes).asInstanceOf[Record]
-      userResult.get("name").toString must_== "Jeff"
-      userResult.get("ID") must_== 1
-      user.toString must_== userResult.toString
+      userResult.get("name").toString should equal("Jeff")
+      userResult.get("ID") should equal(1)
+      user.toString should equal(userResult.toString)
 
       val testRecordBytes = kryo.toBytesWithClass(testRecord)
       val testRecordResult = kryo.fromBytes(testRecordBytes).asInstanceOf[FiscalRecord]
-      testRecord.toString must_== testRecordResult.toString
+      testRecord.toString should equal(testRecordResult.toString)
     }
   }
 }

chill-bijection/src/main/scala/com/twitter/chill/BijectionEnrichedKryo.scala

@@ -19,17 +19,19 @@ package com.twitter.chill
 import com.twitter.bijection.Injection
 import com.twitter.bijection.{ Bufferable, Bijection, ImplicitBijection, Injection }
 
+import scala.reflect.ClassTag
+
 object BijectionEnrichedKryo {
   implicit def enrich(k: Kryo): BijectionEnrichedKryo = new BijectionEnrichedKryo(k)
 
   /**
    * Use a bijection[A,B] then the KSerializer on B
    */
-  def viaBijection[A, B](kser: KSerializer[B])(implicit bij: ImplicitBijection[A, B], cmf: ClassManifest[B]): KSerializer[A] =
+  def viaBijection[A, B](kser: KSerializer[B])(implicit bij: ImplicitBijection[A, B], cmf: ClassTag[B]): KSerializer[A] =
     new KSerializer[A] {
       def write(k: Kryo, out: Output, obj: A) { kser.write(k, out, bij(obj)) }
       def read(k: Kryo, in: Input, cls: Class[A]) =
-        bij.invert(kser.read(k, in, cmf.erasure.asInstanceOf[Class[B]]))
+        bij.invert(kser.read(k, in, cmf.runtimeClass.asInstanceOf[Class[B]]))
     }
 
   def viaBufferable[T](implicit b: Bufferable[T]): KSerializer[T] =
@@ -38,32 +40,32 @@ object BijectionEnrichedKryo {
 
 class BijectionEnrichedKryo(k: Kryo) {
 
-  def injectionForClass[T](implicit inj: Injection[T, Array[Byte]], cmf: ClassManifest[T]): Kryo = {
-    k.register(cmf.erasure, InjectiveSerializer.asKryo[T])
+  def injectionForClass[T](implicit inj: Injection[T, Array[Byte]], cmf: ClassTag[T]): Kryo = {
+    k.register(cmf.runtimeClass, InjectiveSerializer.asKryo[T])
     k
   }
 
-  def injectionForSubclass[T](implicit inj: Injection[T, Array[Byte]], cmf: ClassManifest[T]): Kryo = {
-    k.addDefaultSerializer(cmf.erasure, InjectiveSerializer.asKryo[T])
+  def injectionForSubclass[T](implicit inj: Injection[T, Array[Byte]], cmf: ClassTag[T]): Kryo = {
+    k.addDefaultSerializer(cmf.runtimeClass, InjectiveSerializer.asKryo[T])
     k
   }
 
-  def bufferableForClass[T](implicit b: Bufferable[T], cmf: ClassManifest[T]): Kryo = {
-    k.register(cmf.erasure, BijectionEnrichedKryo.viaBufferable[T])
+  def bufferableForClass[T](implicit b: Bufferable[T], cmf: ClassTag[T]): Kryo = {
+    k.register(cmf.runtimeClass, BijectionEnrichedKryo.viaBufferable[T])
     k
   }
 
   /**
    * B has to already be registered, then use the KSerializer[B] to create KSerialzer[A]
    */
-  def forClassViaBijection[A, B](implicit bij: ImplicitBijection[A, B], acmf: ClassManifest[A], bcmf: ClassManifest[B]): Kryo = {
-    val kserb = k.getSerializer(bcmf.erasure).asInstanceOf[KSerializer[B]]
-    k.register(acmf.erasure, BijectionEnrichedKryo.viaBijection[A, B](kserb))
+  def forClassViaBijection[A, B](implicit bij: ImplicitBijection[A, B], acmf: ClassTag[A], bcmf: ClassTag[B]): Kryo = {
+    val kserb = k.getSerializer(bcmf.runtimeClass).asInstanceOf[KSerializer[B]]
+    k.register(acmf.runtimeClass, BijectionEnrichedKryo.viaBijection[A, B](kserb))
     k
   }
 
   /** Helpful override to alleviate rewriting types. */
-  def forClassViaBijection[A, B](bij: Bijection[A, B])(implicit acmf: ClassManifest[A], bcmf: ClassManifest[B]): Kryo = {
+  def forClassViaBijection[A, B](bij: Bijection[A, B])(implicit acmf: ClassTag[A], bcmf: ClassTag[B]): Kryo = {
     implicit def implicitBij = bij
     this.forClassViaBijection[A, B]
   }

chill-bijection/src/test/scala/com/twitter/chill/CustomSerializationSpec.scala

@@ -16,7 +16,7 @@
 
 package com.twitter.chill
 
-import org.specs._
+import org.scalatest._
 
 import com.twitter.bijection.Bijection
 
@@ -29,7 +29,7 @@ object Globals {
   var temp = false
 }
 
-class CustomSerializationSpec extends Specification with BaseProperties {
+class CustomSerializationSpec extends WordSpec with Matchers with BaseProperties {
   "Custom KryoSerializers and KryoDeserializers" should {
     "serialize objects that have registered serialization" in {
 
@@ -66,7 +66,7 @@ class CustomSerializationSpec extends Specification with BaseProperties {
       val point = Point(5, 6)
       val coloredPoint = ColoredPoint(color, point)
 
-      rt(myInst, coloredPoint) must_== coloredPoint
+      rt(myInst, coloredPoint) should equal(coloredPoint)
     }
     "use bijections" in {
       implicit val bij = Bijection.build[TestCaseClassForSerialization, (String, Int)] { s =>
@@ -78,18 +78,18 @@ class CustomSerializationSpec extends Specification with BaseProperties {
           .newKryo
           .forClassViaBijection[TestCaseClassForSerialization, (String, Int)]
       }
-      rt(inst, TestCaseClassForSerialization("hey", 42)) must be_==(TestCaseClassForSerialization("hey", 42))
+      rt(inst, TestCaseClassForSerialization("hey", 42)) should equal(TestCaseClassForSerialization("hey", 42))
     }
     "Make sure KryoInjection and instances are Java Serializable" in {
       val ki = jrt(KryoInjection)
-      ki.invert(ki(1)).get must be_==(1)
+      ki.invert(ki(1)).get should equal(1)
       val kii = jrt(KryoInjection.instance(new ScalaKryoInstantiator))
-      kii.invert(kii(1)).get must be_==(1)
+      kii.invert(kii(1)).get should equal(1)
     }
   }
   "KryoInjection handle an example with closure to function" in {
     val x = rt(() => Foo.Bar)
-    x() must be_==(Foo.Bar)
+    x() should equal(Foo.Bar)
   }
   "handle a closure to println" in {
     Globals.temp = false
@@ -101,6 +101,6 @@ class CustomSerializationSpec extends Specification with BaseProperties {
     })
     val inv = KryoInjection.invert(bytes)
     inv.get.asInstanceOf[() => Unit].apply()
-    Globals.temp must be_==(true)
+    Globals.temp should equal(true)
   }
 }

chill-hadoop/src/test/scala/com/twitter/chill/hadoop/HadoopTests.scala

@@ -16,7 +16,7 @@ limitations under the License.
 
 package com.twitter.chill.hadoop
 
-import org.specs._
+import org.scalatest._
 
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.io.Input;
@@ -37,9 +37,7 @@ class StdKryoInstantiator extends KryoInstantiator {
     k
   }
 }
-class HadoopTests extends Specification {
-  noDetailedDiffs() //Fixes issue for scala 2.9
-
+class HadoopTests extends WordSpec with Matchers {
   def rt[A <: AnyRef](k: KryoSerialization, a: A): A = {
     val out = new BAOut
     val cls = a.getClass.asInstanceOf[Class[AnyRef]]
@@ -65,7 +63,7 @@ class HadoopTests extends Specification {
       val ks = new KryoSerialization(conf)
       Seq(classOf[List[_]], classOf[Int], this.getClass).forall { cls =>
         ks.accept(cls)
-      } must beTrue
+      } should equal(true)
     }
     "Serialize a list of random things" in {
       val conf = new Configuration
@@ -76,7 +74,7 @@ class HadoopTests extends Specification {
       val ks = new KryoSerialization(conf)
       val things = List(1.asInstanceOf[AnyRef], "hey", (1, 2))
 
-      things.map { rt(ks, _) } must be_==(things)
+      things.map { rt(ks, _) } should equal(things)
     }
   }
 }

chill-java/src/test/scala/com/twitter/chill/config/ConfiguredInstantiatorTest.scala

@@ -16,28 +16,28 @@ limitations under the License.
 
 package com.twitter.chill.config
 
-import org.specs._
+import org.scalatest._
 
 import com.twitter.chill._
 import com.esotericsoftware.kryo.Kryo
 
 class TestInst extends KryoInstantiator { override def newKryo = new Kryo }
 
-class ReflectingInstantiatorTest extends Specification {
+class ReflectingInstantiatorTest extends WordSpec with Matchers {
   "A ConfiguredInstantiator" should {
     "work with a reflected instantiator" in {
       val conf = new JavaMapConfig
       ConfiguredInstantiator.setReflect(conf, classOf[TestInst])
-      conf.get(ConfiguredInstantiator.KEY) must be_==(classOf[TestInst].getName)
+      conf.get(ConfiguredInstantiator.KEY) should equal(classOf[TestInst].getName)
       val cci = new ConfiguredInstantiator(conf)
-      cci.getDelegate.getClass == classOf[TestInst] must beTrue
+      cci.getDelegate.getClass should equal(classOf[TestInst])
     }
     "work with a serialized instantiator" in {
       val conf = new JavaMapConfig
       ConfiguredInstantiator.setSerialized(conf, new TestInst)
       val cci = new ConfiguredInstantiator(conf)
       // Here is the only assert:
-      cci.getDelegate.getClass == classOf[TestInst] must beTrue
+      cci.getDelegate.getClass should equal(classOf[TestInst])
     }
   }
 }

chill-java/src/test/scala/com/twitter/chill/java/LocaleTest.scala

@@ -16,7 +16,7 @@ limitations under the License.
 
 package com.twitter.chill.java
 
-import org.specs._
+import org.scalatest._
 
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.io.Input;
@@ -26,8 +26,7 @@ import org.objenesis.strategy.StdInstantiatorStrategy
 
 import _root_.java.util.Locale
 
-class LocaleSpec extends Specification {
-  noDetailedDiffs() //Fixes issue for scala 2.9
+class LocaleSpec extends WordSpec with Matchers {
 
   def rt[A](k: Kryo, a: A): A = {
     val out = new Output(1000, -1)
@@ -45,7 +44,7 @@ class LocaleSpec extends Specification {
       LocaleSerializer.registrar()(kryo)
 
       Locale.getAvailableLocales.foreach { l =>
-        rt(kryo, l) must be_==(l)
+        rt(kryo, l) should equal(l)
       }
     }
   }