You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by sm...@apache.org on 2017/01/19 04:32:09 UTC
[7/9] opennlp git commit: OPENNLP-947: Organize imports according to
new order, this closes apache/opennlp#74
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkSampleTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkSampleTest.java b/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkSampleTest.java
index c2561ee..9f3367d 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkSampleTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkSampleTest.java
@@ -17,17 +17,13 @@
package opennlp.tools.chunker;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
+import org.junit.Assert;
import org.junit.Test;
import opennlp.tools.formats.ResourceAsStreamFactory;
@@ -37,12 +33,6 @@ import opennlp.tools.util.Span;
public class ChunkSampleTest {
- @Test(expected = IllegalArgumentException.class)
- public void testParameterValidation() {
- new ChunkSample(new String[]{""}, new String[]{""},
- new String[]{"test", "one element to much"});
- }
-
private static String[] createSentence() {
return new String[] {
"Forecasts",
@@ -66,7 +56,7 @@ public class ChunkSampleTest {
private static String[] createTags() {
- return new String[]{
+ return new String[] {
"NNS",
"IN",
"DT",
@@ -87,7 +77,7 @@ public class ChunkSampleTest {
}
private static String[] createChunks() {
- return new String[]{
+ return new String[] {
"B-NP",
"B-PP",
"B-NP",
@@ -107,13 +97,29 @@ public class ChunkSampleTest {
};
}
+ public static ChunkSample createGoldSample() {
+ return new ChunkSample(createSentence(), createTags(), createChunks());
+ }
+
+ public static ChunkSample createPredSample() {
+ String[] chunks = createChunks();
+ chunks[5] = "B-NP";
+ return new ChunkSample(createSentence(), createTags(), chunks);
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testParameterValidation() {
+ new ChunkSample(new String[] {""}, new String[] {""},
+ new String[] {"test", "one element to much"});
+ }
+
@Test
public void testRetrievingContent() {
ChunkSample sample = new ChunkSample(createSentence(), createTags(), createChunks());
- assertArrayEquals(createSentence(), sample.getSentence());
- assertArrayEquals(createTags(), sample.getTags());
- assertArrayEquals(createChunks(), sample.getPreds());
+ Assert.assertArrayEquals(createSentence(), sample.getSentence());
+ Assert.assertArrayEquals(createTags(), sample.getTags());
+ Assert.assertArrayEquals(createChunks(), sample.getPreds());
}
@Test
@@ -129,10 +135,10 @@ public class ChunkSampleTest {
for (int i = 0; i < sentence.length; i++) {
String line = reader.readLine();
String[] parts = line.split("\\s+");
- assertEquals(3, parts.length);
- assertEquals(sentence[i], parts[0]);
- assertEquals(tags[i], parts[1]);
- assertEquals(chunks[i], parts[2]);
+ Assert.assertEquals(3, parts.length);
+ Assert.assertEquals(sentence[i], parts[0]);
+ Assert.assertEquals(tags[i], parts[1]);
+ Assert.assertEquals(chunks[i], parts[2]);
}
}
@@ -141,7 +147,7 @@ public class ChunkSampleTest {
ChunkSample sample = new ChunkSample(createSentence(), createTags(), createChunks());
- assertEquals(" [NP Forecasts_NNS ] [PP for_IN ] [NP the_DT trade_NN figures_NNS ] "
+ Assert.assertEquals(" [NP Forecasts_NNS ] [PP for_IN ] [NP the_DT trade_NN figures_NNS ] "
+ "[VP range_VBP ] [ADVP widely_RB ] ,_, [NP Forecasts_NNS ] [PP for_IN ] "
+ "[NP the_DT trade_NN figures_NNS ] "
+ "[VP range_VBP ] [ADVP widely_RB ] ._.", sample.nicePrint());
@@ -153,35 +159,39 @@ public class ChunkSampleTest {
createChunks());
Span[] spans = sample.getPhrasesAsSpanList();
- assertEquals(10, spans.length);
- assertEquals(new Span(0, 1, "NP"), spans[0]);
- assertEquals(new Span(1, 2, "PP"), spans[1]);
- assertEquals(new Span(2, 5, "NP"), spans[2]);
- assertEquals(new Span(5, 6, "VP"), spans[3]);
- assertEquals(new Span(6, 7, "ADVP"), spans[4]);
- assertEquals(new Span(8, 9, "NP"), spans[5]);
- assertEquals(new Span(9, 10, "PP"), spans[6]);
- assertEquals(new Span(10, 13, "NP"), spans[7]);
- assertEquals(new Span(13, 14, "VP"), spans[8]);
- assertEquals(new Span(14, 15, "ADVP"), spans[9]);
+ Assert.assertEquals(10, spans.length);
+ Assert.assertEquals(new Span(0, 1, "NP"), spans[0]);
+ Assert.assertEquals(new Span(1, 2, "PP"), spans[1]);
+ Assert.assertEquals(new Span(2, 5, "NP"), spans[2]);
+ Assert.assertEquals(new Span(5, 6, "VP"), spans[3]);
+ Assert.assertEquals(new Span(6, 7, "ADVP"), spans[4]);
+ Assert.assertEquals(new Span(8, 9, "NP"), spans[5]);
+ Assert.assertEquals(new Span(9, 10, "PP"), spans[6]);
+ Assert.assertEquals(new Span(10, 13, "NP"), spans[7]);
+ Assert.assertEquals(new Span(13, 14, "VP"), spans[8]);
+ Assert.assertEquals(new Span(14, 15, "ADVP"), spans[9]);
}
+
+ // following are some tests to check the argument validation. Since all uses
+ // the same validateArguments method, we do a deeper test only once
+
@Test
public void testPhraseAsSpan() {
Span[] spans = ChunkSample.phrasesAsSpanList(createSentence(),
createTags(), createChunks());
- assertEquals(10, spans.length);
- assertEquals(new Span(0, 1, "NP"), spans[0]);
- assertEquals(new Span(1, 2, "PP"), spans[1]);
- assertEquals(new Span(2, 5, "NP"), spans[2]);
- assertEquals(new Span(5, 6, "VP"), spans[3]);
- assertEquals(new Span(6, 7, "ADVP"), spans[4]);
- assertEquals(new Span(8, 9, "NP"), spans[5]);
- assertEquals(new Span(9, 10, "PP"), spans[6]);
- assertEquals(new Span(10, 13, "NP"), spans[7]);
- assertEquals(new Span(13, 14, "VP"), spans[8]);
- assertEquals(new Span(14, 15, "ADVP"), spans[9]);
+ Assert.assertEquals(10, spans.length);
+ Assert.assertEquals(new Span(0, 1, "NP"), spans[0]);
+ Assert.assertEquals(new Span(1, 2, "PP"), spans[1]);
+ Assert.assertEquals(new Span(2, 5, "NP"), spans[2]);
+ Assert.assertEquals(new Span(5, 6, "VP"), spans[3]);
+ Assert.assertEquals(new Span(6, 7, "ADVP"), spans[4]);
+ Assert.assertEquals(new Span(8, 9, "NP"), spans[5]);
+ Assert.assertEquals(new Span(9, 10, "PP"), spans[6]);
+ Assert.assertEquals(new Span(10, 13, "NP"), spans[7]);
+ Assert.assertEquals(new Span(13, 14, "VP"), spans[8]);
+ Assert.assertEquals(new Span(14, 15, "ADVP"), spans[9]);
}
@Test
@@ -190,35 +200,31 @@ public class ChunkSampleTest {
"/opennlp/tools/chunker/output.txt");
DummyChunkSampleStream predictedSample = new DummyChunkSampleStream(
- new PlainTextByLineStream(in, UTF_8), false);
+ new PlainTextByLineStream(in, StandardCharsets.UTF_8), false);
ChunkSample cs1 = predictedSample.read();
String[] g1 = Span.spansToStrings(cs1.getPhrasesAsSpanList(), cs1.getSentence());
- assertEquals(15, g1.length);
+ Assert.assertEquals(15, g1.length);
ChunkSample cs2 = predictedSample.read();
String[] g2 = Span.spansToStrings(cs2.getPhrasesAsSpanList(), cs2.getSentence());
- assertEquals(10, g2.length);
+ Assert.assertEquals(10, g2.length);
ChunkSample cs3 = predictedSample.read();
String[] g3 = Span.spansToStrings(cs3.getPhrasesAsSpanList(), cs3.getSentence());
- assertEquals(7, g3.length);
- assertEquals("United", g3[0]);
- assertEquals("'s directors", g3[1]);
- assertEquals("voted", g3[2]);
- assertEquals("themselves", g3[3]);
- assertEquals("their spouses", g3[4]);
- assertEquals("lifetime access", g3[5]);
- assertEquals("to", g3[6]);
+ Assert.assertEquals(7, g3.length);
+ Assert.assertEquals("United", g3[0]);
+ Assert.assertEquals("'s directors", g3[1]);
+ Assert.assertEquals("voted", g3[2]);
+ Assert.assertEquals("themselves", g3[3]);
+ Assert.assertEquals("their spouses", g3[4]);
+ Assert.assertEquals("lifetime access", g3[5]);
+ Assert.assertEquals("to", g3[6]);
predictedSample.close();
}
-
- // following are some tests to check the argument validation. Since all uses
- // the same validateArguments method, we do a deeper test only once
-
@Test(expected = IllegalArgumentException.class)
public void testInvalidPhraseAsSpan1() {
ChunkSample.phrasesAsSpanList(new String[2], new String[1], new String[1]);
@@ -247,20 +253,10 @@ public class ChunkSampleTest {
@Test
public void testEquals() {
- assertFalse(createGoldSample() == createGoldSample());
- assertTrue(createGoldSample().equals(createGoldSample()));
- assertFalse(createPredSample().equals(createGoldSample()));
- assertFalse(createPredSample().equals(new Object()));
- }
-
- public static ChunkSample createGoldSample() {
- return new ChunkSample(createSentence(), createTags(), createChunks());
- }
-
- public static ChunkSample createPredSample() {
- String[] chunks = createChunks();
- chunks[5] = "B-NP";
- return new ChunkSample(createSentence(), createTags(), chunks);
+ Assert.assertFalse(createGoldSample() == createGoldSample());
+ Assert.assertTrue(createGoldSample().equals(createGoldSample()));
+ Assert.assertFalse(createPredSample().equals(createGoldSample()));
+ Assert.assertFalse(createPredSample().equals(new Object()));
}
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerDetailedFMeasureListenerTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerDetailedFMeasureListenerTest.java b/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerDetailedFMeasureListenerTest.java
index 9c0754d..5a5aca0 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerDetailedFMeasureListenerTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerDetailedFMeasureListenerTest.java
@@ -17,18 +17,19 @@
package opennlp.tools.chunker;
-import opennlp.tools.cmdline.chunker.ChunkerDetailedFMeasureListener;
-import opennlp.tools.formats.ResourceAsStreamFactory;
-import opennlp.tools.util.PlainTextByLineStream;
-import org.junit.Assert;
-import org.junit.Test;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.Locale;
+import org.junit.Assert;
+import org.junit.Test;
+
+import opennlp.tools.cmdline.chunker.ChunkerDetailedFMeasureListener;
+import opennlp.tools.formats.ResourceAsStreamFactory;
+import opennlp.tools.util.PlainTextByLineStream;
+
public class ChunkerDetailedFMeasureListenerTest {
@Test
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerEvaluatorTest.java b/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerEvaluatorTest.java
index b950163..3d11e1c 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerEvaluatorTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerEvaluatorTest.java
@@ -17,18 +17,19 @@
package opennlp.tools.chunker;
-import opennlp.tools.cmdline.chunker.ChunkEvaluationErrorListener;
-import opennlp.tools.formats.ResourceAsStreamFactory;
-import opennlp.tools.util.PlainTextByLineStream;
-import opennlp.tools.util.eval.FMeasure;
-import org.junit.Assert;
-import org.junit.Test;
-
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
+import org.junit.Assert;
+import org.junit.Test;
+
+import opennlp.tools.cmdline.chunker.ChunkEvaluationErrorListener;
+import opennlp.tools.formats.ResourceAsStreamFactory;
+import opennlp.tools.util.PlainTextByLineStream;
+import opennlp.tools.util.eval.FMeasure;
+
/**
* Tests for {@link ChunkerEvaluator}.
*
@@ -43,6 +44,7 @@ public class ChunkerEvaluatorTest {
* available at http://www.cnts.ua.ac.be/conll2000/chunking/output.html
* The output.txt file has only 3 sentences, but can be replaced by the one
* available at the conll2000 site to validate using a bigger sample.
+ *
* @throws IOException
*/
@Test
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerFactoryTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerFactoryTest.java b/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerFactoryTest.java
index 7b29ce7..c75030a 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerFactoryTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerFactoryTest.java
@@ -17,13 +17,12 @@
package opennlp.tools.chunker;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertTrue;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import org.junit.Assert;
import org.junit.Test;
import opennlp.tools.formats.ResourceAsStreamFactory;
@@ -42,12 +41,11 @@ public class ChunkerFactoryTest {
ResourceAsStreamFactory in = new ResourceAsStreamFactory(
ChunkerFactoryTest.class, "/opennlp/tools/chunker/test.txt");
- ChunkSampleStream stream = new ChunkSampleStream(
- new PlainTextByLineStream(in, UTF_8));
- return stream;
+ return new ChunkSampleStream(
+ new PlainTextByLineStream(in, StandardCharsets.UTF_8));
}
- static ChunkerModel trainModel(ModelType type, ChunkerFactory factory)
+ private static ChunkerModel trainModel(ModelType type, ChunkerFactory factory)
throws IOException {
return ChunkerME.train("en", createSampleStream(),
TrainingParameters.defaultParams(), factory);
@@ -59,8 +57,8 @@ public class ChunkerFactoryTest {
ChunkerModel model = trainModel(ModelType.MAXENT, new ChunkerFactory());
ChunkerFactory factory = model.getFactory();
- assertTrue(factory.getContextGenerator() instanceof DefaultChunkerContextGenerator);
- assertTrue(factory.getSequenceValidator() instanceof DefaultChunkerSequenceValidator);
+ Assert.assertTrue(factory.getContextGenerator() instanceof DefaultChunkerContextGenerator);
+ Assert.assertTrue(factory.getSequenceValidator() instanceof DefaultChunkerSequenceValidator);
ByteArrayOutputStream out = new ByteArrayOutputStream();
model.serialize(out);
@@ -69,8 +67,8 @@ public class ChunkerFactoryTest {
ChunkerModel fromSerialized = new ChunkerModel(in);
factory = fromSerialized.getFactory();
- assertTrue(factory.getContextGenerator() instanceof DefaultChunkerContextGenerator);
- assertTrue(factory.getSequenceValidator() instanceof DefaultChunkerSequenceValidator);
+ Assert.assertTrue(factory.getContextGenerator() instanceof DefaultChunkerContextGenerator);
+ Assert.assertTrue(factory.getSequenceValidator() instanceof DefaultChunkerSequenceValidator);
}
@@ -80,9 +78,8 @@ public class ChunkerFactoryTest {
ChunkerModel model = trainModel(ModelType.MAXENT, new DummyChunkerFactory());
DummyChunkerFactory factory = (DummyChunkerFactory) model.getFactory();
- assertTrue(factory instanceof DummyChunkerFactory);
- assertTrue(factory.getContextGenerator() instanceof DummyChunkerFactory.DummyContextGenerator);
- assertTrue(factory.getSequenceValidator() instanceof DummyChunkerFactory.DummySequenceValidator);
+ Assert.assertTrue(factory.getContextGenerator() instanceof DummyChunkerFactory.DummyContextGenerator);
+ Assert.assertTrue(factory.getSequenceValidator() instanceof DummyChunkerFactory.DummySequenceValidator);
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -91,19 +88,19 @@ public class ChunkerFactoryTest {
ChunkerModel fromSerialized = new ChunkerModel(in);
- factory = (DummyChunkerFactory)fromSerialized.getFactory();
- assertTrue(factory.getContextGenerator() instanceof DefaultChunkerContextGenerator);
- assertTrue(factory.getSequenceValidator() instanceof DefaultChunkerSequenceValidator);
+ factory = (DummyChunkerFactory) fromSerialized.getFactory();
+ Assert.assertTrue(factory.getContextGenerator() instanceof DefaultChunkerContextGenerator);
+ Assert.assertTrue(factory.getSequenceValidator() instanceof DefaultChunkerSequenceValidator);
ChunkerME chunker = new ChunkerME(model);
- String[] toks1 = { "Rockwell", "said", "the", "agreement", "calls", "for",
+ String[] toks1 = {"Rockwell", "said", "the", "agreement", "calls", "for",
"it", "to", "supply", "200", "additional", "so-called", "shipsets",
- "for", "the", "planes", "." };
+ "for", "the", "planes", "."};
- String[] tags1 = { "NNP", "VBD", "DT", "NN", "VBZ", "IN", "PRP", "TO", "VB",
- "CD", "JJ", "JJ", "NNS", "IN", "DT", "NNS", "." };
+ String[] tags1 = {"NNP", "VBD", "DT", "NN", "VBZ", "IN", "PRP", "TO", "VB",
+ "CD", "JJ", "JJ", "NNS", "IN", "DT", "NNS", "."};
chunker.chunk(toks1, tags1);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerMETest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerMETest.java b/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerMETest.java
index 3f37554..c939442 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerMETest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkerMETest.java
@@ -17,16 +17,11 @@
package opennlp.tools.chunker;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
-import java.util.List;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -57,14 +52,14 @@ public class ChunkerMETest {
private Chunker chunker;
- String[] toks1 = { "Rockwell", "said", "the", "agreement", "calls", "for",
+ private static String[] toks1 = { "Rockwell", "said", "the", "agreement", "calls", "for",
"it", "to", "supply", "200", "additional", "so-called", "shipsets",
"for", "the", "planes", "." };
- String[] tags1 = { "NNP", "VBD", "DT", "NN", "VBZ", "IN", "PRP", "TO", "VB",
+ private static String[] tags1 = { "NNP", "VBD", "DT", "NN", "VBZ", "IN", "PRP", "TO", "VB",
"CD", "JJ", "JJ", "NNS", "IN", "DT", "NNS", "." };
- String[] expect1 = { "B-NP", "B-VP", "B-NP", "I-NP", "B-VP", "B-SBAR",
+ private static String[] expect1 = { "B-NP", "B-VP", "B-NP", "I-NP", "B-VP", "B-SBAR",
"B-NP", "B-VP", "I-VP", "B-NP", "I-NP", "I-NP", "I-NP", "B-PP", "B-NP",
"I-NP", "O" };
@@ -76,7 +71,7 @@ public class ChunkerMETest {
"/opennlp/tools/chunker/test.txt");
ObjectStream<ChunkSample> sampleStream = new ChunkSampleStream(
- new PlainTextByLineStream(in, UTF_8));
+ new PlainTextByLineStream(in, StandardCharsets.UTF_8));
TrainingParameters params = new TrainingParameters();
params.put(TrainingParameters.ITERATIONS_PARAM, Integer.toString(70));
@@ -92,49 +87,46 @@ public class ChunkerMETest {
String preds[] = chunker.chunk(toks1, tags1);
- assertArrayEquals(expect1, preds);
+ Assert.assertArrayEquals(expect1, preds);
}
@Test
public void testChunkAsSpan() throws Exception {
-
Span[] preds = chunker.chunkAsSpans(toks1, tags1);
System.out.println(Arrays.toString(preds));
- assertEquals(10, preds.length);
- assertEquals(new Span(0, 1, "NP"), preds[0]);
- assertEquals(new Span(1, 2, "VP"), preds[1]);
- assertEquals(new Span(2, 4, "NP"), preds[2]);
- assertEquals(new Span(4, 5, "VP"), preds[3]);
- assertEquals(new Span(5, 6, "SBAR"), preds[4]);
- assertEquals(new Span(6, 7, "NP"), preds[5]);
- assertEquals(new Span(7, 9, "VP"), preds[6]);
- assertEquals(new Span(9, 13, "NP"), preds[7]);
- assertEquals(new Span(13, 14, "PP"), preds[8]);
- assertEquals(new Span(14, 16, "NP"), preds[9]);
+ Assert.assertEquals(10, preds.length);
+ Assert.assertEquals(new Span(0, 1, "NP"), preds[0]);
+ Assert.assertEquals(new Span(1, 2, "VP"), preds[1]);
+ Assert.assertEquals(new Span(2, 4, "NP"), preds[2]);
+ Assert.assertEquals(new Span(4, 5, "VP"), preds[3]);
+ Assert.assertEquals(new Span(5, 6, "SBAR"), preds[4]);
+ Assert.assertEquals(new Span(6, 7, "NP"), preds[5]);
+ Assert.assertEquals(new Span(7, 9, "VP"), preds[6]);
+ Assert.assertEquals(new Span(9, 13, "NP"), preds[7]);
+ Assert.assertEquals(new Span(13, 14, "PP"), preds[8]);
+ Assert.assertEquals(new Span(14, 16, "NP"), preds[9]);
}
@Test
public void testTokenProbArray() throws Exception {
-
Sequence[] preds = chunker.topKSequences(toks1, tags1);
- assertTrue(preds.length > 0);
- assertEquals(expect1.length, preds[0].getProbs().length);
- assertEquals(Arrays.asList(expect1), preds[0].getOutcomes());
- assertNotSame(Arrays.asList(expect1), preds[1].getOutcomes());
+ Assert.assertTrue(preds.length > 0);
+ Assert.assertEquals(expect1.length, preds[0].getProbs().length);
+ Assert.assertEquals(Arrays.asList(expect1), preds[0].getOutcomes());
+ Assert.assertNotSame(Arrays.asList(expect1), preds[1].getOutcomes());
}
@Test
public void testTokenProbMinScore() throws Exception {
-
Sequence[] preds = chunker.topKSequences(toks1, tags1, -5.55);
- assertTrue(preds.length == 4);
- assertEquals(expect1.length, preds[0].getProbs().length);
- assertEquals(Arrays.asList(expect1), preds[0].getOutcomes());
- assertNotSame(Arrays.asList(expect1), preds[1].getOutcomes());
+ Assert.assertTrue(preds.length == 4);
+ Assert.assertEquals(expect1.length, preds[0].getProbs().length);
+ Assert.assertEquals(Arrays.asList(expect1), preds[0].getOutcomes());
+ Assert.assertNotSame(Arrays.asList(expect1), preds[1].getOutcomes());
}
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/chunker/DummyChunkSampleStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/chunker/DummyChunkSampleStream.java b/opennlp-tools/src/test/java/opennlp/tools/chunker/DummyChunkSampleStream.java
index 2361104..acbba84 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/chunker/DummyChunkSampleStream.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/chunker/DummyChunkSampleStream.java
@@ -32,13 +32,12 @@ import opennlp.tools.util.ObjectStream;
public class DummyChunkSampleStream extends
FilterObjectStream<String, ChunkSample> {
- boolean mIsPredicted;
- int count = 0;
+ private boolean mIsPredicted;
+ private int count = 0;
// the predicted flag sets if the stream will contain the expected or the
// predicted tags.
- public DummyChunkSampleStream(ObjectStream<String> samples,
- boolean isPredicted) {
+ public DummyChunkSampleStream(ObjectStream<String> samples, boolean isPredicted) {
super(samples);
mIsPredicted = isPredicted;
}
@@ -51,10 +50,10 @@ public class DummyChunkSampleStream extends
*/
public ChunkSample read() throws IOException {
- List<String> toks = new ArrayList<String>();
- List<String> posTags = new ArrayList<String>();
- List<String> chunkTags = new ArrayList<String>();
- List<String> predictedChunkTags = new ArrayList<String>();
+ List<String> toks = new ArrayList<>();
+ List<String> posTags = new ArrayList<>();
+ List<String> chunkTags = new ArrayList<>();
+ List<String> predictedChunkTags = new ArrayList<>();
for (String line = samples.read(); line != null && !line.equals(""); line = samples
.read()) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/cmdline/ArgumentParserTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/cmdline/ArgumentParserTest.java b/opennlp-tools/src/test/java/opennlp/tools/cmdline/ArgumentParserTest.java
index a6aedd9..c4b0516 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/cmdline/ArgumentParserTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/cmdline/ArgumentParserTest.java
@@ -17,19 +17,16 @@
package opennlp.tools.cmdline;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import java.nio.charset.Charset;
import java.util.Collection;
+import org.junit.Assert;
+import org.junit.Test;
+
import opennlp.tools.cmdline.ArgumentParser.OptionalParameter;
import opennlp.tools.cmdline.ArgumentParser.ParameterDescription;
import opennlp.tools.cmdline.params.EncodingParameter;
-import org.junit.Test;
-
public class ArgumentParserTest {
interface ZeroMethods {
@@ -81,22 +78,20 @@ public class ArgumentParserTest {
@Test
public void testSimpleArguments() {
-
String argsString = "-encoding UTF-8 -alphaNumOpt false";
-
SimpleArguments args = ArgumentParser.parse(argsString.split(" "), SimpleArguments.class);
- assertEquals("UTF-8", args.getEncoding());
- assertEquals(Integer.valueOf(100), args.getIterations());
- assertEquals(null, args.getCutoff());
- assertEquals(false, args.getAlphaNumOpt());
+ Assert.assertEquals("UTF-8", args.getEncoding());
+ Assert.assertEquals(Integer.valueOf(100), args.getIterations());
+ Assert.assertEquals(null, args.getCutoff());
+ Assert.assertEquals(false, args.getAlphaNumOpt());
}
@Test(expected = IllegalArgumentException.class)
public void testSimpleArgumentsMissingEncoding() {
String argsString = "-alphaNumOpt false";
- assertFalse(ArgumentParser.validateArguments(argsString.split(" "), SimpleArguments.class));
+ Assert.assertFalse(ArgumentParser.validateArguments(argsString.split(" "), SimpleArguments.class));
ArgumentParser.parse(argsString.split(" "), SimpleArguments.class);
}
@@ -104,23 +99,21 @@ public class ArgumentParserTest {
public void testAllOptionalArgumentsOneArgument() {
String argsString = "-alphaNumOpt false";
- assertTrue(ArgumentParser.validateArguments(argsString.split(" "), AllOptionalArguments.class));
+ Assert.assertTrue(ArgumentParser.validateArguments(argsString.split(" "), AllOptionalArguments.class));
ArgumentParser.parse(argsString.split(" "), AllOptionalArguments.class);
}
@Test
public void testAllOptionalArgumentsZeroArguments() {
String[] args = {};
-
- assertTrue(ArgumentParser.validateArguments(args, AllOptionalArguments.class));
+ Assert.assertTrue(ArgumentParser.validateArguments(args, AllOptionalArguments.class));
ArgumentParser.parse(args, AllOptionalArguments.class);
}
@Test(expected = IllegalArgumentException.class)
public void testAllOptionalArgumentsExtraArgument() {
String argsString = "-encoding UTF-8";
-
- assertFalse(ArgumentParser.validateArguments(argsString.split(" "), AllOptionalArguments.class));
+ Assert.assertFalse(ArgumentParser.validateArguments(argsString.split(" "), AllOptionalArguments.class));
ArgumentParser.parse(argsString.split(" "), AllOptionalArguments.class);
}
@@ -135,37 +128,31 @@ public class ArgumentParserTest {
int expectedLength = 2;
for (String arg : arguments) {
- assertTrue(usage.contains(arg));
+ Assert.assertTrue(usage.contains(arg));
expectedLength += arg.length();
}
- assertTrue(usage.contains("a charset encoding"));
-
- assertTrue(expectedLength < usage.length());
+ Assert.assertTrue(usage.contains("a charset encoding"));
+ Assert.assertTrue(expectedLength < usage.length());
}
interface ExtendsEncodingParameter extends EncodingParameter {
-
@ParameterDescription(valueName = "value")
String getSomething();
-
}
-
@Test
public void testDefaultEncodingParameter() {
String args[] = "-something aValue".split(" ");
- assertTrue(ArgumentParser.validateArguments(args, ExtendsEncodingParameter.class));
+ Assert.assertTrue(ArgumentParser.validateArguments(args, ExtendsEncodingParameter.class));
ExtendsEncodingParameter params = ArgumentParser.parse(args, ExtendsEncodingParameter.class);
- assertEquals(Charset.defaultCharset(), params.getEncoding());
-
+ Assert.assertEquals(Charset.defaultCharset(), params.getEncoding());
}
@Test
public void testSetEncodingParameter() {
-
Collection<Charset> availableCharset = Charset.availableCharsets().values();
String notTheDefaultCharset = "UTF-8";
for (Charset charset : availableCharset) {
@@ -176,10 +163,9 @@ public class ArgumentParserTest {
}
String args[] = ("-something aValue -encoding " + notTheDefaultCharset).split(" ");
- assertTrue(ArgumentParser.validateArguments(args, ExtendsEncodingParameter.class));
+ Assert.assertTrue(ArgumentParser.validateArguments(args, ExtendsEncodingParameter.class));
ExtendsEncodingParameter params = ArgumentParser.parse(args, ExtendsEncodingParameter.class);
- assertEquals(Charset.forName(notTheDefaultCharset), params.getEncoding());
-
+ Assert.assertEquals(Charset.forName(notTheDefaultCharset), params.getEncoding());
}
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/cmdline/CLITest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/cmdline/CLITest.java b/opennlp-tools/src/test/java/opennlp/tools/cmdline/CLITest.java
index 00a7c11..5a35888 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/cmdline/CLITest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/cmdline/CLITest.java
@@ -17,11 +17,10 @@
package opennlp.tools.cmdline;
-import static org.junit.Assert.assertEquals;
-
import java.security.Permission;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -76,7 +75,7 @@ public class CLITest {
try {
CLI.main(new String[]{});
} catch (ExitException e) {
- assertEquals(0, e.status());
+ Assert.assertEquals(0, e.status());
}
}
@@ -88,7 +87,7 @@ public class CLITest {
try {
CLI.main(new String[]{"unknown name"});
} catch (ExitException e) {
- assertEquals(1, e.status());
+ Assert.assertEquals(1, e.status());
}
}
@@ -100,7 +99,7 @@ public class CLITest {
try {
CLI.main(new String[]{"DoccatTrainer", "-param", "value"});
} catch (ExitException e) {
- assertEquals(1, e.status());
+ Assert.assertEquals(1, e.status());
}
}
@@ -112,7 +111,7 @@ public class CLITest {
try {
CLI.main(new String[]{"Doccat", "unknown.model"});
} catch (ExitException e) {
- assertEquals(-1, e.status());
+ Assert.assertEquals(-1, e.status());
}
}
@@ -128,7 +127,7 @@ public class CLITest {
try {
CLI.main(new String[]{toolName, "help"});
} catch (ExitException e) {
- assertEquals(0, e.status());
+ Assert.assertEquals(0, e.status());
}
}
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/cmdline/TerminateToolExceptionTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/cmdline/TerminateToolExceptionTest.java b/opennlp-tools/src/test/java/opennlp/tools/cmdline/TerminateToolExceptionTest.java
index c4f53b5..cecff70 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/cmdline/TerminateToolExceptionTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/cmdline/TerminateToolExceptionTest.java
@@ -17,8 +17,7 @@
package opennlp.tools.cmdline;
-import static org.junit.Assert.assertEquals;
-
+import org.junit.Assert;
import org.junit.Test;
/**
@@ -29,6 +28,6 @@ public class TerminateToolExceptionTest {
@Test
public void testCreation() {
TerminateToolException e = new TerminateToolException(-500);
- assertEquals(-500, e.getCode());
+ Assert.assertEquals(-500, e.getCode());
}
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryAsSetCaseInsensitiveTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryAsSetCaseInsensitiveTest.java b/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryAsSetCaseInsensitiveTest.java
index e7b6944..8b975b5 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryAsSetCaseInsensitiveTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryAsSetCaseInsensitiveTest.java
@@ -15,23 +15,18 @@
* limitations under the License.
*/
-
package opennlp.tools.dictionary;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import opennlp.tools.util.StringList;
-
+import org.junit.Assert;
import org.junit.Test;
+import opennlp.tools.util.StringList;
+
public class DictionaryAsSetCaseInsensitiveTest {
private Dictionary getDict() {
@@ -57,10 +52,10 @@ public class DictionaryAsSetCaseInsensitiveTest {
Set<String> set = dict.asStringSet();
- assertTrue(set.contains(a));
- assertFalse(set.contains(b));
+ Assert.assertTrue(set.contains(a));
+ Assert.assertFalse(set.contains(b));
- assertTrue(set.contains(a.toUpperCase()));
+ Assert.assertTrue(set.contains(a.toUpperCase()));
}
/**
@@ -79,8 +74,8 @@ public class DictionaryAsSetCaseInsensitiveTest {
Set<String> set = dict.asStringSet();
- assertTrue(set.contains(a));
- assertEquals(1, set.size());
+ Assert.assertTrue(set.contains(a));
+ Assert.assertEquals(1, set.size());
}
/**
@@ -99,8 +94,8 @@ public class DictionaryAsSetCaseInsensitiveTest {
Set<String> set = dict.asStringSet();
- assertTrue(set.contains(a));
- assertEquals(1, set.size());
+ Assert.assertTrue(set.contains(a));
+ Assert.assertEquals(1, set.size());
}
/**
@@ -123,7 +118,7 @@ public class DictionaryAsSetCaseInsensitiveTest {
Set<String> setB = dictB.asStringSet();
- assertTrue(setA.equals(setB));
+ Assert.assertTrue(setA.equals(setB));
}
/**
@@ -144,7 +139,7 @@ public class DictionaryAsSetCaseInsensitiveTest {
Set<String> setB = dictB.asStringSet();
- assertTrue(setA.equals(setB));
+ Assert.assertTrue(setA.equals(setB));
}
/**
@@ -164,7 +159,7 @@ public class DictionaryAsSetCaseInsensitiveTest {
Set<String> setB = dictB.asStringSet();
- assertEquals(setA.hashCode(), setB.hashCode());
+ Assert.assertEquals(setA.hashCode(), setB.hashCode());
}
/**
@@ -185,7 +180,7 @@ public class DictionaryAsSetCaseInsensitiveTest {
Set<String> setB = dictB.asStringSet();
// TODO: should it be equal??
- assertNotSame(setA.hashCode(), setB.hashCode());
+ Assert.assertNotSame(setA.hashCode(), setB.hashCode());
}
/**
@@ -204,7 +199,7 @@ public class DictionaryAsSetCaseInsensitiveTest {
Set<String> set = dict.asStringSet();
- assertTrue(set.contains(entry2));
+ Assert.assertTrue(set.contains(entry2));
}
/**
@@ -223,14 +218,14 @@ public class DictionaryAsSetCaseInsensitiveTest {
dictA.put(asSL(entry2.toUpperCase()));
Iterator<String> it = dictA.asStringSet().iterator();
- List<String> elements = new ArrayList<String>();
+ List<String> elements = new ArrayList<>();
while (it.hasNext()) {
elements.add(it.next());
}
- assertEquals(2, elements.size());
- assertTrue(elements.contains(entry1));
- assertTrue(elements.contains(entry2));
+ Assert.assertEquals(2, elements.size());
+ Assert.assertTrue(elements.contains(entry1));
+ Assert.assertTrue(elements.contains(entry2));
}
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryAsSetCaseSensitiveTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryAsSetCaseSensitiveTest.java b/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryAsSetCaseSensitiveTest.java
index d735ff6..ce0949f 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryAsSetCaseSensitiveTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryAsSetCaseSensitiveTest.java
@@ -15,23 +15,18 @@
* limitations under the License.
*/
-
package opennlp.tools.dictionary;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import opennlp.tools.util.StringList;
-
+import org.junit.Assert;
import org.junit.Test;
+import opennlp.tools.util.StringList;
+
public class DictionaryAsSetCaseSensitiveTest {
private Dictionary getDict() {
@@ -57,10 +52,10 @@ public class DictionaryAsSetCaseSensitiveTest {
Set<String> set = dict.asStringSet();
- assertTrue(set.contains(a));
- assertFalse(set.contains(b));
+ Assert.assertTrue(set.contains(a));
+ Assert.assertFalse(set.contains(b));
- assertFalse(set.contains(a.toUpperCase()));
+ Assert.assertFalse(set.contains(a.toUpperCase()));
}
/**
@@ -79,8 +74,8 @@ public class DictionaryAsSetCaseSensitiveTest {
Set<String> set = dict.asStringSet();
- assertTrue(set.contains(a));
- assertEquals(1, set.size());
+ Assert.assertTrue(set.contains(a));
+ Assert.assertEquals(1, set.size());
}
/**
@@ -99,8 +94,8 @@ public class DictionaryAsSetCaseSensitiveTest {
Set<String> set = dict.asStringSet();
- assertTrue(set.contains(a));
- assertEquals(2, set.size());
+ Assert.assertTrue(set.contains(a));
+ Assert.assertEquals(2, set.size());
}
/**
@@ -123,7 +118,7 @@ public class DictionaryAsSetCaseSensitiveTest {
Set<String> setB = dictB.asStringSet();
- assertTrue(setA.equals(setB));
+ Assert.assertTrue(setA.equals(setB));
}
/**
@@ -145,7 +140,7 @@ public class DictionaryAsSetCaseSensitiveTest {
Set<String> setB = dictB.asStringSet();
// should fail in case sensitive dict
- assertFalse(setA.equals(setB));
+ Assert.assertFalse(setA.equals(setB));
}
/**
@@ -165,7 +160,7 @@ public class DictionaryAsSetCaseSensitiveTest {
Set<String> setB = dictB.asStringSet();
- assertEquals(setA.hashCode(), setB.hashCode());
+ Assert.assertEquals(setA.hashCode(), setB.hashCode());
}
/**
@@ -186,7 +181,7 @@ public class DictionaryAsSetCaseSensitiveTest {
Set<String> setB = dictB.asStringSet();
// TODO: should it be equal??
- assertNotSame(setA.hashCode(), setB.hashCode());
+ Assert.assertNotSame(setA.hashCode(), setB.hashCode());
}
/**
@@ -206,7 +201,7 @@ public class DictionaryAsSetCaseSensitiveTest {
Set<String> set = dict.asStringSet();
// should return false because 1a != 1A in a case sensitive lookup
- assertFalse(set.contains(entry2));
+ Assert.assertFalse(set.contains(entry2));
}
/**
@@ -225,16 +220,16 @@ public class DictionaryAsSetCaseSensitiveTest {
dictA.put(asSL(entry2.toUpperCase()));
Iterator<String> it = dictA.asStringSet().iterator();
- List<String> elements = new ArrayList<String>();
+ List<String> elements = new ArrayList<>();
while (it.hasNext()) {
elements.add(it.next());
}
- assertEquals(4, elements.size());
- assertTrue(elements.contains(entry1));
- assertTrue(elements.contains(entry2));
- assertTrue(elements.contains(entry1.toUpperCase()));
- assertTrue(elements.contains(entry2.toUpperCase()));
+ Assert.assertEquals(4, elements.size());
+ Assert.assertTrue(elements.contains(entry1));
+ Assert.assertTrue(elements.contains(entry2));
+ Assert.assertTrue(elements.contains(entry1.toUpperCase()));
+ Assert.assertTrue(elements.contains(entry2.toUpperCase()));
}
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryTest.java b/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryTest.java
index b6fc9c0..3e4b313 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryTest.java
@@ -15,22 +15,19 @@
* limitations under the License.
*/
-
package opennlp.tools.dictionary;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.StringReader;
+import org.junit.Assert;
+import org.junit.Test;
+
import opennlp.tools.util.InvalidFormatException;
import opennlp.tools.util.StringList;
-import org.junit.Test;
-
/**
* Tests for the {@link Dictionary} class.
*/
@@ -56,17 +53,17 @@ public class DictionaryTest {
@Test
public void testLookup() {
- StringList entry1 = new StringList(new String[]{"1a", "1b"});
- StringList entry1u = new StringList(new String[]{"1A", "1B"});
- StringList entry2 = new StringList(new String[]{"1A", "1C"});
+ StringList entry1 = new StringList("1a", "1b");
+ StringList entry1u = new StringList("1A", "1B");
+ StringList entry2 = new StringList("1A", "1C");
Dictionary dict = getCaseInsensitive();
dict.put(entry1);
- assertTrue(dict.contains(entry1));
- assertTrue(dict.contains(entry1u));
- assertTrue(!dict.contains(entry2));
+ Assert.assertTrue(dict.contains(entry1));
+ Assert.assertTrue(dict.contains(entry1u));
+ Assert.assertTrue(!dict.contains(entry2));
}
/**
@@ -74,17 +71,17 @@ public class DictionaryTest {
*/
@Test
public void testLookupCaseSensitive() {
- StringList entry1 = new StringList(new String[]{"1a", "1b"});
- StringList entry1u = new StringList(new String[]{"1A", "1B"});
- StringList entry2 = new StringList(new String[]{"1A", "1C"});
+ StringList entry1 = new StringList("1a", "1b");
+ StringList entry1u = new StringList("1A", "1B");
+ StringList entry2 = new StringList("1A", "1C");
Dictionary dict = getCaseSensitive();
dict.put(entry1);
- assertTrue(dict.contains(entry1));
- assertTrue(!dict.contains(entry1u));
- assertTrue(!dict.contains(entry2));
+ Assert.assertTrue(dict.contains(entry1));
+ Assert.assertTrue(!dict.contains(entry1u));
+ Assert.assertTrue(!dict.contains(entry2));
}
/**
@@ -94,7 +91,7 @@ public class DictionaryTest {
* @throws InvalidFormatException
*/
@Test
- public void testSerialization() throws IOException, InvalidFormatException {
+ public void testSerialization() throws IOException {
Dictionary reference = getCaseInsensitive();
String a1 = "a1";
@@ -102,7 +99,7 @@ public class DictionaryTest {
String a3 = "a3";
String a5 = "a5";
- reference.put(new StringList(new String[]{a1, a2, a3, a5,}));
+ reference.put(new StringList(a1, a2, a3, a5));
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -111,7 +108,7 @@ public class DictionaryTest {
Dictionary recreated = new Dictionary(
new ByteArrayInputStream(out.toByteArray()));
- assertTrue(reference.equals(recreated));
+ Assert.assertTrue(reference.equals(recreated));
}
/**
@@ -128,19 +125,11 @@ public class DictionaryTest {
Dictionary dictionay =
Dictionary.parseOneEntryPerLine(new StringReader(testDictionary));
- assertTrue(dictionay.size() == 4);
-
- assertTrue(dictionay.contains(
- new StringList(new String[]{"1a", "1b", "1c", "1d"})));
-
- assertTrue(dictionay.contains(
- new StringList(new String[]{"2a", "2b", "2c"})));
-
- assertTrue(dictionay.contains(
- new StringList(new String[]{"3a"})));
-
- assertTrue(dictionay.contains(
- new StringList(new String[]{"4a", "4b"})));
+ Assert.assertTrue(dictionay.size() == 4);
+ Assert.assertTrue(dictionay.contains(new StringList("1a", "1b", "1c", "1d")));
+ Assert.assertTrue(dictionay.contains(new StringList("2a", "2b", "2c")));
+ Assert.assertTrue(dictionay.contains(new StringList(new String[]{"3a"})));
+ Assert.assertTrue(dictionay.contains(new StringList("4a", "4b")));
}
/**
@@ -148,8 +137,8 @@ public class DictionaryTest {
*/
@Test
public void testEquals() {
- StringList entry1 = new StringList(new String[]{"1a", "1b"});
- StringList entry2 = new StringList(new String[]{"2a", "2b"});
+ StringList entry1 = new StringList("1a", "1b");
+ StringList entry2 = new StringList("2a", "2b");
Dictionary dictA = getCaseInsensitive();
dictA.put(entry1);
@@ -163,9 +152,9 @@ public class DictionaryTest {
dictC.put(entry1);
dictC.put(entry2);
- assertTrue(dictA.equals(dictB));
- assertTrue(dictC.equals(dictA));
- assertTrue(dictB.equals(dictC));
+ Assert.assertTrue(dictA.equals(dictB));
+ Assert.assertTrue(dictC.equals(dictA));
+ Assert.assertTrue(dictB.equals(dictC));
}
/**
@@ -173,8 +162,8 @@ public class DictionaryTest {
*/
@Test
public void testHashCode() {
- StringList entry1 = new StringList(new String[]{"1a", "1b"});
- StringList entry2 = new StringList(new String[]{"1A", "1B"});
+ StringList entry1 = new StringList("1a", "1b");
+ StringList entry2 = new StringList("1A", "1B");
Dictionary dictA = getCaseInsensitive();
dictA.put(entry1);
@@ -188,9 +177,9 @@ public class DictionaryTest {
Dictionary dictD = getCaseSensitive();
dictD.put(entry2);
- assertEquals(dictA.hashCode(), dictB.hashCode());
- assertEquals(dictB.hashCode(), dictC.hashCode());
- assertEquals(dictC.hashCode(), dictD.hashCode());
+ Assert.assertEquals(dictA.hashCode(), dictB.hashCode());
+ Assert.assertEquals(dictB.hashCode(), dictC.hashCode());
+ Assert.assertEquals(dictC.hashCode(), dictD.hashCode());
}
/**
@@ -198,7 +187,7 @@ public class DictionaryTest {
*/
@Test
public void testToString() {
- StringList entry1 = new StringList(new String[]{"1a", "1b"});
+ StringList entry1 = new StringList("1a", "1b");
Dictionary dictA = getCaseInsensitive();
@@ -215,14 +204,14 @@ public class DictionaryTest {
@Test
public void testDifferentCaseLookup() {
- StringList entry1 = new StringList(new String[]{"1a", "1b"});
- StringList entry2 = new StringList(new String[]{"1A", "1B"});
+ StringList entry1 = new StringList("1a", "1b");
+ StringList entry2 = new StringList("1A", "1B");
Dictionary dict = getCaseInsensitive();
dict.put(entry1);
- assertTrue(dict.contains(entry2));
+ Assert.assertTrue(dict.contains(entry2));
}
/**
@@ -231,14 +220,14 @@ public class DictionaryTest {
@Test
public void testDifferentCaseLookupCaseSensitive() {
- StringList entry1 = new StringList(new String[]{"1a", "1b"});
- StringList entry2 = new StringList(new String[]{"1A", "1B"});
+ StringList entry1 = new StringList("1a", "1b");
+ StringList entry2 = new StringList("1A", "1B");
Dictionary dict = getCaseSensitive();
dict.put(entry1);
- assertTrue(!dict.contains(entry2));
+ Assert.assertTrue(!dict.contains(entry2));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/doccat/DoccatFactoryTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/doccat/DoccatFactoryTest.java b/opennlp-tools/src/test/java/opennlp/tools/doccat/DoccatFactoryTest.java
index 6502c3b..ebf3b27 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/doccat/DoccatFactoryTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/doccat/DoccatFactoryTest.java
@@ -17,13 +17,13 @@
package opennlp.tools.doccat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Test;
+
import opennlp.tools.formats.ResourceAsStreamFactory;
import opennlp.tools.tokenize.SimpleTokenizer;
import opennlp.tools.tokenize.WhitespaceTokenizer;
@@ -32,8 +32,6 @@ import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
import opennlp.tools.util.TrainingParameters;
-import org.junit.Test;
-
/**
* Tests for the {@link DoccatFactory} class.
*/
@@ -62,7 +60,7 @@ public class DoccatFactoryTest {
public void testDefault() throws IOException {
DoccatModel model = train();
- assertNotNull(model);
+ Assert.assertNotNull(model);
ByteArrayOutputStream out = new ByteArrayOutputStream();
model.serialize(out);
@@ -72,13 +70,13 @@ public class DoccatFactoryTest {
DoccatFactory factory = fromSerialized.getFactory();
- assertNotNull(factory);
+ Assert.assertNotNull(factory);
- assertEquals(1, factory.getFeatureGenerators().length);
- assertEquals(BagOfWordsFeatureGenerator.class,
+ Assert.assertEquals(1, factory.getFeatureGenerators().length);
+ Assert.assertEquals(BagOfWordsFeatureGenerator.class,
factory.getFeatureGenerators()[0].getClass());
- assertEquals(WhitespaceTokenizer.INSTANCE, factory.getTokenizer());
+ Assert.assertEquals(WhitespaceTokenizer.INSTANCE, factory.getTokenizer());
}
@@ -91,7 +89,7 @@ public class DoccatFactoryTest {
DoccatModel model = train(factory);
- assertNotNull(model);
+ Assert.assertNotNull(model);
ByteArrayOutputStream out = new ByteArrayOutputStream();
model.serialize(out);
@@ -101,16 +99,16 @@ public class DoccatFactoryTest {
factory = fromSerialized.getFactory();
- assertNotNull(factory);
+ Assert.assertNotNull(factory);
- assertEquals(3, factory.getFeatureGenerators().length);
- assertEquals(BagOfWordsFeatureGenerator.class,
+ Assert.assertEquals(3, factory.getFeatureGenerators().length);
+ Assert.assertEquals(BagOfWordsFeatureGenerator.class,
factory.getFeatureGenerators()[0].getClass());
- assertEquals(NGramFeatureGenerator.class,
+ Assert.assertEquals(NGramFeatureGenerator.class,
factory.getFeatureGenerators()[1].getClass());
- assertEquals(NGramFeatureGenerator.class,factory.getFeatureGenerators()[2].getClass());
+ Assert.assertEquals(NGramFeatureGenerator.class,factory.getFeatureGenerators()[2].getClass());
- assertEquals(SimpleTokenizer.INSTANCE.getClass(), factory.getTokenizer()
+ Assert.assertEquals(SimpleTokenizer.INSTANCE.getClass(), factory.getTokenizer()
.getClass());
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerMETest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerMETest.java b/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerMETest.java
index 52e3595..d569e74 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerMETest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerMETest.java
@@ -17,31 +17,29 @@
package opennlp.tools.doccat;
-import static org.junit.Assert.assertEquals;
-
import java.io.IOException;
import java.util.Set;
import java.util.SortedMap;
+import org.junit.Assert;
+import org.junit.Test;
+
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.ObjectStreamUtils;
import opennlp.tools.util.TrainingParameters;
-import org.junit.Test;
-
public class DocumentCategorizerMETest {
@Test
public void testSimpleTraining() throws IOException {
- ObjectStream<DocumentSample> samples = ObjectStreamUtils.createObjectStream(new DocumentSample[]{
+ ObjectStream<DocumentSample> samples = ObjectStreamUtils.createObjectStream(
new DocumentSample("1", new String[]{"a", "b", "c"}),
new DocumentSample("1", new String[]{"a", "b", "c", "1", "2"}),
new DocumentSample("1", new String[]{"a", "b", "c", "3", "4"}),
new DocumentSample("0", new String[]{"x", "y", "z"}),
new DocumentSample("0", new String[]{"x", "y", "z", "5", "6"}),
- new DocumentSample("0", new String[]{"x", "y", "z", "7", "8"})
- });
+ new DocumentSample("0", new String[]{"x", "y", "z", "7", "8"}));
TrainingParameters params = new TrainingParameters();
params.put(TrainingParameters.ITERATIONS_PARAM, Integer.toString(100));
@@ -53,15 +51,15 @@ public class DocumentCategorizerMETest {
DocumentCategorizer doccat = new DocumentCategorizerME(model);
double aProbs[] = doccat.categorize("a");
- assertEquals("1", doccat.getBestCategory(aProbs));
+ Assert.assertEquals("1", doccat.getBestCategory(aProbs));
double bProbs[] = doccat.categorize("x");
- assertEquals("0", doccat.getBestCategory(bProbs));
+ Assert.assertEquals("0", doccat.getBestCategory(bProbs));
//test to make sure sorted map's last key is cat 1 because it has the highest score.
SortedMap<Double, Set<String>> sortedScoreMap = doccat.sortedScoreMap("a");
for (String cat : sortedScoreMap.get(sortedScoreMap.lastKey())) {
- assertEquals("1", cat);
+ Assert.assertEquals("1", cat);
break;
}
System.out.println("");
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerNBTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerNBTest.java b/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerNBTest.java
index ad30f4a..ae97840 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerNBTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentCategorizerNBTest.java
@@ -17,20 +17,19 @@
package opennlp.tools.doccat;
-import static org.junit.Assert.assertEquals;
-
import java.io.IOException;
import java.util.Set;
import java.util.SortedMap;
+import org.junit.Assert;
+import org.junit.Test;
+
import opennlp.tools.ml.AbstractTrainer;
import opennlp.tools.ml.naivebayes.NaiveBayesTrainer;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.ObjectStreamUtils;
import opennlp.tools.util.TrainingParameters;
-import org.junit.Test;
-
public class DocumentCategorizerNBTest {
@Test
@@ -55,15 +54,15 @@ public class DocumentCategorizerNBTest {
DocumentCategorizer doccat = new DocumentCategorizerME(model);
double aProbs[] = doccat.categorize("a");
- assertEquals("1", doccat.getBestCategory(aProbs));
+ Assert.assertEquals("1", doccat.getBestCategory(aProbs));
double bProbs[] = doccat.categorize("x");
- assertEquals("0", doccat.getBestCategory(bProbs));
+ Assert.assertEquals("0", doccat.getBestCategory(bProbs));
//test to make sure sorted map's last key is cat 1 because it has the highest score.
SortedMap<Double, Set<String>> sortedScoreMap = doccat.sortedScoreMap("a");
for (String cat : sortedScoreMap.get(sortedScoreMap.lastKey())) {
- assertEquals("1", cat);
+ Assert.assertEquals("1", cat);
break;
}
System.out.println("");
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentSampleTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentSampleTest.java b/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentSampleTest.java
index 727474d..232158b 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentSampleTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentSampleTest.java
@@ -17,20 +17,17 @@
package opennlp.tools.doccat;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
+import org.junit.Assert;
import org.junit.Test;
-
public class DocumentSampleTest {
@Test
public void testEquals() {
- assertFalse(createGoldSample() == createGoldSample());
- assertTrue(createGoldSample().equals(createGoldSample()));
- assertFalse(createPredSample().equals(createGoldSample()));
- assertFalse(createPredSample().equals(new Object()));
+ Assert.assertFalse(createGoldSample() == createGoldSample());
+ Assert.assertTrue(createGoldSample().equals(createGoldSample()));
+ Assert.assertFalse(createPredSample().equals(createGoldSample()));
+ Assert.assertFalse(createPredSample().equals(new Object()));
}
public static DocumentSample createGoldSample() {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/eval/ArvoresDeitadasEval.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/eval/ArvoresDeitadasEval.java b/opennlp-tools/src/test/java/opennlp/tools/eval/ArvoresDeitadasEval.java
index 33d6ffe..7233a77 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/eval/ArvoresDeitadasEval.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/eval/ArvoresDeitadasEval.java
@@ -21,6 +21,9 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Test;
+
import opennlp.tools.chunker.ChunkerCrossValidator;
import opennlp.tools.chunker.ChunkerFactory;
import opennlp.tools.formats.ad.ADChunkSampleStream;
@@ -43,9 +46,6 @@ import opennlp.tools.util.PlainTextByLineStream;
import opennlp.tools.util.TrainingParameters;
import opennlp.tools.util.model.ModelUtil;
-import org.junit.Assert;
-import org.junit.Test;
-
/**
* Cross validation of Sentence Detector, Tokenizer and Chunker against the
* Portugues corpus.
@@ -61,7 +61,6 @@ import org.junit.Test;
* "http://www.linguateca.pt/floresta/ficheiros/gz/Bosque_CF_8.0.ad.txt.gz">
* Bosque_CF_8.0.ad.txt.gz </a></li>
* </ul>
- *
*/
public class ArvoresDeitadasEval {
@@ -88,7 +87,7 @@ public class ArvoresDeitadasEval {
}
private static void sentenceCrossEval(TrainingParameters params,
- double expectedScore) throws IOException {
+ double expectedScore) throws IOException {
ADSentenceSampleStream samples = new ADSentenceSampleStream(
getLineSample(FLORESTA_VIRGEM), false);
@@ -104,7 +103,7 @@ public class ArvoresDeitadasEval {
}
private static void tokenizerCrossEval(TrainingParameters params,
- double expectedScore) throws IOException {
+ double expectedScore) throws IOException {
ObjectStream<NameSample> nameSamples = new ADNameSampleStream(
getLineSample(FLORESTA_VIRGEM), true);
@@ -131,7 +130,7 @@ public class ArvoresDeitadasEval {
}
private static void chunkerCrossEval(TrainingParameters params,
- double expectedScore) throws IOException {
+ double expectedScore) throws IOException {
ADChunkSampleStream samples = new ADChunkSampleStream(getLineSample(BOSQUE));
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/eval/Conll00ChunkerEval.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/eval/Conll00ChunkerEval.java b/opennlp-tools/src/test/java/opennlp/tools/eval/Conll00ChunkerEval.java
index 0ff3002..94c1ef1 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/eval/Conll00ChunkerEval.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/eval/Conll00ChunkerEval.java
@@ -15,12 +15,14 @@
* limitations under the License.
*/
-
package opennlp.tools.eval;
import java.io.File;
import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Test;
+
import opennlp.tools.chunker.ChunkSample;
import opennlp.tools.chunker.ChunkSampleStream;
import opennlp.tools.chunker.ChunkerEvaluator;
@@ -33,9 +35,6 @@ import opennlp.tools.util.PlainTextByLineStream;
import opennlp.tools.util.TrainingParameters;
import opennlp.tools.util.model.ModelUtil;
-import org.junit.Assert;
-import org.junit.Test;
-
/**
* Evaluates the chunker against the English CONLL2000 corpus.
* <p>
@@ -56,10 +55,10 @@ public class Conll00ChunkerEval {
}
private static void eval(ChunkerModel model, File testData,
- double expectedFMeasure) throws IOException {
+ double expectedFMeasure) throws IOException {
ObjectStream<ChunkSample> samples = new ChunkSampleStream(
- new PlainTextByLineStream(new MarkableFileInputStreamFactory(testData),"UTF-8"));
+ new PlainTextByLineStream(new MarkableFileInputStreamFactory(testData), "UTF-8"));
ChunkerEvaluator evaluator = new ChunkerEvaluator(new ChunkerME(model));
evaluator.evaluate(samples);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/eval/Conll02NameFinderEval.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/eval/Conll02NameFinderEval.java b/opennlp-tools/src/test/java/opennlp/tools/eval/Conll02NameFinderEval.java
index da579bb..7819546 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/eval/Conll02NameFinderEval.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/eval/Conll02NameFinderEval.java
@@ -15,12 +15,14 @@
* limitations under the License.
*/
-
package opennlp.tools.eval;
import java.io.File;
import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Test;
+
import opennlp.tools.formats.Conll02NameSampleStream;
import opennlp.tools.formats.Conll02NameSampleStream.LANGUAGE;
import opennlp.tools.namefind.NameFinderME;
@@ -33,9 +35,6 @@ import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.TrainingParameters;
import opennlp.tools.util.model.ModelUtil;
-import org.junit.Assert;
-import org.junit.Test;
-
/**
* Evaluates the name finder against the Dutch and Spanish CONLL2002 corpus.
* <p>
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/eval/ConllXPosTaggerEval.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/eval/ConllXPosTaggerEval.java b/opennlp-tools/src/test/java/opennlp/tools/eval/ConllXPosTaggerEval.java
index ae94060..b6c2fa1 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/eval/ConllXPosTaggerEval.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/eval/ConllXPosTaggerEval.java
@@ -21,6 +21,9 @@ import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
+import org.junit.Assert;
+import org.junit.Test;
+
import opennlp.tools.formats.ConllXPOSSampleStream;
import opennlp.tools.postag.POSEvaluator;
import opennlp.tools.postag.POSModel;
@@ -32,9 +35,6 @@ import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.TrainingParameters;
import opennlp.tools.util.model.ModelUtil;
-import org.junit.Assert;
-import org.junit.Test;
-
/**
* Evaluates the POS Tagger on the CONLL-X data. The CONLL-X data includes training and evaluation data for
* Danish, Dutch, Portuguese and Swedish.
@@ -56,7 +56,7 @@ import org.junit.Test;
public class ConllXPosTaggerEval {
private static POSModel train(File trainFile, String lang,
- TrainingParameters params) throws IOException {
+ TrainingParameters params) throws IOException {
ObjectStream<POSSample> samples =
new ConllXPOSSampleStream(new MarkableFileInputStreamFactory(trainFile), Charset.forName("UTF-8"));
@@ -65,7 +65,7 @@ public class ConllXPosTaggerEval {
}
private static void eval(POSModel model, File testData,
- double expectedAccuracy) throws IOException {
+ double expectedAccuracy) throws IOException {
ObjectStream<POSSample> samples = new ConllXPOSSampleStream(
new MarkableFileInputStreamFactory(testData), Charset.forName("UTF-8"));
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/eval/EvalUtil.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/eval/EvalUtil.java b/opennlp-tools/src/test/java/opennlp/tools/eval/EvalUtil.java
index c546392..0b0d315 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/eval/EvalUtil.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/eval/EvalUtil.java
@@ -21,7 +21,7 @@ import java.io.File;
public class EvalUtil {
- public static final File getOpennlpDataDir() {
+ public static File getOpennlpDataDir() {
return new File(System.getProperty("OPENNLP_DATA_DIR"));
}
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4NameFinderEval.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4NameFinderEval.java b/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4NameFinderEval.java
index 24327fe..d654014 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4NameFinderEval.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4NameFinderEval.java
@@ -20,6 +20,10 @@ package opennlp.tools.eval;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
+
+import org.junit.Assert;
+import org.junit.Test;
+
import opennlp.tools.formats.DirectorySampleStream;
import opennlp.tools.formats.convert.FileToStringSampleStream;
import opennlp.tools.formats.ontonotes.OntoNotesNameSampleStream;
@@ -30,8 +34,6 @@ import opennlp.tools.namefind.TokenNameFinderFactory;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.TrainingParameters;
import opennlp.tools.util.model.ModelUtil;
-import org.junit.Assert;
-import org.junit.Test;
public class OntoNotes4NameFinderEval {
@@ -51,11 +53,11 @@ public class OntoNotes4NameFinderEval {
ObjectStream<NameSample> samples = new OntoNotesNameSampleStream(new FileToStringSampleStream(
documentStream, Charset.forName("UTF-8")));
- TokenNameFinderCrossValidator cv = new TokenNameFinderCrossValidator("en", null,
+ TokenNameFinderCrossValidator cv = new TokenNameFinderCrossValidator("en", null,
params, new TokenNameFinderFactory());
if (type != null) {
- samples = new NameSampleTypeFilter(new String[]{type}, samples);
+ samples = new NameSampleTypeFilter(new String[] {type}, samples);
}
cv.evaluate(samples, 10);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4ParserEval.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4ParserEval.java b/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4ParserEval.java
index e775567..b48e946 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4ParserEval.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4ParserEval.java
@@ -22,6 +22,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.Charset;
+
+import org.junit.Assert;
+import org.junit.Test;
+
import opennlp.tools.formats.DirectorySampleStream;
import opennlp.tools.formats.convert.FileToStringSampleStream;
import opennlp.tools.formats.ontonotes.DocumentToLineStream;
@@ -33,8 +37,6 @@ import opennlp.tools.parser.lang.en.HeadRulesTest;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.TrainingParameters;
import opennlp.tools.util.model.ModelUtil;
-import org.junit.Assert;
-import org.junit.Test;
public class OntoNotes4ParserEval {
@@ -53,7 +55,7 @@ public class OntoNotes4ParserEval {
OntoNotesParseSampleStream samples = new OntoNotesParseSampleStream(
new DocumentToLineStream(new FileToStringSampleStream(
- documentStream, Charset.forName("UTF-8"))));
+ documentStream, Charset.forName("UTF-8"))));
ParserCrossValidator cv = new ParserCrossValidator("en", params, rules, ParserType.CHUNKING);
@@ -67,7 +69,7 @@ public class OntoNotes4ParserEval {
HeadRules headRules;
try (InputStream headRulesIn =
- HeadRulesTest.class.getResourceAsStream("/opennlp/tools/parser/en_head_rules")) {
+ HeadRulesTest.class.getResourceAsStream("/opennlp/tools/parser/en_head_rules")) {
headRules = new opennlp.tools.parser.lang.en.HeadRules(
new InputStreamReader(headRulesIn, "UTF-8"));
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4PosTaggerEval.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4PosTaggerEval.java b/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4PosTaggerEval.java
index 9c7d352..5ce1fba 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4PosTaggerEval.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4PosTaggerEval.java
@@ -20,6 +20,10 @@ package opennlp.tools.eval;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
+
+import org.junit.Assert;
+import org.junit.Test;
+
import opennlp.tools.formats.DirectorySampleStream;
import opennlp.tools.formats.convert.FileToStringSampleStream;
import opennlp.tools.formats.convert.ParseToPOSSampleStream;
@@ -30,8 +34,6 @@ import opennlp.tools.postag.POSTaggerFactory;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.TrainingParameters;
import opennlp.tools.util.model.ModelUtil;
-import org.junit.Assert;
-import org.junit.Test;
public class OntoNotes4PosTaggerEval {
@@ -39,7 +41,7 @@ public class OntoNotes4PosTaggerEval {
throws IOException {
ObjectStream<File> documentStream = new DirectorySampleStream(new File(
- EvalUtil.getOpennlpDataDir(), "ontonotes4/data/files/data/english"),
+ EvalUtil.getOpennlpDataDir(), "ontonotes4/data/files/data/english"),
file -> {
if (file.isFile()) {
return file.getName().endsWith(".parse");
@@ -50,7 +52,7 @@ public class OntoNotes4PosTaggerEval {
ParseToPOSSampleStream samples = new ParseToPOSSampleStream(new OntoNotesParseSampleStream(
new DocumentToLineStream(
- new FileToStringSampleStream(documentStream, Charset.forName("UTF-8")))));
+ new FileToStringSampleStream(documentStream, Charset.forName("UTF-8")))));
POSTaggerCrossValidator cv = new POSTaggerCrossValidator("en", params, new POSTaggerFactory());
cv.evaluate(samples, 10);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/eval/SourceForgeModelEval.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/eval/SourceForgeModelEval.java b/opennlp-tools/src/test/java/opennlp/tools/eval/SourceForgeModelEval.java
index 639c7fc..7211cd3 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/eval/SourceForgeModelEval.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/eval/SourceForgeModelEval.java
@@ -17,6 +17,16 @@
package opennlp.tools.eval;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.charset.Charset;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import org.junit.Assert;
+import org.junit.Test;
+
import opennlp.tools.chunker.Chunker;
import opennlp.tools.chunker.ChunkerME;
import opennlp.tools.chunker.ChunkerModel;
@@ -45,24 +55,15 @@ import opennlp.tools.util.MarkableFileInputStreamFactory;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
import opennlp.tools.util.Span;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.nio.charset.Charset;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
/**
* This tests ensures that the existing SourceForge models perform
* like they are expected to.
- *
+ * <p>
* To run this tests external the leipzig sentences files is needed:
* leipzig/eng_news_2010_300K-sentences.txt, this file can be
* obtained from the leipzig corpus project. <br>
- *
+ * <p>
* And all the SourceForge models:<br>
* - models-sf/en-sent.bin<br>
* - models-sf/en-token.bin<br>
@@ -93,8 +94,8 @@ public class SourceForgeModelEval {
MessageDigest digest = createDigest();
try (ObjectStream<String> lines = new PlainTextByLineStream(
- new MarkableFileInputStreamFactory(new File(EvalUtil.getOpennlpDataDir(),
- "leipzig/eng_news_2010_300K-sentences.txt")), Charset.forName("UTF-8"))) {
+ new MarkableFileInputStreamFactory(new File(EvalUtil.getOpennlpDataDir(),
+ "leipzig/eng_news_2010_300K-sentences.txt")), Charset.forName("UTF-8"))) {
String line;
while ((line = lines.read()) != null) {
@@ -102,7 +103,7 @@ public class SourceForgeModelEval {
}
Assert.assertEquals(new BigInteger("248567841356936801447294643695012852392"),
- new BigInteger(1, digest.digest()));
+ new BigInteger(1, digest.digest()));
}
}
@@ -110,7 +111,7 @@ public class SourceForgeModelEval {
public void evalSentenceModel() throws IOException {
SentenceModel model = new SentenceModel(
- new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-sent.bin"));
+ new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-sent.bin"));
MessageDigest digest = createDigest();
@@ -119,10 +120,10 @@ public class SourceForgeModelEval {
StringBuilder text = new StringBuilder();
try (ObjectStream<DocumentSample> lineBatches = new LeipzigDoccatSampleStream("en", 25,
- new MarkableFileInputStreamFactory(new File(EvalUtil.getOpennlpDataDir(),
- "leipzig/eng_news_2010_300K-sentences.txt")))) {
+ new MarkableFileInputStreamFactory(new File(EvalUtil.getOpennlpDataDir(),
+ "leipzig/eng_news_2010_300K-sentences.txt")))) {
- DocumentSample lineBatch ;
+ DocumentSample lineBatch;
while ((lineBatch = lineBatches.read()) != null) {
text.append(String.join(" ", lineBatch.getText())).append(" ");
}
@@ -135,7 +136,7 @@ public class SourceForgeModelEval {
}
Assert.assertEquals(new BigInteger("228544068397077998410949364710969159291"),
- new BigInteger(1, digest.digest()));
+ new BigInteger(1, digest.digest()));
}
@Test
@@ -146,16 +147,16 @@ public class SourceForgeModelEval {
// and then tokenize it here
TokenizerModel model = new TokenizerModel(
- new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-token.bin"));
+ new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-token.bin"));
MessageDigest digest = createDigest();
Tokenizer tokenizer = new TokenizerME(model);
try (ObjectStream<DocumentSample> lines = new LeipzigDoccatSampleStream("en", 1,
- WhitespaceTokenizer.INSTANCE,
- new MarkableFileInputStreamFactory(new File(EvalUtil.getOpennlpDataDir(),
- "leipzig/eng_news_2010_300K-sentences.txt")))) {
+ WhitespaceTokenizer.INSTANCE,
+ new MarkableFileInputStreamFactory(new File(EvalUtil.getOpennlpDataDir(),
+ "leipzig/eng_news_2010_300K-sentences.txt")))) {
DocumentSample line;
while ((line = lines.read()) != null) {
@@ -167,13 +168,13 @@ public class SourceForgeModelEval {
}
Assert.assertEquals(new BigInteger("180602607571756839321060482558626151930"),
- new BigInteger(1, digest.digest()));
+ new BigInteger(1, digest.digest()));
}
private ObjectStream<DocumentSample> createLineWiseStream() throws IOException {
return new LeipzigDoccatSampleStream("en", 1,
- new MarkableFileInputStreamFactory(new File(EvalUtil.getOpennlpDataDir(),
- "leipzig/eng_news_2010_300K-sentences.txt")));
+ new MarkableFileInputStreamFactory(new File(EvalUtil.getOpennlpDataDir(),
+ "leipzig/eng_news_2010_300K-sentences.txt")));
}
@@ -201,7 +202,7 @@ public class SourceForgeModelEval {
@Test
public void evalNerDateModel() throws IOException {
TokenNameFinderModel personModel = new TokenNameFinderModel(
- new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-ner-date.bin"));
+ new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-ner-date.bin"));
evalNameFinder(personModel, new BigInteger("116570003910213570906062355532299200317"));
}
@@ -209,7 +210,7 @@ public class SourceForgeModelEval {
@Test
public void evalNerLocationModel() throws IOException {
TokenNameFinderModel personModel = new TokenNameFinderModel(
- new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-ner-location.bin"));
+ new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-ner-location.bin"));
evalNameFinder(personModel, new BigInteger("44810593886021404716125849669208680993"));
}
@@ -217,7 +218,7 @@ public class SourceForgeModelEval {
@Test
public void evalNerMoneyModel() throws IOException {
TokenNameFinderModel personModel = new TokenNameFinderModel(
- new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-ner-money.bin"));
+ new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-ner-money.bin"));
evalNameFinder(personModel, new BigInteger("65248897509365807977219790824670047287"));
}
@@ -225,7 +226,7 @@ public class SourceForgeModelEval {
@Test
public void evalNerOrganizationModel() throws IOException {
TokenNameFinderModel personModel = new TokenNameFinderModel(
- new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-ner-organization.bin"));
+ new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-ner-organization.bin"));
evalNameFinder(personModel, new BigInteger("50454559690338630659278005157657197233"));
}
@@ -233,7 +234,7 @@ public class SourceForgeModelEval {
@Test
public void evalNerPercentageModel() throws IOException {
TokenNameFinderModel personModel = new TokenNameFinderModel(
- new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-ner-percentage.bin"));
+ new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-ner-percentage.bin"));
evalNameFinder(personModel, new BigInteger("320996882594215344113023719117249515343"));
}
@@ -260,10 +261,10 @@ public class SourceForgeModelEval {
MessageDigest digest = createDigest();
POSTagger tagger = new POSTaggerME(new POSModel(
- new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-pos-perceptron.bin")));
+ new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-pos-perceptron.bin")));
Chunker chunker = new ChunkerME(new ChunkerModel(
- new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-chunker.bin")));
+ new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-chunker.bin")));
try (ObjectStream<DocumentSample> lines = createLineWiseStream()) {
@@ -308,7 +309,7 @@ public class SourceForgeModelEval {
@Test
public void evalMaxentModel() throws IOException {
POSModel maxentModel = new POSModel(
- new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-pos-maxent.bin"));
+ new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-pos-maxent.bin"));
evalPosModel(maxentModel, new BigInteger("231995214522232523777090597594904492687"));
}
@@ -316,7 +317,7 @@ public class SourceForgeModelEval {
@Test
public void evalPerceptronModel() throws IOException {
POSModel perceptronModel = new POSModel(
- new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-pos-perceptron.bin"));
+ new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-pos-perceptron.bin"));
evalPosModel(perceptronModel, new BigInteger("209440430718727101220960491543652921728"));
}
@@ -325,7 +326,7 @@ public class SourceForgeModelEval {
public void evalParserModel() throws IOException {
ParserModel model = new ParserModel(
- new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-parser-chunking.bin"));
+ new File(EvalUtil.getOpennlpDataDir(), "models-sf/en-parser-chunking.bin"));
MessageDigest digest = createDigest();
@@ -338,14 +339,13 @@ public class SourceForgeModelEval {
Parse[] parse = ParserTool.parseLine(String.join(" ", line.getText()), parser, 1);
if (parse.length > 0) {
digest.update(parse[0].toString().getBytes("UTF-8"));
- }
- else {
+ } else {
digest.update("empty".getBytes("UTF-8"));
}
}
}
Assert.assertEquals(new BigInteger("155722144104513046994135548456420803172"),
- new BigInteger(1, digest.digest()));
+ new BigInteger(1, digest.digest()));
}
}
http://git-wip-us.apache.org/repos/asf/opennlp/blob/ccc58b48/opennlp-tools/src/test/java/opennlp/tools/formats/Conll02NameSampleStreamTest.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/formats/Conll02NameSampleStreamTest.java b/opennlp-tools/src/test/java/opennlp/tools/formats/Conll02NameSampleStreamTest.java
index 072b6eb..7b4c374 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/formats/Conll02NameSampleStreamTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/formats/Conll02NameSampleStreamTest.java
@@ -17,22 +17,17 @@
package opennlp.tools.formats;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Test;
+
import opennlp.tools.formats.Conll02NameSampleStream.LANGUAGE;
import opennlp.tools.namefind.NameSample;
import opennlp.tools.util.InputStreamFactory;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.Span;
-import org.junit.Test;
-
/**
*
* Note:
@@ -54,20 +49,20 @@ public class Conll02NameSampleStreamTest {
NameSample personName = sampleStream.read();
- assertNotNull(personName);
+ Assert.assertNotNull(personName);
- assertEquals(5, personName.getSentence().length);
- assertEquals(1, personName.getNames().length);
- assertEquals(true, personName.isClearAdaptiveDataSet());
+ Assert.assertEquals(5, personName.getSentence().length);
+ Assert.assertEquals(1, personName.getNames().length);
+ Assert.assertEquals(true, personName.isClearAdaptiveDataSet());
Span nameSpan = personName.getNames()[0];
- assertEquals(0, nameSpan.getStart());
- assertEquals(4, nameSpan.getEnd());
- assertEquals(true, personName.isClearAdaptiveDataSet());
+ Assert.assertEquals(0, nameSpan.getStart());
+ Assert.assertEquals(4, nameSpan.getEnd());
+ Assert.assertEquals(true, personName.isClearAdaptiveDataSet());
- assertEquals(0, sampleStream.read().getNames().length);
+ Assert.assertEquals(0, sampleStream.read().getNames().length);
- assertNull(sampleStream.read());
+ Assert.assertNull(sampleStream.read());
}
@Test
@@ -76,14 +71,14 @@ public class Conll02NameSampleStreamTest {
NameSample personName = sampleStream.read();
- assertEquals(0, personName.getNames().length);
- assertTrue(personName.isClearAdaptiveDataSet());
+ Assert.assertEquals(0, personName.getNames().length);
+ Assert.assertTrue(personName.isClearAdaptiveDataSet());
personName = sampleStream.read();
- assertFalse(personName.isClearAdaptiveDataSet());
+ Assert.assertFalse(personName.isClearAdaptiveDataSet());
- assertNull(sampleStream.read());
+ Assert.assertNull(sampleStream.read());
}
@Test
@@ -94,6 +89,6 @@ public class Conll02NameSampleStreamTest {
sampleStream.reset();
- assertEquals(sample, sampleStream.read());
+ Assert.assertEquals(sample, sampleStream.read());
}
}