Convert 2 tests to junit4

Author: manning

test/src/edu/stanford/nlp/classify/GeneralDatasetTest.java

@@ -2,59 +2,60 @@
 
 import java.util.Arrays;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import edu.stanford.nlp.ling.BasicDatum;
 import edu.stanford.nlp.util.Pair;
 
-
 /**
  * @author Christopher Manning
  */
-public class GeneralDatasetTest extends TestCase {
+public class GeneralDatasetTest {
 
-  public static void testCreateFolds() {
+  @Test
+  public void testCreateFolds() {
     GeneralDataset<String, String> data = new Dataset<>();
-    data.add(new BasicDatum<String, String>(Arrays.asList(new String[]{"fever", "cough", "congestion"}), "cold"));
-    data.add(new BasicDatum<String, String>(Arrays.asList(new String[]{"fever", "cough", "nausea"}), "flu"));
-    data.add(new BasicDatum<String, String>(Arrays.asList(new String[]{"cough", "congestion"}), "cold"));
-    data.add(new BasicDatum<String, String>(Arrays.asList(new String[]{"cough", "congestion"}), "cold"));
-    data.add(new BasicDatum<String, String>(Arrays.asList(new String[]{"fever", "nausea"}), "flu"));
-    data.add(new BasicDatum<String, String>(Arrays.asList(new String[]{"cough", "sore throat"}), "cold"));
+    data.add(new BasicDatum<>(Arrays.asList(new String[]{"fever", "cough", "congestion"}), "cold"));
+    data.add(new BasicDatum<>(Arrays.asList(new String[]{"fever", "cough", "nausea"}), "flu"));
+    data.add(new BasicDatum<>(Arrays.asList(new String[]{"cough", "congestion"}), "cold"));
+    data.add(new BasicDatum<>(Arrays.asList(new String[]{"cough", "congestion"}), "cold"));
+    data.add(new BasicDatum<>(Arrays.asList(new String[]{"fever", "nausea"}), "flu"));
+    data.add(new BasicDatum<>(Arrays.asList(new String[]{"cough", "sore throat"}), "cold"));
 
     Pair<GeneralDataset<String,String>,GeneralDataset<String,String>> devTrainTest =
             data.split(3, 5);
-    assertEquals(4, devTrainTest.first().size());
-    assertEquals(2, devTrainTest.second().size());
-    assertEquals("cold", devTrainTest.first().getDatum(devTrainTest.first().size() - 1).label());
-    assertEquals("flu", devTrainTest.second().getDatum(devTrainTest.second().size() - 1).label());
+    Assert.assertEquals(4, devTrainTest.first().size());
+    Assert.assertEquals(2, devTrainTest.second().size());
+    Assert.assertEquals("cold", devTrainTest.first().getDatum(devTrainTest.first().size() - 1).label());
+    Assert.assertEquals("flu", devTrainTest.second().getDatum(devTrainTest.second().size() - 1).label());
 
     Pair<GeneralDataset<String,String>,GeneralDataset<String,String>> devTrainTest2 =
             data.split(0,2);
-    assertEquals(4, devTrainTest2.first().size());
-    assertEquals(2, devTrainTest2.second().size());
+    Assert.assertEquals(4, devTrainTest2.first().size());
+    Assert.assertEquals(2, devTrainTest2.second().size());
 
     Pair<GeneralDataset<String,String>,GeneralDataset<String,String>> devTrainTest3 =
             data.split(1.0/3.0);
-    assertEquals(devTrainTest2.first().size(), devTrainTest3.first().size());
-    assertEquals(devTrainTest2.first().labelIndex(), devTrainTest3.first().labelIndex());
-    assertEquals(devTrainTest2.second().size(), devTrainTest3.second().size());
-    assertTrue(Arrays.equals(devTrainTest2.first().labels, devTrainTest2.first().labels));
-    assertTrue(Arrays.equals(devTrainTest2.second().labels, devTrainTest2.second().labels));
+    Assert.assertEquals(devTrainTest2.first().size(), devTrainTest3.first().size());
+    Assert.assertEquals(devTrainTest2.first().labelIndex(), devTrainTest3.first().labelIndex());
+    Assert.assertEquals(devTrainTest2.second().size(), devTrainTest3.second().size());
+    Assert.assertArrayEquals(devTrainTest2.first().labels, devTrainTest2.first().labels);
+    Assert.assertArrayEquals(devTrainTest2.second().labels, devTrainTest2.second().labels);
 
-    data.add(new BasicDatum<String, String>(Arrays.asList(new String[]{"fever", "nausea"}), "flu"));
+    data.add(new BasicDatum<>(Arrays.asList(new String[]{"fever", "nausea"}), "flu"));
 
     Pair<GeneralDataset<String,String>,GeneralDataset<String,String>> devTrainTest4 =
             data.split(1.0/3.0);
-    assertEquals(5, devTrainTest4.first().size());
-    assertEquals(2, devTrainTest4.second().size());
+    Assert.assertEquals(5, devTrainTest4.first().size());
+    Assert.assertEquals(2, devTrainTest4.second().size());
 
     Pair<GeneralDataset<String,String>,GeneralDataset<String,String>> devTrainTest5 =
             data.split(1.0/8.0);
-    assertEquals(7, devTrainTest5.first().size());
-    assertEquals(0, devTrainTest5.second().size());
+    Assert.assertEquals(7, devTrainTest5.first().size());
+    Assert.assertEquals(0, devTrainTest5.second().size());
 
-    // Sonal did this, but I think she got it wrong and either should have past in test ratio or have taken p.second()
+    // Sonal did this, but I think she got it wrong and either should have passed in test ratio or have taken p.second()
     // double trainRatio = 0.9;
     // Pair<GeneralDataset<String,String>,GeneralDataset<String,String>> p = data.split(0, (int) Math.floor(data.size() * trainRatio));
     // assertEquals(6, p.first().size());

test/src/edu/stanford/nlp/classify/WeightedRVFDatasetTest.java

@@ -1,39 +1,45 @@
 package edu.stanford.nlp.classify;
 
+import java.util.Arrays;
+
+import org.junit.Assert;
+import org.junit.Test;
+
 import edu.stanford.nlp.ling.RVFDatum;
 import edu.stanford.nlp.stats.Counters;
-import junit.framework.TestCase;
 
-import java.util.Arrays;
 
 /**
  * TODO(gabor) JavaDoc
  *
  * @author Gabor Angeli
  */
-public class WeightedRVFDatasetTest extends TestCase {
+public class WeightedRVFDatasetTest {
 
+  @Test
   public void testWeightingWorks() {
     WeightedRVFDataset<String, String> dataset = new WeightedRVFDataset<>();
     RVFDatum<String, String> datum1 = newRVFDatum(null, "a", "b", "a");
     dataset.add(datum1, 42.0f);
     RVFDatum<String, String> datum2 = newRVFDatum(null, "a", "b", "a");
     dataset.add(datum2, 7.3f);
-    assertEquals(42.0f, dataset.getWeights()[0], 1e-10);
-    assertEquals(7.3f, dataset.getWeights()[1], 1e-10);
+    Assert.assertEquals(42.0f, dataset.getWeights()[0], 1e-10);
+    Assert.assertEquals(7.3f, dataset.getWeights()[1], 1e-10);
   }
 
+  @Test
   public void testBackwardsCompatibility() {
-    RVFDataset<String, String> dataset = new WeightedRVFDataset<>();
+    WeightedRVFDataset<String, String> dataset = new WeightedRVFDataset<>();
     RVFDatum<String, String> datum1 = newRVFDatum(null, "a", "b", "a");
     dataset.add(datum1);
     RVFDatum<String, String> datum2 = newRVFDatum(null, "a", "b", "a");
     dataset.add(datum2);
-    assertEquals(1.0f, ((WeightedRVFDataset<String, String>) dataset).getWeights()[0], 1e-10);
-    assertEquals(1.0f, ((WeightedRVFDataset<String, String>) dataset).getWeights()[1], 1e-10);
+    Assert.assertEquals(1.0f, dataset.getWeights()[0], 1e-10);
+    Assert.assertEquals(1.0f, dataset.getWeights()[1], 1e-10);
   }
 
 
+  @Test
   public void testMixedCompatibility() {
     WeightedRVFDataset<String, String> dataset = new WeightedRVFDataset<>();
     RVFDatum<String, String> datum1 = newRVFDatum(null, "a", "b", "a");
@@ -42,13 +48,15 @@ public void testMixedCompatibility() {
     dataset.add(datum2);
     RVFDatum<String, String> datum3 = newRVFDatum(null, "a", "b", "a");
     dataset.add(datum3, 7.3f);
-    assertEquals(42.0f, dataset.getWeights()[0], 1e-10);
-    assertEquals(1.0f, dataset.getWeights()[1], 1e-10);
-    assertEquals(7.3f, dataset.getWeights()[2], 1e-10);
+    Assert.assertEquals(42.0f, dataset.getWeights()[0], 1e-10);
+    Assert.assertEquals(1.0f, dataset.getWeights()[1], 1e-10);
+    Assert.assertEquals(7.3f, dataset.getWeights()[2], 1e-10);
   }
 
 
+  @SafeVarargs
   private static <L, F> RVFDatum<L, F> newRVFDatum(L label, F ... items) {
     return new RVFDatum<>(Counters.asCounter(Arrays.asList(items)), label);
   }
+
 }