FunctionKernelTest tests were actually already in MapConversionTest and KernelTest. Updated desc in the latter to reflect actual test intent

Author: ochafik

src/test/scala/scalacl/FunctionKernelTest.scala

@@ -94,54 +94,4 @@ class FunctionKernelTest extends BaseTest {
         println((timeMicros / 1000.0) + " milliseconds")
       }
   }
-
-  it should "capture simple scalars" in context {
-    implicit context =>
-      val f = 0.2f
-
-      val array = Array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
-      val clArray: CLArray[Int] = array.cl
-
-      val clResult = clArray.map((x: Int) => x * 2 * f)
-      val result = array.map(x => x * 2 * f)
-      clResult.toList should equal(result.toList) // plusOrMinus 0.001f)
-
-      clArray.release()
-      clResult.release()
-  }
-
-  it should "capture simple arrays" in context {
-    implicit context =>
-      val clResult = {
-        val f = CLArray(10, 20, 30, 40)
-        val a = CLArray(0, 1, 2, 3)
-
-        val r = if (true) {
-          val rr = new CLArray[Int](a.length)
-          kernel {
-            for (i <- 0 until a.length.toInt) {
-              rr(i) = f(i) + i
-            }
-          }
-          rr
-        } else {
-          a.map((x: Int) => f(x) + x)
-        }
-        //assertNotNull("result buffer doesn't have any write event", r.buffers(0).dataWrite)
-        //assertEquals("source buffer doesn't have expected read event", 1, a.buffers(0).dataReads.size)
-        //r.finish()
-        //Thread.sleep(500)
-        //assertNull("result buffer failed to clear its dataWrite upon finish()", r.buffers(0).dataWrite)
-        //assertEquals("source buffer failed to clear its dataReads upon finish()", 0, a.buffers(0).dataReads.size)
-        //assertEquals("captured buffer failed to clear its dataReads upon finish()", 0, f.buffers(0).dataReads.size)
-
-        r
-      }
-      val result = {
-        val f = Array(10, 20, 30, 40)
-        val a = Array(0, 1, 2, 3)
-        a.map(x => f(x) + x)
-      }
-      clResult.toList should equal(result.toList)
-  }
 }

src/test/scala/scalacl/KernelTest.scala

@@ -93,7 +93,7 @@ class KernelTest extends BaseTest {
         r
       }
 
-      result.toList should equal(clResult.toList)
+      clResult.toList should equal(result.toList)
   }
 
   it should "check equality of kernels" in {

src/test/scala/scalacl/MapConversionTest.scala

@@ -4,19 +4,22 @@ class MapConversionTest extends BaseTest {
 
   behavior of "map"
 
-  it should "compute scalar function with int type" in context {
+  it should "capture simple scalars" in context {
     implicit context =>
-      val f = 0.2f
+      val capturedScala = 0.2f
 
       val array = Array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
       val clArray: CLArray[Int] = array.cl
 
-      val clResult = clArray.map((x: Int) => x * 2 * f)
-      val result = array.map(x => x * 2 * f)
+      val clResult = clArray.map((x: Int) => x * 2 * capturedScala)
+      val result = array.map(x => x * 2 * capturedScala)
 
       result.toArray zip clResult.toArray foreach {
         case (r, cl) => r should equal(cl +- 0.001f)
       }
+
+      clArray.release()
+      clResult.release()
   }
 
 }