Use plain old JUnit for tests

Author: loverdos

Diff for: project/build.properties

@@ -5,5 +5,5 @@ project.name=maybe
 sbt.version=0.7.7
 project.version=0.1-SNAPSHOT
 publish.remote=false
-build.scala.versions=2.9.1 2.9.0-1 2.9.0 2.8.1
+build.scala.versions=2.9.1 2.9.0-1 2.9.0 2.8.2 2.8.1
 project.initialize=false

Diff for: project/build/Maybe.scala

@@ -31,21 +31,12 @@ class Maybe(info: ProjectInfo) extends DefaultProject(info) {
   def extraResources = "LICENSE.txt"
   override def mainResources = super.mainResources +++ extraResources
 
-  val junitInterface = "com.novocode" % "junit-interface" % "0.6" % "test->default"
+  val junitInterface = "com.novocode" % "junit-interface" % "0.7" % "test->default"
 
   override def testOptions = 
     super.testOptions ++ 
     Seq(TestArgument(TestFrameworks.JUnit, "-q", "-v"))
 
-//  val lib_scalatest = "org.scalatest"  %% "scalatest" % "1.4.1"  % "test"     withSources()
-  val lib_scalatest =  buildScalaVersion match {
-    case "2.8.1"   => "org.scalatest" % "scalatest_2.8.1"   % "1.5.1"     % "test" withSources()
-    case "2.9.0"   => "org.scalatest" % "scalatest_2.9.0"   % "1.6.1"     % "test" withSources()
-    case "2.9.0-1" => "org.scalatest" % "scalatest_2.9.0-1" % "1.6.1"     % "test" withSources()
-    case "2.9.1"   => "org.scalatest" % "scalatest_2.9.1"   % "1.6.1"     % "test" withSources()
-    case v         => error("Unsupported Scala version " + v)
-  }
-
   override def packageDocsJar = defaultJarPath("-javadoc.jar")
   override def packageSrcJar= defaultJarPath("-sources.jar")
   val sourceArtifact = Artifact.sources(artifactID)

Diff for: src/main/scala/com/ckkloverdos/maybe/Maybe.scala

@@ -150,10 +150,8 @@ final case class Just[@specialized(Boolean, Char, Int, Double) +A](get: A) exten
   def filter(f: (A) => Boolean): Maybe[A] = if(f(get)) this else NoVal
   def foreach(f: A => Unit) = f(get)
 
-  protected def equalsImpl(that: Maybe[_]) = that match {
-    case Just(v) => v == get
-    case _       => false
-  }
+  protected def equalsImpl(that: Maybe[_]) =
+    that.getClass == classOf[Just[_]] && that.asInstanceOf[Just[_]].get == this.get
 }
 
 case object NoVal extends MaybeOption[Nothing] {
@@ -177,10 +175,7 @@ case object NoVal extends MaybeOption[Nothing] {
   def filter(f: (Nothing) => Boolean) = NoVal
   def foreach(f: Nothing => Unit) = {}
 
-  protected def equalsImpl(that: Maybe[_]) = that match {
-    case NoVal => true
-    case _     => false
-  }
+  protected def equalsImpl(that: Maybe[_]) = that eq NoVal
 }
 
 /**

Diff for: src/test/scala/com/ckkloverdos/maybe/MaybeTest.scala

@@ -16,36 +16,36 @@
 
 package com.ckkloverdos.maybe
 
-import org.scalatest.FlatSpec
+import org.junit.Assert
+import org.junit.Test
 
 /**
  * 
  * @author Christos KK Loverdos <loverdos@gmail.com>.
  */
 
-class MaybeTest extends FlatSpec {
-
-  behavior of "Maybe"
-
-  it should ("translate null to " + NoVal) in {
-    assert(Maybe(null) === NoVal)
+class MaybeTest {
+  @Test
+  def testNullToNoVal = {
+    Assert.assertTrue(Maybe(null) == NoVal)
   }
 
-  it should "translate a non-null value x to Just(x)" in {
+  @Test
+  def testNotNullToJust = {
     val items = List(
       1,
       "Hello world",
       (x: Int) => x * x,
       new java.lang.Double(2.0),
-      List(1, 2, 3)
-    )
+      List(1, 2, 3))
 
     for(item <- items) {
-      assert(Maybe(item) === Just(item))
+      Assert.assertTrue(Maybe(item).isJust)
     }
   }
 
-  it should "translate a body that throws an exception to a Failed(exception)" in {
-    assert(Maybe(throw new Exception).isFailed)
+  @Test
+  def testExceptionToFailed = {
+    Assert.assertTrue(Maybe(throw new Exception).isFailed)
   }
 }