ScalaTest should be used instead of JUnit.

ymnk · May 19, 2013 · 0fa43af · 0fa43af
1 parent a7c5068
commit 0fa43af
Show file tree

Hide file tree

Showing 8 changed files with 188 additions and 192 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -22,12 +22,10 @@ object MyBuild extends Build {
 
   import BuildSettings._
 
-  val scalatest = "org.scalatest" %% "scalatest" % "1.6.1"
-  val junit = "junit" % "junit" % "4.8"
-  val junit_interface = "com.novocode" % "junit-interface" % "0.7"
+  val scalatest = "org.scalatest" % "scalatest_2.10" % "1.9.1" % "test"
 
   private val dependencies = Seq (
-    scalatest, junit, junit_interface
+    scalatest
   )
 
   private val test_argument = 

diff --git a/src/test/scala/Adler32Test.scala b/src/test/scala/Adler32Test.scala
@@ -1,24 +1,24 @@
-/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
+/* -*-mode:scala; c-basic-offset:2; indent-tabs-mode:nil -*- */
 package com.jcraft.jzlib
 
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-import org.junit.{Test, Before}
-import org.junit.Assert._
-import org.hamcrest.CoreMatchers._
+import org.scalatest._
+import org.scalatest.matchers.ShouldMatchers
+
 import java.util.zip.{Adler32 => juzAdler32}
 
-@RunWith(classOf[JUnit4])
-class Adler32Test {
+class Adler32Test extends FlatSpec with BeforeAndAfter with ShouldMatchers {
   private var adler: Adler32 = _
 
-  @Before
-  def setUp = {
+  before {
     adler = new Adler32
   }
 
-  @Test
-  def comat = {
+  after {
+  }
+
+  behavior of "Adler32"
+
+  it must "be compatible with java.util.zip.Adler32." in {
     val buf1 = randombuf(1024)
     val juza = new juzAdler32
     val expected = {
@@ -27,11 +27,10 @@ class Adler32Test {
     }
     val actual = getValue(List(buf1));
 
-    assertThat(actual, is(expected)) 
+    actual should equal (expected)
   }
 
-  @Test
-  def copy = {
+  it can "copy itself." in {
     val buf1 = randombuf(1024)
     val buf2 = randombuf(1024)
 
@@ -47,11 +46,10 @@ class Adler32Test {
     val expected = adler1.getValue
     val actual = adler2.getValue
 
-    assertThat(actual, is(expected)) 
+    actual should equal (expected)
   }
 
-  @Test
-  def combine = {
+  it can "combine adler values." in {
 
     val buf1 = randombuf(1024)
     val buf2 = randombuf(1024)
@@ -62,7 +60,7 @@ class Adler32Test {
 
     val actual = Adler32.combine(adler1, adler2, buf2.length)
 
-    assertThat(actual, is(expected)) 
+    actual should equal (expected)
   }
 
   private def getValue(buf:Seq[Array[Byte]]) = synchronized {