SCL-4: symbol kinds test

Jan Paw · Jan Paw · commit 1ea0dece421d · 2014-08-06T13:14:51.000+02:00
diff --git a/src/test/scala/scalacl/BaseTest.scala b/src/test/scala/scalacl/BaseTest.scala
@@ -3,6 +3,8 @@ package scalacl
 import org.scalatest.{ FlatSpecLike, Matchers }
 import org.scalamock.scalatest.MockFactory
 
+import scalaxy.components.{WithTestFresh, WithRuntimeUniverse}
+
 trait BaseTest extends FlatSpecLike with Matchers with MockFactory{
   def context[T](f: Context => T): T = {
     val context = Context.best
@@ -12,3 +14,5 @@ trait BaseTest extends FlatSpecLike with Matchers with MockFactory{
   }
 }
 
+
+trait RuntimeUniverseTest extends WithRuntimeUniverse with WithTestFresh
diff --git a/src/test/scala/scalacl/impl/SymbolKindsTest.scala b/src/test/scala/scalacl/impl/SymbolKindsTest.scala
@@ -31,16 +31,13 @@
 package scalacl
 package impl
 
-import scalaxy.components._
+class SymbolKindsTest
+    extends BaseTest
+    with RuntimeUniverseTest
+    with SymbolKinds {
 
-import org.junit._
-import Assert._
-import org.hamcrest.CoreMatchers._
+  behavior of "Symbols kind resolving"
 
-class SymbolKindsTest
-    extends SymbolKinds
-    with WithRuntimeUniverse
-    with WithTestFresh {
   import global._
 
   class EmptyClass()
@@ -52,23 +49,22 @@ class SymbolKindsTest
     var v = 0
   }
 
-  @Test
-  def testKinds() {
-    assertEquals(SymbolKind.Tuploid, kindOf(typeOf[Int]))
-    assertEquals(SymbolKind.Tuploid, kindOf(typeOf[Float]))
-    assertEquals(SymbolKind.Tuploid, kindOf(typeOf[(Int, Int)]))
+  it should "find properly kind some object" in {
+    SymbolKind.Tuploid should equal (kindOf(typeOf[Int]))
+    SymbolKind.Tuploid should equal (kindOf(typeOf[Float]))
+    SymbolKind.Tuploid should equal (kindOf(typeOf[(Int, Int)]))
 
-    assertEquals(SymbolKind.ArrayLike, kindOf(typeOf[CLArray[Int]]))
-    assertEquals(SymbolKind.ArrayLike, kindOf(typeOf[CLFilteredArray[Int]]))
+    SymbolKind.ArrayLike should equal (kindOf(typeOf[CLArray[Int]]))
+    SymbolKind.ArrayLike should equal (kindOf(typeOf[CLFilteredArray[Int]]))
 
-    assertEquals(SymbolKind.Tuploid, kindOf(typeOf[ImmutableClass]))
-    assertEquals(SymbolKind.Tuploid, kindOf(typeOf[ImmutableCaseClass]))
+    SymbolKind.Tuploid should equal (kindOf(typeOf[ImmutableClass]))
+    SymbolKind.Tuploid should equal (kindOf(typeOf[ImmutableCaseClass]))
 
-    assertEquals(SymbolKind.Other, kindOf(typeOf[MutableClass]))
-    assertEquals(SymbolKind.Other, kindOf(typeOf[MutableCaseClass]))
+    SymbolKind.Other should equal (kindOf(typeOf[MutableClass]))
+    SymbolKind.Other should equal (kindOf(typeOf[MutableCaseClass]))
 
-    assertEquals(SymbolKind.Other, kindOf(typeOf[EmptyClass]))
-    assertEquals(SymbolKind.Other, kindOf(typeOf[EmptyCaseClass]))
+    SymbolKind.Other should equal (kindOf(typeOf[EmptyClass]))
+    SymbolKind.Other should equal (kindOf(typeOf[EmptyCaseClass]))
   }
 
 }
diff --git a/src/test/scala/scalacl/impl/VectorizationTest.scala b/src/test/scala/scalacl/impl/VectorizationTest.scala
@@ -36,8 +36,7 @@ import scalaxy.components._
 class VectorizationTest
     extends BaseTest
     with Vectorization
-    with WithRuntimeUniverse
-    with WithTestFresh {
+    with RuntimeUniverseTest {
   
   behavior of "ScalaCl vectorization"
   

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@ package scalacl`
`3`	`3`	`import org.scalatest.{ FlatSpecLike, Matchers }`
`4`	`4`	`import org.scalamock.scalatest.MockFactory`
`5`	`5`
	`6`	`+import scalaxy.components.{WithTestFresh, WithRuntimeUniverse}`
	`7`	`+`
`6`	`8`	`trait BaseTest extends FlatSpecLike with Matchers with MockFactory{`
`7`	`9`	`def context[T](f: Context => T): T = {`
`8`	`10`	`val context = Context.best`
`@@ -12,3 +14,5 @@ trait BaseTest extends FlatSpecLike with Matchers with MockFactory{`
`12`	`14`	`}`
`13`	`15`	`}`
`14`	`16`
	`17`	`+`
	`18`	`+trait RuntimeUniverseTest extends WithRuntimeUniverse with WithTestFresh`