This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-text.git
commit f63330b8c6dae451199242168abb282078b519ab Author: Gary Gregory <[email protected]> AuthorDate: Fri Dec 12 14:17:18 2025 -0500 Sort members --- .../text/lookup/StringLookupFactoryTest.java | 28 +++++++++++----------- .../text/similarity/LevenshteinResultsTest.java | 22 ++++++++--------- .../text/translate/CharSequenceTranslatorTest.java | 22 ++++++++--------- .../commons/text/translate/OctalUnescaperTest.java | 16 ++++++------- .../text/translate/SinglePassTranslatorTest.java | 14 +++++------ .../text/translate/UnicodeUnescaperTest.java | 10 ++++---- 6 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java b/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java index 43e6f237..caeccd82 100644 --- a/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java +++ b/src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java @@ -103,6 +103,12 @@ class StringLookupFactoryTest { StringLookupFactory.INSTANCE.addDefaultStringLookups(null); } + @Test + void testClear() { + // this will clear out the global cache in ConstantStringLookup + StringLookupFactory.clear(); + } + /** * Tests that we return the singleton. */ @@ -229,6 +235,14 @@ class StringLookupFactoryTest { // @formatter:on } + /** + * Tests that we return the singleton. + */ + @Test + void testDeprecatedSingletons() { + assertSame(StringLookupFactory.INSTANCE_BASE64_DECODER, StringLookupFactory.INSTANCE.base64StringLookup()); + } + /** * Tests that we return the singleton. */ @@ -257,14 +271,6 @@ class StringLookupFactoryTest { assertSame(XmlEncoderStringLookup.INSTANCE, stringLookupFactory.xmlEncoderStringLookup()); } - /** - * Tests that we return the singleton. - */ - @Test - void testDeprecatedSingletons() { - assertSame(StringLookupFactory.INSTANCE_BASE64_DECODER, StringLookupFactory.INSTANCE.base64StringLookup()); - } - @Test void testXmlStringLookup() { final StringLookupFactory stringLookupFactory = StringLookupFactory.INSTANCE; @@ -286,10 +292,4 @@ class StringLookupFactoryTest { final String key = XmlStringLookupTest.DOC_DIR + "document-entity-ref.xml:/document/content"; assertEquals(XmlStringLookupTest.DATA, StringLookupFactory.INSTANCE.xmlStringLookup(XmlStringLookupTest.EMPTY_MAP).apply(key).trim()); } - - @Test - void testClear() { - // this will clear out the global cache in ConstantStringLookup - StringLookupFactory.clear(); - } } diff --git a/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java b/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java index ac93db06..d72f91f9 100644 --- a/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java +++ b/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java @@ -32,20 +32,20 @@ class LevenshteinResultsTest { } @Test - void testEqualsReturningFalse() { + void testEqualsDifferentDistance() { final Integer integerOne = 1662; final Integer integerTwo = 1164; final LevenshteinResults levenshteinResults = new LevenshteinResults(integerOne, integerOne, integerOne, integerOne); - final LevenshteinResults levenshteinResultsTwo = new LevenshteinResults(integerOne, integerOne, integerTwo, integerTwo); + final LevenshteinResults levenshteinResultsTwo = new LevenshteinResults(integerTwo, integerOne, integerOne, integerOne); assertFalse(levenshteinResults.equals(levenshteinResultsTwo)); } @Test - void testEqualsDifferentDistance() { + void testEqualsReturningFalse() { final Integer integerOne = 1662; final Integer integerTwo = 1164; final LevenshteinResults levenshteinResults = new LevenshteinResults(integerOne, integerOne, integerOne, integerOne); - final LevenshteinResults levenshteinResultsTwo = new LevenshteinResults(integerTwo, integerOne, integerOne, integerOne); + final LevenshteinResults levenshteinResultsTwo = new LevenshteinResults(integerOne, integerOne, integerTwo, integerTwo); assertFalse(levenshteinResults.equals(levenshteinResultsTwo)); } @@ -56,6 +56,13 @@ class LevenshteinResultsTest { assertTrue(levenshteinResults.equals(levenshteinResults)); } + @Test + void testEqualsWithDifferentObject() { + final Integer integer = -647; + final LevenshteinResults levenshteinResults = new LevenshteinResults(integer, null, null, integer); + assertFalse(levenshteinResults.equals("Test")); + } + @Test void testEqualsWithNonNull() { final Integer integer = 1; @@ -71,11 +78,4 @@ class LevenshteinResultsTest { assertFalse(levenshteinResults.equals(null)); } - @Test - void testEqualsWithDifferentObject() { - final Integer integer = -647; - final LevenshteinResults levenshteinResults = new LevenshteinResults(integer, null, null, integer); - assertFalse(levenshteinResults.equals("Test")); - } - } diff --git a/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java b/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java index 3bb33283..894fc877 100644 --- a/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java +++ b/src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java @@ -41,17 +41,6 @@ class CharSequenceTranslatorTest { //Used to count translate invocations private int translateInvocationCounter; - @Test - void testWith() throws IOException { - final CharSequenceTranslator charSequenceTranslatorOne = new TestCharSequenceTranslator(); - final CharSequenceTranslator charSequenceTranslatorTwo = new TestCharSequenceTranslator(); - final CharSequenceTranslator charSequenceTranslatorThree = new TestCharSequenceTranslator(); - final CharSequenceTranslator aggregatedTranslator = charSequenceTranslatorOne.with(charSequenceTranslatorTwo, charSequenceTranslatorThree); - aggregatedTranslator.translate("", 0, null); - assertInstanceOf(AggregateTranslator.class, aggregatedTranslator); - assertEquals(3, translateInvocationCounter); - } - @Test void testIOException() { final CharSequenceTranslator translator = new CharSequenceTranslator() { @@ -64,4 +53,15 @@ class CharSequenceTranslatorTest { assertThrows(UncheckedIOException.class, () -> translator.translate(".")); } + + @Test + void testWith() throws IOException { + final CharSequenceTranslator charSequenceTranslatorOne = new TestCharSequenceTranslator(); + final CharSequenceTranslator charSequenceTranslatorTwo = new TestCharSequenceTranslator(); + final CharSequenceTranslator charSequenceTranslatorThree = new TestCharSequenceTranslator(); + final CharSequenceTranslator aggregatedTranslator = charSequenceTranslatorOne.with(charSequenceTranslatorTwo, charSequenceTranslatorThree); + aggregatedTranslator.translate("", 0, null); + assertInstanceOf(AggregateTranslator.class, aggregatedTranslator); + assertEquals(3, translateInvocationCounter); + } } diff --git a/src/test/java/org/apache/commons/text/translate/OctalUnescaperTest.java b/src/test/java/org/apache/commons/text/translate/OctalUnescaperTest.java index 1f7d4b7b..2dd9cefa 100644 --- a/src/test/java/org/apache/commons/text/translate/OctalUnescaperTest.java +++ b/src/test/java/org/apache/commons/text/translate/OctalUnescaperTest.java @@ -83,14 +83,6 @@ class OctalUnescaperTest { assertEquals("\\999", result, "Failed to ignore an out of range octal character via the between method"); } - @Test - void testInvalid() { - final OctalUnescaper oue = new OctalUnescaper(); - final String input = "\\4a"; - final String result = oue.translate(input); - assertEquals("\4a", result, "Failed to unescape octal characters via the between method"); - } - @Test void testHighLowSurrogate() { final OctalUnescaper oue = new OctalUnescaper(); @@ -110,4 +102,12 @@ class OctalUnescaperTest { result = oue.translate(input); assertEquals("\377\uD83D", result, "Failed to unescape octal characters via the between method"); } + + @Test + void testInvalid() { + final OctalUnescaper oue = new OctalUnescaper(); + final String input = "\\4a"; + final String result = oue.translate(input); + assertEquals("\4a", result, "Failed to unescape octal characters via the between method"); + } } diff --git a/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java b/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java index 12ade3f3..1a66bc19 100644 --- a/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java +++ b/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java @@ -30,6 +30,13 @@ import org.junit.jupiter.api.Test; */ class SinglePassTranslatorTest { + private static final class TestTranslator extends SinglePassTranslator { + @Override + void translateWhole(final CharSequence input, final Writer writer) { + // noop + } + } + private final SinglePassTranslator dummyTranslator = new SinglePassTranslator() { @Override @@ -66,11 +73,4 @@ class SinglePassTranslatorTest { void testTranslateThrowsIllegalArgumentExceptionWithNonAnonymousClass() { assertThrows(IllegalArgumentException.class, () -> new TestTranslator().translate("(,Fk", 647, null)); } - - private static final class TestTranslator extends SinglePassTranslator { - @Override - void translateWhole(final CharSequence input, final Writer writer) { - // noop - } - } } diff --git a/src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java b/src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java index f20d7106..2879f56c 100644 --- a/src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java +++ b/src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java @@ -34,6 +34,11 @@ class UnicodeUnescaperTest { assertThrows(IllegalArgumentException.class, () -> escaper.translate(input)); } + @Test + void testTooShort() { + assertThrows(IllegalArgumentException.class, () -> new UnicodeUnescaper().translate("\\u")); + } + // Requested in LANG-507 @Test void testUPlus() { @@ -49,9 +54,4 @@ class UnicodeUnescaperTest { final String result = escaper.translate(input); assertEquals("G", result, "Failed to unescape Unicode characters with many 'u' characters"); } - - @Test - void testTooShort() { - assertThrows(IllegalArgumentException.class, () -> new UnicodeUnescaper().translate("\\u")); - } }
