Re-added generics fix for java 1.6.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1368802 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Neidhart 2012-08-03 06:26:11 +00:00
parent 1f09f103a8
commit dba4df56e4
1 changed files with 2 additions and 2 deletions

View File

@ -520,7 +520,7 @@ public class TestCollectionUtils extends MockTestCase {
Collection<List<? extends Number>> col = new ArrayList<List<? extends Number>>(); Collection<List<? extends Number>> col = new ArrayList<List<? extends Number>>();
col.add(collectionA); col.add(collectionA);
col.add(collectionB); col.add(collectionB);
Closure<List<? extends Number>> resultClosure = CollectionUtils.forAllDo(col, testClosure); Closure<List<? extends Number>> resultClosure = CollectionUtils.<List<? extends Number>,Closure<List<? extends Number>>>forAllDo(col, testClosure);
assertSame(testClosure, resultClosure); assertSame(testClosure, resultClosure);
assertTrue(collectionA.isEmpty() && collectionB.isEmpty()); assertTrue(collectionA.isEmpty() && collectionB.isEmpty());
resultClosure = CollectionUtils.forAllDo(col, null); resultClosure = CollectionUtils.forAllDo(col, null);
@ -542,7 +542,7 @@ public class TestCollectionUtils extends MockTestCase {
Closure<List<? extends Number>> resultClosure = CollectionUtils.forAllDo(col.iterator(), testClosure); Closure<List<? extends Number>> resultClosure = CollectionUtils.forAllDo(col.iterator(), testClosure);
assertSame(testClosure, resultClosure); assertSame(testClosure, resultClosure);
assertTrue(collectionA.isEmpty() && collectionB.isEmpty()); assertTrue(collectionA.isEmpty() && collectionB.isEmpty());
resultClosure = CollectionUtils.forAllDo(col.iterator(), null); resultClosure = CollectionUtils.<List<? extends Number>,Closure<List<? extends Number>>>forAllDo(col.iterator(), null);
assertNull(resultClosure); assertNull(resultClosure);
assertTrue(collectionA.isEmpty() && collectionB.isEmpty()); assertTrue(collectionA.isEmpty() && collectionB.isEmpty());
resultClosure = CollectionUtils.forAllDo((Iterator) null, testClosure); resultClosure = CollectionUtils.forAllDo((Iterator) null, testClosure);