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
The following commit(s) were added to refs/heads/master by this push:
new 464a5da8 Use Checkstyle ParenPad
464a5da8 is described below
commit 464a5da82e43651bf4d359073f6064f965a01557
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Nov 26 15:15:00 2023 -0500
Use Checkstyle ParenPad
---
src/conf/checkstyle.xml | 3 +-
.../org/apache/commons/codec/digest/HmacUtils.java | 2 +-
.../apache/commons/codec/digest/PureJavaCrc32.java | 2 +-
.../apache/commons/codec/language/Metaphone.java | 6 +-
.../commons/codec/StringEncoderComparatorTest.java | 16 +-
.../apache/commons/codec/binary/Base64Test.java | 33 +--
.../commons/codec/digest/HmacAlgorithmsTest.java | 48 ++--
.../apache/commons/codec/digest/XXHash32Test.java | 23 +-
.../codec/language/DoubleMetaphoneTest.java | 4 +-
.../commons/codec/language/MetaphoneTest.java | 267 ++++-----------------
10 files changed, 111 insertions(+), 293 deletions(-)
diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml
index 5e01baea..5d67b2cc 100644
--- a/src/conf/checkstyle.xml
+++ b/src/conf/checkstyle.xml
@@ -71,13 +71,12 @@ limitations under the License.
<property name="ordered" value="true"/>
<property name="separated" value="true"/>
</module>
+ <module name="ParenPad" />
</module>
-
<module name="LineLength">
<!-- Ignore lines that begin with " * ", such as within a Javadoc
comment. -->
<property name="ignorePattern" value="^ *\* *[^ ]"/>
<property name="max" value="160"/>
</module>
-
</module>
diff --git a/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
b/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
index 61481c16..5460098d 100644
--- a/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
+++ b/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
@@ -995,7 +995,7 @@ public final class HmacUtils {
final byte[] buffer = new byte[STREAM_BUFFER_LENGTH];
int read;
- while ((read = valueToDigest.read(buffer, 0, STREAM_BUFFER_LENGTH) ) >
-1) {
+ while ((read = valueToDigest.read(buffer, 0, STREAM_BUFFER_LENGTH)) >
-1) {
mac.update(buffer, 0, read);
}
return mac.doFinal();
diff --git a/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32.java
b/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32.java
index 3594bea7..bed1257e 100644
--- a/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32.java
+++ b/src/main/java/org/apache/commons/codec/digest/PureJavaCrc32.java
@@ -604,7 +604,7 @@ public class PureJavaCrc32 implements Checksum {
for (final int end = offset + len - remainder; i < end; i += 8) {
final int x = localCrc ^
(b[i] << 24 >>> 24) + (b[i + 1] << 24 >>> 16) +
- (b[i + 2] << 24 >>> 8 ) + (b[i + 3] << 24);
+ (b[i + 2] << 24 >>> 8) + (b[i + 3] << 24);
localCrc = T[(x << 24 >>> 24) + 0x700] ^ T[(x << 16 >>> 24) + 0x600] ^
T[(x << 8 >>> 24) + 0x500] ^ T[ (x >>> 24) + 0x400] ^
diff --git a/src/main/java/org/apache/commons/codec/language/Metaphone.java
b/src/main/java/org/apache/commons/codec/language/Metaphone.java
index bf055587..ee820a98 100644
--- a/src/main/java/org/apache/commons/codec/language/Metaphone.java
+++ b/src/main/java/org/apache/commons/codec/language/Metaphone.java
@@ -129,8 +129,7 @@ public class Metaphone implements StringEncoder {
private boolean isNextChar(final StringBuilder string, final int index,
final char c) {
boolean matches = false;
- if (index >= 0 &&
- index < string.length() - 1 ) {
+ if (index >= 0 && index < string.length() - 1) {
matches = string.charAt(index + 1) == c;
}
return matches;
@@ -138,8 +137,7 @@ public class Metaphone implements StringEncoder {
private boolean isPreviousChar(final StringBuilder string, final int
index, final char c) {
boolean matches = false;
- if (index > 0 &&
- index < string.length() ) {
+ if (index > 0 && index < string.length()) {
matches = string.charAt(index - 1) == c;
}
return matches;
diff --git
a/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java
b/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java
index 930aeb94..d0cc36fc 100644
--- a/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java
+++ b/src/test/java/org/apache/commons/codec/StringEncoderComparatorTest.java
@@ -47,28 +47,22 @@ public class StringEncoderComparatorTest {
final String[] resultArray =
testList.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
for (int i = 0; i < resultArray.length; i++) {
- assertEquals(controlArray[i], resultArray[i],
- "Result Array not Equal to Control Array at index: " + i);
+ assertEquals(controlArray[i], resultArray[i], "Result Array not
Equal to Control Array at index: " + i);
}
}
@Test
public void testComparatorWithDoubleMetaphoneAndInvalidInput() throws
Exception {
- final StringEncoderComparator sCompare =
- new StringEncoderComparator( new DoubleMetaphone() );
+ final StringEncoderComparator sCompare = new
StringEncoderComparator(new DoubleMetaphone());
final int compare = sCompare.compare(Double.valueOf(3.0d),
Long.valueOf(3));
- assertEquals(0, compare,
- "Trying to compare objects that make no sense to the
underlying encoder" +
- " should return a zero compare code");
+ assertEquals(0, compare, "Trying to compare objects that make no sense
to the underlying encoder" + " should return a zero compare code");
}
@Test
public void testComparatorWithSoundex() throws Exception {
- final StringEncoderComparator sCompare =
- new StringEncoderComparator( new Soundex() );
+ final StringEncoderComparator sCompare = new
StringEncoderComparator(new Soundex());
- assertEquals(0, sCompare.compare("O'Brien", "O'Brian"),
- "O'Brien and O'Brian didn't come out with the same Soundex,
something must be wrong here");
+ assertEquals(0, sCompare.compare("O'Brien", "O'Brian"), "O'Brien and
O'Brian didn't come out with the same Soundex, something must be wrong here");
}
}
diff --git a/src/test/java/org/apache/commons/codec/binary/Base64Test.java
b/src/test/java/org/apache/commons/codec/binary/Base64Test.java
index 5855911f..a6525d5a 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64Test.java
@@ -222,28 +222,17 @@ public class Base64Test {
final byte[] b1 = StringUtils.getBytesUtf8("Hello World");
final byte[] b2 = {};
final byte[] b3 = null;
- final byte[] b4 = Hex.decodeHex("2bf7cc2701fe4397b49ebeed5acc7090");
// for
-
// url-safe
-
// tests
-
- assertEquals("SGVsbG8gV29ybGQ=", base64.encodeToString(b1),
- "byteToString Hello World");
- assertEquals( "SGVsbG8gV29ybGQ=", Base64.encodeBase64String(b1),
- "byteToString static Hello World");
- assertEquals("", base64.encodeToString(b2),
- "byteToString \"\"");
- assertEquals("", Base64.encodeBase64String(b2),
- "byteToString static \"\"");
- assertNull(base64.encodeToString(b3),
- "byteToString null");
- assertNull(Base64.encodeBase64String(b3),
- "byteToString static null");
- assertEquals("K/fMJwH+Q5e0nr7tWsxwkA==", base64.encodeToString(b4),
- "byteToString UUID");
- assertEquals("K/fMJwH+Q5e0nr7tWsxwkA==", Base64.encodeBase64String(b4),
- "byteToString static UUID");
- assertEquals("K_fMJwH-Q5e0nr7tWsxwkA",
Base64.encodeBase64URLSafeString(b4),
- "byteToString static-url-safe UUID");
+ final byte[] b4 = Hex.decodeHex("2bf7cc2701fe4397b49ebeed5acc7090");
// for url-safe tests
+
+ assertEquals("SGVsbG8gV29ybGQ=", base64.encodeToString(b1),
"byteToString Hello World");
+ assertEquals("SGVsbG8gV29ybGQ=", Base64.encodeBase64String(b1),
"byteToString static Hello World");
+ assertEquals("", base64.encodeToString(b2), "byteToString \"\"");
+ assertEquals("", Base64.encodeBase64String(b2), "byteToString static
\"\"");
+ assertNull(base64.encodeToString(b3), "byteToString null");
+ assertNull(Base64.encodeBase64String(b3), "byteToString static null");
+ assertEquals("K/fMJwH+Q5e0nr7tWsxwkA==", base64.encodeToString(b4),
"byteToString UUID");
+ assertEquals("K/fMJwH+Q5e0nr7tWsxwkA==",
Base64.encodeBase64String(b4), "byteToString static UUID");
+ assertEquals("K_fMJwH-Q5e0nr7tWsxwkA",
Base64.encodeBase64URLSafeString(b4), "byteToString static-url-safe UUID");
}
/**
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 71491ab8..65b8d4eb 100644
--- a/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
+++ b/src/test/java/org/apache/commons/codec/digest/HmacAlgorithmsTest.java
@@ -52,8 +52,7 @@ public class HmacAlgorithmsTest {
static final byte[] STANDARD_KEY_BYTES = STANDARD_KEY_STRING.getBytes();
- static final byte[] STANDARD_MD5_RESULT_BYTES = { -128, 7, 7, 19, 70, 62,
119, 73, -71, 12, 45, -62, 73,
- 17, -30, 117 };
+ static final byte[] STANDARD_MD5_RESULT_BYTES = { -128, 7, 7, 19, 70, 62,
119, 73, -71, 12, 45, -62, 73, 17, -30, 117 };
static final String STANDARD_MD5_RESULT_STRING =
"80070713463e7749b90c2dc24911e275";
@@ -61,32 +60,29 @@ public class HmacAlgorithmsTest {
static final byte[] STANDARD_PHRASE_BYTES =
STANDARD_PHRASE_STRING.getBytes();
- static final byte[] STANDARD_SHA1_RESULT_BYTES = { -34, 124, -101, -123,
-72, -73, -118, -90, -68, -118,
- 122, 54, -9, 10, -112, 112, 28, -99, -76, -39 };
+ static final byte[] STANDARD_SHA1_RESULT_BYTES = { -34, 124, -101, -123,
-72, -73, -118, -90, -68, -118, 122, 54, -9, 10, -112, 112, 28, -99, -76, -39 };
static final String STANDARD_SHA1_RESULT_STRING =
"de7c9b85b8b78aa6bc8a7a36f70a90701c9db4d9";
- static final byte[] STANDARD_SHA224_RESULT_BYTES = { -120, -1, -117, 84,
103, 93, 57, -72, -9, 35, 34,
- -26, 95, -7, 69, -59, 45, -106, 55, -103, -120, -83, -94, 86, 57,
116, 126, 105 };
+ static final byte[] STANDARD_SHA224_RESULT_BYTES = { -120, -1, -117, 84,
103, 93, 57, -72, -9, 35, 34, -26, 95, -7, 69, -59, 45, -106, 55, -103, -120,
-83,
+ -94, 86, 57, 116, 126, 105 };
static final String STANDARD_SHA224_RESULT_STRING =
"88ff8b54675d39b8f72322e65ff945c52d96379988ada25639747e69";
- static final byte[] STANDARD_SHA256_RESULT_BYTES = { -9, -68, -125, -12,
48, 83, -124, 36, -79, 50, -104,
- -26, -86, 111, -79, 67, -17, 77, 89, -95, 73, 70, 23, 89, -105,
71, -99, -68, 45, 26, 60, -40 };
+ static final byte[] STANDARD_SHA256_RESULT_BYTES = { -9, -68, -125, -12,
48, 83, -124, 36, -79, 50, -104, -26, -86, 111, -79, 67, -17, 77, 89, -95, 73,
70,
+ 23, 89, -105, 71, -99, -68, 45, 26, 60, -40 };
static final String STANDARD_SHA256_RESULT_STRING =
"f7bc83f430538424b13298e6aa6fb143ef4d59a14946175997479dbc2d1a3cd8";
- static final byte[] STANDARD_SHA384_RESULT_BYTES = { -41, -12, 114, 126,
44, 11, 57, -82, 15, 30, 64,
- -52, -106, -10, 2, 66, -43, -73, -128, 24, 65, -50, -90, -4, 89,
44, 93, 62, 26, -27, 7, 0, 88, 42, -106,
- -49, 53, -31, -27, 84, -103, 95, -28, -32, 51, -127, -62, 55 };
+ static final byte[] STANDARD_SHA384_RESULT_BYTES = { -41, -12, 114, 126,
44, 11, 57, -82, 15, 30, 64, -52, -106, -10, 2, 66, -43, -73, -128, 24, 65, -50,
+ -90, -4, 89, 44, 93, 62, 26, -27, 7, 0, 88, 42, -106, -49, 53,
-31, -27, 84, -103, 95, -28, -32, 51, -127, -62, 55 };
static final String STANDARD_SHA384_RESULT_STRING =
"D7F4727E2C0B39AE0F1E40CC96F60242D5B7801841CEA6FC592C5D3E1AE50700582A96CF35E1E554995FE4E03381C237"
.toLowerCase();
- static final byte[] STANDARD_SHA512_RESULT_BYTES = { -76, 42, -16, -112,
87, -70, -63, -30, -44, 23, 8,
- -28, -118, -112, 46, 9, -75, -1, 127, 18, -85, 66, -118, 79, -24,
102, 83, -57, 61, -46, 72, -5, -126, -7,
- 72, -91, 73, -9, -73, -111, -91, -76, 25, 21, -18, 77, 30, -61,
-109, 83, 87, -28, -30, 49, 114, 80, -48,
- 55, 42, -6, 46, -66, -21, 58 };
+ static final byte[] STANDARD_SHA512_RESULT_BYTES = { -76, 42, -16, -112,
87, -70, -63, -30, -44, 23, 8, -28, -118, -112, 46, 9, -75, -1, 127, 18, -85,
66,
+ -118, 79, -24, 102, 83, -57, 61, -46, 72, -5, -126, -7, 72, -91,
73, -9, -73, -111, -91, -76, 25, 21, -18, 77, 30, -61, -109, 83, 87, -28, -30,
49,
+ 114, 80, -48, 55, 42, -6, 46, -66, -21, 58 };
static final String STANDARD_SHA512_RESULT_STRING =
"B42AF09057BAC1E2D41708E48A902E09B5FF7F12AB428A4FE86653C73DD248FB82F948A549F7B791A5B41915EE4D1EC3935357E4E2317250D0372AFA2EBEEB3A"
.toLowerCase();
@@ -97,11 +93,11 @@ public class HmacAlgorithmsTest {
public static Stream<Arguments> data() {
List<Arguments> list = Arrays.asList(
// @formatter:off
- Arguments.of( HmacAlgorithms.HMAC_MD5,
STANDARD_MD5_RESULT_BYTES, STANDARD_MD5_RESULT_STRING ),
- Arguments.of( HmacAlgorithms.HMAC_SHA_1,
STANDARD_SHA1_RESULT_BYTES, STANDARD_SHA1_RESULT_STRING ),
- Arguments.of( HmacAlgorithms.HMAC_SHA_256,
STANDARD_SHA256_RESULT_BYTES, STANDARD_SHA256_RESULT_STRING ),
- Arguments.of( HmacAlgorithms.HMAC_SHA_384,
STANDARD_SHA384_RESULT_BYTES, STANDARD_SHA384_RESULT_STRING ),
- Arguments.of( HmacAlgorithms.HMAC_SHA_512,
STANDARD_SHA512_RESULT_BYTES, STANDARD_SHA512_RESULT_STRING ));
+ Arguments.of(HmacAlgorithms.HMAC_MD5,
STANDARD_MD5_RESULT_BYTES, STANDARD_MD5_RESULT_STRING),
+ Arguments.of(HmacAlgorithms.HMAC_SHA_1,
STANDARD_SHA1_RESULT_BYTES, STANDARD_SHA1_RESULT_STRING),
+ Arguments.of(HmacAlgorithms.HMAC_SHA_256,
STANDARD_SHA256_RESULT_BYTES, STANDARD_SHA256_RESULT_STRING),
+ Arguments.of(HmacAlgorithms.HMAC_SHA_384,
STANDARD_SHA384_RESULT_BYTES, STANDARD_SHA384_RESULT_STRING),
+ Arguments.of(HmacAlgorithms.HMAC_SHA_512,
STANDARD_SHA512_RESULT_BYTES, STANDARD_SHA512_RESULT_STRING));
// @formatter:on
if (SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8)) {
list = new ArrayList<>(list);
@@ -126,7 +122,8 @@ public class HmacAlgorithmsTest {
@ParameterizedTest
@MethodSource("data")
- public void testAlgorithm(final HmacAlgorithms hmacAlgorithm, final byte[]
standardResultBytes, final String standardResultString) throws
NoSuchAlgorithmException {
+ public void testAlgorithm(final HmacAlgorithms hmacAlgorithm, final byte[]
standardResultBytes, final String standardResultString)
+ throws NoSuchAlgorithmException {
assumeTrue(HmacUtils.isAvailable(hmacAlgorithm));
final String algorithm = hmacAlgorithm.getName();
assertNotNull(algorithm);
@@ -217,10 +214,10 @@ public class HmacAlgorithmsTest {
@ParameterizedTest
@MethodSource("data")
- public void testMacHexInputStream(final HmacAlgorithms hmacAlgorithm,
final byte[] standardResultBytes, final String standardResultString) throws
IOException {
+ public 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(new
ByteArrayInputStream(STANDARD_PHRASE_BYTES)));
+ assertEquals(standardResultString, new HmacUtils(hmacAlgorithm,
STANDARD_KEY_BYTES).hmacHex(new ByteArrayInputStream(STANDARD_PHRASE_BYTES)));
}
@ParameterizedTest
@@ -234,8 +231,7 @@ public class HmacAlgorithmsTest {
@MethodSource("data")
public void testMacInputStream(final HmacAlgorithms hmacAlgorithm, final
byte[] standardResultBytes, final String standardResultString) throws
IOException {
assumeTrue(HmacUtils.isAvailable(hmacAlgorithm));
- assertArrayEquals(standardResultBytes,
- new HmacUtils(hmacAlgorithm, STANDARD_KEY_BYTES).hmac(new
ByteArrayInputStream(STANDARD_PHRASE_BYTES)));
+ assertArrayEquals(standardResultBytes, new HmacUtils(hmacAlgorithm,
STANDARD_KEY_BYTES).hmac(new ByteArrayInputStream(STANDARD_PHRASE_BYTES)));
}
@ParameterizedTest
diff --git a/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
b/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
index 70549ded..ac4faa85 100644
--- a/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/XXHash32Test.java
@@ -38,22 +38,25 @@ public class XXHash32Test {
private static long copy(final InputStream input, final OutputStream
output, final int bufferSize) throws IOException {
final byte[] buffer = new byte[bufferSize];
int n = 0;
- long count=0;
+ long count = 0;
while (-1 != (n = input.read(buffer))) {
output.write(buffer, 0, n);
count += n;
}
return count;
}
+
public static Stream<Arguments> data() {
- return Stream.of(
- // reference checksums created with xxh32sum
- // http://cyan4973.github.io/xxHash/
- Arguments.of( "org/apache/commons/codec/bla.tar", "fbb5c8d1" ),
- Arguments.of( "org/apache/commons/codec/bla.tar.xz",
"4106a208" ),
- Arguments.of( "org/apache/commons/codec/small.bin", "f66c26f8"
)
- );
- }
+ // @formatter:off
+ return Stream.of(
+ // reference checksums created with xxh32sum
+ // http://cyan4973.github.io/xxHash/
+ Arguments.of("org/apache/commons/codec/bla.tar", "fbb5c8d1"),
+ Arguments.of("org/apache/commons/codec/bla.tar.xz", "4106a208"),
+ Arguments.of("org/apache/commons/codec/small.bin", "f66c26f8")
+ );
+ // @formatter:on
+ }
private static byte[] toByteArray(final InputStream input) throws
IOException {
final ByteArrayOutputStream output = new ByteArrayOutputStream();
@@ -61,7 +64,7 @@ public class XXHash32Test {
return output.toByteArray();
}
- private File file;
+ private File file;
private String expectedChecksum;
diff --git
a/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
b/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
index 6aafad6d..9600efa9 100644
--- a/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
+++ b/src/test/java/org/apache/commons/codec/language/DoubleMetaphoneTest.java
@@ -1228,13 +1228,13 @@ public class DoubleMetaphoneTest extends
AbstractStringEncoderTest<DoubleMetapho
// Sanity check of default settings
assertEquals(4, doubleMetaphone.getMaxCodeLen(), "Default Max Code
Length");
- assertEquals( "JMPT", doubleMetaphone.doubleMetaphone(value, false),
"Default Primary");
+ assertEquals("JMPT", doubleMetaphone.doubleMetaphone(value, false),
"Default Primary");
assertEquals("AMPT", doubleMetaphone.doubleMetaphone(value, true),
"Default Alternate");
// Check setting Max Code Length
doubleMetaphone.setMaxCodeLen(3);
assertEquals(3, doubleMetaphone.getMaxCodeLen(), "Set Max Code
Length");
- assertEquals( "JMP", doubleMetaphone.doubleMetaphone(value, false),
"Max=3 Primary");
+ assertEquals("JMP", doubleMetaphone.doubleMetaphone(value, false),
"Max=3 Primary");
assertEquals("AMP", doubleMetaphone.doubleMetaphone(value, true),
"Max=3 Alternate");
}
diff --git a/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java
b/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java
index 6f840a7e..0bc3e68a 100644
--- a/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java
+++ b/src/test/java/org/apache/commons/codec/language/MetaphoneTest.java
@@ -31,8 +31,7 @@ public class MetaphoneTest extends
AbstractStringEncoderTest<Metaphone> {
public void assertIsMetaphoneEqual(final String source, final String[]
matches) {
// match source to all matches
for (final String matche : matches) {
- assertTrue(this.getStringEncoder().isMetaphoneEqual(source,
matche),
- "Source: " + source + ", should have same Metaphone as: "
+ matche);
+ assertTrue(this.getStringEncoder().isMetaphoneEqual(source,
matche), "Source: " + source + ", should have same Metaphone as: " + matche);
}
// match to each other
for (final String matche : matches) {
@@ -60,39 +59,35 @@ public class MetaphoneTest extends
AbstractStringEncoderTest<Metaphone> {
@Test
public void testDiscardOfSCEOrSCIOrSCY() {
- assertEquals( "SNS", this.getStringEncoder().metaphone("SCIENCE") );
- assertEquals( "SN", this.getStringEncoder().metaphone("SCENE") );
- assertEquals( "S", this.getStringEncoder().metaphone("SCY") );
+ assertEquals("SNS", this.getStringEncoder().metaphone("SCIENCE"));
+ assertEquals("SN", this.getStringEncoder().metaphone("SCENE"));
+ assertEquals("S", this.getStringEncoder().metaphone("SCY"));
}
@Test
public void testDiscardOfSilentGN() {
// NOTE: This does not test for silent GN, but for starting with GN
- assertEquals( "N", this.getStringEncoder().metaphone("GNU") );
+ assertEquals("N", this.getStringEncoder().metaphone("GNU"));
// NOTE: Trying to test for GNED, but expected code does not appear to
execute
- assertEquals( "SNT", this.getStringEncoder().metaphone("SIGNED") );
+ assertEquals("SNT", this.getStringEncoder().metaphone("SIGNED"));
}
@Test
public void testDiscardOfSilentHAfterG() {
- assertEquals( "KNT", this.getStringEncoder().metaphone("GHENT") );
- assertEquals( "B", this.getStringEncoder().metaphone("BAUGH") );
+ assertEquals("KNT", this.getStringEncoder().metaphone("GHENT"));
+ assertEquals("B", this.getStringEncoder().metaphone("BAUGH"));
}
@Test
public void testExceedLength() {
// should be AKSKS, but is truncated by Max Code Length
- assertEquals( "AKSK", this.getStringEncoder().metaphone("AXEAXE") );
+ assertEquals("AKSK", this.getStringEncoder().metaphone("AXEAXE"));
}
@Test
public void testIsMetaphoneEqual1() {
- this.assertMetaphoneEqual(new String[][] { { "Case", "case" }, {
- "CASE", "Case" }, {
- "caSe", "cAsE" }, {
- "quick", "cookie" }
- });
+ this.assertMetaphoneEqual(new String[][] { { "Case", "case" }, {
"CASE", "Case" }, { "caSe", "cAsE" }, { "quick", "cookie" } });
}
/**
@@ -100,8 +95,7 @@ public class MetaphoneTest extends
AbstractStringEncoderTest<Metaphone> {
*/
@Test
public void testIsMetaphoneEqual2() {
- this.assertMetaphoneEqual(new String[][] { { "Lawrence", "Lorenza" }, {
- "Gary", "Cahra" }, });
+ this.assertMetaphoneEqual(new String[][] { { "Lawrence", "Lorenza" },
{ "Gary", "Cahra" }, });
}
/**
@@ -123,58 +117,16 @@ public class MetaphoneTest extends
AbstractStringEncoderTest<Metaphone> {
public void testIsMetaphoneEqualAlbert() {
this.assertIsMetaphoneEqual("Albert", new String[] { "Ailbert",
"Alberik", "Albert", "Alberto", "Albrecht" });
}
+
/**
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
*/
@Test
public void testIsMetaphoneEqualGary() {
- this.assertIsMetaphoneEqual(
- "Gary",
- new String[] {
- "Cahra",
- "Cara",
- "Carey",
- "Cari",
- "Caria",
- "Carie",
- "Caro",
- "Carree",
- "Carri",
- "Carrie",
- "Carry",
- "Cary",
- "Cora",
- "Corey",
- "Cori",
- "Corie",
- "Correy",
- "Corri",
- "Corrie",
- "Corry",
- "Cory",
- "Gray",
- "Kara",
- "Kare",
- "Karee",
- "Kari",
- "Karia",
- "Karie",
- "Karrah",
- "Karrie",
- "Karry",
- "Kary",
- "Keri",
- "Kerri",
- "Kerrie",
- "Kerry",
- "Kira",
- "Kiri",
- "Kora",
- "Kore",
- "Kori",
- "Korie",
- "Korrie",
- "Korry" });
+ this.assertIsMetaphoneEqual("Gary",
+ new String[] { "Cahra", "Cara", "Carey", "Cari", "Caria",
"Carie", "Caro", "Carree", "Carri", "Carrie", "Carry", "Cary", "Cora", "Corey",
+ "Cori", "Corie", "Correy", "Corri", "Corrie", "Corry",
"Cory", "Gray", "Kara", "Kare", "Karee", "Kari", "Karia", "Karie", "Karrah",
+ "Karrie", "Karry", "Kary", "Keri", "Kerri", "Kerrie",
"Kerry", "Kira", "Kiri", "Kora", "Kore", "Kori", "Korie", "Korrie", "Korry" });
}
/**
@@ -182,68 +134,12 @@ public class MetaphoneTest extends
AbstractStringEncoderTest<Metaphone> {
*/
@Test
public void testIsMetaphoneEqualJohn() {
- this.assertIsMetaphoneEqual(
- "John",
- new String[] {
- "Gena",
- "Gene",
- "Genia",
- "Genna",
- "Genni",
- "Gennie",
- "Genny",
- "Giana",
- "Gianna",
- "Gina",
- "Ginni",
- "Ginnie",
- "Ginny",
- "Jaine",
- "Jan",
- "Jana",
- "Jane",
- "Janey",
- "Jania",
- "Janie",
- "Janna",
- "Jany",
- "Jayne",
- "Jean",
- "Jeana",
- "Jeane",
- "Jeanie",
- "Jeanna",
- "Jeanne",
- "Jeannie",
- "Jen",
- "Jena",
- "Jeni",
- "Jenn",
- "Jenna",
- "Jennee",
- "Jenni",
- "Jennie",
- "Jenny",
- "Jinny",
- "Jo Ann",
- "Jo-Ann",
- "Jo-Anne",
- "Joan",
- "Joana",
- "Joane",
- "Joanie",
- "Joann",
- "Joanna",
- "Joanne",
- "Joeann",
- "Johna",
- "Johnna",
- "Joni",
- "Jonie",
- "Juana",
- "June",
- "Junia",
- "Junie" });
+ this.assertIsMetaphoneEqual("John",
+ new String[] { "Gena", "Gene", "Genia", "Genna", "Genni",
"Gennie", "Genny", "Giana", "Gianna", "Gina", "Ginni", "Ginnie", "Ginny",
"Jaine",
+ "Jan", "Jana", "Jane", "Janey", "Jania", "Janie",
"Janna", "Jany", "Jayne", "Jean", "Jeana", "Jeane", "Jeanie", "Jeanna",
"Jeanne",
+ "Jeannie", "Jen", "Jena", "Jeni", "Jenn", "Jenna",
"Jennee", "Jenni", "Jennie", "Jenny", "Jinny", "Jo Ann", "Jo-Ann", "Jo-Anne",
"Joan",
+ "Joana", "Joane", "Joanie", "Joann", "Joanna",
"Joanne", "Joeann", "Johna", "Johnna", "Joni", "Jonie", "Juana", "June",
"Junia",
+ "Junie" });
}
/**
@@ -253,25 +149,8 @@ public class MetaphoneTest extends
AbstractStringEncoderTest<Metaphone> {
*/
@Test
public void testIsMetaphoneEqualKnight() {
- this.assertIsMetaphoneEqual(
- "Knight",
- new String[] {
- "Hynda",
- "Nada",
- "Nadia",
- "Nady",
- "Nat",
- "Nata",
- "Natty",
- "Neda",
- "Nedda",
- "Nedi",
- "Netta",
- "Netti",
- "Nettie",
- "Netty",
- "Nita",
- "Nydia" });
+ this.assertIsMetaphoneEqual("Knight", new String[] { "Hynda", "Nada",
"Nadia", "Nady", "Nat", "Nata", "Natty", "Neda", "Nedda", "Nedi", "Netta",
+ "Netti", "Nettie", "Netty", "Nita", "Nydia" });
}
/**
@@ -279,30 +158,8 @@ public class MetaphoneTest extends
AbstractStringEncoderTest<Metaphone> {
*/
@Test
public void testIsMetaphoneEqualMary() {
- this.assertIsMetaphoneEqual(
- "Mary",
- new String[] {
- "Mair",
- "Maire",
- "Mara",
- "Mareah",
- "Mari",
- "Maria",
- "Marie",
- "Mary",
- "Maura",
- "Maure",
- "Meara",
- "Merrie",
- "Merry",
- "Mira",
- "Moira",
- "Mora",
- "Moria",
- "Moyra",
- "Muire",
- "Myra",
- "Myrah" });
+ this.assertIsMetaphoneEqual("Mary", new String[] { "Mair", "Maire",
"Mara", "Mareah", "Mari", "Maria", "Marie", "Mary", "Maura", "Maure", "Meara",
+ "Merrie", "Merry", "Mira", "Moira", "Mora", "Moria", "Moyra",
"Muire", "Myra", "Myrah" });
}
/**
@@ -318,9 +175,7 @@ public class MetaphoneTest extends
AbstractStringEncoderTest<Metaphone> {
*/
@Test
public void testIsMetaphoneEqualPeter() {
- this.assertIsMetaphoneEqual(
- "Peter",
- new String[] { "Peadar", "Peder", "Pedro", "Peter", "Petr",
"Peyter", "Pieter", "Pietro", "Piotr" });
+ this.assertIsMetaphoneEqual("Peter", new String[] { "Peadar", "Peder",
"Pedro", "Peter", "Petr", "Peyter", "Pieter", "Pietro", "Piotr" });
}
/**
@@ -336,21 +191,8 @@ public class MetaphoneTest extends
AbstractStringEncoderTest<Metaphone> {
*/
@Test
public void testIsMetaphoneEqualSusan() {
- this.assertIsMetaphoneEqual(
- "Susan",
- new String[] {
- "Siusan",
- "Sosanna",
- "Susan",
- "Susana",
- "Susann",
- "Susanna",
- "Susannah",
- "Susanne",
- "Suzann",
- "Suzanna",
- "Suzanne",
- "Zuzana" });
+ this.assertIsMetaphoneEqual("Susan",
+ new String[] { "Siusan", "Sosanna", "Susan", "Susana",
"Susann", "Susanna", "Susannah", "Susanne", "Suzann", "Suzanna", "Suzanne",
"Zuzana" });
}
/**
@@ -360,9 +202,8 @@ public class MetaphoneTest extends
AbstractStringEncoderTest<Metaphone> {
*/
@Test
public void testIsMetaphoneEqualWhite() {
- this.assertIsMetaphoneEqual(
- "White",
- new String[] { "Wade", "Wait", "Waite", "Wat", "Whit", "Wiatt",
"Wit", "Wittie", "Witty", "Wood", "Woodie", "Woody" });
+ this.assertIsMetaphoneEqual("White",
+ new String[] { "Wade", "Wait", "Waite", "Wat", "Whit",
"Wiatt", "Wit", "Wittie", "Witty", "Wood", "Woodie", "Woody" });
}
/**
@@ -380,9 +221,7 @@ public class MetaphoneTest extends
AbstractStringEncoderTest<Metaphone> {
*/
@Test
public void testIsMetaphoneEqualXalan() {
- this.assertIsMetaphoneEqual(
- "Xalan",
- new String[] { "Celene", "Celina", "Celine", "Selena", "Selene",
"Selina", "Seline", "Suellen", "Xylina" });
+ this.assertIsMetaphoneEqual("Xalan", new String[] { "Celene",
"Celina", "Celine", "Selena", "Selene", "Selina", "Seline", "Suellen", "Xylina"
});
}
@Test
@@ -402,49 +241,49 @@ public class MetaphoneTest extends
AbstractStringEncoderTest<Metaphone> {
@Test
public void testPHTOF() {
- assertEquals( "FX", this.getStringEncoder().metaphone("PHISH") );
+ assertEquals("FX", this.getStringEncoder().metaphone("PHISH"));
}
@Test
public void testSetMaxLengthWithTruncation() {
// should be AKSKS, but istruncated by Max Code Length
- this.getStringEncoder().setMaxCodeLen( 6 );
- assertEquals( "AKSKSK", this.getStringEncoder().metaphone("AXEAXEAXE")
);
+ this.getStringEncoder().setMaxCodeLen(6);
+ assertEquals("AKSKSK", this.getStringEncoder().metaphone("AXEAXEAXE"));
}
@Test
public void testSHAndSIOAndSIAToX() {
- assertEquals( "XT", this.getStringEncoder().metaphone("SHOT") );
- assertEquals( "OTXN", this.getStringEncoder().metaphone("ODSIAN") );
- assertEquals( "PLXN", this.getStringEncoder().metaphone("PULSION") );
+ assertEquals("XT", this.getStringEncoder().metaphone("SHOT"));
+ assertEquals("OTXN", this.getStringEncoder().metaphone("ODSIAN"));
+ assertEquals("PLXN", this.getStringEncoder().metaphone("PULSION"));
}
@Test
public void testTCH() {
- assertEquals( "RX", this.getStringEncoder().metaphone("RETCH") );
- assertEquals( "WX", this.getStringEncoder().metaphone("WATCH") );
+ assertEquals("RX", this.getStringEncoder().metaphone("RETCH"));
+ assertEquals("WX", this.getStringEncoder().metaphone("WATCH"));
}
@Test
public void testTIOAndTIAToX() {
- assertEquals( "OX", this.getStringEncoder().metaphone("OTIA") );
- assertEquals( "PRXN", this.getStringEncoder().metaphone("PORTION") );
+ assertEquals("OX", this.getStringEncoder().metaphone("OTIA"));
+ assertEquals("PRXN", this.getStringEncoder().metaphone("PORTION"));
}
@Test
public void testTranslateOfSCHAndCH() {
- assertEquals( "SKTL", this.getStringEncoder().metaphone("SCHEDULE") );
- assertEquals( "SKMT", this.getStringEncoder().metaphone("SCHEMATIC") );
+ assertEquals("SKTL", this.getStringEncoder().metaphone("SCHEDULE"));
+ assertEquals("SKMT", this.getStringEncoder().metaphone("SCHEMATIC"));
- assertEquals( "KRKT", this.getStringEncoder().metaphone("CHARACTER") );
- assertEquals( "TX", this.getStringEncoder().metaphone("TEACH") );
+ assertEquals("KRKT", this.getStringEncoder().metaphone("CHARACTER"));
+ assertEquals("TX", this.getStringEncoder().metaphone("TEACH"));
}
@Test
public void testTranslateToJOfDGEOrDGIOrDGY() {
- assertEquals( "TJ", this.getStringEncoder().metaphone("DODGY") );
- assertEquals( "TJ", this.getStringEncoder().metaphone("DODGE") );
- assertEquals( "AJMT", this.getStringEncoder().metaphone("ADGIEMTI") );
+ assertEquals("TJ", this.getStringEncoder().metaphone("DODGY"));
+ assertEquals("TJ", this.getStringEncoder().metaphone("DODGE"));
+ assertEquals("AJMT", this.getStringEncoder().metaphone("ADGIEMTI"));
}
/**
@@ -458,14 +297,14 @@ public class MetaphoneTest extends
AbstractStringEncoderTest<Metaphone> {
@Test
public void testWordEndingInMB() {
- assertEquals( "KM", this.getStringEncoder().metaphone("COMB") );
- assertEquals( "TM", this.getStringEncoder().metaphone("TOMB") );
- assertEquals( "WM", this.getStringEncoder().metaphone("WOMB") );
+ assertEquals("KM", this.getStringEncoder().metaphone("COMB"));
+ assertEquals("TM", this.getStringEncoder().metaphone("TOMB"));
+ assertEquals("WM", this.getStringEncoder().metaphone("WOMB"));
}
@Test
public void testWordsWithCIA() {
- assertEquals( "XP", this.getStringEncoder().metaphone("CIAPO") );
+ assertEquals("XP", this.getStringEncoder().metaphone("CIAPO"));
}
public void validateFixture(final String[][] pairs) {
