SCL-4: in context{}

Jan Paw · Jan Paw · commit 96e56c5d0daa · 2014-08-05T22:21:43.000+02:00
diff --git a/project/ScalaCLBuild.scala b/project/ScalaCLBuild.scala
@@ -80,6 +80,7 @@ object ScalaCLBuild extends Build {
       libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _),
       libraryDependencies ++= Seq(
         "junit" % "junit" % "4.10" % "test",
+        "org.scalatest" % "scalatest_2.11" % "2.2.1" % "test",
         "com.novocode" % "junit-interface" % "0.8" % "test"
       )
     )
diff --git a/src/test/scala/scalacl/BaseTest.scala b/src/test/scala/scalacl/BaseTest.scala
@@ -0,0 +1,13 @@
+package scalacl
+
+import org.scalatest.{ FlatSpecLike, Matchers }
+
+trait BaseTest extends FlatSpecLike with Matchers {
+  def context[T](f: Context => T): T = {
+    val context = Context.best
+    try {
+      f(context)
+    } finally context.release()
+  }
+}
+
diff --git a/src/test/scala/scalacl/KernelTest.scala b/src/test/scala/scalacl/KernelTest.scala
@@ -34,67 +34,58 @@ import impl._
 import org.junit._
 import Assert._
 
-class KernelTest {
-  @Test
-  def intRange1DKernel() {
-    implicit val context = Context.best
-    try {
+class KernelTest extends BaseTest {
+  behavior of "ScalaCl kernel"
 
+  it should "perform computation in kernel block for integers" in context {
+    implicit context =>
       val n = 25
-      val a = new Array[Int](n)
-      val ca = new CLArray[Int](n)
+      val result = new Array[Int](n)
+      val clResult = new CLArray[Int](n)
       val f = 10
 
       kernel {
         for (i <- 0 until n by 3)
-          ca(i) = i * f + 10
+          clResult(i) = i * f + 10
       }
+
       for (i <- 0 until n by 3)
-        a(i) = i * f + 10
+        result(i) = i * f + 10
 
-      assertEquals(a.toSeq, ca.toSeq)
-    } finally {
-      context.release()
-    }
+      result.toSeq should equal (clResult.toSeq)
   }
-  @Test
-  def longRange1DKernel() {
-    implicit val context = Context.best
-    try {
 
+  it should "perform computation in kernel block for longs" in context {
+    implicit context =>
       val n = 25L
-      val a = new Array[Long](n.toInt)
-      val ca = new CLArray[Long](n)
+      val result = new Array[Long](n.toInt)
+      val clResult = new CLArray[Long](n)
       val f = 10
 
       kernel {
         for (i <- 0L until n by 3L)
-          ca(i) = i * f + 10
+          clResult(i) = i * f + 10
       }
       for (i <- 0L until n by 3L)
-        a(i.toInt) = i * f + 10
+        result(i.toInt) = i * f + 10
 
-      assertEquals(a.toSeq, ca.toSeq)
-    } finally {
-      context.release()
-    }
+      result.toSeq should equal (clResult.toSeq)
   }
 
-  @Test
-  def testEquality() {
+  it should "check equality of kernels" in {
     val sources = "aa"
     same(new KernelDef(sources = sources, salt = 1), new KernelDef(sources = sources, salt = 1))
     diff(new KernelDef(sources = sources, salt = 1), new KernelDef(sources = sources, salt = 2), sameHC = false)
     diff(new KernelDef(sources = sources, salt = 1), new KernelDef(sources = "a" + ('b' - 1), salt = 1), sameHC = true)
   }
 
   def same(a: AnyRef, b: AnyRef) = {
-    assertEquals(a.hashCode, b.hashCode)
-    assertEquals(a, b)
+    a.hashCode should equal (b.hashCode)
+    a shouldEqual equal (b)
   }
 
   def diff(a: AnyRef, b: AnyRef, sameHC: Boolean) = {
-    assertTrue(sameHC ^ (a.hashCode != b.hashCode))
-    assertFalse(a.equals(b))
+    assert(sameHC ^ (a.hashCode != b.hashCode))
+    assert(!a.equals(b))
   }
 }
diff --git a/src/test/scala/scalacl/TaskTest.scala b/src/test/scala/scalacl/TaskTest.scala
@@ -29,26 +29,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package scalacl
-import impl._
 
-import org.junit._
-import Assert._
+class TaskTest extends BaseTest {
+  behavior of "ScalaCl task"
 
-class TaskTest {
-  @Ignore
-  @Test
-  def simple() {
-    implicit val context = Context.best
-    try {
-      val a = new CLArray[Int](3)
+  ignore should "perform computation in task block" in context {
+    implicit context =>
+      val result = new CLArray[Int](3)
       val f = 10
       task {
-        a(1) = 10 * f
+        result(1) = 10 * f
       }
-      println(a.toSeq)
-      assertEquals(Seq(0, 100, 0), a.toSeq)
-    } finally {
-      context.release()
-    }
+      result should equal (Seq(0, 100, 0))
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ object ScalaCLBuild extends Build {`
`80`	`80`	`libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _),`
`81`	`81`	`libraryDependencies ++= Seq(`
`82`	`82`	`"junit" % "junit" % "4.10" % "test",`
	`83`	`+ "org.scalatest" % "scalatest_2.11" % "2.2.1" % "test",`
`83`	`84`	`"com.novocode" % "junit-interface" % "0.8" % "test"`
`84`	`85`	`)`
`85`	`86`	`)`