Sort members

Author: garydgregory

src/test/java/org/apache/commons/text/lookup/StringLookupFactoryTest.java

@@ -103,6 +103,12 @@ void testAddDefaultStringLookupsNull() {
         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 @@ void testDefaultStringLookupsHolder_multipleLookups() {
         // @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 @@ void testSingletons() {
         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 @@ void testXmlStringLookupExternalEntityOn() {
         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();
-    }
 }

src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java

@@ -32,20 +32,20 @@ void testEqualsDifferenceInSubstitutionCount() {
     }
 
     @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 @@ void testEqualsSameObject() {
         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 @@ void testEqualsWithNull() {
         assertFalse(levenshteinResults.equals(null));
     }
 
-    @Test
-    void testEqualsWithDifferentObject() {
-        final Integer integer = -647;
-        final LevenshteinResults levenshteinResults = new LevenshteinResults(integer, null, null, integer);
-        assertFalse(levenshteinResults.equals("Test"));
-    }
-
 }

src/test/java/org/apache/commons/text/translate/CharSequenceTranslatorTest.java

@@ -41,17 +41,6 @@ public int translate(final CharSequence input, final int index, final Writer wri
     //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 @@ public int translate(CharSequence input, int index, Writer writer) throws IOExce
         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);
+    }
 }

src/test/java/org/apache/commons/text/translate/OctalUnescaperTest.java

@@ -83,14 +83,6 @@ void testBetween() {
         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 @@ void testHighLowSurrogate() {
         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");
+    }
 }

src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java

@@ -30,6 +30,13 @@
  */
 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 @@ void testTranslateThrowsIllegalArgumentException() {
     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
-        }
-    }
 }

src/test/java/org/apache/commons/text/translate/UnicodeUnescaperTest.java

@@ -34,6 +34,11 @@ void testLessThanFour() {
         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 @@ void testUuuuu() {
         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"));
-    }
 }