Repository: opennlp Updated Branches: refs/heads/master 08e163ca5 -> 3e66f1b6c
http://git-wip-us.apache.org/repos/asf/opennlp/blob/3e66f1b6/opennlp-tools/src/test/java/opennlp/tools/namefind/NameFinderEventStreamTest.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/test/java/opennlp/tools/namefind/NameFinderEventStreamTest.java b/opennlp-tools/src/test/java/opennlp/tools/namefind/NameFinderEventStreamTest.java index 1143af1..b6d1698 100644 --- a/opennlp-tools/src/test/java/opennlp/tools/namefind/NameFinderEventStreamTest.java +++ b/opennlp-tools/src/test/java/opennlp/tools/namefind/NameFinderEventStreamTest.java @@ -49,17 +49,18 @@ public class NameFinderEventStreamTest { NameSample nameSample = new NameSample(SENTENCE, new Span[]{new Span(0, 2, "person")}, false); - ObjectStream<Event> eventStream = new NameFinderEventStream( - ObjectStreamUtils.createObjectStream(nameSample)); + try (ObjectStream<Event> eventStream = new NameFinderEventStream( + ObjectStreamUtils.createObjectStream(nameSample))) { - Assert.assertEquals("person-" + NameFinderME.START, eventStream.read().getOutcome()); - Assert.assertEquals("person-" + NameFinderME.CONTINUE, eventStream.read().getOutcome()); + Assert.assertEquals("person-" + NameFinderME.START, eventStream.read().getOutcome()); + Assert.assertEquals("person-" + NameFinderME.CONTINUE, eventStream.read().getOutcome()); - for (int i = 0; i < 10; i++) { - Assert.assertEquals(NameFinderME.OTHER, eventStream.read().getOutcome()); - } + for (int i = 0; i < 10; i++) { + Assert.assertEquals(NameFinderME.OTHER, eventStream.read().getOutcome()); + } - Assert.assertNull(eventStream.read()); + Assert.assertNull(eventStream.read()); + } } http://git-wip-us.apache.org/repos/asf/opennlp/blob/3e66f1b6/opennlp-tools/src/test/java/opennlp/tools/parser/ChunkSampleStreamTest.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/test/java/opennlp/tools/parser/ChunkSampleStreamTest.java b/opennlp-tools/src/test/java/opennlp/tools/parser/ChunkSampleStreamTest.java index 65447b1..2523005 100644 --- a/opennlp-tools/src/test/java/opennlp/tools/parser/ChunkSampleStreamTest.java +++ b/opennlp-tools/src/test/java/opennlp/tools/parser/ChunkSampleStreamTest.java @@ -32,66 +32,67 @@ public class ChunkSampleStreamTest { @Test public void testConvertParseToPosSample() throws IOException { - ObjectStream<ChunkSample> chunkSampleStream = new ChunkSampleStream(new ParseSampleStream( - ObjectStreamUtils.createObjectStream(ParseTest.PARSE_STRING))); + try (ObjectStream<ChunkSample> chunkSampleStream = new ChunkSampleStream(new ParseSampleStream( + ObjectStreamUtils.createObjectStream(ParseTest.PARSE_STRING)))) { - ChunkSample sample = chunkSampleStream.read(); + ChunkSample sample = chunkSampleStream.read(); - assertEquals("She", sample.getSentence()[0]); - assertEquals("PRP", sample.getTags()[0]); - assertEquals("S-NP", sample.getPreds()[0]); - assertEquals("was", sample.getSentence()[1]); - assertEquals("VBD", sample.getTags()[1]); - assertEquals("O", sample.getPreds()[1]); - assertEquals("just", sample.getSentence()[2]); - assertEquals("RB", sample.getTags()[2]); - assertEquals("S-ADVP", sample.getPreds()[2]); - assertEquals("another", sample.getSentence()[3]); - assertEquals("DT", sample.getTags()[3]); - assertEquals("S-NP", sample.getPreds()[3]); - assertEquals("freighter", sample.getSentence()[4]); - assertEquals("NN", sample.getTags()[4]); - assertEquals("C-NP", sample.getPreds()[4]); - assertEquals("from", sample.getSentence()[5]); - assertEquals("IN", sample.getTags()[5]); - assertEquals("O", sample.getPreds()[5]); - assertEquals("the", sample.getSentence()[6]); - assertEquals("DT", sample.getTags()[6]); - assertEquals("S-NP", sample.getPreds()[6]); - assertEquals("States", sample.getSentence()[7]); - assertEquals("NNPS", sample.getTags()[7]); - assertEquals("C-NP", sample.getPreds()[7]); - assertEquals(",", sample.getSentence()[8]); - assertEquals(",", sample.getTags()[8]); - assertEquals("O", sample.getPreds()[8]); - assertEquals("and", sample.getSentence()[9]); - assertEquals("CC", sample.getTags()[9]); - assertEquals("O", sample.getPreds()[9]); - assertEquals("she", sample.getSentence()[10]); - assertEquals("PRP", sample.getTags()[10]); - assertEquals("S-NP", sample.getPreds()[10]); - assertEquals("seemed", sample.getSentence()[11]); - assertEquals("VBD", sample.getTags()[11]); - assertEquals("O", sample.getPreds()[11]); - assertEquals("as", sample.getSentence()[12]); - assertEquals("RB", sample.getTags()[12]); - assertEquals("S-ADJP", sample.getPreds()[12]); - assertEquals("commonplace", sample.getSentence()[13]); - assertEquals("JJ", sample.getTags()[13]); - assertEquals("C-ADJP", sample.getPreds()[13]); - assertEquals("as", sample.getSentence()[14]); - assertEquals("IN", sample.getTags()[14]); - assertEquals("O", sample.getPreds()[14]); - assertEquals("her", sample.getSentence()[15]); - assertEquals("PRP$", sample.getTags()[15]); - assertEquals("S-NP", sample.getPreds()[15]); - assertEquals("name", sample.getSentence()[16]); - assertEquals("NN", sample.getTags()[16]); - assertEquals("C-NP", sample.getPreds()[16]); - assertEquals(".", sample.getSentence()[17]); - assertEquals(".", sample.getTags()[17]); - assertEquals("O", sample.getPreds()[17]); + assertEquals("She", sample.getSentence()[0]); + assertEquals("PRP", sample.getTags()[0]); + assertEquals("S-NP", sample.getPreds()[0]); + assertEquals("was", sample.getSentence()[1]); + assertEquals("VBD", sample.getTags()[1]); + assertEquals("O", sample.getPreds()[1]); + assertEquals("just", sample.getSentence()[2]); + assertEquals("RB", sample.getTags()[2]); + assertEquals("S-ADVP", sample.getPreds()[2]); + assertEquals("another", sample.getSentence()[3]); + assertEquals("DT", sample.getTags()[3]); + assertEquals("S-NP", sample.getPreds()[3]); + assertEquals("freighter", sample.getSentence()[4]); + assertEquals("NN", sample.getTags()[4]); + assertEquals("C-NP", sample.getPreds()[4]); + assertEquals("from", sample.getSentence()[5]); + assertEquals("IN", sample.getTags()[5]); + assertEquals("O", sample.getPreds()[5]); + assertEquals("the", sample.getSentence()[6]); + assertEquals("DT", sample.getTags()[6]); + assertEquals("S-NP", sample.getPreds()[6]); + assertEquals("States", sample.getSentence()[7]); + assertEquals("NNPS", sample.getTags()[7]); + assertEquals("C-NP", sample.getPreds()[7]); + assertEquals(",", sample.getSentence()[8]); + assertEquals(",", sample.getTags()[8]); + assertEquals("O", sample.getPreds()[8]); + assertEquals("and", sample.getSentence()[9]); + assertEquals("CC", sample.getTags()[9]); + assertEquals("O", sample.getPreds()[9]); + assertEquals("she", sample.getSentence()[10]); + assertEquals("PRP", sample.getTags()[10]); + assertEquals("S-NP", sample.getPreds()[10]); + assertEquals("seemed", sample.getSentence()[11]); + assertEquals("VBD", sample.getTags()[11]); + assertEquals("O", sample.getPreds()[11]); + assertEquals("as", sample.getSentence()[12]); + assertEquals("RB", sample.getTags()[12]); + assertEquals("S-ADJP", sample.getPreds()[12]); + assertEquals("commonplace", sample.getSentence()[13]); + assertEquals("JJ", sample.getTags()[13]); + assertEquals("C-ADJP", sample.getPreds()[13]); + assertEquals("as", sample.getSentence()[14]); + assertEquals("IN", sample.getTags()[14]); + assertEquals("O", sample.getPreds()[14]); + assertEquals("her", sample.getSentence()[15]); + assertEquals("PRP$", sample.getTags()[15]); + assertEquals("S-NP", sample.getPreds()[15]); + assertEquals("name", sample.getSentence()[16]); + assertEquals("NN", sample.getTags()[16]); + assertEquals("C-NP", sample.getPreds()[16]); + assertEquals(".", sample.getSentence()[17]); + assertEquals(".", sample.getTags()[17]); + assertEquals("O", sample.getPreds()[17]); - assertNull(chunkSampleStream.read()); + assertNull(chunkSampleStream.read()); + } } } http://git-wip-us.apache.org/repos/asf/opennlp/blob/3e66f1b6/opennlp-tools/src/test/java/opennlp/tools/parser/PosSampleStreamTest.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/test/java/opennlp/tools/parser/PosSampleStreamTest.java b/opennlp-tools/src/test/java/opennlp/tools/parser/PosSampleStreamTest.java index bcbc975..49ba630 100644 --- a/opennlp-tools/src/test/java/opennlp/tools/parser/PosSampleStreamTest.java +++ b/opennlp-tools/src/test/java/opennlp/tools/parser/PosSampleStreamTest.java @@ -31,48 +31,49 @@ public class PosSampleStreamTest { @Test public void testConvertParseToPosSample() throws IOException { - ObjectStream<POSSample> posSampleStream = new PosSampleStream(new ParseSampleStream( - ObjectStreamUtils.createObjectStream(ParseTest.PARSE_STRING))); + try (ObjectStream<POSSample> posSampleStream = new PosSampleStream(new ParseSampleStream( + ObjectStreamUtils.createObjectStream(ParseTest.PARSE_STRING)))) { - POSSample sample = posSampleStream.read(); + POSSample sample = posSampleStream.read(); - Assert.assertEquals("PRP", sample.getTags()[0]); - Assert.assertEquals("She", sample.getSentence()[0]); - Assert.assertEquals("VBD", sample.getTags()[1]); - Assert.assertEquals("was", sample.getSentence()[1]); - Assert.assertEquals("RB", sample.getTags()[2]); - Assert.assertEquals("just", sample.getSentence()[2]); - Assert.assertEquals("DT", sample.getTags()[3]); - Assert.assertEquals("another", sample.getSentence()[3]); - Assert.assertEquals("NN", sample.getTags()[4]); - Assert.assertEquals("freighter", sample.getSentence()[4]); - Assert.assertEquals("IN", sample.getTags()[5]); - Assert.assertEquals("from", sample.getSentence()[5]); - Assert.assertEquals("DT", sample.getTags()[6]); - Assert.assertEquals("the", sample.getSentence()[6]); - Assert.assertEquals("NNPS", sample.getTags()[7]); - Assert.assertEquals("States", sample.getSentence()[7]); - Assert.assertEquals(",", sample.getTags()[8]); - Assert.assertEquals(",", sample.getSentence()[8]); - Assert.assertEquals("CC", sample.getTags()[9]); - Assert.assertEquals("and", sample.getSentence()[9]); - Assert.assertEquals("PRP", sample.getTags()[10]); - Assert.assertEquals("she", sample.getSentence()[10]); - Assert.assertEquals("VBD", sample.getTags()[11]); - Assert.assertEquals("seemed", sample.getSentence()[11]); - Assert.assertEquals("RB", sample.getTags()[12]); - Assert.assertEquals("as", sample.getSentence()[12]); - Assert.assertEquals("JJ", sample.getTags()[13]); - Assert.assertEquals("commonplace", sample.getSentence()[13]); - Assert.assertEquals("IN", sample.getTags()[14]); - Assert.assertEquals("as", sample.getSentence()[14]); - Assert.assertEquals("PRP$", sample.getTags()[15]); - Assert.assertEquals("her", sample.getSentence()[15]); - Assert.assertEquals("NN", sample.getTags()[16]); - Assert.assertEquals("name", sample.getSentence()[16]); - Assert.assertEquals(".", sample.getTags()[17]); - Assert.assertEquals(".", sample.getSentence()[17]); + Assert.assertEquals("PRP", sample.getTags()[0]); + Assert.assertEquals("She", sample.getSentence()[0]); + Assert.assertEquals("VBD", sample.getTags()[1]); + Assert.assertEquals("was", sample.getSentence()[1]); + Assert.assertEquals("RB", sample.getTags()[2]); + Assert.assertEquals("just", sample.getSentence()[2]); + Assert.assertEquals("DT", sample.getTags()[3]); + Assert.assertEquals("another", sample.getSentence()[3]); + Assert.assertEquals("NN", sample.getTags()[4]); + Assert.assertEquals("freighter", sample.getSentence()[4]); + Assert.assertEquals("IN", sample.getTags()[5]); + Assert.assertEquals("from", sample.getSentence()[5]); + Assert.assertEquals("DT", sample.getTags()[6]); + Assert.assertEquals("the", sample.getSentence()[6]); + Assert.assertEquals("NNPS", sample.getTags()[7]); + Assert.assertEquals("States", sample.getSentence()[7]); + Assert.assertEquals(",", sample.getTags()[8]); + Assert.assertEquals(",", sample.getSentence()[8]); + Assert.assertEquals("CC", sample.getTags()[9]); + Assert.assertEquals("and", sample.getSentence()[9]); + Assert.assertEquals("PRP", sample.getTags()[10]); + Assert.assertEquals("she", sample.getSentence()[10]); + Assert.assertEquals("VBD", sample.getTags()[11]); + Assert.assertEquals("seemed", sample.getSentence()[11]); + Assert.assertEquals("RB", sample.getTags()[12]); + Assert.assertEquals("as", sample.getSentence()[12]); + Assert.assertEquals("JJ", sample.getTags()[13]); + Assert.assertEquals("commonplace", sample.getSentence()[13]); + Assert.assertEquals("IN", sample.getTags()[14]); + Assert.assertEquals("as", sample.getSentence()[14]); + Assert.assertEquals("PRP$", sample.getTags()[15]); + Assert.assertEquals("her", sample.getSentence()[15]); + Assert.assertEquals("NN", sample.getTags()[16]); + Assert.assertEquals("name", sample.getSentence()[16]); + Assert.assertEquals(".", sample.getTags()[17]); + Assert.assertEquals(".", sample.getSentence()[17]); - Assert.assertNull(posSampleStream.read()); + Assert.assertNull(posSampleStream.read()); + } } } http://git-wip-us.apache.org/repos/asf/opennlp/blob/3e66f1b6/opennlp-tools/src/test/java/opennlp/tools/postag/POSSampleEventStreamTest.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/test/java/opennlp/tools/postag/POSSampleEventStreamTest.java b/opennlp-tools/src/test/java/opennlp/tools/postag/POSSampleEventStreamTest.java index fdc9d46..7ebc84b 100644 --- a/opennlp-tools/src/test/java/opennlp/tools/postag/POSSampleEventStreamTest.java +++ b/opennlp-tools/src/test/java/opennlp/tools/postag/POSSampleEventStreamTest.java @@ -39,13 +39,13 @@ public class POSSampleEventStreamTest { POSSample sample = POSSample.parse(sentence); - ObjectStream<Event> eventStream = new POSSampleEventStream( - ObjectStreamUtils.createObjectStream(sample)); - - Assert.assertEquals("DT", eventStream.read().getOutcome()); - Assert.assertEquals("VBZ", eventStream.read().getOutcome()); - Assert.assertEquals("JJ", eventStream.read().getOutcome()); - Assert.assertEquals(".", eventStream.read().getOutcome()); - Assert.assertNull(eventStream.read()); + try (ObjectStream<Event> eventStream = new POSSampleEventStream( + ObjectStreamUtils.createObjectStream(sample))) { + Assert.assertEquals("DT", eventStream.read().getOutcome()); + Assert.assertEquals("VBZ", eventStream.read().getOutcome()); + Assert.assertEquals("JJ", eventStream.read().getOutcome()); + Assert.assertEquals(".", eventStream.read().getOutcome()); + Assert.assertNull(eventStream.read()); + } } } http://git-wip-us.apache.org/repos/asf/opennlp/blob/3e66f1b6/opennlp-tools/src/test/java/opennlp/tools/postag/WordTagSampleStreamTest.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/test/java/opennlp/tools/postag/WordTagSampleStreamTest.java b/opennlp-tools/src/test/java/opennlp/tools/postag/WordTagSampleStreamTest.java index 01b96fc..4c82e13 100644 --- a/opennlp-tools/src/test/java/opennlp/tools/postag/WordTagSampleStreamTest.java +++ b/opennlp-tools/src/test/java/opennlp/tools/postag/WordTagSampleStreamTest.java @@ -37,29 +37,29 @@ public class WordTagSampleStreamTest { Collection<String> sampleString = new ArrayList<>(1); sampleString.add("This_x1 is_x2 a_x3 test_x4 sentence_x5 ._x6"); - WordTagSampleStream stream = - new WordTagSampleStream(new CollectionObjectStream<>(sampleString)); + try (WordTagSampleStream stream = + new WordTagSampleStream(new CollectionObjectStream<>(sampleString))) { + POSSample sample = stream.read(); + String[] words = sample.getSentence(); - POSSample sample = stream.read(); - String[] words = sample.getSentence(); + Assert.assertEquals("This", words[0]); + Assert.assertEquals("is", words[1]); + Assert.assertEquals("a", words[2]); + Assert.assertEquals("test", words[3]); + Assert.assertEquals("sentence", words[4]); + Assert.assertEquals(".", words[5]); - Assert.assertEquals("This", words[0]); - Assert.assertEquals("is", words[1]); - Assert.assertEquals("a", words[2]); - Assert.assertEquals("test", words[3]); - Assert.assertEquals("sentence", words[4]); - Assert.assertEquals(".", words[5]); + String[] tags = sample.getTags(); + Assert.assertEquals("x1", tags[0]); + Assert.assertEquals("x2", tags[1]); + Assert.assertEquals("x3", tags[2]); + Assert.assertEquals("x4", tags[3]); + Assert.assertEquals("x5", tags[4]); + Assert.assertEquals("x6", tags[5]); - String[] tags = sample.getTags(); - Assert.assertEquals("x1", tags[0]); - Assert.assertEquals("x2", tags[1]); - Assert.assertEquals("x3", tags[2]); - Assert.assertEquals("x4", tags[3]); - Assert.assertEquals("x5", tags[4]); - Assert.assertEquals("x6", tags[5]); - - Assert.assertNull(stream.read()); - stream.reset(); - Assert.assertNotNull(stream.read()); + Assert.assertNull(stream.read()); + stream.reset(); + Assert.assertNotNull(stream.read()); + } } } http://git-wip-us.apache.org/repos/asf/opennlp/blob/3e66f1b6/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokSpanEventStreamTest.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokSpanEventStreamTest.java b/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokSpanEventStreamTest.java index 172e7db..789a504 100644 --- a/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokSpanEventStreamTest.java +++ b/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokSpanEventStreamTest.java @@ -42,15 +42,16 @@ public class TokSpanEventStreamTest { ObjectStream<TokenSample> tokenSampleStream = new TokenSampleStream(sentenceStream); - ObjectStream<Event> eventStream = new TokSpanEventStream(tokenSampleStream, false); + try (ObjectStream<Event> eventStream = new TokSpanEventStream(tokenSampleStream, false)) { - Assert.assertEquals(TokenizerME.SPLIT, eventStream.read().getOutcome()); - Assert.assertEquals(TokenizerME.NO_SPLIT, eventStream.read().getOutcome()); - Assert.assertEquals(TokenizerME.NO_SPLIT, eventStream.read().getOutcome()); - Assert.assertEquals(TokenizerME.SPLIT, eventStream.read().getOutcome()); - Assert.assertEquals(TokenizerME.SPLIT, eventStream.read().getOutcome()); + Assert.assertEquals(TokenizerME.SPLIT, eventStream.read().getOutcome()); + Assert.assertEquals(TokenizerME.NO_SPLIT, eventStream.read().getOutcome()); + Assert.assertEquals(TokenizerME.NO_SPLIT, eventStream.read().getOutcome()); + Assert.assertEquals(TokenizerME.SPLIT, eventStream.read().getOutcome()); + Assert.assertEquals(TokenizerME.SPLIT, eventStream.read().getOutcome()); - Assert.assertNull(eventStream.read()); - Assert.assertNull(eventStream.read()); + Assert.assertNull(eventStream.read()); + Assert.assertNull(eventStream.read()); + } } } http://git-wip-us.apache.org/repos/asf/opennlp/blob/3e66f1b6/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleStreamTest.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleStreamTest.java b/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleStreamTest.java index 84f5f10..f811b0d 100644 --- a/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleStreamTest.java +++ b/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleStreamTest.java @@ -96,19 +96,19 @@ public class TokenSampleStreamTest { public void testParsingWhitespaceAndSeparatedString() throws IOException { String sampleTokens = "a b<SPLIT>c d<SPLIT>e"; - ObjectStream<TokenSample> sampleTokenStream = new TokenSampleStream( - ObjectStreamUtils.createObjectStream(sampleTokens)); + try (ObjectStream<TokenSample> sampleTokenStream = new TokenSampleStream( + ObjectStreamUtils.createObjectStream(sampleTokens))) { + TokenSample tokenSample = sampleTokenStream.read(); - TokenSample tokenSample = sampleTokenStream.read(); - - Span[] tokenSpans = tokenSample.getTokenSpans(); + Span[] tokenSpans = tokenSample.getTokenSpans(); - Assert.assertEquals(5, tokenSpans.length); + Assert.assertEquals(5, tokenSpans.length); - Assert.assertEquals("a", tokenSpans[0].getCoveredText(tokenSample.getText())); - Assert.assertEquals("b", tokenSpans[1].getCoveredText(tokenSample.getText())); - Assert.assertEquals("c", tokenSpans[2].getCoveredText(tokenSample.getText())); - Assert.assertEquals("d", tokenSpans[3].getCoveredText(tokenSample.getText())); - Assert.assertEquals("e", tokenSpans[4].getCoveredText(tokenSample.getText())); + Assert.assertEquals("a", tokenSpans[0].getCoveredText(tokenSample.getText())); + Assert.assertEquals("b", tokenSpans[1].getCoveredText(tokenSample.getText())); + Assert.assertEquals("c", tokenSpans[2].getCoveredText(tokenSample.getText())); + Assert.assertEquals("d", tokenSpans[3].getCoveredText(tokenSample.getText())); + Assert.assertEquals("e", tokenSpans[4].getCoveredText(tokenSample.getText())); + } } } http://git-wip-us.apache.org/repos/asf/opennlp/blob/3e66f1b6/opennlp-tools/src/test/java/opennlp/tools/util/AbstractEventStreamTest.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/test/java/opennlp/tools/util/AbstractEventStreamTest.java b/opennlp-tools/src/test/java/opennlp/tools/util/AbstractEventStreamTest.java index 0470fc2..d4855b4 100644 --- a/opennlp-tools/src/test/java/opennlp/tools/util/AbstractEventStreamTest.java +++ b/opennlp-tools/src/test/java/opennlp/tools/util/AbstractEventStreamTest.java @@ -46,15 +46,15 @@ public class AbstractEventStreamTest { samples.add(RESULT.EMPTY); samples.add(RESULT.EVENTS); - TestEventStream eventStream = new TestEventStream(new CollectionObjectStream<>(samples)); + try (TestEventStream eventStream = new TestEventStream(new CollectionObjectStream<>(samples))) { + int eventCounter = 0; - int eventCounter = 0; + while (eventStream.read() != null) { + eventCounter++; + } - while (eventStream.read() != null) { - eventCounter++; + Assert.assertEquals(2, eventCounter); } - - Assert.assertEquals(2, eventCounter); } /** @@ -67,15 +67,16 @@ public class AbstractEventStreamTest { List<RESULT> samples = new ArrayList<>(); samples.add(RESULT.EMPTY); - TestEventStream eventStream = new TestEventStream(new CollectionObjectStream<>(samples)); - Assert.assertNull(eventStream.read()); + try (TestEventStream eventStream = new TestEventStream(new CollectionObjectStream<>(samples))) { + Assert.assertNull(eventStream.read()); - // now check if it can handle multiple empty event iterators - samples.add(RESULT.EMPTY); - samples.add(RESULT.EMPTY); - - eventStream = new TestEventStream(new CollectionObjectStream<>(samples)); - Assert.assertNull(eventStream.read()); + // now check if it can handle multiple empty event iterators + samples.add(RESULT.EMPTY); + samples.add(RESULT.EMPTY); + } + try (TestEventStream eventStream = new TestEventStream(new CollectionObjectStream<>(samples))) { + Assert.assertNull(eventStream.read()); + } } private enum RESULT { http://git-wip-us.apache.org/repos/asf/opennlp/blob/3e66f1b6/opennlp-tools/src/test/java/opennlp/tools/util/ParagraphStreamTest.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/test/java/opennlp/tools/util/ParagraphStreamTest.java b/opennlp-tools/src/test/java/opennlp/tools/util/ParagraphStreamTest.java index 3d0c117..26a333c 100644 --- a/opennlp-tools/src/test/java/opennlp/tools/util/ParagraphStreamTest.java +++ b/opennlp-tools/src/test/java/opennlp/tools/util/ParagraphStreamTest.java @@ -26,31 +26,30 @@ public class ParagraphStreamTest { @Test public void testSimpleReading() throws IOException { - ParagraphStream paraStream = new ParagraphStream( - ObjectStreamUtils.createObjectStream("1", "2", "", "", "4", "5")); - - Assert.assertEquals("1\n2\n", paraStream.read()); - Assert.assertEquals("4\n5\n", paraStream.read()); - Assert.assertNull(paraStream.read()); - - paraStream = new ParagraphStream( - ObjectStreamUtils.createObjectStream("1", "2", "", "", "4", "5", "")); - - Assert.assertEquals("1\n2\n", paraStream.read()); - Assert.assertEquals("4\n5\n", paraStream.read()); - Assert.assertNull(paraStream.read()); + try (ParagraphStream paraStream = new ParagraphStream( + ObjectStreamUtils.createObjectStream("1", "2", "", "", "4", "5"))) { + Assert.assertEquals("1\n2\n", paraStream.read()); + Assert.assertEquals("4\n5\n", paraStream.read()); + Assert.assertNull(paraStream.read()); + } + try (ParagraphStream paraStream = new ParagraphStream( + ObjectStreamUtils.createObjectStream("1", "2", "", "", "4", "5", ""))) { + Assert.assertEquals("1\n2\n", paraStream.read()); + Assert.assertEquals("4\n5\n", paraStream.read()); + Assert.assertNull(paraStream.read()); + } } @Test public void testReset() throws IOException { - ParagraphStream paraStream = new ParagraphStream( - ObjectStreamUtils.createObjectStream("1", "2", "", "", "4", "5", "")); - - Assert.assertEquals("1\n2\n", paraStream.read()); - paraStream.reset(); - - Assert.assertEquals("1\n2\n", paraStream.read()); - Assert.assertEquals("4\n5\n", paraStream.read()); - Assert.assertNull(paraStream.read()); + try (ParagraphStream paraStream = new ParagraphStream( + ObjectStreamUtils.createObjectStream("1", "2", "", "", "4", "5", ""))) { + Assert.assertEquals("1\n2\n", paraStream.read()); + paraStream.reset(); + + Assert.assertEquals("1\n2\n", paraStream.read()); + Assert.assertEquals("4\n5\n", paraStream.read()); + Assert.assertNull(paraStream.read()); + } } }
