Remove usage of junit.framework

4 files changed, 61 insertions, 25 deletions

diff --git a/fsa/src/test/java/com/yahoo/fsa/test/FSADataTestCase.java b/fsa/src/test/java/com/yahoo/fsa/test/FSADataTestCase.java
index c245bb25af9..c8e7f5620de 100644
--- a/fsa/src/test/java/com/yahoo/fsa/test/FSADataTestCase.java
+++ b/fsa/src/test/java/com/yahoo/fsa/test/FSADataTestCase.java
@@ -2,6 +2,8 @@
 package com.yahoo.fsa.test;
 
 import com.yahoo.fsa.FSA;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -9,10 +11,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.nio.BufferUnderflowException;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author geirst
  */
-public class FSADataTestCase extends junit.framework.TestCase {
+public class FSADataTestCase {
 
     private static class Worker extends Thread {
         FSA.State state;
@@ -48,14 +53,12 @@ public class FSADataTestCase extends junit.framework.TestCase {
 
     private FSA fsa;
 
-    public FSADataTestCase(String name) {
-        super(name);
-    }
-
-    protected void setUp() throws IOException {
+    @Before
+    public void setUp() throws IOException {
         fsa = new FSA(new FileInputStream("src/test/fsa/test-data.fsa"));
     }
 
+    @Test
     public void testBasic() {
         FSA.State state = fsa.getState();
         state.delta("aa");
@@ -78,6 +81,7 @@ public class FSADataTestCase extends junit.framework.TestCase {
         assertEquals("dddddd data", state.dataString());
     }
 
+    @Test
     public void testMultipleThreads() {
         long numRuns = 10000;
         List<Worker> workers = new ArrayList<Worker>();
diff --git a/fsa/src/test/java/com/yahoo/fsa/test/FSAIteratorTestCase.java b/fsa/src/test/java/com/yahoo/fsa/test/FSAIteratorTestCase.java
index 97522a6634d..06150d606d0 100644
--- a/fsa/src/test/java/com/yahoo/fsa/test/FSAIteratorTestCase.java
+++ b/fsa/src/test/java/com/yahoo/fsa/test/FSAIteratorTestCase.java
@@ -2,15 +2,21 @@
 package com.yahoo.fsa.test;
 
 import com.yahoo.fsa.FSA;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author geirst
  */
-public class FSAIteratorTestCase extends junit.framework.TestCase {
+public class FSAIteratorTestCase {
 
     private FSA fsa;
 
@@ -18,11 +24,8 @@ public class FSAIteratorTestCase extends junit.framework.TestCase {
 
     private List<String> expected;
 
-    public FSAIteratorTestCase(String name) {
-        super(name);
-    }
-
-    protected void setUp() {
+    @Before
+    public void setUp() {
         fsa = new FSA("src/test/fsa/test-iterator.fsa");
         state = fsa.getState();
 
@@ -59,30 +62,36 @@ public class FSAIteratorTestCase extends junit.framework.TestCase {
         assertTrue(beginIdx == endIdx);
     }
 
+    @Test
     public void testIterator() {
         checkIterator(0, expected.size(), "");
     }
 
+    @Test
     public void testIteratorSingle() {
         state.delta("dach");
         checkIterator(6, 7, "dach");
     }
 
+    @Test
     public void testIteratorSubset() {
         state.delta("abd");
         checkIterator(3, 6, "abd");
     }
 
+    @Test
     public void testIteratorFinalState() {
         state.delta("dacia");
         checkIterator(7, 10, "dacia");
     }
 
+    @Test
     public void testIteratorFinalStateOnly() {
         state.delta("dachs");
         checkIterator(6, 7, "dachs");
     }
 
+    @Test
     public void testIteratorEmpty1() {
         state.delta("b");
         java.util.Iterator i = fsa.iterator(state);
@@ -95,6 +104,7 @@ public class FSAIteratorTestCase extends junit.framework.TestCase {
         }
     }
 
+    @Test
     public void testIteratorEmpty2() {
         state.delta("daciac");
         java.util.Iterator i = fsa.iterator(state);
@@ -107,6 +117,7 @@ public class FSAIteratorTestCase extends junit.framework.TestCase {
         }
     }
 
+    @Test
     public void testIteratorRemove() {
         java.util.Iterator i = fsa.iterator(state);
         try {
@@ -116,4 +127,5 @@ public class FSAIteratorTestCase extends junit.framework.TestCase {
             assertTrue(true);
         }
     }
+
 }
diff --git a/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java b/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java
index 95b2b22b853..f08f58911ef 100644
--- a/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java
+++ b/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java
@@ -2,52 +2,59 @@
 package com.yahoo.fsa.test;
 
 import com.yahoo.fsa.FSA;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.io.FileInputStream;
 import java.io.IOException;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author bratseth
  */
-public class FSATestCase extends junit.framework.TestCase {
+public class FSATestCase {
 
     private FSA fsa;
 
     private FSA.State state;
 
-    public FSATestCase(String name) {
-        super(name);
-    }
-
-    protected void setUp() throws IOException {
+    @Before
+    public void setUp() throws IOException {
         fsa=new FSA(new FileInputStream("src/test/fsa/test-fsa.fsa"));
         state=fsa.getState();
     }
 
+    @Test
     public void testSingleWordDelta() {
         state.delta("aword");
         assertTrue(state.isValid());
         assertTrue(state.isFinal());
     }
 
+    @Test
     public void testSingleWordDeltaWord() {
         state.deltaWord("aword");
         assertTrue(state.isValid());
         assertTrue(state.isFinal());
     }
 
+    @Test
     public void testSingleWordDeltaPartialMatch() {
         state.delta("awo");
         assertTrue(state.isValid());
         assertFalse(state.isFinal());
     }
 
+    @Test
     public void testSingleWordDeltaPartialMatchWord() {
         state.deltaWord("awo");
         assertTrue(state.isValid());
         assertFalse(state.isFinal());
     }
 
+    @Test
     public void testMultiWordDelta() {
         state.delta("th");
         assertFalse(state.isFinal());
@@ -62,6 +69,7 @@ public class FSATestCase extends junit.framework.TestCase {
         assertTrue(state.isFinal());
     }
 
+    @Test
     public void testMultiWordDeltaWord() {
         state.deltaWord("this");
         assertFalse(state.isFinal());
@@ -74,6 +82,7 @@ public class FSATestCase extends junit.framework.TestCase {
         assertTrue(state.isFinal());
     }
 
+    @Test
     public void testMultiWordDeltaWordInvalid() {
         state.deltaWord("th");
         assertFalse(state.isFinal());
@@ -82,6 +91,7 @@ public class FSATestCase extends junit.framework.TestCase {
         assertFalse(state.isValid());
     }
 
+    @Test
     public void testMultiWordDeltaTry() {
         assertFalse(state.tryDeltaWord("thiss"));
         assertTrue(state.isValid());
@@ -94,7 +104,6 @@ public class FSATestCase extends junit.framework.TestCase {
         assertTrue(state.tryDeltaWord("test"));
         assertTrue(state.isValid());
         assertTrue(state.isFinal());
-
     }
 
 }
diff --git a/fsa/src/test/java/com/yahoo/fsa/test/UTF8TestCase.java b/fsa/src/test/java/com/yahoo/fsa/test/UTF8TestCase.java
index 68ee5483b36..fb3e8a3215d 100644
--- a/fsa/src/test/java/com/yahoo/fsa/test/UTF8TestCase.java
+++ b/fsa/src/test/java/com/yahoo/fsa/test/UTF8TestCase.java
@@ -2,13 +2,20 @@
 package com.yahoo.fsa.test;
 
 import com.yahoo.fsa.FSA;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.Iterator;
 import java.nio.charset.Charset;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author geirst
  */
-public class UTF8TestCase extends junit.framework.TestCase {
+public class UTF8TestCase {
 
     private Charset charset = Charset.forName("utf-8");
     private FSA fsa;
@@ -27,11 +34,8 @@ public class UTF8TestCase extends junit.framework.TestCase {
         return retval;
     }
 
-    public UTF8TestCase(String name) {
-        super(name);
-    }
-
-    protected void setUp() {
+    @Before
+    public void setUp() {
         fsa = new FSA("src/test/fsa/utf8.fsa"); // fsa with one word (6 code points, 18 bytes)
         state = fsa.getState();
         int pbuf[] = {0xe0,0xa4,0xb9};
@@ -43,11 +47,13 @@ public class UTF8TestCase extends junit.framework.TestCase {
         word = prefix + suffix;
     }
 
+    @Test
     public void testStringDelta() {
         state.delta(word);
         assertTrue(state.isFinal());
     }
 
+    @Test
     public void testCharDelta() {
         assertEquals(6, word.length());
         for (int i = 0; i < word.length(); ++i) {
@@ -57,6 +63,7 @@ public class UTF8TestCase extends junit.framework.TestCase {
         assertTrue(state.isFinal());
     }
 
+    @Test
     public void testByteDelta() {
         FSA.State state = fsa.getState();
         assertEquals(3, prefixBuf.length);
@@ -72,6 +79,7 @@ public class UTF8TestCase extends junit.framework.TestCase {
         assertTrue(state.isFinal());
     }
 
+    @Test
     public void testIteratorAtStart() {
         Iterator<FSA.Iterator.Item> itr = fsa.iterator(state);
         FSA.Iterator.Item item = itr.next();
@@ -79,6 +87,7 @@ public class UTF8TestCase extends junit.framework.TestCase {
         assertFalse(itr.hasNext());
     }
 
+    @Test
     public void testIteratorWithPrefix() {
         state.delta(prefix);
         Iterator<FSA.Iterator.Item> itr = fsa.iterator(state);
@@ -87,6 +96,7 @@ public class UTF8TestCase extends junit.framework.TestCase {
         assertFalse(itr.hasNext());
     }
 
+    @Test
     public void testIteratorWithCompleteWord() {
         state.delta(word);
         Iterator<FSA.Iterator.Item> itr = fsa.iterator(state);
@@ -94,4 +104,5 @@ public class UTF8TestCase extends junit.framework.TestCase {
         assertEquals("", item.getString());
         assertFalse(itr.hasNext());
     }
+
 }