Sort members

Author: garydgregory

src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java

@@ -69,11 +69,6 @@
  */
 public class DaitchMokotoffSoundex implements StringEncoder {
 
-    /**
-     * The NUL character.
-     */
-    private static final char NUL = '\0';
-
     /**
      * Inner class representing a branch during DM Soundex encoding.
      */
@@ -205,6 +200,11 @@ public String toString() {
         }
     }
 
+    /**
+     * The NUL character.
+     */
+    private static final char NUL = '\0';
+
     private static final String COMMENT = "//";
 
     private static final String DOUBLE_QUOTE = "\"";

src/main/java/org/apache/commons/codec/language/bm/Rule.java

@@ -80,8 +80,6 @@
  */
 public class Rule {
 
-    private static final String PIPE = "|";
-
     /**
      * A phoneme.
      */
@@ -276,6 +274,8 @@ public interface RPattern {
         boolean isMatch(CharSequence input);
     }
 
+    private static final String PIPE = "|";
+
     /**
      * Always matches.
      */

src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java

@@ -235,18 +235,18 @@ void testMacHexFile(final HmacAlgorithms hmacAlgorithm, final byte[] standardRes
 
     @ParameterizedTest
     @MethodSource("data")
-    void testMacHexPath(final HmacAlgorithms hmacAlgorithm, final byte[] standardResultBytes, final String standardResultString)
+    void testMacHexInputStream(final HmacAlgorithms hmacAlgorithm, final byte[] standardResultBytes, final String standardResultString)
             throws IOException {
         assumeTrue(HmacUtils.isAvailable(hmacAlgorithm));
-        assertEquals(standardResultString, new HmacUtils(hmacAlgorithm, STANDARD_KEY_BYTES).hmacHex(TempFile));
+        assertEquals(standardResultString, new HmacUtils(hmacAlgorithm, STANDARD_KEY_BYTES).hmacHex(new ByteArrayInputStream(STANDARD_PHRASE_BYTES)));
     }
 
     @ParameterizedTest
     @MethodSource("data")
-    void testMacHexInputStream(final HmacAlgorithms hmacAlgorithm, final byte[] standardResultBytes, final String standardResultString)
+    void testMacHexPath(final HmacAlgorithms hmacAlgorithm, final byte[] standardResultBytes, final String standardResultString)
             throws IOException {
         assumeTrue(HmacUtils.isAvailable(hmacAlgorithm));
-        assertEquals(standardResultString, new HmacUtils(hmacAlgorithm, STANDARD_KEY_BYTES).hmacHex(new ByteArrayInputStream(STANDARD_PHRASE_BYTES)));
+        assertEquals(standardResultString, new HmacUtils(hmacAlgorithm, STANDARD_KEY_BYTES).hmacHex(TempFile));
     }
 
     @ParameterizedTest

src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java

@@ -35,6 +35,10 @@
  */
 class DaitchMokotoffSoundexTest extends AbstractStringEncoderTest<DaitchMokotoffSoundex> {
 
+    static IntStream getNonLetters() {
+        return IntStream.rangeClosed(Character.MIN_VALUE, Character.MAX_VALUE).filter(c -> !Character.isLetter(c));
+    }
+
     @Override
     protected DaitchMokotoffSoundex createStringEncoder() {
         return new DaitchMokotoffSoundex();
@@ -99,16 +103,6 @@ void testEncodeIgnoreHyphens() throws EncoderException {
                 "KINGSMI-TH", "KINGSMIT-H", "KINGSMITH-");
     }
 
-    @Test
-    void testEncodeIgnoreTrimmable() {
-        assertEquals("746536", encode(" \t\n\r Washington \t\n\r "));
-        assertEquals("746536", encode("Washington"));
-    }
-
-    static IntStream getNonLetters() {
-        return IntStream.rangeClosed(Character.MIN_VALUE, Character.MAX_VALUE).filter(c -> !Character.isLetter(c));
-    }
-
     @ParameterizedTest
     @MethodSource("getNonLetters")
     void testEncodeIgnoreNonLetters(final int nonLetterInt) throws EncoderException {
@@ -117,6 +111,12 @@ void testEncodeIgnoreNonLetters(final int nonLetterInt) throws EncoderException
                 "Washi" + nonLetterChar + "ngton");
     }
 
+    @Test
+    void testEncodeIgnoreTrimmable() {
+        assertEquals("746536", encode(" \t\n\r Washington \t\n\r "));
+        assertEquals("746536", encode("Washington"));
+    }
+
     /**
      * Examples from http://www.jewishgen.org/infofiles/soundex.html
      */

src/test/java/org/apache/commons/codec/language/bm/RuleTest.java

@@ -41,6 +41,15 @@ private Rule.Phoneme[][] makePhonemes() {
         return phonemes;
     }
 
+    @Test
+    void testParsePhonemeExprLang311() {
+        assertEquals(1, Rule.parsePhonemeExpr("()").size());
+        assertEquals(1, Rule.parsePhonemeExpr("(())").size());
+        assertEquals(2, Rule.parsePhonemeExpr("(()|)").size());
+        assertEquals(2, Rule.parsePhonemeExpr("(|())").size());
+        assertEquals(3, Rule.parsePhonemeExpr("(|()|)").size());
+    }
+
     @Test
     void testPhonemeComparedToLaterIsNegative() {
         for (final Rule.Phoneme[] phs : makePhonemes()) {
@@ -63,15 +72,6 @@ void testPhonemeComparedToSelfIsZero() {
         }
     }
 
-    @Test
-    void testParsePhonemeExprLang311() {
-        assertEquals(1, Rule.parsePhonemeExpr("()").size());
-        assertEquals(1, Rule.parsePhonemeExpr("(())").size());
-        assertEquals(2, Rule.parsePhonemeExpr("(()|)").size());
-        assertEquals(2, Rule.parsePhonemeExpr("(|())").size());
-        assertEquals(3, Rule.parsePhonemeExpr("(|()|)").size());
-    }
-
     @Test
     void testSubSequenceWorks() {
         // AppendableCharSequence is private to Rule. We can only make it through a Phoneme.