You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/11/25 14:19:54 UTC
[commons-collections] 02/02: Reuse constants
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-collections.git
commit 6031f5395b8da5fbe1c566094a2bc528aff3d4c6
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 25 09:19:47 2022 -0500
Reuse constants
---
.../java/org/apache/commons/collections4/CollectionUtilsTest.java | 3 ++-
src/test/java/org/apache/commons/collections4/MapUtilsTest.java | 2 +-
.../java/org/apache/commons/collections4/bag/AbstractBagTest.java | 3 ++-
.../commons/collections4/collection/AbstractCollectionTest.java | 3 ++-
.../commons/collections4/comparators/FixedOrderComparatorTest.java | 5 +++--
.../apache/commons/collections4/iterators/FilterIteratorTest.java | 3 ++-
.../apache/commons/collections4/list/CursorableLinkedListTest.java | 5 +++--
.../apache/commons/collections4/multiset/AbstractMultiSetTest.java | 3 ++-
8 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java b/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
index fb03cdf57..de4480ec4 100644
--- a/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
@@ -54,6 +54,7 @@ import org.apache.commons.collections4.collection.TransformedCollection;
import org.apache.commons.collections4.collection.UnmodifiableCollection;
import org.apache.commons.collections4.functors.DefaultEquator;
import org.apache.commons.collections4.queue.CircularFifoQueue;
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -1029,7 +1030,7 @@ public class CollectionUtilsTest extends MockTestCase {
@Test
public void reverse() {
CollectionUtils.reverseArray(new Object[] {});
- final Integer[] a = collectionA.toArray(new Integer[collectionA.size()]);
+ final Integer[] a = collectionA.toArray(ArrayUtils.EMPTY_INTEGER_OBJECT_ARRAY);
CollectionUtils.reverseArray(a);
// assume our implementation is correct if it returns the same order as the Java function
Collections.reverse(collectionA);
diff --git a/src/test/java/org/apache/commons/collections4/MapUtilsTest.java b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
index 7e55b7a60..66b61c71d 100644
--- a/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
@@ -167,7 +167,7 @@ public class MapUtilsTest {
() -> assertThrows(NullPointerException.class, () -> MapUtils.putAll(null, new Object[0]))
);
- Map<String, String> test = MapUtils.putAll(new HashMap<String, String>(), new String[0]);
+ Map<String, String> test = MapUtils.putAll(new HashMap<String, String>(), org.apache.commons.lang3.ArrayUtils.EMPTY_STRING_ARRAY);
assertEquals(0, test.size());
// sub array
diff --git a/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java b/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java
index 0de6275f6..c3884c749 100644
--- a/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java
+++ b/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java
@@ -35,6 +35,7 @@ import org.apache.commons.collections4.Bag;
import org.apache.commons.collections4.BulkTest;
import org.apache.commons.collections4.collection.AbstractCollectionTest;
import org.apache.commons.collections4.set.AbstractSetTest;
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.jupiter.api.Test;
/**
@@ -503,7 +504,7 @@ public abstract class AbstractBagTest<T> extends AbstractCollectionTest<T> {
bag.add((T) "B");
bag.add((T) "B");
bag.add((T) "C");
- final String[] array = bag.toArray(new String[0]);
+ final String[] array = bag.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
int a = 0, b = 0, c = 0;
for (final String element : array) {
a += element.equals("A") ? 1 : 0;
diff --git a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
index 05c539b57..166afbf0c 100644
--- a/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
+++ b/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
@@ -39,6 +39,7 @@ import java.util.Objects;
import java.util.function.Predicate;
import org.apache.commons.collections4.AbstractObjectTest;
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -1120,7 +1121,7 @@ public abstract class AbstractCollectionTest<E> extends AbstractObjectTest {
"toArray(null) should raise NPE");
verify();
- array = getCollection().toArray(new Object[0]);
+ array = getCollection().toArray(ArrayUtils.EMPTY_OBJECT_ARRAY);
a = getCollection().toArray();
if ((getIterationBehaviour() & UNORDERED) != 0) {
diff --git a/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java b/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
index 0f67861ee..9b23abec8 100644
--- a/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
+++ b/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
@@ -24,6 +24,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Random;
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.jupiter.api.Test;
/**
@@ -170,7 +171,7 @@ public class FixedOrderComparatorTest extends AbstractComparatorTest<String> {
assertEquals(FixedOrderComparator.UnknownObjectBehavior.BEFORE, comparator.getUnknownObjectBehavior());
LinkedList<String> keys = new LinkedList<>(Arrays.asList(topCities));
keys.addFirst("Minneapolis");
- assertComparatorYieldsOrder(keys.toArray(new String[0]), comparator);
+ assertComparatorYieldsOrder(keys.toArray(ArrayUtils.EMPTY_STRING_ARRAY), comparator);
assertEquals(-1, comparator.compare("Minneapolis", "New York"));
assertEquals( 1, comparator.compare("New York", "Minneapolis"));
@@ -180,7 +181,7 @@ public class FixedOrderComparatorTest extends AbstractComparatorTest<String> {
comparator.setUnknownObjectBehavior(FixedOrderComparator.UnknownObjectBehavior.AFTER);
keys = new LinkedList<>(Arrays.asList(topCities));
keys.add("Minneapolis");
- assertComparatorYieldsOrder(keys.toArray(new String[0]), comparator);
+ assertComparatorYieldsOrder(keys.toArray(ArrayUtils.EMPTY_STRING_ARRAY), comparator);
assertEquals( 1, comparator.compare("Minneapolis", "New York"));
assertEquals(-1, comparator.compare("New York", "Minneapolis"));
diff --git a/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java b/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
index 1eb2412f7..ce670dd84 100644
--- a/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
+++ b/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
@@ -28,6 +28,7 @@ import java.util.NoSuchElementException;
import org.apache.commons.collections4.Predicate;
import org.apache.commons.collections4.functors.NotNullPredicate;
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -105,7 +106,7 @@ public class FilterIteratorTest<E> extends AbstractIteratorTest<E> {
@Test
public void testReturnValues() {
- verifyElementsInPredicate(new String[0]);
+ verifyElementsInPredicate(ArrayUtils.EMPTY_STRING_ARRAY);
verifyElementsInPredicate(new String[] { "a" });
verifyElementsInPredicate(new String[] { "b" });
verifyElementsInPredicate(new String[] { "c" });
diff --git a/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java b/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
index ab504182b..e81d37dba 100644
--- a/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
+++ b/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
@@ -29,6 +29,7 @@ import java.util.ListIterator;
import java.util.NoSuchElementException;
import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -1390,7 +1391,7 @@ public class CursorableLinkedListTest<E> extends AbstractLinkedListTest<E> {
assertEquals("5", elts[4]);
assertEquals(5, elts.length);
- final String[] elts2 = list.toArray(new String[0]);
+ final String[] elts2 = list.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
assertEquals("1", elts2[0]);
assertEquals("2", elts2[1]);
assertEquals("3", elts2[2]);
@@ -1513,7 +1514,7 @@ public class CursorableLinkedListTest<E> extends AbstractLinkedListTest<E> {
list.add(prefix + bulk + element);
list.add(prefix + bulk + bulk + element);
}
- return list.toArray(new String[0]);
+ return list.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
}
@Override
diff --git a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
index 1f41f14a2..6da6c0ffd 100644
--- a/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
+++ b/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
@@ -34,6 +34,7 @@ import org.apache.commons.collections4.BulkTest;
import org.apache.commons.collections4.MultiSet;
import org.apache.commons.collections4.collection.AbstractCollectionTest;
import org.apache.commons.collections4.set.AbstractSetTest;
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.jupiter.api.Test;
/**
@@ -517,7 +518,7 @@ public abstract class AbstractMultiSetTest<T> extends AbstractCollectionTest<T>
multiset.add((T) "B");
multiset.add((T) "B");
multiset.add((T) "C");
- final String[] array = multiset.toArray(new String[0]);
+ final String[] array = multiset.toArray(ArrayUtils.EMPTY_STRING_ARRAY);
int a = 0, b = 0, c = 0;
for (final String element : array) {
a += element.equals("A") ? 1 : 0;