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-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 7489d6e21 CharSet now maintains iteration order
7489d6e21 is described below
commit 7489d6e21334673dc56399de7decaaa00f11ebcf
Author: Gary Gregory <[email protected]>
AuthorDate: Sat Feb 21 07:36:34 2026 -0500
CharSet now maintains iteration order
Javadoc
---
src/changes/changes.xml | 1 +
.../java/org/apache/commons/lang3/CharSet.java | 51 ++---
.../java/org/apache/commons/lang3/CharSetTest.java | 237 +++++++++++----------
3 files changed, 146 insertions(+), 143 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index b6c579782..2a28785e9 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -118,6 +118,7 @@ The <action> type attribute can be add,update,fix,remove.
<action type="fix" dev="ggregory" due-to="ThrawnCA, Gary
Gregory">Fix StringUtils.abbreviate(String, String, int) contract violations
#1572.</action>
<action type="fix" dev="ggregory" due-to="TK_ENDO,
Arnout Engelen, Gary Gregory">Add test coverage for negative-day adjustment in
DurationFormatUtils #1596.</action>
<action type="fix" dev="ggregory" due-to="Mohammad
Bireybi, Gary Gregory">[Javadoc] Add usage examples to CharSet.contains(char)
#1605.</action>
+ <action type="fix" dev="ggregory" due-to="Gary
Gregory">CharSet now maintains iteration order.</action>
<!-- ADD -->
<action type="add" dev="ggregory" due-to="Gary
Gregory">Add JavaVersion.JAVA_27.</action>
<action type="add" dev="ggregory" due-to="Gary
Gregory">Add SystemUtils.IS_JAVA_27.</action>
diff --git a/src/main/java/org/apache/commons/lang3/CharSet.java
b/src/main/java/org/apache/commons/lang3/CharSet.java
index 89dc5fe63..65547e4d6 100644
--- a/src/main/java/org/apache/commons/lang3/CharSet.java
+++ b/src/main/java/org/apache/commons/lang3/CharSet.java
@@ -19,7 +19,7 @@
import java.io.Serializable;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
import java.util.stream.Stream;
@@ -79,7 +79,9 @@ public class CharSet implements Serializable {
/**
* A Map of the common cases used in the factory.
- * Subclasses can add more common patterns if desired
+ * <p>
+ * Subclasses can add more common patterns if desired.
+ * </p>
*
* @since 2.0
*/
@@ -152,8 +154,8 @@ public class CharSet implements Serializable {
*
* <p>All CharSet objects returned by this method will be immutable.</p>
*
- * @param setStrs Strings to merge into the set, may be null
- * @return a CharSet instance
+ * @param setStrs Strings to merge into the set, may be null.
+ * @return a CharSet instance.
* @since 2.4
*/
public static CharSet getInstance(final String... setStrs) {
@@ -170,14 +172,14 @@ public static CharSet getInstance(final String...
setStrs) {
}
/** The set of CharRange objects. */
- private final Set<CharRange> set = Collections.synchronizedSet(new
HashSet<>());
+ private final Set<CharRange> set = Collections.synchronizedSet(new
LinkedHashSet<>());
/**
* Constructs a new CharSet using the set syntax.
* Each string is merged in with the set.
*
- * @param set Strings to merge into the initial set
- * @throws NullPointerException if set is {@code null}
+ * @param set Strings to merge into the initial set.
+ * @throws NullPointerException if set is {@code null}.
*/
protected CharSet(final String... set) {
Stream.of(set).forEach(this::add);
@@ -192,7 +194,6 @@ protected void add(final String str) {
if (str == null) {
return;
}
-
final int len = str.length();
int pos = 0;
while (pos < len) {
@@ -218,10 +219,10 @@ protected void add(final String str) {
}
/**
- * Does the {@link CharSet} contain the specified
- * character {@code ch}.
- *
- * <p>Examples using the negation character:</p>
+ * Tests whether this {@link CharSet} contain the specified character
{@code ch}.
+ * <p>
+ * Examples using the negation character:
+ * </p>
* <pre>
* CharSet.getInstance("^a-c").contains('a') = false
* CharSet.getInstance("^a-c").contains('d') = true
@@ -232,8 +233,8 @@ protected void add(final String str) {
* CharSet.getInstance("^", "a-c").contains('^') = true
* </pre>
*
- * @param ch the character to check for
- * @return {@code true} if the set contains the characters
+ * @param ch the character to check.
+ * @return {@code true} if the set contains the characters.
*/
public boolean contains(final char ch) {
synchronized (set) {
@@ -248,8 +249,8 @@ public boolean contains(final char ch) {
* <p>The two sets {@code abc} and {@code a-c} are <em>not</em>
* equal according to this method.</p>
*
- * @param obj the object to compare to
- * @return true if equal
+ * @param obj the object to compare.
+ * @return true if equal.
* @since 2.0
*/
@Override
@@ -265,21 +266,21 @@ public boolean equals(final Object obj) {
}
/**
- * Gets the internal set as an array of CharRange objects.
+ * Gets the set of character ranges.
+ * <p>
+ * Package private for testing.
+ * </p>
*
- * @return an array of immutable CharRange objects
- * @since 2.0
+ * @return the set of character ranges.
*/
-// NOTE: This is no longer public as CharRange is no longer a public class.
-// It may be replaced when CharSet moves to Range.
- /*public*/ CharRange[] getCharRanges() {
- return set.toArray(CharRange.EMPTY_ARRAY);
+ Set<CharRange> getCharRanges() {
+ return set;
}
/**
* Gets a hash code compatible with the equals method.
*
- * @return a suitable hash code
+ * @return a suitable hash code.
* @since 2.0
*/
@Override
@@ -290,7 +291,7 @@ public int hashCode() {
/**
* Gets a string representation of the set.
*
- * @return string representation of the set
+ * @return string representation of the set.
*/
@Override
public String toString() {
diff --git a/src/test/java/org/apache/commons/lang3/CharSetTest.java
b/src/test/java/org/apache/commons/lang3/CharSetTest.java
index 7fbed997a..a20a43fa4 100644
--- a/src/test/java/org/apache/commons/lang3/CharSetTest.java
+++ b/src/test/java/org/apache/commons/lang3/CharSetTest.java
@@ -25,6 +25,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.lang.reflect.Modifier;
+import java.util.Set;
import org.junit.jupiter.api.Test;
@@ -42,92 +43,92 @@ void testClass() {
@Test
void testConstructor_String_combo() {
CharSet set;
- CharRange[] array;
+ Set<CharRange> array;
set = CharSet.getInstance("abc");
array = set.getCharRanges();
- assertEquals(3, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.is('a')));
- assertTrue(ArrayUtils.contains(array, CharRange.is('b')));
- assertTrue(ArrayUtils.contains(array, CharRange.is('c')));
+ assertEquals(3, array.size());
+ assertTrue(array.contains(CharRange.is('a')));
+ assertTrue(array.contains(CharRange.is('b')));
+ assertTrue(array.contains(CharRange.is('c')));
set = CharSet.getInstance("a-ce-f");
array = set.getCharRanges();
- assertEquals(2, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isIn('a', 'c')));
- assertTrue(ArrayUtils.contains(array, CharRange.isIn('e', 'f')));
+ assertEquals(2, array.size());
+ assertTrue(array.contains(CharRange.isIn('a', 'c')));
+ assertTrue(array.contains(CharRange.isIn('e', 'f')));
set = CharSet.getInstance("ae-f");
array = set.getCharRanges();
- assertEquals(2, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.is('a')));
- assertTrue(ArrayUtils.contains(array, CharRange.isIn('e', 'f')));
+ assertEquals(2, array.size());
+ assertTrue(array.contains(CharRange.is('a')));
+ assertTrue(array.contains(CharRange.isIn('e', 'f')));
set = CharSet.getInstance("e-fa");
array = set.getCharRanges();
- assertEquals(2, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.is('a')));
- assertTrue(ArrayUtils.contains(array, CharRange.isIn('e', 'f')));
+ assertEquals(2, array.size());
+ assertTrue(array.contains(CharRange.is('a')));
+ assertTrue(array.contains(CharRange.isIn('e', 'f')));
set = CharSet.getInstance("ae-fm-pz");
array = set.getCharRanges();
- assertEquals(4, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.is('a')));
- assertTrue(ArrayUtils.contains(array, CharRange.isIn('e', 'f')));
- assertTrue(ArrayUtils.contains(array, CharRange.isIn('m', 'p')));
- assertTrue(ArrayUtils.contains(array, CharRange.is('z')));
+ assertEquals(4, array.size());
+ assertTrue(array.contains(CharRange.is('a')));
+ assertTrue(array.contains(CharRange.isIn('e', 'f')));
+ assertTrue(array.contains(CharRange.isIn('m', 'p')));
+ assertTrue(array.contains(CharRange.is('z')));
}
@Test
void testConstructor_String_comboNegated() {
CharSet set;
- CharRange[] array;
+ Set<CharRange> array;
set = CharSet.getInstance("^abc");
array = set.getCharRanges();
- assertEquals(3, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isNot('a')));
- assertTrue(ArrayUtils.contains(array, CharRange.is('b')));
- assertTrue(ArrayUtils.contains(array, CharRange.is('c')));
+ assertEquals(3, array.size());
+ assertTrue(array.contains(CharRange.isNot('a')));
+ assertTrue(array.contains(CharRange.is('b')));
+ assertTrue(array.contains(CharRange.is('c')));
set = CharSet.getInstance("b^ac");
array = set.getCharRanges();
- assertEquals(3, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.is('b')));
- assertTrue(ArrayUtils.contains(array, CharRange.isNot('a')));
- assertTrue(ArrayUtils.contains(array, CharRange.is('c')));
+ assertEquals(3, array.size());
+ assertTrue(array.contains(CharRange.is('b')));
+ assertTrue(array.contains(CharRange.isNot('a')));
+ assertTrue(array.contains(CharRange.is('c')));
set = CharSet.getInstance("db^ac");
array = set.getCharRanges();
- assertEquals(4, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.is('d')));
- assertTrue(ArrayUtils.contains(array, CharRange.is('b')));
- assertTrue(ArrayUtils.contains(array, CharRange.isNot('a')));
- assertTrue(ArrayUtils.contains(array, CharRange.is('c')));
+ assertEquals(4, array.size());
+ assertTrue(array.contains(CharRange.is('d')));
+ assertTrue(array.contains(CharRange.is('b')));
+ assertTrue(array.contains(CharRange.isNot('a')));
+ assertTrue(array.contains(CharRange.is('c')));
set = CharSet.getInstance("^b^a");
array = set.getCharRanges();
- assertEquals(2, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isNot('b')));
- assertTrue(ArrayUtils.contains(array, CharRange.isNot('a')));
+ assertEquals(2, array.size());
+ assertTrue(array.contains(CharRange.isNot('b')));
+ assertTrue(array.contains(CharRange.isNot('a')));
set = CharSet.getInstance("b^a-c^z");
array = set.getCharRanges();
- assertEquals(3, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isNotIn('a', 'c')));
- assertTrue(ArrayUtils.contains(array, CharRange.isNot('z')));
- assertTrue(ArrayUtils.contains(array, CharRange.is('b')));
+ assertEquals(3, array.size());
+ assertTrue(array.contains(CharRange.isNotIn('a', 'c')));
+ assertTrue(array.contains(CharRange.isNot('z')));
+ assertTrue(array.contains(CharRange.is('b')));
}
@Test
void testConstructor_String_oddCombinations() {
CharSet set;
- CharRange[] array;
+ Set<CharRange> array;
set = CharSet.getInstance("a-^c");
array = set.getCharRanges();
- assertTrue(ArrayUtils.contains(array, CharRange.isIn('a', '^'))); //
"a-^"
- assertTrue(ArrayUtils.contains(array, CharRange.is('c'))); // "c"
+ assertTrue(array.contains(CharRange.isIn('a', '^'))); // "a-^"
+ assertTrue(array.contains(CharRange.is('c'))); // "c"
assertFalse(set.contains('b'));
assertTrue(set.contains('^'));
assertTrue(set.contains('_')); // between ^ and a
@@ -135,16 +136,16 @@ void testConstructor_String_oddCombinations() {
set = CharSet.getInstance("^a-^c");
array = set.getCharRanges();
- assertTrue(ArrayUtils.contains(array, CharRange.isNotIn('a', '^')));
// "^a-^"
- assertTrue(ArrayUtils.contains(array, CharRange.is('c'))); // "c"
+ assertTrue(array.contains(CharRange.isNotIn('a', '^'))); // "^a-^"
+ assertTrue(array.contains(CharRange.is('c'))); // "c"
assertTrue(set.contains('b'));
assertFalse(set.contains('^'));
assertFalse(set.contains('_')); // between ^ and a
set = CharSet.getInstance("a- ^-- "); //contains everything
array = set.getCharRanges();
- assertTrue(ArrayUtils.contains(array, CharRange.isIn('a', ' '))); //
"a- "
- assertTrue(ArrayUtils.contains(array, CharRange.isNotIn('-', ' ')));
// "^-- "
+ assertTrue(array.contains(CharRange.isIn('a', ' '))); // "a- "
+ assertTrue(array.contains(CharRange.isNotIn('-', ' '))); // "^-- "
assertTrue(set.contains('#'));
assertTrue(set.contains('^'));
assertTrue(set.contains('a'));
@@ -153,7 +154,7 @@ void testConstructor_String_oddCombinations() {
set = CharSet.getInstance("^-b");
array = set.getCharRanges();
- assertTrue(ArrayUtils.contains(array, CharRange.isIn('^', 'b'))); //
"^-b"
+ assertTrue(array.contains(CharRange.isIn('^', 'b'))); // "^-b"
assertTrue(set.contains('b'));
assertTrue(set.contains('_')); // between ^ and a
assertFalse(set.contains('A'));
@@ -161,7 +162,7 @@ void testConstructor_String_oddCombinations() {
set = CharSet.getInstance("b-^");
array = set.getCharRanges();
- assertTrue(ArrayUtils.contains(array, CharRange.isIn('^', 'b'))); //
"b-^"
+ assertTrue(array.contains(CharRange.isIn('^', 'b'))); // "b-^"
assertTrue(set.contains('b'));
assertTrue(set.contains('^'));
assertTrue(set.contains('a')); // between ^ and b
@@ -171,149 +172,149 @@ void testConstructor_String_oddCombinations() {
@Test
void testConstructor_String_oddDash() {
CharSet set;
- CharRange[] array;
+ Set<CharRange> array;
set = CharSet.getInstance("-");
array = set.getCharRanges();
- assertEquals(1, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.is('-')));
+ assertEquals(1, array.size());
+ assertTrue(array.contains(CharRange.is('-')));
set = CharSet.getInstance("--");
array = set.getCharRanges();
- assertEquals(1, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.is('-')));
+ assertEquals(1, array.size());
+ assertTrue(array.contains(CharRange.is('-')));
set = CharSet.getInstance("---");
array = set.getCharRanges();
- assertEquals(1, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.is('-')));
+ assertEquals(1, array.size());
+ assertTrue(array.contains(CharRange.is('-')));
set = CharSet.getInstance("----");
array = set.getCharRanges();
- assertEquals(1, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.is('-')));
+ assertEquals(1, array.size());
+ assertTrue(array.contains(CharRange.is('-')));
set = CharSet.getInstance("-a");
array = set.getCharRanges();
- assertEquals(2, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.is('-')));
- assertTrue(ArrayUtils.contains(array, CharRange.is('a')));
+ assertEquals(2, array.size());
+ assertTrue(array.contains(CharRange.is('-')));
+ assertTrue(array.contains(CharRange.is('a')));
set = CharSet.getInstance("a-");
array = set.getCharRanges();
- assertEquals(2, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.is('a')));
- assertTrue(ArrayUtils.contains(array, CharRange.is('-')));
+ assertEquals(2, array.size());
+ assertTrue(array.contains(CharRange.is('a')));
+ assertTrue(array.contains(CharRange.is('-')));
set = CharSet.getInstance("a--");
array = set.getCharRanges();
- assertEquals(1, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isIn('a', '-')));
+ assertEquals(1, array.size());
+ assertTrue(array.contains(CharRange.isIn('a', '-')));
set = CharSet.getInstance("--a");
array = set.getCharRanges();
- assertEquals(1, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isIn('-', 'a')));
+ assertEquals(1, array.size());
+ assertTrue(array.contains(CharRange.isIn('-', 'a')));
}
@Test
void testConstructor_String_oddNegate() {
CharSet set;
- CharRange[] array;
+ Set<CharRange> array;
set = CharSet.getInstance("^");
array = set.getCharRanges();
- assertEquals(1, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.is('^'))); // "^"
+ assertEquals(1, array.size());
+ assertTrue(array.contains(CharRange.is('^'))); // "^"
set = CharSet.getInstance("^^");
array = set.getCharRanges();
- assertEquals(1, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isNot('^'))); // "^^"
+ assertEquals(1, array.size());
+ assertTrue(array.contains(CharRange.isNot('^'))); // "^^"
set = CharSet.getInstance("^^^");
array = set.getCharRanges();
- assertEquals(2, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isNot('^'))); // "^^"
- assertTrue(ArrayUtils.contains(array, CharRange.is('^'))); // "^"
+ assertEquals(2, array.size());
+ assertTrue(array.contains(CharRange.isNot('^'))); // "^^"
+ assertTrue(array.contains(CharRange.is('^'))); // "^"
set = CharSet.getInstance("^^^^");
array = set.getCharRanges();
- assertEquals(1, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isNot('^'))); // "^^"
x2
+ assertEquals(1, array.size());
+ assertTrue(array.contains(CharRange.isNot('^'))); // "^^" x2
set = CharSet.getInstance("a^");
array = set.getCharRanges();
- assertEquals(2, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.is('a'))); // "a"
- assertTrue(ArrayUtils.contains(array, CharRange.is('^'))); // "^"
+ assertEquals(2, array.size());
+ assertTrue(array.contains(CharRange.is('a'))); // "a"
+ assertTrue(array.contains(CharRange.is('^'))); // "^"
set = CharSet.getInstance("^a-");
array = set.getCharRanges();
- assertEquals(2, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isNot('a'))); // "^a"
- assertTrue(ArrayUtils.contains(array, CharRange.is('-'))); // "-"
+ assertEquals(2, array.size());
+ assertTrue(array.contains(CharRange.isNot('a'))); // "^a"
+ assertTrue(array.contains(CharRange.is('-'))); // "-"
set = CharSet.getInstance("^^-c");
array = set.getCharRanges();
- assertEquals(1, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isNotIn('^', 'c')));
// "^^-c"
+ assertEquals(1, array.size());
+ assertTrue(array.contains(CharRange.isNotIn('^', 'c'))); // "^^-c"
set = CharSet.getInstance("^c-^");
array = set.getCharRanges();
- assertEquals(1, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isNotIn('c', '^')));
// "^c-^"
+ assertEquals(1, array.size());
+ assertTrue(array.contains(CharRange.isNotIn('c', '^'))); // "^c-^"
set = CharSet.getInstance("^c-^d");
array = set.getCharRanges();
- assertEquals(2, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isNotIn('c', '^')));
// "^c-^"
- assertTrue(ArrayUtils.contains(array, CharRange.is('d'))); // "d"
+ assertEquals(2, array.size());
+ assertTrue(array.contains(CharRange.isNotIn('c', '^'))); // "^c-^"
+ assertTrue(array.contains(CharRange.is('d'))); // "d"
set = CharSet.getInstance("^^-");
array = set.getCharRanges();
- assertEquals(2, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isNot('^'))); // "^^"
- assertTrue(ArrayUtils.contains(array, CharRange.is('-'))); // "-"
+ assertEquals(2, array.size());
+ assertTrue(array.contains(CharRange.isNot('^'))); // "^^"
+ assertTrue(array.contains(CharRange.is('-'))); // "-"
}
@Test
void testConstructor_String_simple() {
CharSet set;
- CharRange[] array;
+ Set<CharRange> array;
set = CharSet.getInstance((String) null);
array = set.getCharRanges();
assertEquals("[]", set.toString());
- assertEquals(0, array.length);
+ assertEquals(0, array.size());
set = CharSet.getInstance("");
array = set.getCharRanges();
assertEquals("[]", set.toString());
- assertEquals(0, array.length);
+ assertEquals(0, array.size());
set = CharSet.getInstance("a");
array = set.getCharRanges();
assertEquals("[a]", set.toString());
- assertEquals(1, array.length);
- assertEquals("a", array[0].toString());
+ assertEquals(1, array.size());
+ assertEquals("a", array.iterator().next().toString());
set = CharSet.getInstance("^a");
array = set.getCharRanges();
assertEquals("[^a]", set.toString());
- assertEquals(1, array.length);
- assertEquals("^a", array[0].toString());
+ assertEquals(1, array.size());
+ assertEquals("^a", array.iterator().next().toString());
set = CharSet.getInstance("a-e");
array = set.getCharRanges();
assertEquals("[a-e]", set.toString());
- assertEquals(1, array.length);
- assertEquals("a-e", array[0].toString());
+ assertEquals(1, array.size());
+ assertEquals("a-e", array.iterator().next().toString());
set = CharSet.getInstance("^a-e");
array = set.getCharRanges();
assertEquals("[^a-e]", set.toString());
- assertEquals(1, array.length);
- assertEquals("^a-e", array[0].toString());
+ assertEquals(1, array.size());
+ assertEquals("^a-e", array.iterator().next().toString());
}
@Test
@@ -354,9 +355,9 @@ void testContains_Char() {
assertTrue(dtob.contains('d'));
assertFalse(dtob.contains('e'));
- final CharRange[] array = dtob.getCharRanges();
+ final Set<CharRange> array = dtob.getCharRanges();
assertEquals("[b-d]", dtob.toString());
- assertEquals(1, array.length);
+ assertEquals(1, array.size());
}
@Test
@@ -447,26 +448,26 @@ void testSerialization() {
@Test
void testStatics() {
- CharRange[] array;
+ Set<CharRange> array;
array = CharSet.EMPTY.getCharRanges();
- assertEquals(0, array.length);
+ assertEquals(0, array.size());
array = CharSet.ASCII_ALPHA.getCharRanges();
- assertEquals(2, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isIn('a', 'z')));
- assertTrue(ArrayUtils.contains(array, CharRange.isIn('A', 'Z')));
+ assertEquals(2, array.size());
+ assertTrue(array.contains(CharRange.isIn('a', 'z')));
+ assertTrue(array.contains(CharRange.isIn('A', 'Z')));
array = CharSet.ASCII_ALPHA_LOWER.getCharRanges();
- assertEquals(1, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isIn('a', 'z')));
+ assertEquals(1, array.size());
+ assertTrue(array.contains(CharRange.isIn('a', 'z')));
array = CharSet.ASCII_ALPHA_UPPER.getCharRanges();
- assertEquals(1, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isIn('A', 'Z')));
+ assertEquals(1, array.size());
+ assertTrue(array.contains(CharRange.isIn('A', 'Z')));
array = CharSet.ASCII_NUMERIC.getCharRanges();
- assertEquals(1, array.length);
- assertTrue(ArrayUtils.contains(array, CharRange.isIn('0', '9')));
+ assertEquals(1, array.size());
+ assertTrue(array.contains(CharRange.isIn('0', '9')));
}
}
