switch to scalatest

project/build.scala

@@ -60,10 +60,8 @@ object Build extends sbt.Build {
 object Shared {
 
   val testDeps = Seq(
-    "org.scalatest" %% "scalatest" % "2.1.6" % "it,test",
+    "org.scalatest" %% "scalatest" % "2.1.6" % "it,test"
 //    "org.scalacheck" %% "scalacheck" % "1.11.4" % "it,test",
-    "com.novocode" % "junit-interface" % "0.10" % "test",
-    "junit" % "junit" % "4.11" % "test"
   )
 
   val settings = Seq(

runtime/src/test/java/org/capnproto/LayoutTest.java

@@ -1,48 +0,0 @@
-package org.capnproto;
-
-import java.nio.ByteBuffer;
-import org.junit.Test;
-
-import static org.hamcrest.core.IsEqual.equalTo;
-import org.junit.Assert;
-
-public class LayoutTest {
-
-    @Test
-    public void simpleRawDataStruct() {
-        byte[] data = {0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-                       0x01, 0x23, 0x45, 0x67, (byte)0x89, (byte)0xab,
-                       (byte)0xcd, (byte)0xef};
-
-        ByteBuffer buffer = ByteBuffer.wrap(data);
-        buffer.order(java.nio.ByteOrder.LITTLE_ENDIAN);
-        PointerReader pointerReader = new PointerReader(new SegmentReader(buffer), 0, 0x7fffffff);
-        StructReader reader = pointerReader.getStruct();
-
-        Assert.assertThat(reader.getLongField(0), equalTo(0xefcdab8967452301L));
-        Assert.assertThat(reader.getLongField(1), equalTo(0L));
-        Assert.assertThat(reader.getIntField(0), equalTo(0x67452301));
-        Assert.assertThat(reader.getIntField(1), equalTo(0xefcdab89));
-        Assert.assertThat(reader.getIntField(2), equalTo(0));
-        Assert.assertThat(reader.getShortField(0), equalTo((short) 0x2301));
-        Assert.assertThat(reader.getShortField(1), equalTo((short)0x6745));
-        Assert.assertThat(reader.getShortField(2), equalTo((short)0xab89));
-        Assert.assertThat(reader.getShortField(3), equalTo((short)0xefcd));
-        Assert.assertThat(reader.getShortField(4), equalTo((short)0));
-
-        // TODO masking
-
-        Assert.assertTrue(reader.getBoolField(0));
-        Assert.assertFalse(reader.getBoolField(1));
-        Assert.assertFalse(reader.getBoolField(2));
-        Assert.assertFalse(reader.getBoolField(3));
-        Assert.assertFalse(reader.getBoolField(4));
-        Assert.assertFalse(reader.getBoolField(5));
-        Assert.assertFalse(reader.getBoolField(6));
-        Assert.assertFalse(reader.getBoolField(7));
-
-        Assert.assertTrue(reader.getBoolField(8));
-        Assert.assertTrue(reader.getBoolField(9));
-    }
-
-}

runtime/src/test/scala/org/capnproto/LayoutTest.scala

@@ -0,0 +1,59 @@
+package org.capnproto;
+
+import org.scalatest.FunSuite
+
+class ExampleSuite extends FunSuite {
+
+  test("simpleRawDataStruct") {
+        val data : Array[Byte] =
+             Array(0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+                   0x01, 0x23, 0x45, 0x67, 0x89.toByte, 0xab.toByte,
+                   0xcd.toByte, 0xef.toByte);
+
+        val buffer = java.nio.ByteBuffer.wrap(data);
+        buffer.order(java.nio.ByteOrder.LITTLE_ENDIAN);
+
+
+        val pointerReader = new PointerReader(new SegmentReader(buffer), 0, 0x7fffffff);
+        val reader = pointerReader.getStruct();
+
+        assert(reader.getLongField(0) === 0xefcdab8967452301L);
+        assert(reader.getLongField(1) === 0L);
+
+        assert(reader.getIntField(0) === 0x67452301);
+        assert(reader.getIntField(1) === 0xefcdab89);
+        assert(reader.getIntField(2) === 0);
+        assert(reader.getShortField(0) === 0x2301.toShort);
+        assert(reader.getShortField(1) === 0x6745.toShort);
+        assert(reader.getShortField(2) === 0xab89.toShort);
+        assert(reader.getShortField(3) === 0xefcd.toShort);
+        assert(reader.getShortField(4) === 0.toShort);
+
+        // TODO masking
+
+        assert(reader.getBoolField(0) === true);
+        assert(reader.getBoolField(1) === false);
+        assert(reader.getBoolField(2) === false);
+
+        assert(reader.getBoolField(3) === false);
+        assert(reader.getBoolField(4) === false);
+        assert(reader.getBoolField(5) === false);
+        assert(reader.getBoolField(6) === false);
+        assert(reader.getBoolField(7) == false);
+
+        assert(reader.getBoolField(8) === true);
+        assert(reader.getBoolField(9) === true);
+        assert(reader.getBoolField(10) === false);
+        assert(reader.getBoolField(11) === false);
+        assert(reader.getBoolField(12) === false);
+        assert(reader.getBoolField(13) === true);
+        assert(reader.getBoolField(14) === false);
+        assert(reader.getBoolField(15) === false);
+
+        assert(reader.getBoolField(63) === true);
+        assert(reader.getBoolField(64) === false);
+
+  }
+
+}
+