Down to one compile error, but will it run?

tonymorris · tonymorris · commit 876b9bc6e0ef · 2011-02-05T18:07:31.000+10:00
diff --git a/project/project.iml b/project/project.iml
@@ -4,7 +4,7 @@
     <facet type="scala" name="Scala">
       <configuration>
         <option name="compilerLibraryLevel" value="Project" />
-        <option name="compilerLibraryName" value="defScala" />
+        <option name="compilerLibraryName" value="scala-2.8.1" />
       </configuration>
     </facet>
   </component>
diff --git a/src/test/fj/Tests.scala b/src/test/fj/Tests.scala
@@ -1,9 +1,7 @@
 package fj
 
-import List.flatten
-
 object Tests {
-  def tests = flatten(List (
+  def tests = List (
     fj.data.CheckArray.tests,
     fj.data.CheckList.tests,
     fj.data.CheckStream.tests,
@@ -15,7 +13,7 @@ object Tests {
     fj.data.CheckTreeMap.tests,
     fj.control.parallel.CheckStrategy.tests,
     fj.control.parallel.CheckParModule.tests
-  ))
+  ).flatten
 
   def main(args: Array[String]) {
     run(tests)
diff --git a/src/test/fj/control/parallel/ArbitraryParModule.scala b/src/test/fj/control/parallel/ArbitraryParModule.scala
@@ -3,8 +3,22 @@ package fj.control.parallel
 import org.scalacheck.Arbitrary
 import ParModule.parModule
 import org.scalacheck.Arbitrary.arbitrary
+import fj.P1
+import fj.Implicit._
 
 object ArbitraryParModule {
-  implicit def arbitraryParModule(implicit s: Arbitrary[Strategy[Unit]]): Arbitrary[ParModule] = 
-    Arbitrary(arbitrary[Strategy[Unit]].map((x) => parModule(x)))
+  implicit def arbitraryParModule(implicit s: Arbitrary[Strategy[Unit]]): Arbitrary[ParModule] =
+    Arbitrary(arbitrary[Strategy[Unit]].map(x => parModule({
+      x.xmap((a: P1[Unit]) => new P1[fj.Unit] {
+        def _1 = {
+          a._1
+          fj.Unit.unit
+        }
+      }, (a: P1[fj.Unit]) => new P1[Unit] {
+        def _1 = {
+          a._1
+          ()
+        }
+      })
+    })))
 }
diff --git a/src/test/fj/control/parallel/ArbitraryStrategy.scala b/src/test/fj/control/parallel/ArbitraryStrategy.scala
@@ -2,7 +2,6 @@ package fj.control.parallel
 
 import fj.control._
 import org.scalacheck.Arbitrary
-import org.scalacheck.Arbitrary
 import org.scalacheck.Gen.value
 import Strategy.executorStrategy
 import java.util.concurrent.Executors.newFixedThreadPool
diff --git a/src/test/fj/control/parallel/CheckParModule.scala b/src/test/fj/control/parallel/CheckParModule.scala
@@ -9,9 +9,11 @@ import fj.data.ArbitraryArray.arbitraryArray
 import fj.data.List
 import fj.data.Stream
 import fj.data.Array
-import fj.pre.Equal.{listEqual, stringEqual, streamEqual, arrayEqual}
-import fj.pre.Monoid.stringMonoid
+import fj.Equal.{listEqual, stringEqual, streamEqual, arrayEqual}
+import fj.Monoid.stringMonoid
 import fj.P
+import fj.P1
+import fj.Tests
 
 object CheckParModule {
   def rev = (x: String) => x.reverse: String
diff --git a/src/test/fj/control/parallel/CheckStrategy.scala b/src/test/fj/control/parallel/CheckStrategy.scala
@@ -15,6 +15,7 @@ import fj.data.Array
 import fj.data.Array.array
 import fj.Implicit._
 import fj.Equal.{listEqual, stringEqual, arrayEqual}
+import fj.Tests
 
 object CheckStrategy {
 
diff --git a/src/test/fj/data/CheckArray.scala b/src/test/fj/data/CheckArray.scala
@@ -7,6 +7,7 @@ import fj.Implicit._
 import fj.data.Array.{array, empty, join}
 import fj.Equal.{arrayEqual, stringEqual}
 import fj.Unit.unit
+import fj.Tests
 
 object CheckArray {
   val prop_isEmpty = forAll((a: Array[Int]) =>
diff --git a/src/test/fj/data/CheckHashMap.scala b/src/test/fj/data/CheckHashMap.scala
@@ -5,6 +5,7 @@ import ArbitraryHashMap._
 import fj.Equal.{intEqual, stringEqual, optionEqual}
 import fj.Hash.{intHash, stringHash}
 import fj.Implicit._
+import fj.Tests
 
 object CheckHashMap {
   implicit val equalInt: fj.Equal[Int] = intEqual comap ((x: Int) => (x: java.lang.Integer))
diff --git a/src/test/fj/data/CheckHashSet.scala b/src/test/fj/data/CheckHashSet.scala
@@ -5,6 +5,7 @@ import ArbitraryHashSet._
 import fj.Equal.intEqual
 import fj.Hash.intHash
 import fj.Implicit._
+import fj.Tests
 
 object CheckHashSet {
   implicit val equalInt: fj.Equal[Int] = intEqual comap ((x: Int) => (x: java.lang.Integer))
diff --git a/src/test/fj/data/CheckList.scala b/src/test/fj/data/CheckList.scala
@@ -9,6 +9,7 @@ import fj.P1
 import fj.Unit.unit
 import List.{nil, single, join, iterateWhile}
 import fj.Implicit._
+import fj.Tests
 
 object CheckList {
   val prop_isEmpty = forAll((a: List[Int]) =>
diff --git a/src/test/fj/data/CheckSet.scala b/src/test/fj/data/CheckSet.scala
@@ -12,6 +12,7 @@ import fj.P.p
 import fj.Unit.unit
 import Set.{empty, single, join, iterableSet}
 import fj.Implicit._
+import fj.Tests
 
 object CheckSet {
 
diff --git a/src/test/fj/data/CheckTree.scala b/src/test/fj/data/CheckTree.scala
@@ -8,6 +8,7 @@ import Stream.{join}
 import fj.Implicit._
 import fj.Monoid.{intAdditionMonoid}
 import fj.Monoid
+import fj.Tests
 
 object CheckTree {
 
diff --git a/src/test/fj/data/CheckTreeMap.scala b/src/test/fj/data/CheckTreeMap.scala
@@ -5,6 +5,7 @@ import fj.Ord
 import org.scalacheck.Prop._
 import ArbitraryTreeMap._
 import fj.Implicit._
+import fj.Tests
 
 object CheckTreeMap {
   def idInt(n: Int) = n:java.lang.Integer
