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 4a1f7d77 Normalize array type declarations
4a1f7d77 is described below
commit 4a1f7d7750f00575c6daa27fb88f4401d8a94790
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Aug 23 08:40:24 2023 -0400
Normalize array type declarations
---
src/test/java/org/apache/commons/codec/binary/Base16Test.java | 4 ++--
src/test/java/org/apache/commons/codec/binary/Base32Test.java | 6 +++---
src/test/java/org/apache/commons/codec/binary/Base64Test.java | 4 ++--
src/test/java/org/apache/commons/codec/binary/HexTest.java | 6 +++---
.../java/org/apache/commons/codec/digest/PureJavaCrc32Test.java | 2 +-
.../org/apache/commons/codec/language/ColognePhoneticTest.java | 8 ++++----
src/test/java/org/apache/commons/codec/net/BCodecTest.java | 4 ++--
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/test/java/org/apache/commons/codec/binary/Base16Test.java
b/src/test/java/org/apache/commons/codec/binary/Base16Test.java
index 46049e5b..6afdcb93 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base16Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base16Test.java
@@ -278,7 +278,7 @@ public class Base16Test {
assertEquals("0010", new String(new Base16().encode(new byte[] {
(byte) 0, (byte) 16 })));
assertEquals("0011", new String(new Base16().encode(new byte[] {
(byte) 0, (byte) 17 })));
for (int i = -128; i <= 127; i++) {
- final byte test[] = { (byte) i, (byte) i };
+ final byte[] test = { (byte) i, (byte) i };
assertArrayEquals(test, new Base16().decode(new
Base16().encode(test)));
}
}
@@ -391,7 +391,7 @@ public class Base16Test {
assertEquals("67", new String(new Base16().encode(new byte[] { (byte)
103 })));
assertEquals("68", new String(new Base16().encode(new byte[] { (byte)
104 })));
for (int i = -128; i <= 127; i++) {
- final byte test[] = { (byte) i };
+ final byte[] test = { (byte) i };
assertArrayEquals(test, new Base16().decode(new
Base16().encode(test)));
}
}
diff --git a/src/test/java/org/apache/commons/codec/binary/Base32Test.java
b/src/test/java/org/apache/commons/codec/binary/Base32Test.java
index 2bb11e35..23009f0f 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base32Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base32Test.java
@@ -365,14 +365,14 @@ public class Base32Test {
for (int i = 0; i < 20; i++) {
Base32 codec = new Base32();
final BaseNCodec.Context context = new BaseNCodec.Context();
- final byte unencoded[] = new byte[i];
- final byte allInOne[] = codec.encode(unencoded);
+ final byte[] unencoded = new byte[i];
+ final byte[] allInOne = codec.encode(unencoded);
codec = new Base32();
for (int j=0; j< unencoded.length; j++) {
codec.encode(unencoded, j, 1, context);
}
codec.encode(unencoded, 0, -1, context);
- final byte singly[] = new byte[allInOne.length];
+ final byte[] singly = new byte[allInOne.length];
codec.readResults(singly, 0, 100, context);
if (!Arrays.equals(allInOne, singly)){
fail();
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 e207b7de..151bfef1 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64Test.java
@@ -588,7 +588,7 @@ public class Base64Test {
public void testPairs() {
assertEquals("AAA=", new String(Base64.encodeBase64(new byte[] { 0, 0
})));
for (int i = -128; i <= 127; i++) {
- final byte test[] = { (byte) i, (byte) i };
+ final byte[] test = { (byte) i, (byte) i };
assertArrayEquals(test,
Base64.decodeBase64(Base64.encodeBase64(test)));
}
}
@@ -868,7 +868,7 @@ public class Base64Test {
assertEquals("Zw==", new String(Base64.encodeBase64(new byte[] {
(byte) 103 })));
assertEquals("aA==", new String(Base64.encodeBase64(new byte[] {
(byte) 104 })));
for (int i = -128; i <= 127; i++) {
- final byte test[] = { (byte) i };
+ final byte[] test = { (byte) i };
assertArrayEquals(test,
Base64.decodeBase64(Base64.encodeBase64(test)));
}
}
diff --git a/src/test/java/org/apache/commons/codec/binary/HexTest.java
b/src/test/java/org/apache/commons/codec/binary/HexTest.java
index 9aa32807..badc46a1 100644
--- a/src/test/java/org/apache/commons/codec/binary/HexTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/HexTest.java
@@ -530,7 +530,7 @@ public class HexTest {
@Test
public void testEncodeHexPartialInput() {
- final byte data[] = "hello world".getBytes(StandardCharsets.UTF_8);
+ final byte[] data = "hello world".getBytes(StandardCharsets.UTF_8);
char[] hex = Hex.encodeHex(data, 0, 0, true);
assertArrayEquals(new char[0], hex);
@@ -556,14 +556,14 @@ public class HexTest {
@Test
public void testEncodeHexPartialInputUnderbounds() {
- final byte data[] = "hello world".getBytes(StandardCharsets.UTF_8);
+ final byte[] data = "hello world".getBytes(StandardCharsets.UTF_8);
assertThrows(ArrayIndexOutOfBoundsException.class, () ->
Hex.encodeHex(data, -2, 10, true));
}
@Test
public void testEncodeHexPartialInputOverbounds() {
- final byte data[] = "hello world".getBytes(StandardCharsets.UTF_8);
+ final byte[] data = "hello world".getBytes(StandardCharsets.UTF_8);
assertThrows(ArrayIndexOutOfBoundsException.class, () ->
Hex.encodeHex(data, 9, 10, true));
}
diff --git
a/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
b/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
index c70f6768..3f3df687 100644
--- a/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
+++ b/src/test/java/org/apache/commons/codec/digest/PureJavaCrc32Test.java
@@ -60,7 +60,7 @@ public class PureJavaCrc32Test {
final Random random1 = new Random();
final Random random2 = new Random();
for (int i = 0; i < 10000; i++) {
- final byte randomBytes[] = new byte[random1.nextInt(2048)];
+ final byte[] randomBytes = new byte[random1.nextInt(2048)];
random2.nextBytes(randomBytes);
checkOnBytes(randomBytes, false);
}
diff --git
a/src/test/java/org/apache/commons/codec/language/ColognePhoneticTest.java
b/src/test/java/org/apache/commons/codec/language/ColognePhoneticTest.java
index 97b75ea6..e8657498 100644
--- a/src/test/java/org/apache/commons/codec/language/ColognePhoneticTest.java
+++ b/src/test/java/org/apache/commons/codec/language/ColognePhoneticTest.java
@@ -50,7 +50,7 @@ public class ColognePhoneticTest extends
AbstractStringEncoderTest<ColognePhonet
}
// Character sequences to be tested by the code
- private static final String MATCHES[] = {
+ private static final String[] MATCHES = {
".*[AEIOUJY].*", // A, E, I, J, O, U, Y
".*H.*", // H
".*B.*", // B
@@ -229,19 +229,19 @@ public class ColognePhoneticTest extends
AbstractStringEncoderTest<ColognePhonet
@Test
public void testVariationsMella() throws EncoderException {
- final String data[] = {"mella", "milah", "moulla", "mellah", "muehle",
"mule"};
+ final String[] data = {"mella", "milah", "moulla", "mellah", "muehle",
"mule"};
this.checkEncodingVariations("65", data);
}
@Test
public void testVariationsMeyer() throws EncoderException {
- final String data[] = {"Meier", "Maier", "Mair", "Meyer", "Meyr",
"Mejer", "Major"};
+ final String[] data = {"Meier", "Maier", "Mair", "Meyer", "Meyr",
"Mejer", "Major"};
this.checkEncodingVariations("67", data);
}
@Test
public void testSpecialCharsBetweenSameLetters() throws EncoderException {
- final String data[] = {"Test test", "Testtest", "Test-test",
"TesT#Test", "TesT?test"};
+ final String[] data = {"Test test", "Testtest", "Test-test",
"TesT#Test", "TesT?test"};
this.checkEncodingVariations("28282", data);
}
diff --git a/src/test/java/org/apache/commons/codec/net/BCodecTest.java
b/src/test/java/org/apache/commons/codec/net/BCodecTest.java
index bce9106e..7b5f51f5 100644
--- a/src/test/java/org/apache/commons/codec/net/BCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/net/BCodecTest.java
@@ -45,10 +45,10 @@ public class BCodecTest {
"=?ASCII?B?AB==?="
};
- static final int SWISS_GERMAN_STUFF_UNICODE[] =
+ static final int[] SWISS_GERMAN_STUFF_UNICODE =
{ 0x47, 0x72, 0xFC, 0x65, 0x7A, 0x69, 0x5F, 0x7A, 0xE4, 0x6D, 0xE4 };
- static final int RUSSIAN_STUFF_UNICODE[] =
+ static final int[] RUSSIAN_STUFF_UNICODE =
{ 0x412, 0x441, 0x435, 0x43C, 0x5F, 0x43F, 0x440, 0x438, 0x432, 0x435,
0x442 };
private String constructString(final int[] unicodeChars) {
