You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by sk...@apache.org on 2008/04/03 04:42:30 UTC

svn commit: r644140 - in /commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections: TestCollectionUtils.java functors/TestEqualPredicate.java

Author: skestle
Date: Wed Apr  2 19:42:30 2008
New Revision: 644140

URL: http://svn.apache.org/viewvc?rev=644140&view=rev
Log:
Fixed javac complier generic issues

Modified:
    commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestCollectionUtils.java
    commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/functors/TestEqualPredicate.java

Modified: commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestCollectionUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestCollectionUtils.java?rev=644140&r1=644139&r2=644140&view=diff
==============================================================================
--- commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestCollectionUtils.java (original)
+++ commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/TestCollectionUtils.java Wed Apr  2 19:42:30 2008
@@ -488,10 +488,10 @@
 
     @Test
     public void find() {
-        Predicate<Number> testPredicate = EqualPredicate.<Number>equalPredicate(4);
+        Predicate<Number> testPredicate = equalPredicate((Number) 4);
         Integer test = CollectionUtils.find(collectionA, testPredicate);
         assertTrue(test.equals(4));
-        testPredicate = EqualPredicate.<Number>equalPredicate(45);
+        testPredicate = equalPredicate((Number) 45);
         test = CollectionUtils.find(collectionA, testPredicate);
         assertTrue(test == null);
         assertEquals(CollectionUtils.find(null, testPredicate), null);

Modified: commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/functors/TestEqualPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/functors/TestEqualPredicate.java?rev=644140&r1=644139&r2=644140&view=diff
==============================================================================
--- commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/functors/TestEqualPredicate.java (original)
+++ commons/proper/collections/branches/collections_jdk5_branch/src/test/org/apache/commons/collections/functors/TestEqualPredicate.java Wed Apr  2 19:42:30 2008
@@ -13,7 +13,7 @@
     private static final EqualsTestObject TRUE_OBJECT = new EqualsTestObject(true);
 
     @Override
-    protected Predicate<?> generatePredicate() {
+    protected Predicate<Object> generatePredicate() {
        return equalPredicate(null);
     }
     
@@ -31,7 +31,7 @@
     
     @Test
     public void testPredicateTypeCanBeSuperClassOfObject() throws Exception {
-        Predicate<Number> predicate = EqualPredicate.<Number>equalPredicate(4);
+        Predicate<Number> predicate = equalPredicate((Number) 4);
         assertTrue(predicate, 4);
     }