This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/opennlp.git
The following commit(s) were added to refs/heads/main by this push:
new 629d569a OPENNLP-1468 Simplify test assertions in JUnit tests
629d569a is described below
commit 629d569a445735f3a0cba06393e7125fd7019b2d
Author: Martin Wiesner <[email protected]>
AuthorDate: Sat Feb 18 07:20:02 2023 +0100
OPENNLP-1468 Simplify test assertions in JUnit tests
---
.../serializer/DictionaryEntryPersistor.java | 2 +-
.../opennlp/tools/chunker/ChunkSampleTest.java | 8 ++---
.../DictionaryAsSetCaseInsensitiveTest.java | 4 +--
.../DictionaryAsSetCaseSensitiveTest.java | 4 +--
.../opennlp/tools/dictionary/DictionaryTest.java | 18 +++++-----
.../opennlp/tools/doccat/DocumentSampleTest.java | 8 ++---
.../tools/langdetect/LanguageSampleTest.java | 2 +-
.../opennlp/tools/langdetect/LanguageTest.java | 2 +-
.../opennlp/tools/lemmatizer/LemmaSampleTest.java | 8 ++---
.../java/opennlp/tools/ml/TrainerFactoryTest.java | 4 +--
.../tools/ml/maxent/quasinewton/QNTrainerTest.java | 4 +--
.../DictionaryNameFinderEvaluatorTest.java | 4 +--
.../tools/namefind/DictionaryNameFinderTest.java | 16 ++++-----
.../opennlp/tools/namefind/NameSampleTest.java | 8 ++---
.../tools/namefind/RegexNameFinderTest.java | 16 ++++-----
.../test/java/opennlp/tools/parser/ParseTest.java | 6 ++--
.../opennlp/tools/postag/POSDictionaryTest.java | 2 +-
.../java/opennlp/tools/postag/POSSampleTest.java | 8 ++---
.../sentdetect/SentenceDetectorFactoryTest.java | 23 ++++++-------
.../tools/sentdetect/SentenceSampleTest.java | 8 ++---
.../tools/tokenize/SimpleTokenizerTest.java | 40 +++++++++++-----------
.../opennlp/tools/tokenize/TokenSampleTest.java | 8 ++---
.../tools/tokenize/TokenizerFactoryTest.java | 4 +--
.../tools/tokenize/WhitespaceTokenizerTest.java | 16 ++++-----
.../test/java/opennlp/tools/util/SequenceTest.java | 2 +-
.../src/test/java/opennlp/tools/util/SpanTest.java | 36 +++++++++----------
.../java/opennlp/tools/util/StringListTest.java | 5 ++-
.../java/opennlp/tools/util/StringUtilTest.java | 2 +-
.../test/java/opennlp/tools/util/VersionTest.java | 2 +-
29 files changed, 133 insertions(+), 137 deletions(-)
diff --git
a/opennlp-tools/src/main/java/opennlp/tools/dictionary/serializer/DictionaryEntryPersistor.java
b/opennlp-tools/src/main/java/opennlp/tools/dictionary/serializer/DictionaryEntryPersistor.java
index 5bf3fff2..53b8f1f7 100644
---
a/opennlp-tools/src/main/java/opennlp/tools/dictionary/serializer/DictionaryEntryPersistor.java
+++
b/opennlp-tools/src/main/java/opennlp/tools/dictionary/serializer/DictionaryEntryPersistor.java
@@ -98,7 +98,7 @@ public class DictionaryEntryPersistor {
}
/* get the attribute here ... */
if (mAttributes.getValue(ATTRIBUTE_CASE_SENSITIVE) != null) {
- mIsCaseSensitiveDictionary =
Boolean.valueOf(mAttributes.getValue(ATTRIBUTE_CASE_SENSITIVE));
+ mIsCaseSensitiveDictionary =
Boolean.parseBoolean(mAttributes.getValue(ATTRIBUTE_CASE_SENSITIVE));
}
mAttributes = null;
}
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 9e2fd462..4a0c6768 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkSampleTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/chunker/ChunkSampleTest.java
@@ -299,10 +299,10 @@ public class ChunkSampleTest {
@Test
void testEquals() {
- Assertions.assertFalse(createGoldSample() == createGoldSample());
- Assertions.assertTrue(createGoldSample().equals(createGoldSample()));
- Assertions.assertFalse(createPredSample().equals(createGoldSample()));
- Assertions.assertFalse(createPredSample().equals(new Object()));
+ Assertions.assertNotSame(createGoldSample(), createGoldSample());
+ Assertions.assertEquals(createGoldSample(), createGoldSample());
+ Assertions.assertNotEquals(createPredSample(), createGoldSample());
+ Assertions.assertNotEquals(createPredSample(), new Object());
}
}
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 f6413530..d31b1557 100644
---
a/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryAsSetCaseInsensitiveTest.java
+++
b/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryAsSetCaseInsensitiveTest.java
@@ -118,7 +118,7 @@ public class DictionaryAsSetCaseInsensitiveTest {
Set<String> setB = dictB.asStringSet();
- Assertions.assertTrue(setA.equals(setB));
+ Assertions.assertEquals(setA, setB);
}
/**
@@ -139,7 +139,7 @@ public class DictionaryAsSetCaseInsensitiveTest {
Set<String> setB = dictB.asStringSet();
- Assertions.assertTrue(setA.equals(setB));
+ Assertions.assertEquals(setA, setB);
}
/**
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 0515da8a..314096d7 100644
---
a/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryAsSetCaseSensitiveTest.java
+++
b/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryAsSetCaseSensitiveTest.java
@@ -118,7 +118,7 @@ public class DictionaryAsSetCaseSensitiveTest {
Set<String> setB = dictB.asStringSet();
- Assertions.assertTrue(setA.equals(setB));
+ Assertions.assertEquals(setA, setB);
}
/**
@@ -140,7 +140,7 @@ public class DictionaryAsSetCaseSensitiveTest {
Set<String> setB = dictB.asStringSet();
// should fail in case sensitive dict
- Assertions.assertFalse(setA.equals(setB));
+ Assertions.assertNotEquals(setA, setB);
}
/**
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 57237f53..9046d6ce 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/dictionary/DictionaryTest.java
@@ -63,7 +63,7 @@ public class DictionaryTest {
Assertions.assertTrue(dict.contains(entry1));
Assertions.assertTrue(dict.contains(entry1u));
- Assertions.assertTrue(!dict.contains(entry2));
+ Assertions.assertFalse(dict.contains(entry2));
}
/**
@@ -80,8 +80,8 @@ public class DictionaryTest {
dict.put(entry1);
Assertions.assertTrue(dict.contains(entry1));
- Assertions.assertTrue(!dict.contains(entry1u));
- Assertions.assertTrue(!dict.contains(entry2));
+ Assertions.assertFalse(dict.contains(entry1u));
+ Assertions.assertFalse(dict.contains(entry2));
}
/**
@@ -108,7 +108,7 @@ public class DictionaryTest {
Dictionary recreated = new Dictionary(
new ByteArrayInputStream(out.toByteArray()));
- Assertions.assertTrue(reference.equals(recreated));
+ Assertions.assertEquals(reference, recreated);
}
/**
@@ -125,7 +125,7 @@ public class DictionaryTest {
Dictionary dictionay =
Dictionary.parseOneEntryPerLine(new StringReader(testDictionary));
- Assertions.assertTrue(dictionay.size() == 4);
+ Assertions.assertEquals(4, dictionay.size());
Assertions.assertTrue(dictionay.contains(new StringList("1a", "1b", "1c",
"1d")));
Assertions.assertTrue(dictionay.contains(new StringList("2a", "2b",
"2c")));
Assertions.assertTrue(dictionay.contains(new StringList(new String[]
{"3a"})));
@@ -152,9 +152,9 @@ public class DictionaryTest {
dictC.put(entry1);
dictC.put(entry2);
- Assertions.assertTrue(dictA.equals(dictB));
- Assertions.assertTrue(dictC.equals(dictA));
- Assertions.assertTrue(dictB.equals(dictC));
+ Assertions.assertEquals(dictA, dictB);
+ Assertions.assertEquals(dictC, dictA);
+ Assertions.assertEquals(dictB, dictC);
}
/**
@@ -227,7 +227,7 @@ public class DictionaryTest {
dict.put(entry1);
- Assertions.assertTrue(!dict.contains(entry2));
+ Assertions.assertFalse(dict.contains(entry2));
}
}
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 04f52424..8989a095 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentSampleTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/doccat/DocumentSampleTest.java
@@ -32,10 +32,10 @@ public class DocumentSampleTest {
@Test
void testEquals() {
- Assertions.assertFalse(createGoldSample() == createGoldSample());
- Assertions.assertTrue(createGoldSample().equals(createGoldSample()));
- Assertions.assertFalse(createPredSample().equals(createGoldSample()));
- Assertions.assertFalse(createPredSample().equals(new Object()));
+ Assertions.assertNotSame(createGoldSample(), createGoldSample());
+ Assertions.assertEquals(createGoldSample(), createGoldSample());
+ Assertions.assertNotEquals(createPredSample(), createGoldSample());
+ Assertions.assertNotEquals(createPredSample(), new Object());
}
@Test
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/langdetect/LanguageSampleTest.java
b/opennlp-tools/src/test/java/opennlp/tools/langdetect/LanguageSampleTest.java
index 4a1a269c..428c7db1 100644
---
a/opennlp-tools/src/test/java/opennlp/tools/langdetect/LanguageSampleTest.java
+++
b/opennlp-tools/src/test/java/opennlp/tools/langdetect/LanguageSampleTest.java
@@ -125,6 +125,6 @@ public class LanguageSampleTest {
Assertions.assertNotEquals(sampleA, sampleB);
Assertions.assertNotEquals(sampleA, sampleC);
Assertions.assertNotEquals(sampleB, sampleC);
- Assertions.assertNotEquals(sampleA, "something else");
+ Assertions.assertNotEquals(sampleA.getContext(), "something else");
}
}
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/langdetect/LanguageTest.java
b/opennlp-tools/src/test/java/opennlp/tools/langdetect/LanguageTest.java
index 8e610da9..9a31b28c 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/langdetect/LanguageTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/langdetect/LanguageTest.java
@@ -99,6 +99,6 @@ public class LanguageTest {
Assertions.assertEquals(langA6, langA5);
- Assertions.assertNotEquals(langA, "something else");
+ Assertions.assertNotEquals(langA.getLang(), "something else");
}
}
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/lemmatizer/LemmaSampleTest.java
b/opennlp-tools/src/test/java/opennlp/tools/lemmatizer/LemmaSampleTest.java
index c6d8bed9..29b5cc53 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/lemmatizer/LemmaSampleTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/lemmatizer/LemmaSampleTest.java
@@ -112,10 +112,10 @@ public class LemmaSampleTest {
@Test
void testEquals() {
- Assertions.assertFalse(createGoldSample() == createGoldSample());
- Assertions.assertTrue(createGoldSample().equals(createGoldSample()));
- Assertions.assertFalse(createPredSample().equals(createGoldSample()));
- Assertions.assertFalse(createPredSample().equals(new Object()));
+ Assertions.assertNotSame(createGoldSample(), createGoldSample());
+ Assertions.assertEquals(createGoldSample(), createGoldSample());
+ Assertions.assertNotEquals(createPredSample(), createGoldSample());
+ Assertions.assertNotEquals(createPredSample(), new Object());
}
public static LemmaSample createGoldSample() {
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/ml/TrainerFactoryTest.java
b/opennlp-tools/src/test/java/opennlp/tools/ml/TrainerFactoryTest.java
index 9ef9b6be..9e6c8e0d 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/ml/TrainerFactoryTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/ml/TrainerFactoryTest.java
@@ -68,14 +68,14 @@ public class TrainerFactoryTest {
TrainerType trainerType = TrainerFactory.getTrainerType(mlParams);
-
Assertions.assertTrue(TrainerType.EVENT_MODEL_SEQUENCE_TRAINER.equals(trainerType));
+ Assertions.assertEquals(TrainerType.EVENT_MODEL_SEQUENCE_TRAINER,
trainerType);
}
@Test
void testIsSequenceTrainerFalse() {
mlParams.put(AbstractTrainer.ALGORITHM_PARAM, GISTrainer.MAXENT_VALUE);
TrainerType trainerType = TrainerFactory.getTrainerType(mlParams);
-
Assertions.assertFalse(TrainerType.EVENT_MODEL_SEQUENCE_TRAINER.equals(trainerType));
+ Assertions.assertNotEquals(TrainerType.EVENT_MODEL_SEQUENCE_TRAINER,
trainerType);
}
}
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/quasinewton/QNTrainerTest.java
b/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/quasinewton/QNTrainerTest.java
index afcf5e45..533a6c9e 100644
---
a/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/quasinewton/QNTrainerTest.java
+++
b/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/quasinewton/QNTrainerTest.java
@@ -91,7 +91,7 @@ public class QNTrainerTest {
QNModel trainedModel = new QNTrainer(15, true).trainModel(
ITERATIONS, testDataIndexer);
- Assertions.assertFalse(trainedModel.equals(null));
+ Assertions.assertNotEquals(null, trainedModel);
}
@Test
@@ -114,7 +114,7 @@ public class QNTrainerTest {
AbstractModel readModel = modelReader.getModel();
QNModel deserModel = (QNModel) readModel;
- Assertions.assertTrue(trainedModel.equals(deserModel));
+ Assertions.assertEquals(trainedModel, deserModel);
String[] features2Classify = new String[] {
"feature2", "feature3", "feature3",
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderEvaluatorTest.java
b/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderEvaluatorTest.java
index bb92c49d..89a7765f 100644
---
a/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderEvaluatorTest.java
+++
b/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderEvaluatorTest.java
@@ -53,8 +53,8 @@ public class DictionaryNameFinderEvaluatorTest {
sample.close();
FMeasure fmeasure = evaluator.getFMeasure();
- Assertions.assertTrue(fmeasure.getFMeasure() == 1);
- Assertions.assertTrue(fmeasure.getRecallScore() == 1);
+ Assertions.assertEquals(1, fmeasure.getFMeasure());
+ Assertions.assertEquals(1, fmeasure.getRecallScore());
}
/**
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderTest.java
b/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderTest.java
index a907c6b7..d40d9e82 100644
---
a/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderTest.java
+++
b/opennlp-tools/src/test/java/opennlp/tools/namefind/DictionaryNameFinderTest.java
@@ -61,7 +61,7 @@ public class DictionaryNameFinderTest {
SimpleTokenizer tokenizer = SimpleTokenizer.INSTANCE;
String[] tokens = tokenizer.tokenize(sentence);
Span[] names = mNameFinder.find(tokens);
- Assertions.assertTrue(names.length == 1);
+ Assertions.assertEquals(1, names.length);
Assertions.assertTrue(names[0].getStart() == 0 && names[0].getEnd() == 1);
}
@@ -71,7 +71,7 @@ public class DictionaryNameFinderTest {
SimpleTokenizer tokenizer = SimpleTokenizer.INSTANCE;
String[] tokens = tokenizer.tokenize(sentence);
Span[] names = mNameFinder.find(tokens);
- Assertions.assertTrue(names.length == 1);
+ Assertions.assertEquals(1, names.length);
Assertions.assertTrue(names[0].getStart() == 2 && names[0].getEnd() == 3);
}
@@ -82,7 +82,7 @@ public class DictionaryNameFinderTest {
SimpleTokenizer tokenizer = SimpleTokenizer.INSTANCE;
String[] tokens = tokenizer.tokenize(sentence);
Span[] names = mNameFinder.find(tokens);
- Assertions.assertTrue(names.length == 1);
+ Assertions.assertEquals(1, names.length);
Assertions.assertTrue(names[0].getStart() == 3 && names[0].getEnd() == 4);
}
@@ -90,7 +90,7 @@ public class DictionaryNameFinderTest {
void testLastMatchingTokenNameIsChoosen() {
String[] sentence = {"a", "b", "c", "Vanessa"};
Span[] names = mNameFinder.find(sentence);
- Assertions.assertTrue(names.length == 1);
+ Assertions.assertEquals(1, names.length);
Assertions.assertTrue(names[0].getStart() == 3 && names[0].getEnd() == 4);
}
@@ -98,7 +98,7 @@ public class DictionaryNameFinderTest {
void testLongerTokenNameIsPreferred() {
String[] sentence = {"a", "b", "c", "Vanessa", "Williams"};
Span[] names = mNameFinder.find(sentence);
- Assertions.assertTrue(names.length == 1);
+ Assertions.assertEquals(1, names.length);
Assertions.assertTrue(names[0].getStart() == 3 && names[0].getEnd() == 5);
}
@@ -106,7 +106,7 @@ public class DictionaryNameFinderTest {
void testCaseSensitivity() {
String[] sentence = {"a", "b", "c", "vanessa", "williams"};
Span[] names = mNameFinder.find(sentence);
- Assertions.assertTrue(names.length == 1);
+ Assertions.assertEquals(1, names.length);
Assertions.assertTrue(names[0].getStart() == 3 && names[0].getEnd() == 5);
}
@@ -114,7 +114,7 @@ public class DictionaryNameFinderTest {
void testCaseLongerEntry() {
String[] sentence = {"a", "b", "michael", "jordan"};
Span[] names = mNameFinder.find(sentence);
- Assertions.assertTrue(names.length == 1);
- Assertions.assertTrue(names[0].length() == 2);
+ Assertions.assertEquals(1, names.length);
+ Assertions.assertEquals(2, names[0].length());
}
}
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/namefind/NameSampleTest.java
b/opennlp-tools/src/test/java/opennlp/tools/namefind/NameSampleTest.java
index c17bad02..0aaf9d32 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/namefind/NameSampleTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/namefind/NameSampleTest.java
@@ -299,10 +299,10 @@ public class NameSampleTest {
@Test
void testEquals() {
- Assertions.assertFalse(createGoldSample() == createGoldSample());
- Assertions.assertTrue(createGoldSample().equals(createGoldSample()));
- Assertions.assertFalse(createGoldSample().equals(createPredSample()));
- Assertions.assertFalse(createPredSample().equals(new Object()));
+ Assertions.assertNotSame(createGoldSample(), createGoldSample());
+ Assertions.assertEquals(createGoldSample(), createGoldSample());
+ Assertions.assertNotEquals(createGoldSample(), createPredSample());
+ Assertions.assertNotEquals(createPredSample(), new Object());
}
public static NameSample createGoldSample() {
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/namefind/RegexNameFinderTest.java
b/opennlp-tools/src/test/java/opennlp/tools/namefind/RegexNameFinderTest.java
index 577e752a..104afc26 100644
---
a/opennlp-tools/src/test/java/opennlp/tools/namefind/RegexNameFinderTest.java
+++
b/opennlp-tools/src/test/java/opennlp/tools/namefind/RegexNameFinderTest.java
@@ -49,10 +49,10 @@ public class RegexNameFinderTest {
Span[] result = finder.find(sentence);
- Assertions.assertTrue(result.length == 1);
+ Assertions.assertEquals(1, result.length);
- Assertions.assertTrue(result[0].getStart() == 1);
- Assertions.assertTrue(result[0].getEnd() == 2);
+ Assertions.assertEquals(1, result[0].getStart());
+ Assertions.assertEquals(2, result[0].getEnd());
}
@Test
@@ -72,11 +72,11 @@ public class RegexNameFinderTest {
Span[] result = finder.find(sentence);
- Assertions.assertTrue(result.length == 1);
+ Assertions.assertEquals(1, result.length);
- Assertions.assertTrue(result[0].getStart() == 1);
- Assertions.assertTrue(result[0].getEnd() == 3);
- Assertions.assertTrue(result[0].getType().equals("match"));
+ Assertions.assertEquals(1, result[0].getStart());
+ Assertions.assertEquals(3, result[0].getEnd());
+ Assertions.assertEquals("match", result[0].getType());
}
@Test
@@ -94,6 +94,6 @@ public class RegexNameFinderTest {
Span[] result = finder.find(sentence);
- Assertions.assertTrue(result.length == 0);
+ Assertions.assertEquals(0, result.length);
}
}
diff --git a/opennlp-tools/src/test/java/opennlp/tools/parser/ParseTest.java
b/opennlp-tools/src/test/java/opennlp/tools/parser/ParseTest.java
index 675a3721..08cf70a3 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/parser/ParseTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/parser/ParseTest.java
@@ -46,15 +46,15 @@ public class ParseTest {
@Test
void testEquals() {
Parse p1 = Parse.parseParse(PARSE_STRING);
- Assertions.assertTrue(p1.equals(p1));
+ Assertions.assertEquals(p1, p1);
}
@Test
void testParseClone() {
Parse p1 = Parse.parseParse(PARSE_STRING);
Parse p2 = (Parse) p1.clone();
- Assertions.assertTrue(p1.equals(p2));
- Assertions.assertTrue(p2.equals(p1));
+ Assertions.assertEquals(p1, p2);
+ Assertions.assertEquals(p2, p1);
}
@Test
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/postag/POSDictionaryTest.java
b/opennlp-tools/src/test/java/opennlp/tools/postag/POSDictionaryTest.java
index e2681978..ee581365 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/postag/POSDictionaryTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/postag/POSDictionaryTest.java
@@ -60,7 +60,7 @@ public class POSDictionaryTest {
dictionary.put("c", "7", "8", "9");
dictionary.put("Always", "RB", "NNP");
-
Assertions.assertTrue(dictionary.equals(serializeDeserializeDict(dictionary)));
+ Assertions.assertEquals(dictionary, serializeDeserializeDict(dictionary));
}
@Test
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/postag/POSSampleTest.java
b/opennlp-tools/src/test/java/opennlp/tools/postag/POSSampleTest.java
index d4c34bb1..1d6fc3f1 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/postag/POSSampleTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/postag/POSSampleTest.java
@@ -38,10 +38,10 @@ public class POSSampleTest {
@Test
void testEquals() throws InvalidFormatException {
- Assertions.assertFalse(createGoldSample() == createGoldSample());
- Assertions.assertTrue(createGoldSample().equals(createGoldSample()));
- Assertions.assertFalse(createPredSample().equals(createGoldSample()));
- Assertions.assertFalse(createPredSample().equals(new Object()));
+ Assertions.assertNotSame(createGoldSample(), createGoldSample());
+ Assertions.assertEquals(createGoldSample(), createGoldSample());
+ Assertions.assertNotEquals(createPredSample(), createGoldSample());
+ Assertions.assertNotEquals(createPredSample(), new Object());
}
public static POSSample createGoldSample() throws InvalidFormatException {
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/sentdetect/SentenceDetectorFactoryTest.java
b/opennlp-tools/src/test/java/opennlp/tools/sentdetect/SentenceDetectorFactoryTest.java
index 2bf89324..ceda3aac 100644
---
a/opennlp-tools/src/test/java/opennlp/tools/sentdetect/SentenceDetectorFactoryTest.java
+++
b/opennlp-tools/src/test/java/opennlp/tools/sentdetect/SentenceDetectorFactoryTest.java
@@ -22,7 +22,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -78,7 +77,7 @@ public class SentenceDetectorFactoryTest {
SentenceDetectorFactory factory = sdModel.getFactory();
Assertions.assertTrue(factory.getSDContextGenerator() instanceof
DefaultSDContextGenerator);
Assertions.assertTrue(factory.getEndOfSentenceScanner() instanceof
DefaultEndOfSentenceScanner);
- Assertions.assertTrue(Arrays.equals(eos, factory.getEOSCharacters()));
+ Assertions.assertArrayEquals(eos, factory.getEOSCharacters());
ByteArrayOutputStream out = new ByteArrayOutputStream();
sdModel.serialize(out);
@@ -89,7 +88,7 @@ public class SentenceDetectorFactoryTest {
factory = fromSerialized.getFactory();
Assertions.assertTrue(factory.getSDContextGenerator() instanceof
DefaultSDContextGenerator);
Assertions.assertTrue(factory.getEndOfSentenceScanner() instanceof
DefaultEndOfSentenceScanner);
- Assertions.assertTrue(Arrays.equals(eos, factory.getEOSCharacters()));
+ Assertions.assertArrayEquals(eos, factory.getEOSCharacters());
}
@Test
@@ -104,7 +103,7 @@ public class SentenceDetectorFactoryTest {
Assertions.assertNull(factory.getAbbreviationDictionary());
Assertions.assertTrue(factory.getSDContextGenerator() instanceof
DefaultSDContextGenerator);
Assertions.assertTrue(factory.getEndOfSentenceScanner() instanceof
DefaultEndOfSentenceScanner);
- Assertions.assertTrue(Arrays.equals(eos, factory.getEOSCharacters()));
+ Assertions.assertArrayEquals(eos, factory.getEOSCharacters());
ByteArrayOutputStream out = new ByteArrayOutputStream();
sdModel.serialize(out);
@@ -116,7 +115,7 @@ public class SentenceDetectorFactoryTest {
Assertions.assertNull(factory.getAbbreviationDictionary());
Assertions.assertTrue(factory.getSDContextGenerator() instanceof
DefaultSDContextGenerator);
Assertions.assertTrue(factory.getEndOfSentenceScanner() instanceof
DefaultEndOfSentenceScanner);
- Assertions.assertTrue(Arrays.equals(eos, factory.getEOSCharacters()));
+ Assertions.assertArrayEquals(eos, factory.getEOSCharacters());
}
@Test
@@ -131,8 +130,7 @@ public class SentenceDetectorFactoryTest {
Assertions.assertNull(factory.getAbbreviationDictionary());
Assertions.assertTrue(factory.getSDContextGenerator() instanceof
DefaultSDContextGenerator);
Assertions.assertTrue(factory.getEndOfSentenceScanner() instanceof
DefaultEndOfSentenceScanner);
- Assertions.assertTrue(Arrays.equals(Factory.defaultEosCharacters,
- factory.getEOSCharacters()));
+ Assertions.assertArrayEquals(Factory.defaultEosCharacters,
factory.getEOSCharacters());
ByteArrayOutputStream out = new ByteArrayOutputStream();
sdModel.serialize(out);
@@ -144,8 +142,7 @@ public class SentenceDetectorFactoryTest {
Assertions.assertNull(factory.getAbbreviationDictionary());
Assertions.assertTrue(factory.getSDContextGenerator() instanceof
DefaultSDContextGenerator);
Assertions.assertTrue(factory.getEndOfSentenceScanner() instanceof
DefaultEndOfSentenceScanner);
- Assertions.assertTrue(Arrays.equals(Factory.defaultEosCharacters,
- factory.getEOSCharacters()));
+ Assertions.assertArrayEquals(Factory.defaultEosCharacters,
factory.getEOSCharacters());
}
@Test
@@ -161,7 +158,7 @@ public class SentenceDetectorFactoryTest {
Assertions.assertTrue(factory.getAbbreviationDictionary() instanceof
DummyDictionary);
Assertions.assertTrue(factory.getSDContextGenerator() instanceof
DummySDContextGenerator);
Assertions.assertTrue(factory.getEndOfSentenceScanner() instanceof
DummyEOSScanner);
- Assertions.assertTrue(Arrays.equals(eos, factory.getEOSCharacters()));
+ Assertions.assertArrayEquals(eos, factory.getEOSCharacters());
ByteArrayOutputStream out = new ByteArrayOutputStream();
sdModel.serialize(out);
@@ -173,10 +170,10 @@ public class SentenceDetectorFactoryTest {
Assertions.assertTrue(factory.getAbbreviationDictionary() instanceof
DummyDictionary);
Assertions.assertTrue(factory.getSDContextGenerator() instanceof
DummySDContextGenerator);
Assertions.assertTrue(factory.getEndOfSentenceScanner() instanceof
DummyEOSScanner);
- Assertions.assertTrue(Arrays.equals(eos, factory.getEOSCharacters()));
+ Assertions.assertArrayEquals(eos, factory.getEOSCharacters());
Assertions.assertEquals(factory.getAbbreviationDictionary(),
sdModel.getAbbreviations());
- Assertions.assertTrue(Arrays.equals(factory.getEOSCharacters(),
sdModel.getEosCharacters()));
+ Assertions.assertArrayEquals(factory.getEOSCharacters(),
sdModel.getEosCharacters());
}
@Test
@@ -191,7 +188,7 @@ public class SentenceDetectorFactoryTest {
Assertions.assertTrue(factory.getAbbreviationDictionary() instanceof
DummyDictionary);
Assertions.assertTrue(factory.getSDContextGenerator() instanceof
DummySDContextGenerator);
Assertions.assertTrue(factory.getEndOfSentenceScanner() instanceof
DummyEOSScanner);
- Assertions.assertTrue(Arrays.equals(eos, factory.getEOSCharacters()));
+ Assertions.assertArrayEquals(eos, factory.getEOSCharacters());
}
}
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/sentdetect/SentenceSampleTest.java
b/opennlp-tools/src/test/java/opennlp/tools/sentdetect/SentenceSampleTest.java
index 70084c9b..3d4b7972 100644
---
a/opennlp-tools/src/test/java/opennlp/tools/sentdetect/SentenceSampleTest.java
+++
b/opennlp-tools/src/test/java/opennlp/tools/sentdetect/SentenceSampleTest.java
@@ -80,10 +80,10 @@ public class SentenceSampleTest {
@Test
void testEquals() {
- Assertions.assertFalse(createGoldSample() == createGoldSample());
- Assertions.assertTrue(createGoldSample().equals(createGoldSample()));
- Assertions.assertFalse(createPredSample().equals(createGoldSample()));
- Assertions.assertFalse(createPredSample().equals(new Object()));
+ Assertions.assertNotSame(createGoldSample(), createGoldSample());
+ Assertions.assertEquals(createGoldSample(), createGoldSample());
+ Assertions.assertNotEquals(createPredSample(), createGoldSample());
+ Assertions.assertNotEquals(createPredSample(), new Object());
}
public static SentenceSample createGoldSample() {
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/tokenize/SimpleTokenizerTest.java
b/opennlp-tools/src/test/java/opennlp/tools/tokenize/SimpleTokenizerTest.java
index c95e1245..a117a5ad 100644
---
a/opennlp-tools/src/test/java/opennlp/tools/tokenize/SimpleTokenizerTest.java
+++
b/opennlp-tools/src/test/java/opennlp/tools/tokenize/SimpleTokenizerTest.java
@@ -38,14 +38,14 @@ public class SimpleTokenizerTest {
String[] tokenizedText = mTokenizer.tokenize(text);
- Assertions.assertTrue("a".equals(tokenizedText[0]));
- Assertions.assertTrue("b".equals(tokenizedText[1]));
- Assertions.assertTrue("c".equals(tokenizedText[2]));
- Assertions.assertTrue("d".equals(tokenizedText[3]));
- Assertions.assertTrue("e".equals(tokenizedText[4]));
- Assertions.assertTrue("f".equals(tokenizedText[5]));
-
- Assertions.assertTrue(tokenizedText.length == 6);
+ Assertions.assertEquals("a", tokenizedText[0]);
+ Assertions.assertEquals("b", tokenizedText[1]);
+ Assertions.assertEquals("c", tokenizedText[2]);
+ Assertions.assertEquals("d", tokenizedText[3]);
+ Assertions.assertEquals("e", tokenizedText[4]);
+ Assertions.assertEquals("f", tokenizedText[5]);
+
+ Assertions.assertEquals(6, tokenizedText.length);
}
/**
@@ -57,9 +57,9 @@ public class SimpleTokenizerTest {
String[] tokenizedText = mTokenizer.tokenize(text);
- Assertions.assertTrue("a".equals(tokenizedText[0]));
- Assertions.assertTrue(".".equals(tokenizedText[1]));
- Assertions.assertTrue(tokenizedText.length == 2);
+ Assertions.assertEquals("a", tokenizedText[0]);
+ Assertions.assertEquals(".", tokenizedText[1]);
+ Assertions.assertEquals(2, tokenizedText.length);
}
/**
@@ -71,9 +71,9 @@ public class SimpleTokenizerTest {
String[] tokenizedText = mTokenizer.tokenize(text);
- Assertions.assertTrue("305".equals(tokenizedText[0]));
- Assertions.assertTrue("KW".equals(tokenizedText[1]));
- Assertions.assertTrue(tokenizedText.length == 2);
+ Assertions.assertEquals("305", tokenizedText[0]);
+ Assertions.assertEquals("KW", tokenizedText[1]);
+ Assertions.assertEquals(2, tokenizedText.length);
}
@Test
@@ -82,12 +82,12 @@ public class SimpleTokenizerTest {
String[] tokenizedText = mTokenizer.tokenize(text);
- Assertions.assertTrue("rebecca".equals(tokenizedText[0]));
- Assertions.assertTrue(".".equals(tokenizedText[1]));
- Assertions.assertTrue("sleep".equals(tokenizedText[2]));
- Assertions.assertTrue("(".equals(tokenizedText[3]));
- Assertions.assertTrue(")".equals(tokenizedText[4]));
- Assertions.assertTrue(tokenizedText.length == 5);
+ Assertions.assertEquals("rebecca", tokenizedText[0]);
+ Assertions.assertEquals(".", tokenizedText[1]);
+ Assertions.assertEquals("sleep", tokenizedText[2]);
+ Assertions.assertEquals("(", tokenizedText[3]);
+ Assertions.assertEquals(")", tokenizedText[4]);
+ Assertions.assertEquals(5, tokenizedText.length);
}
@Test
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleTest.java
b/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleTest.java
index d827fb65..c0e95d48 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenSampleTest.java
@@ -126,9 +126,9 @@ public class TokenSampleTest {
@Test
void testEquals() {
- Assertions.assertFalse(createGoldSample() == createGoldSample());
- Assertions.assertTrue(createGoldSample().equals(createGoldSample()));
- Assertions.assertFalse(createPredSample().equals(createGoldSample()));
- Assertions.assertFalse(createPredSample().equals(new Object()));
+ Assertions.assertNotSame(createGoldSample(), createGoldSample());
+ Assertions.assertEquals(createGoldSample(), createGoldSample());
+ Assertions.assertNotEquals(createPredSample(), createGoldSample());
+ Assertions.assertNotEquals(createPredSample(), new Object());
}
}
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenizerFactoryTest.java
b/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenizerFactoryTest.java
index 9978f27d..e759c854 100644
---
a/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenizerFactoryTest.java
+++
b/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokenizerFactoryTest.java
@@ -71,7 +71,7 @@ public class TokenizerFactoryTest {
TokenizerModel model = train(new TokenizerFactory(lang, dic, false, null));
TokenizerFactory factory = model.getFactory();
- Assertions.assertTrue(factory.getAbbreviationDictionary() != null);
+ Assertions.assertNotNull(factory.getAbbreviationDictionary());
Assertions.assertTrue(factory.getContextGenerator() instanceof
DefaultTokenContextGenerator);
Assertions.assertEquals(Factory.DEFAULT_ALPHANUMERIC,
factory.getAlphaNumericPattern().pattern());
@@ -86,7 +86,7 @@ public class TokenizerFactoryTest {
TokenizerModel fromSerialized = new TokenizerModel(in);
factory = fromSerialized.getFactory();
- Assertions.assertTrue(factory.getAbbreviationDictionary() != null);
+ Assertions.assertNotNull(factory.getAbbreviationDictionary());
Assertions.assertTrue(factory.getContextGenerator() instanceof
DefaultTokenContextGenerator);
Assertions.assertEquals(Factory.DEFAULT_ALPHANUMERIC,
factory.getAlphaNumericPattern().pattern());
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/tokenize/WhitespaceTokenizerTest.java
b/opennlp-tools/src/test/java/opennlp/tools/tokenize/WhitespaceTokenizerTest.java
index 37252d77..8dbcde68 100644
---
a/opennlp-tools/src/test/java/opennlp/tools/tokenize/WhitespaceTokenizerTest.java
+++
b/opennlp-tools/src/test/java/opennlp/tools/tokenize/WhitespaceTokenizerTest.java
@@ -42,14 +42,14 @@ public class WhitespaceTokenizerTest {
String[] tokenizedText = WhitespaceTokenizer.INSTANCE.tokenize(text);
- Assertions.assertTrue("a".equals(tokenizedText[0]));
- Assertions.assertTrue("b".equals(tokenizedText[1]));
- Assertions.assertTrue("c".equals(tokenizedText[2]));
- Assertions.assertTrue("d".equals(tokenizedText[3]));
- Assertions.assertTrue("e".equals(tokenizedText[4]));
- Assertions.assertTrue("f".equals(tokenizedText[5]));
-
- Assertions.assertTrue(tokenizedText.length == 6);
+ Assertions.assertEquals("a", tokenizedText[0]);
+ Assertions.assertEquals("b", tokenizedText[1]);
+ Assertions.assertEquals("c", tokenizedText[2]);
+ Assertions.assertEquals("d", tokenizedText[3]);
+ Assertions.assertEquals("e", tokenizedText[4]);
+ Assertions.assertEquals("f", tokenizedText[5]);
+
+ Assertions.assertEquals(6, tokenizedText.length);
}
@Test
diff --git a/opennlp-tools/src/test/java/opennlp/tools/util/SequenceTest.java
b/opennlp-tools/src/test/java/opennlp/tools/util/SequenceTest.java
index 3c6a0d41..86a23f0b 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/util/SequenceTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/util/SequenceTest.java
@@ -38,7 +38,7 @@ public class SequenceTest {
Assertions.assertEquals(sequence.getOutcomes(), copy.getOutcomes());
Assertions.assertArrayEquals(copy.getProbs(), sequence.getProbs(), 0.0);
- Assertions.assertTrue(sequence.compareTo(copy) == 0);
+ Assertions.assertEquals(0, sequence.compareTo(copy));
}
/**
diff --git a/opennlp-tools/src/test/java/opennlp/tools/util/SpanTest.java
b/opennlp-tools/src/test/java/opennlp/tools/util/SpanTest.java
index 87706307..2f95e2fd 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/util/SpanTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/util/SpanTest.java
@@ -58,7 +58,7 @@ public class SpanTest {
Span a = new Span(500, 900);
Span b = new Span(520, 600);
- Assertions.assertEquals(true, a.contains(b));
+ Assertions.assertTrue(a.contains(b));
}
/**
@@ -67,7 +67,7 @@ public class SpanTest {
@Test
void testContainsWithEqual() {
Span a = new Span(500, 900);
- Assertions.assertEquals(true, a.contains(a));
+ Assertions.assertTrue(a.contains(a));
}
/**
@@ -77,7 +77,7 @@ public class SpanTest {
void testContainsWithLowerIntersect() {
Span a = new Span(500, 900);
Span b = new Span(450, 1000);
- Assertions.assertEquals(false, a.contains(b));
+ Assertions.assertFalse(a.contains(b));
}
/**
@@ -87,7 +87,7 @@ public class SpanTest {
void testContainsWithHigherIntersect() {
Span a = new Span(500, 900);
Span b = new Span(500, 1000);
- Assertions.assertEquals(false, a.contains(b));
+ Assertions.assertFalse(a.contains(b));
}
/**
@@ -167,7 +167,7 @@ public class SpanTest {
void testCompareToLower() {
Span a = new Span(100, 1000);
Span b = new Span(10, 50);
- Assertions.assertEquals(true, a.compareTo(b) > 0);
+ Assertions.assertTrue(a.compareTo(b) > 0);
}
/**
@@ -177,7 +177,7 @@ public class SpanTest {
void testCompareToHigher() {
Span a = new Span(100, 200);
Span b = new Span(300, 400);
- Assertions.assertEquals(true, a.compareTo(b) < 0);
+ Assertions.assertTrue(a.compareTo(b) < 0);
}
/**
@@ -187,7 +187,7 @@ public class SpanTest {
void testCompareToEquals() {
Span a = new Span(30, 1000);
Span b = new Span(30, 1000);
- Assertions.assertEquals(true, a.compareTo(b) == 0);
+ Assertions.assertTrue(a.compareTo(b) == 0);
}
///
@@ -199,7 +199,7 @@ public class SpanTest {
void testCompareToEqualsSameType() {
Span a = new Span(30, 1000, "a");
Span b = new Span(30, 1000, "a");
- Assertions.assertEquals(true, a.compareTo(b) == 0);
+ Assertions.assertTrue(a.compareTo(b) == 0);
}
/**
@@ -209,7 +209,7 @@ public class SpanTest {
void testCompareToEqualsDiffType1() {
Span a = new Span(30, 1000, "a");
Span b = new Span(30, 1000, "b");
- Assertions.assertEquals(true, a.compareTo(b) == -1);
+ Assertions.assertTrue(a.compareTo(b) == -1);
}
/**
@@ -219,7 +219,7 @@ public class SpanTest {
void testCompareToEqualsDiffType2() {
Span a = new Span(30, 1000, "b");
Span b = new Span(30, 1000, "a");
- Assertions.assertEquals(true, a.compareTo(b) == 1);
+ Assertions.assertTrue(a.compareTo(b) == 1);
}
/**
@@ -229,7 +229,7 @@ public class SpanTest {
void testCompareToEqualsNullType1() {
Span a = new Span(30, 1000);
Span b = new Span(30, 1000, "b");
- Assertions.assertEquals(true, a.compareTo(b) == 1);
+ Assertions.assertTrue(a.compareTo(b) == 1);
}
/**
@@ -239,7 +239,7 @@ public class SpanTest {
void testCompareToEqualsNullType2() {
Span a = new Span(30, 1000, "b");
Span b = new Span(30, 1000);
- Assertions.assertEquals(true, a.compareTo(b) == -1);
+ Assertions.assertTrue(a.compareTo(b) == -1);
}
/**
@@ -256,7 +256,7 @@ public class SpanTest {
@Test
void testEqualsWithNull() {
Span a = new Span(0, 0);
- Assertions.assertEquals(a.equals(null), false);
+ Assertions.assertFalse(a.equals(null));
}
/**
@@ -266,19 +266,19 @@ public class SpanTest {
void testEquals() {
Span a1 = new Span(100, 1000, "test");
Span a2 = new Span(100, 1000, "test");
- Assertions.assertTrue(a1.equals(a2));
+ Assertions.assertEquals(a1, a2);
// end is different
Span b1 = new Span(100, 100, "test");
- Assertions.assertFalse(a1.equals(b1));
+ Assertions.assertNotEquals(a1, b1);
// type is different
Span c1 = new Span(100, 1000, "Test");
- Assertions.assertFalse(a1.equals(c1));
+ Assertions.assertNotEquals(a1, c1);
Span d1 = new Span(100, 1000);
- Assertions.assertFalse(d1.equals(a1));
- Assertions.assertFalse(a1.equals(d1));
+ Assertions.assertNotEquals(d1, a1);
+ Assertions.assertNotEquals(a1, d1);
}
diff --git a/opennlp-tools/src/test/java/opennlp/tools/util/StringListTest.java
b/opennlp-tools/src/test/java/opennlp/tools/util/StringListTest.java
index bd6c7321..b8938e5b 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/util/StringListTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/util/StringListTest.java
@@ -34,7 +34,7 @@ public class StringListTest {
void testIntern() {
StringList l1 = new StringList("a");
StringList l2 = new StringList("a", "b");
- Assertions.assertTrue(l1.getToken(0) == l2.getToken(0));
+ Assertions.assertSame(l1.getToken(0), l2.getToken(0));
}
/**
@@ -89,8 +89,7 @@ public class StringListTest {
Assertions.assertEquals(new StringList("a", "b"),
new StringList("a", "b"));
- Assertions.assertFalse(new StringList("a", "b").equals(
- new StringList("A", "B")));
+ Assertions.assertNotEquals(new StringList("a", "b"), new StringList("A",
"B"));
}
/**
diff --git a/opennlp-tools/src/test/java/opennlp/tools/util/StringUtilTest.java
b/opennlp-tools/src/test/java/opennlp/tools/util/StringUtilTest.java
index c9165d8d..b6f02339 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/util/StringUtilTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/util/StringUtilTest.java
@@ -52,7 +52,7 @@ public class StringUtilTest {
@Test
void testIsEmpty() {
Assertions.assertTrue(StringUtil.isEmpty(""));
- Assertions.assertTrue(!StringUtil.isEmpty("a"));
+ Assertions.assertFalse(StringUtil.isEmpty("a"));
}
@Test
diff --git a/opennlp-tools/src/test/java/opennlp/tools/util/VersionTest.java
b/opennlp-tools/src/test/java/opennlp/tools/util/VersionTest.java
index 31d1e901..8921a932 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/util/VersionTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/util/VersionTest.java
@@ -63,6 +63,6 @@ public class VersionTest {
return;
}
- Assertions.assertTrue(false);
+ Assertions.fail();
}
}
