You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sc...@apache.org on 2003/01/25 12:31:12 UTC
cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections TestCollectionUtils.java
scolebourne 2003/01/25 03:31:12
Modified: collections/src/test/org/apache/commons/collections
TestCollectionUtils.java
Log:
Add testing for null parameters passed to filter, transform and countMatches
Revision Changes Path
1.11 +47 -29 jakarta-commons/collections/src/test/org/apache/commons/collections/TestCollectionUtils.java
Index: TestCollectionUtils.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestCollectionUtils.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TestCollectionUtils.java 8 Dec 2002 15:29:26 -0000 1.10
+++ TestCollectionUtils.java 25 Jan 2003 11:31:12 -0000 1.11
@@ -416,19 +416,33 @@
}
+ private static Predicate EQUALS_TWO = new Predicate() {
+ public boolean evaluate(Object input) {
+ return (input.equals("Two"));
+ }
+ };
+
public void testFilter() {
List list = new ArrayList();
list.add("One");
list.add("Two");
list.add("Three");
list.add("Four");
- CollectionUtils.filter(list, new Predicate() {
- public boolean evaluate(Object input) {
- return (input.equals("Two"));
- }
- });
+ CollectionUtils.filter(list, EQUALS_TWO);
assertEquals(1, list.size());
assertEquals("Two", list.get(0));
+
+ list = new ArrayList();
+ list.add("One");
+ list.add("Two");
+ list.add("Three");
+ list.add("Four");
+ CollectionUtils.filter(list, null);
+ assertEquals(4, list.size());
+ CollectionUtils.filter(null, EQUALS_TWO);
+ assertEquals(4, list.size());
+ CollectionUtils.filter(null, null);
+ assertEquals(4, list.size());
}
public void testCountMatches() {
@@ -437,13 +451,12 @@
list.add("Two");
list.add("Three");
list.add("Four");
- int count = CollectionUtils.countMatches(list, new Predicate() {
- public boolean evaluate(Object input) {
- return (input.equals("Two"));
- }
- });
+ int count = CollectionUtils.countMatches(list, EQUALS_TWO);
assertEquals(4, list.size());
assertEquals(1, count);
+ assertEquals(0, CollectionUtils.countMatches(list, null));
+ assertEquals(0, CollectionUtils.countMatches(null, EQUALS_TWO));
+ assertEquals(0, CollectionUtils.countMatches(null, null));
}
public void testSelect() {
@@ -452,11 +465,7 @@
list.add("Two");
list.add("Three");
list.add("Four");
- Collection output = CollectionUtils.select(list, new Predicate() {
- public boolean evaluate(Object input) {
- return (input.equals("Two"));
- }
- });
+ Collection output = CollectionUtils.select(list, EQUALS_TWO);
assertEquals(4, list.size());
assertEquals(1, output.size());
assertEquals("Two", output.iterator().next());
@@ -468,11 +477,7 @@
list.add("Two");
list.add("Three");
list.add("Four");
- Collection output = CollectionUtils.selectRejected(list, new Predicate() {
- public boolean evaluate(Object input) {
- return (input.equals("Two"));
- }
- });
+ Collection output = CollectionUtils.selectRejected(list, EQUALS_TWO);
assertEquals(4, list.size());
assertEquals(3, output.size());
assertTrue(output.contains("One"));
@@ -480,20 +485,33 @@
assertTrue(output.contains("Four"));
}
+ Transformer TRANSFORM_TO_INTEGER = new Transformer() {
+ public Object transform(Object input) {
+ return new Integer((String) input);
+ }
+ };
+
public void testTransform1() {
List list = new ArrayList();
list.add("1");
list.add("2");
list.add("3");
- CollectionUtils.transform(list, new Transformer() {
- public Object transform(Object input) {
- return new Integer((String) input);
- }
- });
+ CollectionUtils.transform(list, TRANSFORM_TO_INTEGER);
assertEquals(3, list.size());
assertEquals(new Integer(1), list.get(0));
assertEquals(new Integer(2), list.get(1));
assertEquals(new Integer(3), list.get(2));
+
+ list = new ArrayList();
+ list.add("1");
+ list.add("2");
+ list.add("3");
+ CollectionUtils.transform(null, TRANSFORM_TO_INTEGER);
+ assertEquals(3, list.size());
+ CollectionUtils.transform(list, null);
+ assertEquals(3, list.size());
+ CollectionUtils.transform(null, null);
+ assertEquals(3, list.size());
}
public void testTransform2() {
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>