diff --git a/summingbird-core-test/src/main/scala/com/twitter/summingbird/ArbitraryWorkaround.scala b/summingbird-core-test/src/main/scala/com/twitter/summingbird/ArbitraryWorkaround.scala deleted file mode 100644 index 4cc8ade2a..000000000 --- a/summingbird-core-test/src/main/scala/com/twitter/summingbird/ArbitraryWorkaround.scala +++ /dev/null @@ -1,26 +0,0 @@ -package com.twitter.summingbird - -import org.scalacheck.{ Arbitrary, Gen } - -/** - * [[org.scalacheck.GenArities]] and [[org.scalacheck.ArbitraryArities]] classes from scalacheck - * contains to many lambdas in the same file which leads to - * bug with functions serialization in Scala 2.12: https://issues.scala-lang.org/browse/SI-10232 - * - * As a workaround this class contains overriden implicits for such cases. - * Should be imported if you import [[Arbitrary]] class. - * - * ScalaCheck issue is tracked at https://github.com/rickynils/scalacheck/issues/342. - */ -object ArbitraryWorkaround { - implicit val f1: Arbitrary[Int => Int] = Arbitrary(Gen.const(x => x * 2)) - implicit val f2: Arbitrary[Int => List[(Int, Int)]] = Arbitrary(Gen.const(x => List((x, x * 3)))) - implicit val f3: Arbitrary[Int => Option[Int]] = Arbitrary(Gen.const(x => { - if (x % 2 == 0) None else Some(x * 4) - })) - implicit val f4: Arbitrary[Int => List[Int]] = Arbitrary(Gen.const(x => List(x * 5))) - implicit val f5: Arbitrary[((Int, (Int, Option[Int]))) => List[(Int, Int)]] = Arbitrary(Gen.const { - case (x, (y, optZ)) => List((x, y), (x, optZ.getOrElse(42))) - }) - implicit val f6: Arbitrary[((Int, Int)) => List[(Int, Int)]] = Arbitrary(Gen.const(x => List(x, x))) -} diff --git a/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/ScaldingLaws.scala b/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/ScaldingLaws.scala index c75a5efaa..36c4858c8 100644 --- a/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/ScaldingLaws.scala +++ b/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/ScaldingLaws.scala @@ -25,7 +25,6 @@ import com.twitter.summingbird.SummingbirdRuntimeStats import com.twitter.scalding.{ Test => TestMode, _ } import org.scalacheck.Arbitrary -import com.twitter.summingbird.ArbitraryWorkaround._ import org.scalacheck.Cogen import org.apache.hadoop.conf.Configuration diff --git a/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/VersionBatchedStoreTest.scala b/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/VersionBatchedStoreTest.scala index dcf224b87..e98a0ba0b 100644 --- a/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/VersionBatchedStoreTest.scala +++ b/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/VersionBatchedStoreTest.scala @@ -28,7 +28,6 @@ import java.io.File import com.twitter.scalding._ import org.scalacheck.Arbitrary -import com.twitter.summingbird.ArbitraryWorkaround._ import org.scalatest.WordSpec diff --git a/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/StormLaws.scala b/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/StormLaws.scala index 6a7b6fc40..73465d331 100644 --- a/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/StormLaws.scala +++ b/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/StormLaws.scala @@ -21,7 +21,6 @@ import com.twitter.summingbird.batch.Batcher import com.twitter.summingbird.online.option.LeftJoinGrouping import org.scalatest.WordSpec import org.scalacheck.Arbitrary -import com.twitter.summingbird.ArbitraryWorkaround._ /** * Tests for Summingbird's Storm planner.