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-text.git
commit 93b8a088a0ebbd2bdb80d05c6f87381976906763
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Jun 26 17:02:28 2020 -0400
No need to create a new size 0 char[] each time one is needed.
---
.../java/org/apache/commons/text/StrBuilder.java | 6 ++++--
.../org/apache/commons/text/TextStringBuilder.java | 5 +++--
.../apache/commons/text/AlphabetConverterTest.java | 8 ++++----
.../org/apache/commons/text/CaseUtilsTest.java | 4 ++--
.../commons/text/CharacterPredicatesTest.java | 4 ++--
.../commons/text/StrBuilderAppendInsertTest.java | 7 ++++---
.../org/apache/commons/text/StrBuilderTest.java | 3 ++-
.../org/apache/commons/text/StrLookupTest.java | 2 +-
.../apache/commons/text/StrSubstitutorTest.java | 2 +-
.../org/apache/commons/text/StrTokenizerTest.java | 11 ++++++-----
.../apache/commons/text/StringEscapeUtilsTest.java | 2 +-
.../apache/commons/text/StringTokenizerTest.java | 12 ++++++-----
.../text/TextStringBuilderAppendInsertTest.java | 7 ++++---
.../apache/commons/text/TextStringBuilderTest.java | 2 +-
.../org/apache/commons/text/WordUtilsTest.java | 23 +++++++++++-----------
.../commons/text/diff/StringsComparatorTest.java | 4 ++--
.../lookup/ResourceBundleStringLookupTest.java | 2 +-
.../text/matcher/StringSubstitutorGetSetTest.java | 2 +-
.../text/similarity/CosineSimilarityTest.java | 9 +++++----
.../text/similarity/IntersectionResultTest.java | 6 +++---
.../similarity/IntersectionSimilarityTest.java | 4 ++--
.../text/similarity/LevenshteinDistanceTest.java | 4 ++--
.../text/similarity/LevenshteinResultsTest.java | 4 ++--
.../LongestCommonSubsequenceDistanceTest.java | 6 +++---
.../similarity/LongestCommonSubsequenceTest.java | 6 +++---
.../text/translate/AggregateTranslatorTest.java | 4 ++--
.../text/translate/CodePointTranslatorTest.java | 4 ++--
.../commons/text/translate/EntityArraysTest.java | 4 ++--
.../text/translate/LookupTranslatorTest.java | 6 +++---
.../text/translate/NumericEntityEscaperTest.java | 4 ++--
.../text/translate/NumericEntityUnescaperTest.java | 4 ++--
.../commons/text/translate/OctalUnescaperTest.java | 4 ++--
.../text/translate/SinglePassTranslatorTest.java | 8 ++++----
.../commons/text/translate/UnicodeEscaperTest.java | 4 ++--
.../UnicodeUnpairedSurrogateRemoverTest.java | 4 ++--
35 files changed, 101 insertions(+), 90 deletions(-)
diff --git a/src/main/java/org/apache/commons/text/StrBuilder.java
b/src/main/java/org/apache/commons/text/StrBuilder.java
index 1f483c3..1b741d2 100644
--- a/src/main/java/org/apache/commons/text/StrBuilder.java
+++ b/src/main/java/org/apache/commons/text/StrBuilder.java
@@ -25,6 +25,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Objects;
+import org.apache.commons.lang3.ArrayUtils;
+
/**
* Builds a string from constituent parts providing a more flexible and
powerful API
* than StringBuffer.
@@ -351,7 +353,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
*/
public char[] toCharArray() {
if (size == 0) {
- return new char[0];
+ return ArrayUtils.EMPTY_CHAR_ARRAY;
}
final char[] chars = new char[size];
System.arraycopy(buffer, 0, chars, 0, size);
@@ -372,7 +374,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
endIndex = validateRange(startIndex, endIndex);
final int len = endIndex - startIndex;
if (len == 0) {
- return new char[0];
+ return ArrayUtils.EMPTY_CHAR_ARRAY;
}
final char[] chars = new char[len];
System.arraycopy(buffer, startIndex, chars, 0, len);
diff --git a/src/main/java/org/apache/commons/text/TextStringBuilder.java
b/src/main/java/org/apache/commons/text/TextStringBuilder.java
index 489e402..4ed6fd1 100644
--- a/src/main/java/org/apache/commons/text/TextStringBuilder.java
+++ b/src/main/java/org/apache/commons/text/TextStringBuilder.java
@@ -25,6 +25,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Objects;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.text.matcher.StringMatcher;
/**
@@ -3136,7 +3137,7 @@ public class TextStringBuilder implements CharSequence,
Appendable, Serializable
*/
public char[] toCharArray() {
if (size == 0) {
- return new char[0];
+ return ArrayUtils.EMPTY_CHAR_ARRAY;
}
final char[] chars = new char[size];
System.arraycopy(buffer, 0, chars, 0, size);
@@ -3158,7 +3159,7 @@ public class TextStringBuilder implements CharSequence,
Appendable, Serializable
endIndex = validateRange(startIndex, endIndex);
final int len = endIndex - startIndex;
if (len == 0) {
- return new char[0];
+ return ArrayUtils.EMPTY_CHAR_ARRAY;
}
final char[] chars = new char[len];
System.arraycopy(buffer, startIndex, chars, 0, len);
diff --git a/src/test/java/org/apache/commons/text/AlphabetConverterTest.java
b/src/test/java/org/apache/commons/text/AlphabetConverterTest.java
index d4c0cb4..e88d5e1 100644
--- a/src/test/java/org/apache/commons/text/AlphabetConverterTest.java
+++ b/src/test/java/org/apache/commons/text/AlphabetConverterTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.commons.text;
+import static org.assertj.core.api.Assertions.assertThat;
+import static
org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.io.UnsupportedEncodingException;
import java.util.Arrays;
import java.util.HashMap;
@@ -24,10 +28,6 @@ import java.util.Map;
import org.junit.jupiter.api.Test;
-import static org.assertj.core.api.Assertions.assertThat;
-import static
org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
/**
* Unit tests for {@link AlphabetConverter}.
*/
diff --git a/src/test/java/org/apache/commons/text/CaseUtilsTest.java
b/src/test/java/org/apache/commons/text/CaseUtilsTest.java
index e882d6e..834b333 100644
--- a/src/test/java/org/apache/commons/text/CaseUtilsTest.java
+++ b/src/test/java/org/apache/commons/text/CaseUtilsTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.text;
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
/**
* Unit tests for {@link CaseUtils} class.
diff --git a/src/test/java/org/apache/commons/text/CharacterPredicatesTest.java
b/src/test/java/org/apache/commons/text/CharacterPredicatesTest.java
index 53879e4..a6ff815 100644
--- a/src/test/java/org/apache/commons/text/CharacterPredicatesTest.java
+++ b/src/test/java/org/apache/commons/text/CharacterPredicatesTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.text;
-import org.junit.jupiter.api.Test;
-
import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
+
/**
* Tests for {@link CharacterPredicates}.
*/
diff --git
a/src/test/java/org/apache/commons/text/StrBuilderAppendInsertTest.java
b/src/test/java/org/apache/commons/text/StrBuilderAppendInsertTest.java
index 18178b1..f916f25 100644
--- a/src/test/java/org/apache/commons/text/StrBuilderAppendInsertTest.java
+++ b/src/test/java/org/apache/commons/text/StrBuilderAppendInsertTest.java
@@ -27,6 +27,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.jupiter.api.Test;
/**
@@ -447,7 +448,7 @@ public class StrBuilderAppendInsertTest {
assertThat(sb.toString()).isEqualTo("NULL");
sb = new StrBuilder();
- sb.append(new char[0]);
+ sb.append(ArrayUtils.EMPTY_CHAR_ARRAY);
assertThat(sb.toString()).isEqualTo("");
sb.append(new char[]{'f', 'o', 'o'});
@@ -1326,7 +1327,7 @@ public class StrBuilderAppendInsertTest {
sb.insert(0, (char[]) null);
assertThat(sb.toString()).isEqualTo("barbaz");
- sb.insert(0, new char[0]);
+ sb.insert(0, ArrayUtils.EMPTY_CHAR_ARRAY);
assertThat(sb.toString()).isEqualTo("barbaz");
sb.insert(0, new char[]{'f', 'o', 'o'});
@@ -1345,7 +1346,7 @@ public class StrBuilderAppendInsertTest {
sb.insert(0, (char[]) null, 0, 0);
assertThat(sb.toString()).isEqualTo("barbaz");
- sb.insert(0, new char[0], 0, 0);
+ sb.insert(0, ArrayUtils.EMPTY_CHAR_ARRAY, 0, 0);
assertThat(sb.toString()).isEqualTo("barbaz");
assertThrows(IndexOutOfBoundsException.class,
diff --git a/src/test/java/org/apache/commons/text/StrBuilderTest.java
b/src/test/java/org/apache/commons/text/StrBuilderTest.java
index a5ae720..ca8aaa8 100644
--- a/src/test/java/org/apache/commons/text/StrBuilderTest.java
+++ b/src/test/java/org/apache/commons/text/StrBuilderTest.java
@@ -19,13 +19,13 @@ package org.apache.commons.text;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.fail;
-import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
@@ -37,6 +37,7 @@ import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
import java.util.Arrays;
+
import org.junit.jupiter.api.Test;
/**
diff --git a/src/test/java/org/apache/commons/text/StrLookupTest.java
b/src/test/java/org/apache/commons/text/StrLookupTest.java
index 1ebd0be..be0d0f5 100644
--- a/src/test/java/org/apache/commons/text/StrLookupTest.java
+++ b/src/test/java/org/apache/commons/text/StrLookupTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.commons.text;
-import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/test/java/org/apache/commons/text/StrSubstitutorTest.java
b/src/test/java/org/apache/commons/text/StrSubstitutorTest.java
index cde37d0..6ff8657 100644
--- a/src/test/java/org/apache/commons/text/StrSubstitutorTest.java
+++ b/src/test/java/org/apache/commons/text/StrSubstitutorTest.java
@@ -18,11 +18,11 @@
package org.apache.commons.text;
import static org.assertj.core.api.Assertions.assertThatNullPointerException;
-import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.HashMap;
diff --git a/src/test/java/org/apache/commons/text/StrTokenizerTest.java
b/src/test/java/org/apache/commons/text/StrTokenizerTest.java
index 72bb788..744e598 100644
--- a/src/test/java/org/apache/commons/text/StrTokenizerTest.java
+++ b/src/test/java/org/apache/commons/text/StrTokenizerTest.java
@@ -17,10 +17,10 @@
package org.apache.commons.text;
-import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays;
@@ -28,6 +28,7 @@ import java.util.Collections;
import java.util.List;
import java.util.NoSuchElementException;
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.jupiter.api.Test;
/**
@@ -596,7 +597,7 @@ public class StrTokenizerTest {
final StrTokenizer tok = new StrTokenizer();
assertEquals(tok, tok.reset());
assertEquals(tok, tok.reset(""));
- assertEquals(tok, tok.reset(new char[0]));
+ assertEquals(tok, tok.reset(ArrayUtils.EMPTY_CHAR_ARRAY));
assertEquals(tok, tok.setDelimiterChar(' '));
assertEquals(tok, tok.setDelimiterString(" "));
assertEquals(tok, tok.setDelimiterMatcher(null));
@@ -711,7 +712,7 @@ public class StrTokenizerTest {
assertEquals("b", tok.next());
assertFalse(tok.hasNext());
- tok = new StrTokenizer(new char[0]);
+ tok = new StrTokenizer(ArrayUtils.EMPTY_CHAR_ARRAY);
assertFalse(tok.hasNext());
tok = new StrTokenizer((char[]) null);
@@ -727,7 +728,7 @@ public class StrTokenizerTest {
assertEquals("b", tok.next());
assertFalse(tok.hasNext());
- tok = new StrTokenizer(new char[0], ' ');
+ tok = new StrTokenizer(ArrayUtils.EMPTY_CHAR_ARRAY, ' ');
assertFalse(tok.hasNext());
tok = new StrTokenizer((char[]) null, ' ');
@@ -744,7 +745,7 @@ public class StrTokenizerTest {
assertEquals("b", tok.next());
assertFalse(tok.hasNext());
- tok = new StrTokenizer(new char[0], ' ', '"');
+ tok = new StrTokenizer(ArrayUtils.EMPTY_CHAR_ARRAY, ' ', '"');
assertFalse(tok.hasNext());
tok = new StrTokenizer((char[]) null, ' ', '"');
diff --git a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
index 105406f..bf6b80a 100644
--- a/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
+++ b/src/test/java/org/apache/commons/text/StringEscapeUtilsTest.java
@@ -18,11 +18,11 @@ package org.apache.commons.text;
import static org.apache.commons.text.StringEscapeUtils.escapeXSI;
import static org.apache.commons.text.StringEscapeUtils.unescapeXSI;
-import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
diff --git a/src/test/java/org/apache/commons/text/StringTokenizerTest.java
b/src/test/java/org/apache/commons/text/StringTokenizerTest.java
index 819ec89..675bf0d 100644
--- a/src/test/java/org/apache/commons/text/StringTokenizerTest.java
+++ b/src/test/java/org/apache/commons/text/StringTokenizerTest.java
@@ -20,13 +20,15 @@ package org.apache.commons.text;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.NoSuchElementException;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.text.matcher.StringMatcher;
import org.apache.commons.text.matcher.StringMatcherFactory;
import org.junit.jupiter.api.Test;
@@ -594,7 +596,7 @@ public class StringTokenizerTest {
final StringTokenizer tok = new StringTokenizer();
assertEquals(tok, tok.reset());
assertEquals(tok, tok.reset(""));
- assertEquals(tok, tok.reset(new char[0]));
+ assertEquals(tok, tok.reset(ArrayUtils.EMPTY_CHAR_ARRAY));
assertEquals(tok, tok.setDelimiterChar(' '));
assertEquals(tok, tok.setDelimiterString(" "));
assertEquals(tok, tok.setDelimiterMatcher(null));
@@ -712,7 +714,7 @@ public class StringTokenizerTest {
assertEquals("b", tok.next());
assertFalse(tok.hasNext());
- tok = new StringTokenizer(new char[0]);
+ tok = new StringTokenizer(ArrayUtils.EMPTY_CHAR_ARRAY);
assertFalse(tok.hasNext());
tok = new StringTokenizer((char[]) null);
@@ -729,7 +731,7 @@ public class StringTokenizerTest {
assertEquals("b", tok.next());
assertFalse(tok.hasNext());
- tok = new StringTokenizer(new char[0], ' ');
+ tok = new StringTokenizer(ArrayUtils.EMPTY_CHAR_ARRAY, ' ');
assertFalse(tok.hasNext());
tok = new StringTokenizer((char[]) null, ' ');
@@ -748,7 +750,7 @@ public class StringTokenizerTest {
assertEquals("b", tok.next());
assertFalse(tok.hasNext());
- tok = new StringTokenizer(new char[0], ' ', '"');
+ tok = new StringTokenizer(ArrayUtils.EMPTY_CHAR_ARRAY, ' ', '"');
assertFalse(tok.hasNext());
tok = new StringTokenizer((char[]) null, ' ', '"');
diff --git
a/src/test/java/org/apache/commons/text/TextStringBuilderAppendInsertTest.java
b/src/test/java/org/apache/commons/text/TextStringBuilderAppendInsertTest.java
index 26870c5..ec96914 100644
---
a/src/test/java/org/apache/commons/text/TextStringBuilderAppendInsertTest.java
+++
b/src/test/java/org/apache/commons/text/TextStringBuilderAppendInsertTest.java
@@ -27,6 +27,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.jupiter.api.Test;
/**
@@ -472,7 +473,7 @@ public class TextStringBuilderAppendInsertTest {
assertThat(sb.toString()).isEqualTo("NULL");
sb = new TextStringBuilder();
- sb.append(new char[0]);
+ sb.append(ArrayUtils.EMPTY_CHAR_ARRAY);
assertThat(sb.toString()).isEqualTo("");
sb.append(new char[]{'f', 'o', 'o'});
@@ -1351,7 +1352,7 @@ public class TextStringBuilderAppendInsertTest {
sb.insert(0, (char[]) null);
assertThat(sb.toString()).isEqualTo("barbaz");
- sb.insert(0, new char[0]);
+ sb.insert(0, ArrayUtils.EMPTY_CHAR_ARRAY);
assertThat(sb.toString()).isEqualTo("barbaz");
sb.insert(0, new char[]{'f', 'o', 'o'});
@@ -1370,7 +1371,7 @@ public class TextStringBuilderAppendInsertTest {
sb.insert(0, (char[]) null, 0, 0);
assertThat(sb.toString()).isEqualTo("barbaz");
- sb.insert(0, new char[0], 0, 0);
+ sb.insert(0, ArrayUtils.EMPTY_CHAR_ARRAY, 0, 0);
assertThat(sb.toString()).isEqualTo("barbaz");
assertThrows(IndexOutOfBoundsException.class,
diff --git a/src/test/java/org/apache/commons/text/TextStringBuilderTest.java
b/src/test/java/org/apache/commons/text/TextStringBuilderTest.java
index d659590..a41deaa 100644
--- a/src/test/java/org/apache/commons/text/TextStringBuilderTest.java
+++ b/src/test/java/org/apache/commons/text/TextStringBuilderTest.java
@@ -19,13 +19,13 @@ package org.apache.commons.text;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.fail;
-import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
diff --git a/src/test/java/org/apache/commons/text/WordUtilsTest.java
b/src/test/java/org/apache/commons/text/WordUtilsTest.java
index 03d8f6b..c37f826 100644
--- a/src/test/java/org/apache/commons/text/WordUtilsTest.java
+++ b/src/test/java/org/apache/commons/text/WordUtilsTest.java
@@ -16,14 +16,15 @@
*/
package org.apache.commons.text;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static
org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
-import static org.assertj.core.api.Assertions.assertThat;
-import static
org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.api.Test;
/**
* Unit tests for {@link WordUtils} class.
@@ -197,8 +198,8 @@ public class WordUtilsTest {
@Test
public void testCapitalizeWithDelimiters_String() {
assertThat(WordUtils.capitalize(null, null)).isNull();
- assertThat(WordUtils.capitalize("", new char[0])).isEqualTo("");
- assertThat(WordUtils.capitalize(" ", new char[0])).isEqualTo(" ");
+ assertThat(WordUtils.capitalize("",
ArrayUtils.EMPTY_CHAR_ARRAY)).isEqualTo("");
+ assertThat(WordUtils.capitalize(" ",
ArrayUtils.EMPTY_CHAR_ARRAY)).isEqualTo(" ");
char[] chars = new char[] {'-', '+', ' ', '@'};
assertThat(WordUtils.capitalize("I", chars)).isEqualTo("I");
@@ -240,8 +241,8 @@ public class WordUtilsTest {
@Test
public void testCapitalizeFullyWithDelimiters_String() {
assertThat(WordUtils.capitalizeFully(null, null)).isNull();
- assertThat(WordUtils.capitalizeFully("", new char[0])).isEqualTo("");
- assertThat(WordUtils.capitalizeFully(" ", new char[0])).isEqualTo("
");
+ assertThat(WordUtils.capitalizeFully("",
ArrayUtils.EMPTY_CHAR_ARRAY)).isEqualTo("");
+ assertThat(WordUtils.capitalizeFully(" ",
ArrayUtils.EMPTY_CHAR_ARRAY)).isEqualTo(" ");
char[] chars = new char[] {'-', '+', ' ', '@'};
assertThat(WordUtils.capitalizeFully("I", chars)).isEqualTo("I");
@@ -295,8 +296,8 @@ public class WordUtilsTest {
@Test
public void testUncapitalizeWithDelimiters_String() {
assertThat(WordUtils.uncapitalize(null, null)).isNull();
- assertThat(WordUtils.uncapitalize("", new char[0])).isEqualTo("");
- assertThat(WordUtils.uncapitalize(" ", new char[0])).isEqualTo(" ");
+ assertThat(WordUtils.uncapitalize("",
ArrayUtils.EMPTY_CHAR_ARRAY)).isEqualTo("");
+ assertThat(WordUtils.uncapitalize(" ",
ArrayUtils.EMPTY_CHAR_ARRAY)).isEqualTo(" ");
char[] chars = new char[] {'-', '+', ' ', '@'};
assertThat(WordUtils.uncapitalize("I", chars)).isEqualTo("i");
@@ -343,7 +344,7 @@ public class WordUtilsTest {
assertThat(WordUtils.initials("Kay O'Murphy", array)).isEqualTo("KO");
assertThat(WordUtils.initials("i am here 123",
array)).isEqualTo("iah1");
- array = new char[0];
+ array = ArrayUtils.EMPTY_CHAR_ARRAY;
assertThat(WordUtils.initials(null, array)).isNull();
assertThat(WordUtils.initials("", array)).isEqualTo("");
assertThat(WordUtils.initials(" ", array)).isEqualTo("");
diff --git
a/src/test/java/org/apache/commons/text/diff/StringsComparatorTest.java
b/src/test/java/org/apache/commons/text/diff/StringsComparatorTest.java
index 50916d7..ea771c1 100644
--- a/src/test/java/org/apache/commons/text/diff/StringsComparatorTest.java
+++ b/src/test/java/org/apache/commons/text/diff/StringsComparatorTest.java
@@ -15,6 +15,8 @@
* limitations under the License.
*/
package org.apache.commons.text.diff;
+import static org.assertj.core.api.Assertions.assertThat;
+
import java.util.Arrays;
import java.util.List;
@@ -22,8 +24,6 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.assertj.core.api.Assertions.assertThat;
-
/**
* Tests for the StringsComparator.
*/
diff --git
a/src/test/java/org/apache/commons/text/lookup/ResourceBundleStringLookupTest.java
b/src/test/java/org/apache/commons/text/lookup/ResourceBundleStringLookupTest.java
index 3977fbc..3c2d02c 100644
---
a/src/test/java/org/apache/commons/text/lookup/ResourceBundleStringLookupTest.java
+++
b/src/test/java/org/apache/commons/text/lookup/ResourceBundleStringLookupTest.java
@@ -17,8 +17,8 @@
package org.apache.commons.text.lookup;
-import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.util.ResourceBundle;
diff --git
a/src/test/java/org/apache/commons/text/matcher/StringSubstitutorGetSetTest.java
b/src/test/java/org/apache/commons/text/matcher/StringSubstitutorGetSetTest.java
index 244d6b5..2009bdf 100644
---
a/src/test/java/org/apache/commons/text/matcher/StringSubstitutorGetSetTest.java
+++
b/src/test/java/org/apache/commons/text/matcher/StringSubstitutorGetSetTest.java
@@ -17,9 +17,9 @@
package org.apache.commons.text.matcher;
-import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.commons.text.StringSubstitutor;
diff --git
a/src/test/java/org/apache/commons/text/similarity/CosineSimilarityTest.java
b/src/test/java/org/apache/commons/text/similarity/CosineSimilarityTest.java
index c229cb5..b7e0685 100644
--- a/src/test/java/org/apache/commons/text/similarity/CosineSimilarityTest.java
+++ b/src/test/java/org/apache/commons/text/similarity/CosineSimilarityTest.java
@@ -17,14 +17,15 @@
package org.apache.commons.text.similarity;
-import org.junit.jupiter.api.Test;
-import java.util.HashMap;
-import java.util.Map;
-
import static org.assertj.core.api.Assertions.assertThat;
import static
org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.within;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+
public class CosineSimilarityTest {
diff --git
a/src/test/java/org/apache/commons/text/similarity/IntersectionResultTest.java
b/src/test/java/org/apache/commons/text/similarity/IntersectionResultTest.java
index c2477e0..7489f5e 100644
---
a/src/test/java/org/apache/commons/text/similarity/IntersectionResultTest.java
+++
b/src/test/java/org/apache/commons/text/similarity/IntersectionResultTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.text.similarity;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
import java.util.HashMap;
import java.util.concurrent.ThreadLocalRandom;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
/**
* Unit tests for {@link IntersectionResult}.
*/
diff --git
a/src/test/java/org/apache/commons/text/similarity/IntersectionSimilarityTest.java
b/src/test/java/org/apache/commons/text/similarity/IntersectionSimilarityTest.java
index 8b4364c..c9f7049 100644
---
a/src/test/java/org/apache/commons/text/similarity/IntersectionSimilarityTest.java
+++
b/src/test/java/org/apache/commons/text/similarity/IntersectionSimilarityTest.java
@@ -19,8 +19,6 @@ package org.apache.commons.text.similarity;
import static
org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.jupiter.api.Test;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -31,6 +29,8 @@ import java.util.Set;
import java.util.function.Function;
import java.util.regex.Pattern;
+import org.junit.jupiter.api.Test;
+
/**
* Unit tests for {@link IntersectionSimilarity}.
*/
diff --git
a/src/test/java/org/apache/commons/text/similarity/LevenshteinDistanceTest.java
b/src/test/java/org/apache/commons/text/similarity/LevenshteinDistanceTest.java
index 45ee27e..22446f4 100644
---
a/src/test/java/org/apache/commons/text/similarity/LevenshteinDistanceTest.java
+++
b/src/test/java/org/apache/commons/text/similarity/LevenshteinDistanceTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.text.similarity;
-import org.junit.jupiter.api.Test;
-
import static org.assertj.core.api.Assertions.assertThat;
import static
org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import org.junit.jupiter.api.Test;
+
/**
* Unit tests for {@link LevenshteinDistance}.
*/
diff --git
a/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java
b/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java
index 3c113c6..48363bb 100644
---
a/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java
+++
b/src/test/java/org/apache/commons/text/similarity/LevenshteinResultsTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.text.similarity;
-import org.junit.jupiter.api.Test;
-
import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
+
public class LevenshteinResultsTest {
@Test
diff --git
a/src/test/java/org/apache/commons/text/similarity/LongestCommonSubsequenceDistanceTest.java
b/src/test/java/org/apache/commons/text/similarity/LongestCommonSubsequenceDistanceTest.java
index b0a8977..257b4fc 100644
---
a/src/test/java/org/apache/commons/text/similarity/LongestCommonSubsequenceDistanceTest.java
+++
b/src/test/java/org/apache/commons/text/similarity/LongestCommonSubsequenceDistanceTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.text.similarity;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
import static org.assertj.core.api.Assertions.assertThat;
import static
org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
/**
* Unit tests for {@link LongestCommonSubsequenceDistance}.
*/
diff --git
a/src/test/java/org/apache/commons/text/similarity/LongestCommonSubsequenceTest.java
b/src/test/java/org/apache/commons/text/similarity/LongestCommonSubsequenceTest.java
index 19b73a4..bd6824d 100644
---
a/src/test/java/org/apache/commons/text/similarity/LongestCommonSubsequenceTest.java
+++
b/src/test/java/org/apache/commons/text/similarity/LongestCommonSubsequenceTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.text.similarity;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
import static org.assertj.core.api.Assertions.assertThat;
import static
org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
/**
* Unit tests for {@link LongestCommonSubsequence}.
*/
diff --git
a/src/test/java/org/apache/commons/text/translate/AggregateTranslatorTest.java
b/src/test/java/org/apache/commons/text/translate/AggregateTranslatorTest.java
index fba9516..6bf8b20 100644
---
a/src/test/java/org/apache/commons/text/translate/AggregateTranslatorTest.java
+++
b/src/test/java/org/apache/commons/text/translate/AggregateTranslatorTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.commons.text.translate;
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
import java.io.StringWriter;
import java.util.HashMap;
import java.util.Map;
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
/**
* Unit tests for {@link AggregateTranslator}.
diff --git
a/src/test/java/org/apache/commons/text/translate/CodePointTranslatorTest.java
b/src/test/java/org/apache/commons/text/translate/CodePointTranslatorTest.java
index ad513f7..e7fe55a 100644
---
a/src/test/java/org/apache/commons/text/translate/CodePointTranslatorTest.java
+++
b/src/test/java/org/apache/commons/text/translate/CodePointTranslatorTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.commons.text.translate;
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
import java.io.PipedReader;
import java.io.PipedWriter;
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
public class CodePointTranslatorTest {
diff --git
a/src/test/java/org/apache/commons/text/translate/EntityArraysTest.java
b/src/test/java/org/apache/commons/text/translate/EntityArraysTest.java
index e4049f7..78d1d21 100644
--- a/src/test/java/org/apache/commons/text/translate/EntityArraysTest.java
+++ b/src/test/java/org/apache/commons/text/translate/EntityArraysTest.java
@@ -17,13 +17,13 @@
package org.apache.commons.text.translate;
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.BufferedReader;
import java.io.FileReader;
import java.util.Map;
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
/**
* Unit tests for {@link EntityArrays}.
diff --git
a/src/test/java/org/apache/commons/text/translate/LookupTranslatorTest.java
b/src/test/java/org/apache/commons/text/translate/LookupTranslatorTest.java
index 868ea40..8ca8e2f 100644
--- a/src/test/java/org/apache/commons/text/translate/LookupTranslatorTest.java
+++ b/src/test/java/org/apache/commons/text/translate/LookupTranslatorTest.java
@@ -17,7 +17,8 @@
package org.apache.commons.text.translate;
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import java.io.IOException;
import java.io.StringWriter;
@@ -25,8 +26,7 @@ import java.security.InvalidParameterException;
import java.util.HashMap;
import java.util.Map;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import org.junit.jupiter.api.Test;
/**
* Unit tests for {@link LookupTranslator}.
diff --git
a/src/test/java/org/apache/commons/text/translate/NumericEntityEscaperTest.java
b/src/test/java/org/apache/commons/text/translate/NumericEntityEscaperTest.java
index 121136a..c3d0c5c 100644
---
a/src/test/java/org/apache/commons/text/translate/NumericEntityEscaperTest.java
+++
b/src/test/java/org/apache/commons/text/translate/NumericEntityEscaperTest.java
@@ -17,10 +17,10 @@
package org.apache.commons.text.translate;
-import org.junit.jupiter.api.Test;
-
import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
+
/**
* Unit tests for {@link NumericEntityEscaper}.
*/
diff --git
a/src/test/java/org/apache/commons/text/translate/NumericEntityUnescaperTest.java
b/src/test/java/org/apache/commons/text/translate/NumericEntityUnescaperTest.java
index 341cd63..a8bd26d 100644
---
a/src/test/java/org/apache/commons/text/translate/NumericEntityUnescaperTest.java
+++
b/src/test/java/org/apache/commons/text/translate/NumericEntityUnescaperTest.java
@@ -17,11 +17,11 @@
package org.apache.commons.text.translate;
-import org.junit.jupiter.api.Test;
-
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+
/**
* Unit tests for {@link NumericEntityUnescaper}.
*/
diff --git
a/src/test/java/org/apache/commons/text/translate/OctalUnescaperTest.java
b/src/test/java/org/apache/commons/text/translate/OctalUnescaperTest.java
index 8e4462f..f9a3b4e 100644
--- a/src/test/java/org/apache/commons/text/translate/OctalUnescaperTest.java
+++ b/src/test/java/org/apache/commons/text/translate/OctalUnescaperTest.java
@@ -17,10 +17,10 @@
package org.apache.commons.text.translate;
-import org.junit.jupiter.api.Test;
-
import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
+
/**
* Unit tests for {@link OctalUnescaper}.
*/
diff --git
a/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java
b/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java
index 2f700c4..8b9bf02 100644
---
a/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java
+++
b/src/test/java/org/apache/commons/text/translate/SinglePassTranslatorTest.java
@@ -16,15 +16,15 @@
*/
package org.apache.commons.text.translate;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static
org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
-import static org.assertj.core.api.Assertions.assertThat;
-import static
org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Unit test for {@link SinglePassTranslator}
diff --git
a/src/test/java/org/apache/commons/text/translate/UnicodeEscaperTest.java
b/src/test/java/org/apache/commons/text/translate/UnicodeEscaperTest.java
index 8f4bfe1..b8c75db 100644
--- a/src/test/java/org/apache/commons/text/translate/UnicodeEscaperTest.java
+++ b/src/test/java/org/apache/commons/text/translate/UnicodeEscaperTest.java
@@ -17,10 +17,10 @@
package org.apache.commons.text.translate;
-import org.junit.jupiter.api.Test;
-
import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
+
/**
* Unit tests for {@link UnicodeEscaper}.
*/
diff --git
a/src/test/java/org/apache/commons/text/translate/UnicodeUnpairedSurrogateRemoverTest.java
b/src/test/java/org/apache/commons/text/translate/UnicodeUnpairedSurrogateRemoverTest.java
index 3ba4a6d..6fdfdbc 100644
---
a/src/test/java/org/apache/commons/text/translate/UnicodeUnpairedSurrogateRemoverTest.java
+++
b/src/test/java/org/apache/commons/text/translate/UnicodeUnpairedSurrogateRemoverTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.commons.text.translate;
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.CharArrayWriter;
import java.io.IOException;
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
/**
* Unit tests for {@link UnicodeUnpairedSurrogateRemover}.
