Get tests working again. Use a home-brew version of scalacheck and sp…

…ecs, built for 2.9.0.RC1.
scalaz · Mar 26, 2011 · 22fdf07 · 22fdf07
1 parent 58f910f
commit 22fdf07
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/lib/scalacheck_2.9.0.RC1-1.9-SNAPSHOT.jar b/lib/scalacheck_2.9.0.RC1-1.9-SNAPSHOT.jar
diff --git a/lib/specs_2.9.0.RC1-1.6.7.1.jar b/lib/specs_2.9.0.RC1-1.6.7.1.jar
diff --git a/project/build/ScalazProject.scala b/project/build/ScalazProject.scala
@@ -25,10 +25,6 @@ abstract class ScalazDefaults(info: ProjectInfo) extends DefaultProject(info) wi
 
   lazy val sourceArtifact = Artifact(artifactID, "src", "jar", Some("sources"), Nil, None)
 
-  def specsDependency = "org.scala-tools.testing" %% "specs" % "1.6.7" % "test"
-
-  def scalacheckDependency = "org.scala-tools.testing" % "scalacheck_2.8.1" % "1.8"
-
   override def packageToPublishActions = super.packageToPublishActions ++ Seq(packageSrc, packageTestSrc)
 
   // Workaround for problem described here: http://groups.google.com/group/simple-build-tool/browse_thread/thread/7575ea3c074ee8aa/373a91c25393085c?#373a91c25393085c
@@ -108,7 +104,7 @@ final class ScalazProject(info: ProjectInfo) extends ParentProject(info) with Ov
   }
 
   class ScalacheckBinding(info: ProjectInfo) extends ScalazDefaults(info) {
-    val scalacheck = scalacheckDependency
+    override def unmanagedClasspath: PathFinder = descendents(parent.path("lib"), "scalacheck*.jar") +++ super.unmanagedClasspath
 
     override def documentOptions = documentTitle("Scalaz Scalacheck") :: super.documentOptions
 
@@ -121,19 +117,18 @@ import org.scalacheck.Prop._
   }
 
   class GeoScalacheck(info: ProjectInfo) extends ScalacheckBinding(info) {
-    override val scalacheck = scalacheckDependency
-
+    override def unmanagedClasspath: PathFinder = descendents(parent.path("lib"), "scalacheck*.jar") +++ super.unmanagedClasspath
     override def documentOptions = documentTitle("Scalaz Geo Scalacheck") :: super.documentOptions.tail
   }
 
   class Example(info: ProjectInfo) extends ScalazDefaults(info) {
-    override protected def testUnmanagedClasspath: PathFinder = descendents(parent.path("lib"), "*.jar")
+    override protected def testUnmanagedClasspath: PathFinder = descendents(parent.path("lib"), "*.jar") +++ super.testUnmanagedClasspath
 
     override def documentOptions = documentTitle("Scalaz Example") :: super.documentOptions
   }
 
   class TestSuite(info: ProjectInfo) extends ScalazDefaults(info) {
-    override protected def testUnmanagedClasspath: PathFinder = descendents(parent.path("lib"), "*.jar")
+    override protected def testUnmanagedClasspath: PathFinder = descendents(parent.path("lib"), "*.jar") +++ super.testUnmanagedClasspath
 
     override def documentOptions = documentTitle("Scalaz Tests") :: super.documentOptions
   }

diff --git a/tests/src/test/scala/scalaz/EqualTest.scala b/tests/src/test/scala/scalaz/EqualTest.scala
@@ -114,13 +114,6 @@ class EqualTest extends Specification with Sugar with ScalaCheck {
       import ScalazProperties.Equal._
       commutativity[A] must pass
       identity[A] must pass
-      checkEqualsNotBasedOnObjectIdentity[A]
     }
   }
-
-  def checkEqualsNotBasedOnObjectIdentity[A: Equal : Manifest : Arbitrary]: Unit = {
-    Prop.forAll((as: Duplicate[A]) => as.pair match {
-      case (a1, a2) =>  a1 ≟ a2
-    }).label("checkEqualsNotBasedOnObjectIdentity") must pass
-  }
 }