diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-08-12 10:34:39 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-08-12 10:34:39 +0000 |
commit | 38285e0e1147042b519957958083e537e6d90fc9 (patch) | |
tree | 317bcc846acb2bc8365ca2aedb76d9066152de40 /linguistics | |
parent | 104f7547cb92ab39251308f15ddc45d515a48ae2 (diff) |
Minor unification of tests.
Diffstat (limited to 'linguistics')
3 files changed, 36 insertions, 25 deletions
diff --git a/linguistics/pom.xml b/linguistics/pom.xml index e341258c75f..3cc430dacc6 100644 --- a/linguistics/pom.xml +++ b/linguistics/pom.xml @@ -15,11 +15,6 @@ <version>7-SNAPSHOT</version> <dependencies> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-library</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> diff --git a/linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpTokenizationTestCase.java b/linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpTokenizationTestCase.java index 914e3817568..fb313e2d281 100644 --- a/linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpTokenizationTestCase.java +++ b/linguistics/src/test/java/com/yahoo/language/opennlp/OpenNlpTokenizationTestCase.java @@ -7,11 +7,19 @@ import com.yahoo.language.process.Token; import com.yahoo.language.process.Tokenizer; import org.junit.Test; -import java.util.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.NoSuchElementException; import static com.yahoo.language.LinguisticsCase.toLowerCase; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * Test of tokenization, with stemming and accent removal @@ -136,8 +144,8 @@ public class OpenNlpTokenizationTestCase { int idx = 0; for (Token token : tokenizer.tokenize(input, Language.GERMAN, StemMode.SHORTEST, false)) { - assertThat("Token offset for token #" + idx, token.getOffset(), is(expOffset[idx])); - assertThat("Token len for token #" + idx, token.getOrig().length(), is(len[idx])); + assertEquals("Token offset for token #" + idx, expOffset[idx], token.getOffset()); + assertEquals("Token len for token #" + idx, len[idx], token.getOrig().length()); idx++; } } @@ -216,21 +224,21 @@ public class OpenNlpTokenizationTestCase { for (int comp = 0; comp < token.getNumComponents(); comp++) { Token t = token.getComponent(comp); if (t.getType().isIndexable()) { - assertThat("comp index: " + i, toLowerCase(t.getTokenString()), is(indexed.get(i++))); + assertEquals("comp index: " + i, indexed.get(i++), toLowerCase(t.getTokenString())); } } } else { if (token.getType().isIndexable()) { - assertThat("exp index: " + i, toLowerCase(token.getTokenString()), is(indexed.get(i++))); + assertEquals("exp index: " + i, indexed.get(i++), toLowerCase(token.getTokenString())); } } if (orig != null) { - assertThat("orig index: " + j, token.getOrig(), is(orig.get(j++))); + assertEquals("orig index: " + j, token.getOrig(), orig.get(j++)); } } - assertThat("indexed length", i, is(indexed.size())); + assertEquals("indexed length", indexed.size(), i); if (orig != null) { - assertThat("orig length", j, is(orig.size())); + assertEquals("orig length", orig.size(), j); } } diff --git a/linguistics/src/test/java/com/yahoo/language/process/TokenizationTestCase.java b/linguistics/src/test/java/com/yahoo/language/process/TokenizationTestCase.java index 72dd6f8ce58..041a27fb1fc 100644 --- a/linguistics/src/test/java/com/yahoo/language/process/TokenizationTestCase.java +++ b/linguistics/src/test/java/com/yahoo/language/process/TokenizationTestCase.java @@ -5,11 +5,19 @@ import com.yahoo.language.Language; import com.yahoo.language.simple.SimpleTokenizer; import org.junit.Test; -import java.util.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.NoSuchElementException; import static com.yahoo.language.LinguisticsCase.toLowerCase; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * Test of tokenization, with stemming and accent removal @@ -134,8 +142,8 @@ public class TokenizationTestCase { int idx = 0; for (Token token : tokenizer.tokenize(input, Language.GERMAN, StemMode.SHORTEST, false)) { - assertThat("Token offset for token #" + idx, token.getOffset(), is(expOffset[idx])); - assertThat("Token len for token #" + idx, token.getOrig().length(), is(len[idx])); + assertEquals("Token offset for token #" + idx, expOffset[idx], token.getOffset()); + assertEquals("Token len for token #" + idx, len[idx], token.getOrig().length()); idx++; } } @@ -214,21 +222,21 @@ public class TokenizationTestCase { for (int comp = 0; comp < token.getNumComponents(); comp++) { Token t = token.getComponent(comp); if (t.getType().isIndexable()) { - assertThat("comp index: " + i, toLowerCase(t.getTokenString()), is(indexed.get(i++))); + assertEquals("comp index: " + i, indexed.get(i++), toLowerCase(t.getTokenString())); } } } else { if (token.getType().isIndexable()) { - assertThat("exp index: " + i, toLowerCase(token.getTokenString()), is(indexed.get(i++))); + assertEquals("exp index: " + i, indexed.get(i++), toLowerCase(token.getTokenString())); } } if (orig != null) { - assertThat("orig index: " + j, token.getOrig(), is(orig.get(j++))); + assertEquals("orig index: " + j, orig.get(j++), token.getOrig()); } } - assertThat("indexed length", i, is(indexed.size())); + assertEquals("indexed length", indexed.size(), i); if (orig != null) { - assertThat("orig length", j, is(orig.size())); + assertEquals("orig length", orig.size(), j); } } |