Merge branch 'cheeseng-2.2-every-serializable' into 2.2.3-and-greater

Author: bvenners

src/main/scala/org/scalactic/Every.scala

@@ -141,7 +141,7 @@ import scala.annotation.unchecked.{ uncheckedVariance => uV }
  *
  * @tparam T the type of elements contained in this <code>Every</code>
  */
-sealed abstract class Every[+T] protected (underlying: Vector[T]) extends PartialFunction[Int, T] {
+sealed abstract class Every[+T] protected (underlying: Vector[T]) extends PartialFunction[Int, T] with Serializable {
 
 /*
   private def this(firstElement: T, otherElements: T*) = this(Vector(firstElement) ++ otherElements)

src/test/scala/org/scalactic/EverySpec.scala

@@ -20,6 +20,7 @@ import org.scalatest._
 import scala.collection.GenTraversable
 import scala.collection.mutable.Buffer
 import scala.collection.mutable.ListBuffer
+import SharedHelpers.serializeRoundtrip
 
 class EverySpec extends UnitSpec {
   "An Every" can "be constructed as a One" in {
@@ -1174,11 +1175,21 @@ class EverySpec extends UnitSpec {
     Every(99).zipWithIndex shouldBe Every((99,0))
     Every(1, 2, 3, 4, 5).zipWithIndex shouldBe Every((1,0), (2,1), (3,2), (4,3), (5,4))
   }
+  it should "be serializable" in {
+    serializeRoundtrip(Every(1))
+  }
   "A One" can "be widened to an Every type via .asEvery" in {
     One(1).asEvery shouldBe One(1)
   }
+  it should "be serializable" in {
+    serializeRoundtrip(One(1))
+  }
   "A Many" can "be widened to an Every type via .asEvery" in {
     Many(1, 2, 3).asEvery shouldBe Many(1, 2, 3)
   }
+  it should "be serializable" in {
+    serializeRoundtrip(Many(1, 2, 3))
+  }
+
 }
 

src/test/scala/org/scalactic/OrSpec.scala

@@ -20,6 +20,7 @@ import org.scalatest._
 import scala.util.Try
 import scala.util.Success
 import scala.util.Failure
+import SharedHelpers.serializeRoundtrip
 
 class OrSpec extends UnitSpec with Accumulation with TypeCheckedTripleEquals {
 
@@ -514,6 +515,11 @@ class OrSpec extends UnitSpec with Accumulation with TypeCheckedTripleEquals {
     Good[Int].orBad("howdy").fold(_ + 1, _.length) shouldBe 5
 
   }
+  it can "be serialized correctly" in {
+    serializeRoundtrip(Or.from(Success(12)) shouldBe Good(12))
+    val ex = new Exception("oops")
+    serializeRoundtrip(Or.from(Failure(ex)) shouldBe Bad(ex))
+  }
   "A Good" can "be widened to an Or type via .asOr" in {
     Good(1).asOr shouldBe Good(1)
     /*
@@ -532,6 +538,9 @@ class OrSpec extends UnitSpec with Accumulation with TypeCheckedTripleEquals {
       (acc, x) => acc orElse (if (x % 2 == 0) Good(x) else acc)
     } shouldBe Good(6)
   }
+  it can "be serialized correctly" in {
+    serializeRoundtrip(Good(1))
+  }
   "A Bad" can "be widened to an Or type via .asOr" in {
     Bad("oops").asOr shouldBe Bad("oops")
     /*
@@ -554,5 +563,8 @@ class OrSpec extends UnitSpec with Accumulation with TypeCheckedTripleEquals {
       acc orElse (if (x % 2 == 0) Good(x) else acc)
     } shouldBe Bad("no evens")
   }
+  it can "be serialized correctly" in {
+    serializeRoundtrip(Bad("oops"))
+  }
 }