SCL-4: mocking and vectorization tests

Jan Paw · Jan Paw · commit fa5dcaadbacf · 2014-08-06T09:34:34.000+02:00
diff --git a/project/ScalaCLBuild.scala b/project/ScalaCLBuild.scala
@@ -71,7 +71,7 @@ object ScalaCLBuild extends Build {
         // "-optimise",
         "-deprecation",
         "-feature",
-        // "-Xlog-free-types",
+        // "-Xlog-free-types",q
         // "-Ymacro-debug-lite",
         "-unchecked"
       ),
@@ -81,6 +81,7 @@ object ScalaCLBuild extends Build {
       libraryDependencies ++= Seq(
         "junit" % "junit" % "4.10" % "test",
         "org.scalatest" % "scalatest_2.11" % "2.2.1" % "test",
+        "org.scalamock" % "scalamock-scalatest-support_2.11" % "3.1.2",
         "com.novocode" % "junit-interface" % "0.8" % "test"
       )
     )
diff --git a/src/test/scala/scalacl/BaseTest.scala b/src/test/scala/scalacl/BaseTest.scala
@@ -1,8 +1,9 @@
 package scalacl
 
 import org.scalatest.{ FlatSpecLike, Matchers }
+import org.scalamock.scalatest.MockFactory
 
-trait BaseTest extends FlatSpecLike with Matchers {
+trait BaseTest extends FlatSpecLike with Matchers with MockFactory{
   def context[T](f: Context => T): T = {
     val context = Context.best
     try {
diff --git a/src/test/scala/scalacl/KernelTest.scala b/src/test/scala/scalacl/KernelTest.scala
@@ -29,10 +29,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package scalacl
-import impl._
 
-import org.junit._
-import Assert._
+import scalacl.impl.KernelDef
 
 class KernelTest extends BaseTest {
   behavior of "ScalaCl kernel"
@@ -66,6 +64,7 @@ class KernelTest extends BaseTest {
         for (i <- 0L until n by 3L)
           clResult(i) = i * f + 10
       }
+
       for (i <- 0L until n by 3L)
         result(i.toInt) = i * f + 10
 
diff --git a/src/test/scala/scalacl/impl/VectorizationTest.scala b/src/test/scala/scalacl/impl/VectorizationTest.scala
@@ -33,21 +33,20 @@ package impl
 
 import scalaxy.components._
 
-import org.junit._
-import Assert._
-import org.hamcrest.CoreMatchers._
-
 class VectorizationTest
-    extends Vectorization
+    extends BaseTest
+    with Vectorization
     with WithRuntimeUniverse
     with WithTestFresh {
+  
+  behavior of "ScalaCl vectorization"
+  
   import global._
 
   private val context = reify { null: Context }
-  private val NotVectorizable: Option[Expr[Unit]] = None
-  private val Vectorizable = not(NotVectorizable)
+  private val vectorized: Option[Expr[Unit]] = mock[Some[Expr[Unit]]]
 
-  private def vec(block: Expr[Unit]) = {
+  private def afterVectorization(block: Expr[Unit]): Option[global.Expr[Unit]] = {
     try {
       vectorize(context, typeCheck(block.tree, WildcardType))
     } catch {
@@ -57,34 +56,28 @@ class VectorizationTest
     }
   }
 
-  @Test
-  def notVectorizable0D() {
-    assertThat(
-      vec(reify { 1 + 2 }),
-      is(NotVectorizable)
-    )
+  it should "not vectorized 0D expression" in {
+    afterVectorization(reify { 1 + 2 }) should not be vectorized
+  }
+
+  it should "vectorized 1D expression" in {
+    afterVectorization(reify {
+      for (i <- 0 until 10) i + 1
+    }) should be (vectorized)
   }
 
-  @Test
-  def vectorizable1D() {
-    assertThat(
-      vec(reify {
-        for (i <- 0 until 10) i + 2
-      }),
-      is(Vectorizable)
-    )
+  it should "vectorized 2D expression" in {
+    afterVectorization(reify {
+      for (i <- 0 until 10; j <- 0 until 10)
+        i + j + 2
+    }) should be (vectorized)
   }
 
-  // @Ignore
-  @Test
-  def notVectorizable2D() {
-    assertThat(
-      vec(reify {
-        for (i <- 0 until 10; j <- 0 until 10)
-          i + j + 2
-      }),
-      //is(NotVectorizable)
-      is(Vectorizable)
-    )
+  ignore should "vectorized 3D expression" in {
+    afterVectorization(reify {
+      for (i <- 0 until 10; j <- 0 until 10; k <- 0 until 10)
+        i + j + k + 3
+    }) should be (vectorized)
   }
+
 }
