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-codec.git
commit ed43d2a48cd741f62b849ae19b7a9e64d7f73f33
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Jul 18 21:35:58 2025 -0400
Sort members
---
.../codec/language/DaitchMokotoffSoundex.java | 10 +++++-----
.../org/apache/commons/codec/language/bm/Rule.java | 4 ++--
.../commons/codec/digest/HmacAlgorithmsTest.java | 8 ++++----
.../codec/language/DaitchMokotoffSoundexTest.java | 20 ++++++++++----------
.../apache/commons/codec/language/bm/RuleTest.java | 18 +++++++++---------
5 files changed, 30 insertions(+), 30 deletions(-)
diff --git
a/src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java
b/src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java
index 546a77b2..c5fc9652 100644
--- a/src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java
+++ b/src/main/java/org/apache/commons/codec/language/DaitchMokotoffSoundex.java
@@ -69,11 +69,6 @@ import org.apache.commons.codec.StringEncoder;
*/
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 class DaitchMokotoffSoundex implements
StringEncoder {
}
}
+ /**
+ * The NUL character.
+ */
+ private static final char NUL = '\0';
+
private static final String COMMENT = "//";
private static final String DOUBLE_QUOTE = "\"";
diff --git a/src/main/java/org/apache/commons/codec/language/bm/Rule.java
b/src/main/java/org/apache/commons/codec/language/bm/Rule.java
index 42ad9c9d..e0bb0b5c 100644
--- a/src/main/java/org/apache/commons/codec/language/bm/Rule.java
+++ b/src/main/java/org/apache/commons/codec/language/bm/Rule.java
@@ -80,8 +80,6 @@ import
org.apache.commons.codec.language.bm.Languages.LanguageSet;
*/
public class Rule {
- private static final String PIPE = "|";
-
/**
* A phoneme.
*/
@@ -276,6 +274,8 @@ public class Rule {
boolean isMatch(CharSequence input);
}
+ private static final String PIPE = "|";
+
/**
* Always matches.
*/
diff --git
a/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
b/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
index 686f007e..c51005be 100644
--- a/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
@@ -235,18 +235,18 @@ class HmacAlgorithmsTest {
@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
diff --git
a/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java
b/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java
index 3ea2805c..877147d9 100644
---
a/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java
+++
b/src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java
@@ -35,6 +35,10 @@ import org.junit.jupiter.params.provider.MethodSource;
*/
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 @@ class DaitchMokotoffSoundexTest extends
AbstractStringEncoderTest<DaitchMokotoff
"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 @@ class DaitchMokotoffSoundexTest extends
AbstractStringEncoderTest<DaitchMokotoff
"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
*/
diff --git a/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
b/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
index 71734cb4..89ab90fa 100644
--- a/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
+++ b/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
@@ -41,6 +41,15 @@ class RuleTest {
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 @@ class RuleTest {
}
}
- @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.
