Apache/commons-collections
1
0
Fork 0
mirror of https://github.com/apache/commons-collections.git synced 2025-02-17 23:44:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only use static imports for JUnit

Browse Source
This commit is contained in:
Gary Gregory 2024-10-21 10:03:04 -04:00
parent e5c805091a
commit c7fc724f23
9 changed files with 90 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
View File

@ -16,7 +16,6 @@
*/ */
package org.apache.commons.collections4; package org.apache.commons.collections4;
import static org.apache.commons.collections4.functors.EqualPredicate.equalPredicate;
import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertAll;
import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -54,6 +53,7 @@ import org.apache.commons.collections4.collection.SynchronizedCollection;
import org.apache.commons.collections4.collection.TransformedCollection; import org.apache.commons.collections4.collection.TransformedCollection;
import org.apache.commons.collections4.collection.UnmodifiableCollection; import org.apache.commons.collections4.collection.UnmodifiableCollection;
import org.apache.commons.collections4.functors.DefaultEquator; import org.apache.commons.collections4.functors.DefaultEquator;
import org.apache.commons.collections4.functors.EqualPredicate;
import org.apache.commons.collections4.functors.InstanceofPredicate; import org.apache.commons.collections4.functors.InstanceofPredicate;
import org.apache.commons.collections4.functors.UniquePredicate; import org.apache.commons.collections4.functors.UniquePredicate;
import org.apache.commons.collections4.queue.CircularFifoQueue; import org.apache.commons.collections4.queue.CircularFifoQueue;
@ -250,10 +250,10 @@ public class CollectionUtilsTest extends MockTestCase {
@Test @Test
@Deprecated @Deprecated
public void find() { public void find() {
Predicate<Number> testPredicate = equalPredicate((Number) 4); Predicate<Number> testPredicate = EqualPredicate.equalPredicate((Number) 4);
Integer test = CollectionUtils.find(collectionA, testPredicate); Integer test = CollectionUtils.find(collectionA, testPredicate);
assertEquals(4, (int) test); assertEquals(4, (int) test);
testPredicate = equalPredicate((Number) 45); testPredicate = EqualPredicate.equalPredicate((Number) 45);
test = CollectionUtils.find(collectionA, testPredicate); test = CollectionUtils.find(collectionA, testPredicate);
assertNull(test); assertNull(test);
assertNull(CollectionUtils.find(null, testPredicate)); assertNull(CollectionUtils.find(null, testPredicate));

10
src/test/java/org/apache/commons/collections4/IterableUtilsTest.java
View File

@ -16,7 +16,6 @@
*/ */
package org.apache.commons.collections4; package org.apache.commons.collections4;
import static org.apache.commons.collections4.functors.EqualPredicate.equalPredicate;
import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertAll;
import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -40,6 +39,7 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections4.bag.HashBag; import org.apache.commons.collections4.bag.HashBag;
import org.apache.commons.collections4.functors.EqualPredicate;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -302,10 +302,10 @@ public class IterableUtilsTest {
@Test @Test
public void testFind() { public void testFind() {
Predicate<Number> testPredicate = equalPredicate(4); Predicate<Number> testPredicate = EqualPredicate.equalPredicate(4);
Integer test = IterableUtils.find(iterableA, testPredicate); Integer test = IterableUtils.find(iterableA, testPredicate);
assertEquals(4, (int) test); assertEquals(4, (int) test);
testPredicate = equalPredicate(45); testPredicate = EqualPredicate.equalPredicate(45);
test = IterableUtils.find(iterableA, testPredicate); test = IterableUtils.find(iterableA, testPredicate);
assertNull(test); assertNull(test);
assertNull(IterableUtils.find(null, testPredicate)); assertNull(IterableUtils.find(null, testPredicate));
@ -457,10 +457,10 @@ public class IterableUtilsTest {
@Test @Test
public void testIndexOf() { public void testIndexOf() {
Predicate<Number> testPredicate = equalPredicate((Number) 4); Predicate<Number> testPredicate = EqualPredicate.equalPredicate((Number) 4);
int index = IterableUtils.indexOf(iterableA, testPredicate); int index = IterableUtils.indexOf(iterableA, testPredicate);
assertEquals(6, index); assertEquals(6, index);
testPredicate = equalPredicate((Number) 45); testPredicate = EqualPredicate.equalPredicate((Number) 45);
index = IterableUtils.indexOf(iterableA, testPredicate); index = IterableUtils.indexOf(iterableA, testPredicate);
assertEquals(-1, index); assertEquals(-1, index);
assertEquals(-1, IterableUtils.indexOf(null, testPredicate)); assertEquals(-1, IterableUtils.indexOf(null, testPredicate));

14
src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java
View File

@ -16,8 +16,6 @@
*/ */
package org.apache.commons.collections4; package org.apache.commons.collections4;
import static org.apache.commons.collections4.functors.EqualPredicate.equalPredicate;
import static org.apache.commons.collections4.functors.TruePredicate.INSTANCE;
import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.replay;
@ -46,6 +44,8 @@ import java.util.NoSuchElementException;
import java.util.Set; import java.util.Set;
import java.util.Vector; import java.util.Vector;
import org.apache.commons.collections4.functors.EqualPredicate;
import org.apache.commons.collections4.functors.TruePredicate;
import org.apache.commons.collections4.iterators.ArrayIterator; import org.apache.commons.collections4.iterators.ArrayIterator;
import org.apache.commons.collections4.iterators.EmptyIterator; import org.apache.commons.collections4.iterators.EmptyIterator;
import org.apache.commons.collections4.iterators.EmptyListIterator; import org.apache.commons.collections4.iterators.EmptyListIterator;
@ -725,7 +725,7 @@ public class IteratorUtilsTest {
public void testFilteredListIterator() { public void testFilteredListIterator() {
final List arrayList = new ArrayList(); final List arrayList = new ArrayList();
arrayList.add("test"); arrayList.add("test");
final Predicate predicate = INSTANCE; final Predicate predicate = TruePredicate.INSTANCE;
assertTrue(IteratorUtils.filteredListIterator(arrayList.listIterator(), predicate) instanceof ListIterator, assertTrue(IteratorUtils.filteredListIterator(arrayList.listIterator(), predicate) instanceof ListIterator,
"create instance fail"); "create instance fail");
assertAll( assertAll(
@ -736,10 +736,10 @@ public class IteratorUtilsTest {
@Test @Test
public void testFind() { public void testFind() {
Predicate<Number> testPredicate = equalPredicate((Number) 4); Predicate<Number> testPredicate = EqualPredicate.equalPredicate((Number) 4);
Integer test = IteratorUtils.find(iterableA.iterator(), testPredicate); Integer test = IteratorUtils.find(iterableA.iterator(), testPredicate);
assertEquals(4, (int) test); assertEquals(4, (int) test);
testPredicate = equalPredicate((Number) 45); testPredicate = EqualPredicate.equalPredicate((Number) 45);
test = IteratorUtils.find(iterableA.iterator(), testPredicate); test = IteratorUtils.find(iterableA.iterator(), testPredicate);
assertNull(test); assertNull(test);
assertNull(IteratorUtils.find(null, testPredicate)); assertNull(IteratorUtils.find(null, testPredicate));
@ -861,10 +861,10 @@ public class IteratorUtilsTest {
@Test @Test
public void testIndexOf() { public void testIndexOf() {
Predicate<Number> testPredicate = equalPredicate((Number) 4); Predicate<Number> testPredicate = EqualPredicate.equalPredicate((Number) 4);
int index = IteratorUtils.indexOf(iterableA.iterator(), testPredicate); int index = IteratorUtils.indexOf(iterableA.iterator(), testPredicate);
assertEquals(6, index); assertEquals(6, index);
testPredicate = equalPredicate((Number) 45); testPredicate = EqualPredicate.equalPredicate((Number) 45);
index = IteratorUtils.indexOf(iterableA.iterator(), testPredicate); index = IteratorUtils.indexOf(iterableA.iterator(), testPredicate);
assertEquals(-1, index); assertEquals(-1, index);
assertEquals(-1, IteratorUtils.indexOf(null, testPredicate)); assertEquals(-1, IteratorUtils.indexOf(null, testPredicate));

86
src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java
View File

@ -16,8 +16,6 @@
*/ */
package org.apache.commons.collections4; package org.apache.commons.collections4;
import static org.apache.commons.collections4.functors.NullPredicate.nullPredicate;
import static org.apache.commons.collections4.functors.TruePredicate.truePredicate;
import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertSame;
@ -51,16 +49,16 @@ public class PredicateUtilsTest extends AbstractPredicateTest {
@Override @Override
protected Predicate<?> generatePredicate() { protected Predicate<?> generatePredicate() {
return truePredicate(); //Just return something to satisfy super class. return TruePredicate.truePredicate(); //Just return something to satisfy super class.
} }
@Test @Test
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void testAllPredicate() { public void testAllPredicate() {
assertPredicateTrue(AllPredicate.allPredicate(), null); assertPredicateTrue(AllPredicate.allPredicate(), null);
assertTrue(AllPredicate.allPredicate(truePredicate(), truePredicate(), truePredicate()).test(null)); assertTrue(AllPredicate.allPredicate(TruePredicate.truePredicate(), TruePredicate.truePredicate(), TruePredicate.truePredicate()).test(null));
assertFalse(AllPredicate.allPredicate(truePredicate(), FalsePredicate.falsePredicate(), truePredicate()).test(null)); assertFalse(AllPredicate.allPredicate(TruePredicate.truePredicate(), FalsePredicate.falsePredicate(), TruePredicate.truePredicate()).test(null));
assertFalse(AllPredicate.allPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), truePredicate()).test(null)); assertFalse(AllPredicate.allPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), TruePredicate.truePredicate()).test(null));
assertFalse(AllPredicate.allPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null)); assertFalse(AllPredicate.allPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null));
final Collection<Predicate<Object>> coll = new ArrayList<>(); final Collection<Predicate<Object>> coll = new ArrayList<>();
coll.add(TruePredicate.truePredicate()); coll.add(TruePredicate.truePredicate());
@ -128,9 +126,9 @@ public class PredicateUtilsTest extends AbstractPredicateTest {
@Test @Test
public void testAndPredicate() { public void testAndPredicate() {
assertTrue(PredicateUtils.andPredicate(truePredicate(), truePredicate()).evaluate(null)); assertTrue(PredicateUtils.andPredicate(TruePredicate.truePredicate(), TruePredicate.truePredicate()).evaluate(null));
assertFalse(PredicateUtils.andPredicate(truePredicate(), FalsePredicate.falsePredicate()).evaluate(null)); assertFalse(PredicateUtils.andPredicate(TruePredicate.truePredicate(), FalsePredicate.falsePredicate()).evaluate(null));
assertFalse(PredicateUtils.andPredicate(FalsePredicate.falsePredicate(), truePredicate()).evaluate(null)); assertFalse(PredicateUtils.andPredicate(FalsePredicate.falsePredicate(), TruePredicate.truePredicate()).evaluate(null));
assertFalse(PredicateUtils.andPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null)); assertFalse(PredicateUtils.andPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null));
} }
@ -144,9 +142,9 @@ public class PredicateUtilsTest extends AbstractPredicateTest {
public void testAnyPredicate() { public void testAnyPredicate() {
assertPredicateFalse(PredicateUtils.anyPredicate(), null); assertPredicateFalse(PredicateUtils.anyPredicate(), null);
assertTrue(PredicateUtils.anyPredicate(truePredicate(), truePredicate(), truePredicate()).evaluate(null)); assertTrue(PredicateUtils.anyPredicate(TruePredicate.truePredicate(), TruePredicate.truePredicate(), TruePredicate.truePredicate()).evaluate(null));
assertTrue(PredicateUtils.anyPredicate(truePredicate(), FalsePredicate.falsePredicate(), truePredicate()).evaluate(null)); assertTrue(PredicateUtils.anyPredicate(TruePredicate.truePredicate(), FalsePredicate.falsePredicate(), TruePredicate.truePredicate()).evaluate(null));
assertTrue(PredicateUtils.anyPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), truePredicate()).evaluate(null)); assertTrue(PredicateUtils.anyPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), TruePredicate.truePredicate()).evaluate(null));
assertFalse(PredicateUtils.anyPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null)); assertFalse(PredicateUtils.anyPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null));
final Collection<Predicate<Object>> coll = new ArrayList<>(); final Collection<Predicate<Object>> coll = new ArrayList<>();
coll.add(TruePredicate.truePredicate()); coll.add(TruePredicate.truePredicate());
@ -230,9 +228,9 @@ public class PredicateUtilsTest extends AbstractPredicateTest {
@Test @Test
public void testEitherPredicate() { public void testEitherPredicate() {
assertFalse(PredicateUtils.eitherPredicate(truePredicate(), truePredicate()).evaluate(null)); assertFalse(PredicateUtils.eitherPredicate(TruePredicate.truePredicate(), TruePredicate.truePredicate()).evaluate(null));
assertTrue(PredicateUtils.eitherPredicate(truePredicate(), FalsePredicate.falsePredicate()).evaluate(null)); assertTrue(PredicateUtils.eitherPredicate(TruePredicate.truePredicate(), FalsePredicate.falsePredicate()).evaluate(null));
assertTrue(PredicateUtils.eitherPredicate(FalsePredicate.falsePredicate(), truePredicate()).evaluate(null)); assertTrue(PredicateUtils.eitherPredicate(FalsePredicate.falsePredicate(), TruePredicate.truePredicate()).evaluate(null));
assertFalse(PredicateUtils.eitherPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null)); assertFalse(PredicateUtils.eitherPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null));
} }
@ -263,7 +261,7 @@ public class PredicateUtilsTest extends AbstractPredicateTest {
@Test @Test
public void testIdentityPredicate() { public void testIdentityPredicate() {
assertSame(nullPredicate(), PredicateUtils.identityPredicate(null)); assertSame(NullPredicate.nullPredicate(), PredicateUtils.identityPredicate(null));
assertNotNull(PredicateUtils.identityPredicate(6)); assertNotNull(PredicateUtils.identityPredicate(6));
assertFalse(PredicateUtils.identityPredicate(6).evaluate(null)); assertFalse(PredicateUtils.identityPredicate(6).evaluate(null));
assertFalse(PredicateUtils.<Object>identityPredicate(6).evaluate(cObject)); assertFalse(PredicateUtils.<Object>identityPredicate(6).evaluate(cObject));
@ -343,9 +341,9 @@ public class PredicateUtilsTest extends AbstractPredicateTest {
@Test @Test
public void testNeitherPredicate() { public void testNeitherPredicate() {
assertFalse(PredicateUtils.neitherPredicate(truePredicate(), truePredicate()).evaluate(null)); assertFalse(PredicateUtils.neitherPredicate(TruePredicate.truePredicate(), TruePredicate.truePredicate()).evaluate(null));
assertFalse(PredicateUtils.neitherPredicate(truePredicate(), FalsePredicate.falsePredicate()).evaluate(null)); assertFalse(PredicateUtils.neitherPredicate(TruePredicate.truePredicate(), FalsePredicate.falsePredicate()).evaluate(null));
assertFalse(PredicateUtils.neitherPredicate(FalsePredicate.falsePredicate(), truePredicate()).evaluate(null)); assertFalse(PredicateUtils.neitherPredicate(FalsePredicate.falsePredicate(), TruePredicate.truePredicate()).evaluate(null));
assertTrue(PredicateUtils.neitherPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null)); assertTrue(PredicateUtils.neitherPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null));
} }
@ -358,9 +356,9 @@ public class PredicateUtilsTest extends AbstractPredicateTest {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void testNonePredicate() { public void testNonePredicate() {
assertPredicateTrue(PredicateUtils.nonePredicate(), null); assertPredicateTrue(PredicateUtils.nonePredicate(), null);
assertFalse(PredicateUtils.nonePredicate(truePredicate(), truePredicate(), truePredicate()).evaluate(null)); assertFalse(PredicateUtils.nonePredicate(TruePredicate.truePredicate(), TruePredicate.truePredicate(), TruePredicate.truePredicate()).evaluate(null));
assertFalse(PredicateUtils.nonePredicate(truePredicate(), FalsePredicate.falsePredicate(), truePredicate()).evaluate(null)); assertFalse(PredicateUtils.nonePredicate(TruePredicate.truePredicate(), FalsePredicate.falsePredicate(), TruePredicate.truePredicate()).evaluate(null));
assertFalse(PredicateUtils.nonePredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), truePredicate()).evaluate(null)); assertFalse(PredicateUtils.nonePredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), TruePredicate.truePredicate()).evaluate(null));
assertTrue(PredicateUtils.nonePredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null)); assertTrue(PredicateUtils.nonePredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null));
final Collection<Predicate<Object>> coll = new ArrayList<>(); final Collection<Predicate<Object>> coll = new ArrayList<>();
coll.add(TruePredicate.truePredicate()); coll.add(TruePredicate.truePredicate());
@ -430,10 +428,10 @@ public class PredicateUtilsTest extends AbstractPredicateTest {
@Test @Test
public void testNotPredicate() { public void testNotPredicate() {
assertNotNull(PredicateUtils.notPredicate(TruePredicate.truePredicate())); assertNotNull(PredicateUtils.notPredicate(TruePredicate.truePredicate()));
assertFalse(PredicateUtils.notPredicate(truePredicate()).evaluate(null)); assertFalse(PredicateUtils.notPredicate(TruePredicate.truePredicate()).evaluate(null));
assertFalse(PredicateUtils.notPredicate(truePredicate()).evaluate(cObject)); assertFalse(PredicateUtils.notPredicate(TruePredicate.truePredicate()).evaluate(cObject));
assertFalse(PredicateUtils.notPredicate(truePredicate()).evaluate(cString)); assertFalse(PredicateUtils.notPredicate(TruePredicate.truePredicate()).evaluate(cString));
assertFalse(PredicateUtils.notPredicate(truePredicate()).evaluate(cInteger)); assertFalse(PredicateUtils.notPredicate(TruePredicate.truePredicate()).evaluate(cInteger));
} }
@Test @Test
@ -443,7 +441,7 @@ public class PredicateUtilsTest extends AbstractPredicateTest {
@Test @Test
public void testNullIsExceptionPredicate() { public void testNullIsExceptionPredicate() {
assertTrue(PredicateUtils.nullIsExceptionPredicate(truePredicate()).evaluate(new Object())); assertTrue(PredicateUtils.nullIsExceptionPredicate(TruePredicate.truePredicate()).evaluate(new Object()));
assertThrows(FunctorException.class, () -> PredicateUtils.nullIsExceptionPredicate(TruePredicate.truePredicate()).evaluate(null)); assertThrows(FunctorException.class, () -> PredicateUtils.nullIsExceptionPredicate(TruePredicate.truePredicate()).evaluate(null));
} }
@ -454,8 +452,8 @@ public class PredicateUtilsTest extends AbstractPredicateTest {
@Test @Test
public void testNullIsFalsePredicate() { public void testNullIsFalsePredicate() {
assertFalse(PredicateUtils.nullIsFalsePredicate(truePredicate()).evaluate(null)); assertFalse(PredicateUtils.nullIsFalsePredicate(TruePredicate.truePredicate()).evaluate(null));
assertTrue(PredicateUtils.nullIsFalsePredicate(truePredicate()).evaluate(new Object())); assertTrue(PredicateUtils.nullIsFalsePredicate(TruePredicate.truePredicate()).evaluate(new Object()));
assertFalse(PredicateUtils.nullIsFalsePredicate(FalsePredicate.falsePredicate()).evaluate(new Object())); assertFalse(PredicateUtils.nullIsFalsePredicate(FalsePredicate.falsePredicate()).evaluate(new Object()));
} }
@ -466,8 +464,8 @@ public class PredicateUtilsTest extends AbstractPredicateTest {
@Test @Test
public void testNullIsTruePredicate() { public void testNullIsTruePredicate() {
assertTrue(PredicateUtils.nullIsTruePredicate(truePredicate()).evaluate(null)); assertTrue(PredicateUtils.nullIsTruePredicate(TruePredicate.truePredicate()).evaluate(null));
assertTrue(PredicateUtils.nullIsTruePredicate(truePredicate()).evaluate(new Object())); assertTrue(PredicateUtils.nullIsTruePredicate(TruePredicate.truePredicate()).evaluate(new Object()));
assertFalse(PredicateUtils.nullIsTruePredicate(FalsePredicate.falsePredicate()).evaluate(new Object())); assertFalse(PredicateUtils.nullIsTruePredicate(FalsePredicate.falsePredicate()).evaluate(new Object()));
} }
@ -480,11 +478,11 @@ public class PredicateUtilsTest extends AbstractPredicateTest {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void testOnePredicate() { public void testOnePredicate() {
assertPredicateFalse(PredicateUtils.onePredicate((Predicate<Object>[]) new Predicate[] {}), null); assertPredicateFalse(PredicateUtils.onePredicate((Predicate<Object>[]) new Predicate[] {}), null);
assertFalse(PredicateUtils.onePredicate(truePredicate(), truePredicate(), truePredicate()).evaluate(null)); assertFalse(PredicateUtils.onePredicate(TruePredicate.truePredicate(), TruePredicate.truePredicate(), TruePredicate.truePredicate()).evaluate(null));
assertFalse(PredicateUtils.onePredicate(truePredicate(), FalsePredicate.falsePredicate(), truePredicate()).evaluate(null)); assertFalse(PredicateUtils.onePredicate(TruePredicate.truePredicate(), FalsePredicate.falsePredicate(), TruePredicate.truePredicate()).evaluate(null));
assertTrue(PredicateUtils.onePredicate(truePredicate(), FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null)); assertTrue(PredicateUtils.onePredicate(TruePredicate.truePredicate(), FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null));
assertTrue(PredicateUtils.onePredicate(FalsePredicate.falsePredicate(), truePredicate(), FalsePredicate.falsePredicate()).evaluate(null)); assertTrue(PredicateUtils.onePredicate(FalsePredicate.falsePredicate(), TruePredicate.truePredicate(), FalsePredicate.falsePredicate()).evaluate(null));
assertTrue(PredicateUtils.onePredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), truePredicate()).evaluate(null)); assertTrue(PredicateUtils.onePredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), TruePredicate.truePredicate()).evaluate(null));
assertFalse(PredicateUtils.onePredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null)); assertFalse(PredicateUtils.onePredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null));
final Collection<Predicate<Object>> coll = new ArrayList<>(); final Collection<Predicate<Object>> coll = new ArrayList<>();
coll.add(TruePredicate.truePredicate()); coll.add(TruePredicate.truePredicate());
@ -550,9 +548,9 @@ public class PredicateUtilsTest extends AbstractPredicateTest {
@Test @Test
public void testOrPredicate() { public void testOrPredicate() {
assertTrue(PredicateUtils.orPredicate(truePredicate(), truePredicate()).evaluate(null)); assertTrue(PredicateUtils.orPredicate(TruePredicate.truePredicate(), TruePredicate.truePredicate()).evaluate(null));
assertTrue(PredicateUtils.orPredicate(truePredicate(), FalsePredicate.falsePredicate()).evaluate(null)); assertTrue(PredicateUtils.orPredicate(TruePredicate.truePredicate(), FalsePredicate.falsePredicate()).evaluate(null));
assertTrue(PredicateUtils.orPredicate(FalsePredicate.falsePredicate(), truePredicate()).evaluate(null)); assertTrue(PredicateUtils.orPredicate(FalsePredicate.falsePredicate(), TruePredicate.truePredicate()).evaluate(null));
assertFalse(PredicateUtils.orPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null)); assertFalse(PredicateUtils.orPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null));
} }
@ -587,7 +585,7 @@ public class PredicateUtilsTest extends AbstractPredicateTest {
public void testTransformedPredicate() { public void testTransformedPredicate() {
assertTrue(PredicateUtils.transformedPredicate( assertTrue(PredicateUtils.transformedPredicate(
TransformerUtils.nopTransformer(), TransformerUtils.nopTransformer(),
truePredicate()).evaluate(new Object())); TruePredicate.truePredicate()).evaluate(new Object()));
final Map<Object, Object> map = new HashMap<>(); final Map<Object, Object> map = new HashMap<>();
map.put(Boolean.TRUE, "Hello"); map.put(Boolean.TRUE, "Hello");
@ -603,10 +601,10 @@ public class PredicateUtilsTest extends AbstractPredicateTest {
public void testTruePredicate() { public void testTruePredicate() {
assertNotNull(TruePredicate.truePredicate()); assertNotNull(TruePredicate.truePredicate());
assertSame(TruePredicate.truePredicate(), TruePredicate.truePredicate()); assertSame(TruePredicate.truePredicate(), TruePredicate.truePredicate());
assertTrue(truePredicate().evaluate(null)); assertTrue(TruePredicate.truePredicate().evaluate(null));
assertTrue(truePredicate().evaluate(cObject)); assertTrue(TruePredicate.truePredicate().evaluate(cObject));
assertTrue(truePredicate().evaluate(cString)); assertTrue(TruePredicate.truePredicate().evaluate(cString));
assertTrue(truePredicate().evaluate(cInteger)); assertTrue(TruePredicate.truePredicate().evaluate(cInteger));
} }
@Test @Test

5
src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java
View File

@ -16,7 +16,6 @@
*/ */
package org.apache.commons.collections4.functors; package org.apache.commons.collections4.functors;
import static org.apache.commons.collections4.functors.AllPredicate.allPredicate;
import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
@ -93,7 +92,7 @@ public class AllPredicateTest extends AbstractAnyAllOnePredicateTest<Integer> {
// use the constructor directly, as getInstance() returns the original predicate when passed // use the constructor directly, as getInstance() returns the original predicate when passed
// an array of size one. // an array of size one.
final Predicate<Integer> predicate = createMockPredicate(false); final Predicate<Integer> predicate = createMockPredicate(false);
assertFalse(allPredicate(predicate).test(getTestValue()), "single false predicate evaluated to true"); assertFalse(AllPredicate.allPredicate(predicate).test(getTestValue()), "single false predicate evaluated to true");
} }
/** /**
@ -105,7 +104,7 @@ public class AllPredicateTest extends AbstractAnyAllOnePredicateTest<Integer> {
// use the constructor directly, as getInstance() returns the original predicate when passed // use the constructor directly, as getInstance() returns the original predicate when passed
// an array of size one. // an array of size one.
final Predicate<Integer> predicate = createMockPredicate(true); final Predicate<Integer> predicate = createMockPredicate(true);
assertTrue(allPredicate(predicate).test(getTestValue()), "single true predicate evaluated to false"); assertTrue(AllPredicate.allPredicate(predicate).test(getTestValue()), "single true predicate evaluated to false");
} }
/** /**

14
src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java
View File

@ -16,8 +16,6 @@
*/ */
package org.apache.commons.collections4.functors; package org.apache.commons.collections4.functors;
import static org.apache.commons.collections4.functors.ComparatorPredicate.comparatorPredicate;
import java.util.Comparator; import java.util.Comparator;
import org.apache.commons.collections4.Predicate; import org.apache.commons.collections4.Predicate;
@ -34,13 +32,13 @@ public class ComparatorPredicateTest extends AbstractPredicateTest {
@Override @Override
protected Predicate<?> generatePredicate() { protected Predicate<?> generatePredicate() {
return comparatorPredicate(Integer.valueOf(10), new TestComparator<>()); return ComparatorPredicate.comparatorPredicate(Integer.valueOf(10), new TestComparator<>());
} }
@Test @Test
public void testCompareEquals() { public void testCompareEquals() {
final Integer value = Integer.valueOf(10); final Integer value = Integer.valueOf(10);
final Predicate<Integer> p = comparatorPredicate(value, new TestComparator<>()); final Predicate<Integer> p = ComparatorPredicate.comparatorPredicate(value, new TestComparator<>());
assertPredicateFalse(p, Integer.valueOf(value.intValue() - 1)); assertPredicateFalse(p, Integer.valueOf(value.intValue() - 1));
assertPredicateTrue(p, Integer.valueOf(value.intValue())); assertPredicateTrue(p, Integer.valueOf(value.intValue()));
assertPredicateFalse(p, Integer.valueOf(value.intValue() + 1)); assertPredicateFalse(p, Integer.valueOf(value.intValue() + 1));
@ -49,7 +47,7 @@ public class ComparatorPredicateTest extends AbstractPredicateTest {
@Test @Test
public void testCompareGreater() { public void testCompareGreater() {
final Integer value = Integer.valueOf(10); final Integer value = Integer.valueOf(10);
final Predicate<Integer> p = comparatorPredicate(value, new TestComparator<>(), Criterion.GREATER); final Predicate<Integer> p = ComparatorPredicate.comparatorPredicate(value, new TestComparator<>(), Criterion.GREATER);
assertPredicateTrue(p, Integer.valueOf(value.intValue() - 1)); assertPredicateTrue(p, Integer.valueOf(value.intValue() - 1));
assertPredicateFalse(p, Integer.valueOf(value.intValue())); assertPredicateFalse(p, Integer.valueOf(value.intValue()));
assertPredicateFalse(p, Integer.valueOf(value.intValue() + 1)); assertPredicateFalse(p, Integer.valueOf(value.intValue() + 1));
@ -58,7 +56,7 @@ public class ComparatorPredicateTest extends AbstractPredicateTest {
@Test @Test
public void testCompareGreaterOrEqual() { public void testCompareGreaterOrEqual() {
final Integer value = Integer.valueOf(10); final Integer value = Integer.valueOf(10);
final Predicate<Integer> p = comparatorPredicate(value, new TestComparator<>(), Criterion.GREATER_OR_EQUAL); final Predicate<Integer> p = ComparatorPredicate.comparatorPredicate(value, new TestComparator<>(), Criterion.GREATER_OR_EQUAL);
assertPredicateTrue(p, Integer.valueOf(value.intValue() - 1)); assertPredicateTrue(p, Integer.valueOf(value.intValue() - 1));
assertPredicateTrue(p, Integer.valueOf(value.intValue())); assertPredicateTrue(p, Integer.valueOf(value.intValue()));
assertPredicateFalse(p, Integer.valueOf(value.intValue() + 1)); assertPredicateFalse(p, Integer.valueOf(value.intValue() + 1));
@ -67,7 +65,7 @@ public class ComparatorPredicateTest extends AbstractPredicateTest {
@Test @Test
public void testCompareLess() { public void testCompareLess() {
final Integer value = Integer.valueOf(10); final Integer value = Integer.valueOf(10);
final Predicate<Integer> p = comparatorPredicate(value, new TestComparator<>(), Criterion.LESS); final Predicate<Integer> p = ComparatorPredicate.comparatorPredicate(value, new TestComparator<>(), Criterion.LESS);
assertPredicateFalse(p, Integer.valueOf(value.intValue() - 1)); assertPredicateFalse(p, Integer.valueOf(value.intValue() - 1));
assertPredicateFalse(p, Integer.valueOf(value.intValue())); assertPredicateFalse(p, Integer.valueOf(value.intValue()));
assertPredicateTrue(p, Integer.valueOf(value.intValue() + 1)); assertPredicateTrue(p, Integer.valueOf(value.intValue() + 1));
@ -76,7 +74,7 @@ public class ComparatorPredicateTest extends AbstractPredicateTest {
@Test @Test
public void testCompareLessOrEqual() { public void testCompareLessOrEqual() {
final Integer value = Integer.valueOf(10); final Integer value = Integer.valueOf(10);
final Predicate<Integer> p = comparatorPredicate(value, new TestComparator<>(), Criterion.LESS_OR_EQUAL); final Predicate<Integer> p = ComparatorPredicate.comparatorPredicate(value, new TestComparator<>(), Criterion.LESS_OR_EQUAL);
assertPredicateFalse(p, Integer.valueOf(value.intValue() - 1)); assertPredicateFalse(p, Integer.valueOf(value.intValue() - 1));
assertPredicateTrue(p, Integer.valueOf(value.intValue())); assertPredicateTrue(p, Integer.valueOf(value.intValue()));
assertPredicateTrue(p, Integer.valueOf(value.intValue() + 1)); assertPredicateTrue(p, Integer.valueOf(value.intValue() + 1));

13
src/test/java/org/apache/commons/collections4/functors/EqualPredicateTest.java
View File

@ -16,8 +16,6 @@
*/ */
package org.apache.commons.collections4.functors; package org.apache.commons.collections4.functors;
import static org.apache.commons.collections4.functors.EqualPredicate.equalPredicate;
import static org.apache.commons.collections4.functors.NullPredicate.nullPredicate;
import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertSame;
import org.apache.commons.collections4.Predicate; import org.apache.commons.collections4.Predicate;
@ -36,31 +34,32 @@ public class EqualPredicateTest extends AbstractPredicateTest {
return b; return b;
} }
} }
private static final EqualsTestObject FALSE_OBJECT = new EqualsTestObject(false); private static final EqualsTestObject FALSE_OBJECT = new EqualsTestObject(false);
private static final EqualsTestObject TRUE_OBJECT = new EqualsTestObject(true); private static final EqualsTestObject TRUE_OBJECT = new EqualsTestObject(true);
@Override @Override
protected Predicate<Object> generatePredicate() { protected Predicate<Object> generatePredicate() {
return equalPredicate(null); return EqualPredicate.equalPredicate(null);
} }
@Test @Test
public void testNullArgumentEqualsNullPredicate() throws Exception { public void testNullArgumentEqualsNullPredicate() throws Exception {
assertSame(nullPredicate(), equalPredicate(null)); assertSame(NullPredicate.nullPredicate(), EqualPredicate.equalPredicate(null));
} }
@Test @Test
public void testObjectFactoryUsesEqualsForTest() throws Exception { public void testObjectFactoryUsesEqualsForTest() throws Exception {
final Predicate<EqualsTestObject> predicate = equalPredicate(FALSE_OBJECT); final Predicate<EqualsTestObject> predicate = EqualPredicate.equalPredicate(FALSE_OBJECT);
assertPredicateFalse(predicate, FALSE_OBJECT); assertPredicateFalse(predicate, FALSE_OBJECT);
assertPredicateTrue(equalPredicate(TRUE_OBJECT), TRUE_OBJECT); assertPredicateTrue(EqualPredicate.equalPredicate(TRUE_OBJECT), TRUE_OBJECT);
} }
@SuppressWarnings("boxing") @SuppressWarnings("boxing")
@Test @Test
public void testPredicateTypeCanBeSuperClassOfObject() throws Exception { public void testPredicateTypeCanBeSuperClassOfObject() throws Exception {
final Predicate<Number> predicate = equalPredicate((Number) 4); final Predicate<Number> predicate = EqualPredicate.equalPredicate((Number) 4);
assertPredicateTrue(predicate, 4); assertPredicateTrue(predicate, 4);
} }
} }

5
src/test/java/org/apache/commons/collections4/functors/NullPredicateTest.java
View File

@ -16,7 +16,6 @@
*/ */
package org.apache.commons.collections4.functors; package org.apache.commons.collections4.functors;
import static org.apache.commons.collections4.functors.NullPredicate.nullPredicate;
import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertSame;
import org.apache.commons.collections4.Predicate; import org.apache.commons.collections4.Predicate;
@ -25,7 +24,7 @@ import org.junit.jupiter.api.Test;
public class NullPredicateTest extends AbstractPredicateTest { public class NullPredicateTest extends AbstractPredicateTest {
@Override @Override
protected Predicate<?> generatePredicate() { protected Predicate<?> generatePredicate() {
return nullPredicate(); return NullPredicate.nullPredicate();
} }
@Test @Test
@ -37,6 +36,6 @@ public class NullPredicateTest extends AbstractPredicateTest {
@Test @Test
public void testNullPredicate() { public void testNullPredicate() {
assertSame(NullPredicate.nullPredicate(), NullPredicate.nullPredicate()); assertSame(NullPredicate.nullPredicate(), NullPredicate.nullPredicate());
assertPredicateTrue(nullPredicate(), null); assertPredicateTrue(NullPredicate.nullPredicate(), null);
} }
} }

43
src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java
View File

@ -16,7 +16,6 @@
*/ */
package org.apache.commons.collections4.map; package org.apache.commons.collections4.map;
import static org.apache.commons.collections4.map.LazySortedMap.lazySortedMap;
import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertAll;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertInstanceOf;
@ -37,8 +36,7 @@ import org.apache.commons.collections4.TransformerUtils;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
/** /**
* Extension of {@link LazyMapTest} for exercising the * Extension of {@link LazyMapTest} for exercising the {@link LazySortedMap} implementation.
* {@link LazySortedMap} implementation.
* *
* @param <K> the key type. * @param <K> the key type.
* @param <V> the value type. * @param <V> the value type.
@ -80,19 +78,19 @@ public class LazySortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
@Override @Override
public SortedMap<K, V> makeObject() { public SortedMap<K, V> makeObject() {
return lazySortedMap(new TreeMap<>(), FactoryUtils.<V>nullFactory()); return LazySortedMap.lazySortedMap(new TreeMap<>(), FactoryUtils.<V>nullFactory());
} }
@Override @Override
@Test @Test
public void testMapGet() { public void testMapGet() {
Map<Integer, Number> map = lazySortedMap(new TreeMap<>(), oneFactory); Map<Integer, Number> map = LazySortedMap.lazySortedMap(new TreeMap<>(), oneFactory);
assertEquals(0, map.size()); assertEquals(0, map.size());
final Number i1 = map.get(5); final Number i1 = map.get(5);
assertEquals(1, i1); assertEquals(1, i1);
assertEquals(1, map.size()); assertEquals(1, map.size());
map = lazySortedMap(new TreeMap<>(), FactoryUtils.<Number>nullFactory()); map = LazySortedMap.lazySortedMap(new TreeMap<>(), FactoryUtils.<Number>nullFactory());
final Number o = map.get(5); final Number o = map.get(5);
assertNull(o); assertNull(o);
assertEquals(1, map.size()); assertEquals(1, map.size());
@ -101,18 +99,15 @@ public class LazySortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
@Test @Test
public void testReverseSortOrder() { public void testReverseSortOrder() {
final SortedMap<String, Number> map = lazySortedMap(new ConcurrentSkipListMap<>(reverseStringComparator), oneFactory); final SortedMap<String, Number> map = LazySortedMap.lazySortedMap(new ConcurrentSkipListMap<>(reverseStringComparator), oneFactory);
map.put("A", 5); map.put("A", 5);
map.get("B"); // Entry with value "One" created map.get("B"); // Entry with value "One" created
map.put("C", 8); map.put("C", 8);
assertEquals("A", map.lastKey(), "Last key should be A"); assertEquals("A", map.lastKey(), "Last key should be A");
assertEquals("C", map.firstKey(), "First key should be C"); assertEquals("C", map.firstKey(), "First key should be C");
assertEquals("B", map.tailMap("B").firstKey(), assertEquals("B", map.tailMap("B").firstKey(), "First key in tail map should be B");
"First key in tail map should be B"); assertEquals("B", map.headMap("A").lastKey(), "Last key in head map should be B");
assertEquals("B", map.headMap("A").lastKey(), assertEquals("B", map.subMap("C", "A").lastKey(), "Last key in submap should be B");
"Last key in head map should be B");
assertEquals("B", map.subMap("C", "A").lastKey(),
"Last key in submap should be B");
final Comparator<?> c = map.comparator(); final Comparator<?> c = map.comparator();
assertSame(c, reverseStringComparator, "natural order, so comparator should be null"); assertSame(c, reverseStringComparator, "natural order, so comparator should be null");
@ -120,18 +115,15 @@ public class LazySortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
@Test @Test
public void testSortOrder() { public void testSortOrder() {
final SortedMap<String, Number> map = lazySortedMap(new TreeMap<>(), oneFactory); final SortedMap<String, Number> map = LazySortedMap.lazySortedMap(new TreeMap<>(), oneFactory);
map.put("A", 5); map.put("A", 5);
map.get("B"); // Entry with value "One" created map.get("B"); // Entry with value "One" created
map.put("C", 8); map.put("C", 8);
assertEquals("A", map.firstKey(), "First key should be A"); assertEquals("A", map.firstKey(), "First key should be A");
assertEquals("C", map.lastKey(), "Last key should be C"); assertEquals("C", map.lastKey(), "Last key should be C");
assertEquals("B", map.tailMap("B").firstKey(), assertEquals("B", map.tailMap("B").firstKey(), "First key in tail map should be B");
"First key in tail map should be B"); assertEquals("B", map.headMap("C").lastKey(), "Last key in head map should be B");
assertEquals("B", map.headMap("C").lastKey(), assertEquals("B", map.subMap("A", "C").lastKey(), "Last key in submap should be B");
"Last key in head map should be B");
assertEquals("B", map.subMap("A", "C").lastKey(),
"Last key in submap should be B");
final Comparator<?> c = map.comparator(); final Comparator<?> c = map.comparator();
assertNull(c, "natural order, so comparator should be null"); assertNull(c, "natural order, so comparator should be null");
@ -140,14 +132,13 @@ public class LazySortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
@Test @Test
public void testTransformerDecorate() { public void testTransformerDecorate() {
final Transformer<Object, Integer> transformer = TransformerUtils.asTransformer(oneFactory); final Transformer<Object, Integer> transformer = TransformerUtils.asTransformer(oneFactory);
final SortedMap<Integer, Number> map = lazySortedMap(new TreeMap<>(), transformer); final SortedMap<Integer, Number> map = LazySortedMap.lazySortedMap(new TreeMap<>(), transformer);
assertInstanceOf(LazySortedMap.class, map); assertInstanceOf(LazySortedMap.class, map);
assertAll( assertAll(
() -> assertThrows(NullPointerException.class, () -> lazySortedMap(new TreeMap<>(), (Transformer<Integer, Number>) null), () -> assertThrows(NullPointerException.class, () -> LazySortedMap.lazySortedMap(new TreeMap<>(), (Transformer<Integer, Number>) null),
"Expecting NullPointerException for null transformer"), "Expecting NullPointerException for null transformer"),
() -> assertThrows(NullPointerException.class, () -> lazySortedMap((SortedMap<Integer, Number>) null, transformer), () -> assertThrows(NullPointerException.class, () -> LazySortedMap.lazySortedMap((SortedMap<Integer, Number>) null, transformer),
"Expecting NullPointerException for null map") "Expecting NullPointerException for null map"));
);
} }
// public void testCreate() throws Exception { // public void testCreate() throws Exception {