commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r1541658 [1/3] - in /commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor: ./ adapter/ aggregator/ core/ core/algorithm/ core/collection/ core/comparator/ core/composite/ example/ example/kata/four/ example/kata/one/ e...
Date Wed, 13 Nov 2013 18:54:06 GMT
Author: mbenson
Date: Wed Nov 13 18:54:05 2013
New Revision: 1541658

URL: http://svn.apache.org/r1541658
Log:
cleanups

Modified:
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/BaseFunctorTest.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/TestAlgorithms.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/adapter/TestBinaryFunctionBinaryProcedure.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/aggregator/AbstractTimedAggregatorTest.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestConstant.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIdentity.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsEqual.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNotEqual.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNotNull.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNotSame.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNull.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsSame.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestLeftIdentity.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestRightIdentity.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFindWithinGenerator.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFoldLeft.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestGeneratorContains.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestInPlaceTransform.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestIndexOfInGenerator.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRecursiveEvaluation.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRemoveMatching.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRetainMatching.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestFilteredIterator.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestIsElementOf.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestIsEmpty.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestSize.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestTransformedIterator.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/comparator/BaseComparisonPredicateTest.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/comparator/TestComparableComparator.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/comparator/TestComparatorFunction.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/comparator/TestIsEquivalent.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThan.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/comparator/TestIsGreaterThanOrEqual.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThan.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/comparator/TestIsLessThanOrEqual.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/comparator/TestIsNotEquivalent.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/comparator/TestIsWithinRange.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/comparator/TestMax.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/comparator/TestMin.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/composite/TestBinaryOr.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/composite/TestCompositeFunction.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/composite/TestNot.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedNullaryFunction.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/composite/TestTransformedNullaryProcedure.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/FlexiMapExample.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/QuicksortExample.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/kata/four/Abs.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/kata/four/ToInteger.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/kata/one/Add.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/kata/one/Divide.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/kata/one/Mod.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/kata/one/Multiply.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/kata/one/Subtract.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/kata/one/SupermarketPricingExample.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/kata/two/BaseBinaryChop.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/kata/two/TestBinaryChop.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/lines/TestLines.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/map/TestFixedSizeMap.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/map/TestLazyMap.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/map/TestPredicatedMap.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/generator/TestBaseGenerator.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/generator/loop/TestGenerateUntil.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/generator/loop/TestGenerateWhile.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/generator/loop/TestLoopGenerator.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/generator/loop/TestTransformedGenerator.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/generator/loop/TestUntilGenerate.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/generator/loop/TestWhileGenerate.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/generator/util/TestEachElement.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/range/TestCharacterRange.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/range/TestDoubleRange.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/range/TestFloatRange.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/range/TestIntegerRange.java
    commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/range/TestLongRange.java

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/BaseFunctorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/BaseFunctorTest.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/BaseFunctorTest.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/BaseFunctorTest.java Wed Nov 13 18:54:05 2013
@@ -38,38 +38,37 @@ public abstract class BaseFunctorTest {
     @Test
     public final void testObjectEquals() throws Exception {
         Object obj = makeFunctor();
-        assertEquals("equals must be reflexive",obj,obj);
-        assertEquals("hashCode must be reflexive",obj.hashCode(),obj.hashCode());
-        assertTrue(! obj.equals(null) ); // should be able to compare to null
+        assertEquals("equals must be reflexive", obj, obj);
+        assertEquals("hashCode must be reflexive", obj.hashCode(), obj.hashCode());
+        assertTrue(!obj.equals(null)); // should be able to compare to null
 
         Object obj2 = makeFunctor();
         if (obj.equals(obj2)) {
-            assertEquals("equals implies hash equals",obj.hashCode(),obj2.hashCode());
-            assertEquals("equals must be symmetric",obj2,obj);
+            assertEquals("equals implies hash equals", obj.hashCode(), obj2.hashCode());
+            assertEquals("equals must be symmetric", obj2, obj);
         } else {
-            assertTrue("equals must be symmetric",! obj2.equals(obj));
+            assertTrue("equals must be symmetric", !obj2.equals(obj));
         }
-        
-        assertTrue("a functor is not equal to an integer", ! obj.equals(new Integer(1)));
+
+        assertTrue("a functor is not equal to an integer", !obj.equals(Integer.valueOf(1)));
     }
 
     @Test
     public void testToStringIsOverridden() throws Exception {
         Object obj = makeFunctor();
-        assertNotNull("toString should never return null",obj.toString());
-        assertTrue(
-            obj.getClass().getName()  + " should override toString(), found \"" + obj.toString() + "\"",
-            !obj.toString().equals(objectToString(obj)));
+        assertNotNull("toString should never return null", obj.toString());
+        assertTrue(obj.getClass().getName() + " should override toString(), found \"" + obj.toString() + "\"", !obj
+            .toString().equals(objectToString(obj)));
     }
 
     // protected utils
     // ------------------------------------------------------------------------
 
     public static void assertObjectsAreEqual(Object a, Object b) {
-        assertEquals(a,b);
-        assertEquals(b,a);
-        assertEquals(a.hashCode(),b.hashCode());
-        assertEquals(a.toString(),b.toString()); // not strictly required
+        assertEquals(a, b);
+        assertEquals(b, a);
+        assertEquals(a.hashCode(), b.hashCode());
+        assertEquals(a.toString(), b.toString()); // not strictly required
     }
 
     public static void assertObjectsAreNotEqual(Object a, Object b) {
@@ -84,4 +83,4 @@ public abstract class BaseFunctorTest {
     private String objectToString(Object obj) {
         return obj.getClass().getName() + "@" + Integer.toHexString(obj.hashCode());
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/TestAlgorithms.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/TestAlgorithms.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/TestAlgorithms.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/TestAlgorithms.java Wed Nov 13 18:54:05 2013
@@ -54,14 +54,14 @@ public class TestAlgorithms {
         doubled = new ArrayList<Integer>();
         listWithDuplicates = new ArrayList<Integer>();
         sum = 0;
-        for (int i=0;i<10;i++) {
-            list.add(new Integer(i));
-            doubled.add(new Integer(i*2));
-            listWithDuplicates.add(new Integer(i));
-            listWithDuplicates.add(new Integer(i));
+        for (int i = 0; i < 10; i++) {
+            list.add(Integer.valueOf(i));
+            doubled.add(Integer.valueOf(i * 2));
+            listWithDuplicates.add(Integer.valueOf(i));
+            listWithDuplicates.add(Integer.valueOf(i));
             sum += i;
-            if (i%2 == 0) {
-                evens.add(new Integer(i));
+            if (i % 2 == 0) {
+                evens.add(Integer.valueOf(i));
             }
         }
     }
@@ -77,68 +77,72 @@ public class TestAlgorithms {
     // Tests
     // ------------------------------------------------------------------------
 
-
-
     @Test
     public void testRun() {
         Summer summer = new Summer();
         IteratorToGeneratorAdapter.adapt(list.iterator()).run(summer);
-        assertEquals(sum,summer.sum);
+        assertEquals(sum, summer.sum);
     }
 
     @Test
     public void testSelect1() {
-        Collection<Integer> result = new FilteredGenerator<Integer>(IteratorToGeneratorAdapter.adapt(list.iterator()),isEven).toCollection();
+        Collection<Integer> result =
+            new FilteredGenerator<Integer>(IteratorToGeneratorAdapter.adapt(list.iterator()), isEven).toCollection();
         assertNotNull(result);
-        assertEquals(evens,result);
+        assertEquals(evens, result);
     }
 
     @Test
     public void testSelect2() {
         List<Integer> result = new ArrayList<Integer>();
-        assertSame(result,new FilteredGenerator<Integer>(IteratorToGeneratorAdapter.adapt(list.iterator()),isEven).to(result));
-        assertEquals(evens,result);
+        assertSame(result,
+            new FilteredGenerator<Integer>(IteratorToGeneratorAdapter.adapt(list.iterator()), isEven).to(result));
+        assertEquals(evens, result);
     }
 
     @Test
     public void testReject1() {
-        Collection<Integer> result = new FilteredGenerator<Integer>(IteratorToGeneratorAdapter.adapt(list.iterator()),new Not<Integer>(isOdd)).toCollection();
+        Collection<Integer> result =
+            new FilteredGenerator<Integer>(IteratorToGeneratorAdapter.adapt(list.iterator()), new Not<Integer>(isOdd))
+                .toCollection();
         assertNotNull(result);
-        assertEquals(evens,result);
+        assertEquals(evens, result);
     }
 
     @Test
     public void testReject2() {
         List<Object> result = new ArrayList<Object>();
-        assertSame(result,new FilteredGenerator<Integer>(IteratorToGeneratorAdapter.adapt(list.iterator()),new Not<Integer>(isOdd)).to(result));
-        assertEquals(evens,result);
+        assertSame(result, new FilteredGenerator<Integer>(IteratorToGeneratorAdapter.adapt(list.iterator()),
+            new Not<Integer>(isOdd)).to(result));
+        assertEquals(evens, result);
     }
 
     @Test
     public void testApplyToGenerator() {
-        LoopGenerator<Integer> gen = IteratorToGeneratorAdapter.adapt(new IntegerRange(1,5));
+        LoopGenerator<Integer> gen = IteratorToGeneratorAdapter.adapt(new IntegerRange(1, 5));
         Summer summer = new Summer();
 
         new TransformedGenerator<Integer, Integer>(gen, new Doubler()).run(summer);
 
-        assertEquals(2*(1+2+3+4),summer.sum);
+        assertEquals(2 * (1 + 2 + 3 + 4), summer.sum);
     }
 
     @Test
     public void testApply() {
-        Collection<Integer> result = new TransformedGenerator<Integer, Integer>(IteratorToGeneratorAdapter.adapt(list.iterator()), new Doubler())
+        Collection<Integer> result =
+            new TransformedGenerator<Integer, Integer>(IteratorToGeneratorAdapter.adapt(list.iterator()), new Doubler())
                 .toCollection();
         assertNotNull(result);
-        assertEquals(doubled,result);
+        assertEquals(doubled, result);
     }
 
     @Test
     public void testApply2() {
         Set<Integer> set = new HashSet<Integer>();
-        assertSame(set, new TransformedGenerator<Integer, Integer>(IteratorToGeneratorAdapter.adapt(list.iterator()), Identity.<Integer>instance())
-                .to(set));
-        assertEquals(list.size(),set.size());
-        for (Iterator<Integer> iter = list.iterator(); iter.hasNext(); ) {
+        assertSame(set, new TransformedGenerator<Integer, Integer>(IteratorToGeneratorAdapter.adapt(list.iterator()),
+            Identity.<Integer> instance()).to(set));
+        assertEquals(list.size(), set.size());
+        for (Iterator<Integer> iter = list.iterator(); iter.hasNext();) {
             assertTrue(set.contains(iter.next()));
         }
     }
@@ -146,10 +150,11 @@ public class TestAlgorithms {
     @Test
     public void testApply3() {
         Set<Object> set = new HashSet<Object>();
-        assertSame(set, new TransformedGenerator<Object, Object>(IteratorToGeneratorAdapter.adapt(listWithDuplicates.iterator()),
+        assertSame(set,
+            new TransformedGenerator<Object, Object>(IteratorToGeneratorAdapter.adapt(listWithDuplicates.iterator()),
                 Identity.instance()).to(set));
         assertTrue(listWithDuplicates.size() > set.size());
-        for (Iterator<Integer> iter = listWithDuplicates.iterator(); iter.hasNext(); ) {
+        for (Iterator<Integer> iter = listWithDuplicates.iterator(); iter.hasNext();) {
             assertTrue(set.contains(iter.next()));
         }
     }
@@ -179,6 +184,7 @@ public class TestAlgorithms {
         public void run() {
             count++;
         }
+
         public int count = 0;
     }
 
@@ -186,12 +192,13 @@ public class TestAlgorithms {
         public void run(Integer that) {
             sum += that.intValue();
         }
+
         public int sum = 0;
     }
 
     static class Doubler implements Function<Integer, Integer> {
         public Integer evaluate(Integer obj) {
-            return new Integer(2* obj.intValue());
+            return Integer.valueOf(2 * obj.intValue());
         }
     }
 }

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/adapter/TestBinaryFunctionBinaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/adapter/TestBinaryFunctionBinaryProcedure.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/adapter/TestBinaryFunctionBinaryProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/adapter/TestBinaryFunctionBinaryProcedure.java Wed Nov 13 18:54:05 2013
@@ -48,7 +48,7 @@ public class TestBinaryFunctionBinaryPro
     public void testRun() throws Exception {
         class EvaluateCounter implements BinaryFunction<Object, Object, Integer> {
             int count = 0;
-            public Integer evaluate(Object a, Object b) { return new Integer(count++); }
+            public Integer evaluate(Object a, Object b) { return Integer.valueOf(count++); }
         }
         EvaluateCounter counter = new EvaluateCounter();
         BinaryProcedure<Object, Object> p = new BinaryFunctionBinaryProcedure<Object, Object>(counter);

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/aggregator/AbstractTimedAggregatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/aggregator/AbstractTimedAggregatorTest.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/aggregator/AbstractTimedAggregatorTest.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/aggregator/AbstractTimedAggregatorTest.java Wed Nov 13 18:54:05 2013
@@ -86,7 +86,6 @@ public class AbstractTimedAggregatorTest
         // give enough time for the timer to kick in again
         TimeUnit.MILLISECONDS.sleep(interval + SLEEP);
         assertEquals(saveValue, count.get());
-
     }
 
     @Test
@@ -154,7 +153,7 @@ public class AbstractTimedAggregatorTest
 
         @Override
         protected void doReset() {
-            object = new Integer(0);
+            object = Integer.valueOf(   0);
         }
     }
 }

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestConstant.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestConstant.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestConstant.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestConstant.java Wed Nov 13 18:54:05 2013
@@ -43,12 +43,12 @@ public class TestConstant extends BaseFu
     @Test
     public void testEvaluate() throws Exception {
         Constant<Object> f = new Constant<Object>("xyzzy");
-        assertEquals("xyzzy",f.evaluate());
-        assertEquals("xyzzy",f.evaluate(null));
-        assertEquals("xyzzy",f.evaluate(null,null));
-        assertEquals("xyzzy",f.evaluate());
-        assertEquals("xyzzy",f.evaluate("foo"));
-        assertEquals("xyzzy",f.evaluate("foo",new Integer(2)));
+        assertEquals("xyzzy", f.evaluate());
+        assertEquals("xyzzy", f.evaluate(null));
+        assertEquals("xyzzy", f.evaluate(null, null));
+        assertEquals("xyzzy", f.evaluate());
+        assertEquals("xyzzy", f.evaluate("foo"));
+        assertEquals("xyzzy", f.evaluate("foo", Integer.valueOf(2)));
     }
 
     @Test
@@ -56,10 +56,10 @@ public class TestConstant extends BaseFu
         Constant<Object> f = new Constant<Object>(null);
         assertNull(f.evaluate());
         assertNull(f.evaluate(null));
-        assertNull(f.evaluate(null,null));
+        assertNull(f.evaluate(null, null));
         assertNull(f.evaluate());
         assertNull(f.evaluate("foo"));
-        assertNull(f.evaluate("foo",new Integer(2)));
+        assertNull(f.evaluate("foo", Integer.valueOf(2)));
     }
 
     @Test
@@ -67,11 +67,11 @@ public class TestConstant extends BaseFu
         Constant<Object> truePred = new Constant<Object>(Boolean.TRUE);
         assertTrue(truePred.test());
         assertTrue(truePred.test(null));
-        assertTrue(truePred.test(null,null));
+        assertTrue(truePred.test(null, null));
 
         assertTrue(truePred.test());
         assertTrue(truePred.test("foo"));
-        assertTrue(truePred.test("foo",new Integer(2)));
+        assertTrue(truePred.test("foo", Integer.valueOf(2)));
     }
 
     @Test
@@ -79,41 +79,40 @@ public class TestConstant extends BaseFu
         Constant<Object> falsePred = new Constant<Object>(Boolean.FALSE);
         assertTrue(!falsePred.test());
         assertTrue(!falsePred.test(null));
-        assertTrue(!falsePred.test(null,null));
+        assertTrue(!falsePred.test(null, null));
 
         assertTrue(!falsePred.test());
         assertTrue(!falsePred.test("foo"));
-        assertTrue(!falsePred.test("foo",new Integer(2)));
+        assertTrue(!falsePred.test("foo", Integer.valueOf(2)));
     }
 
     @Test
     public void testEquals() throws Exception {
         Constant<Object> f = new Constant<Object>("xyzzy");
-        assertEquals(f,f);
+        assertEquals(f, f);
 
-        assertObjectsAreEqual(f,new Constant<Object>("xyzzy"));
-        assertObjectsAreNotEqual(f,new Constant<Object>("abcde"));
-        assertObjectsAreNotEqual(f,new Constant<Object>(null));
-        assertObjectsAreEqual(new Constant<Object>(null),new Constant<Object>(null));
+        assertObjectsAreEqual(f, new Constant<Object>("xyzzy"));
+        assertObjectsAreNotEqual(f, new Constant<Object>("abcde"));
+        assertObjectsAreNotEqual(f, new Constant<Object>(null));
+        assertObjectsAreEqual(new Constant<Object>(null), new Constant<Object>(null));
         assertTrue(!f.equals(null));
     }
 
     @Test
     public void testConstants() throws Exception {
-        assertEquals(Constant.predicate(true),Constant.TRUE);
+        assertEquals(Constant.predicate(true), Constant.TRUE);
 
-        assertEquals(Constant.truePredicate(),Constant.TRUE);
-        assertSame(Constant.truePredicate(),Constant.TRUE);
+        assertEquals(Constant.truePredicate(), Constant.TRUE);
+        assertSame(Constant.truePredicate(), Constant.TRUE);
 
-        assertEquals(Constant.predicate(true),Constant.TRUE);
-        assertSame(Constant.predicate(true),Constant.TRUE);
+        assertEquals(Constant.predicate(true), Constant.TRUE);
+        assertSame(Constant.predicate(true), Constant.TRUE);
 
-        assertEquals(Constant.falsePredicate(),Constant.FALSE);
-        assertSame(Constant.falsePredicate(),Constant.FALSE);
+        assertEquals(Constant.falsePredicate(), Constant.FALSE);
+        assertSame(Constant.falsePredicate(), Constant.FALSE);
 
-        assertEquals(Constant.predicate(false),Constant.FALSE);
-        assertSame(Constant.predicate(false),Constant.FALSE);
+        assertEquals(Constant.predicate(false), Constant.FALSE);
+        assertSame(Constant.predicate(false), Constant.FALSE);
     }
 
-
 }

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIdentity.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIdentity.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIdentity.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIdentity.java Wed Nov 13 18:54:05 2013
@@ -48,8 +48,8 @@ public class TestIdentity extends BaseFu
         Function<Object, Object> f = new Identity<Object>();
         assertNull(f.evaluate(null));
         assertEquals("xyzzy",f.evaluate("xyzzy"));
-        assertEquals(new Integer(3),f.evaluate(new Integer(3)));
-        Object obj = new Long(12345L);
+        assertEquals(Integer.valueOf(3),f.evaluate(Integer.valueOf(3)));
+        Object obj = Long.valueOf(12345L);
         assertSame(obj,f.evaluate(obj));
     }
 

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsEqual.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsEqual.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsEqual.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsEqual.java Wed Nov 13 18:54:05 2013
@@ -50,14 +50,14 @@ public class TestIsEqual extends BaseFun
         assertTrue(p.test("foo", "foo"));
         assertFalse(p.test(null, "foo"));
         assertFalse(p.test("foo", null));
-        assertTrue(p.test(new Integer(3), new Integer(3)));
-        assertFalse(p.test(null, new Integer(3)));
-        assertFalse(p.test(new Integer(3), null));
+        assertTrue(p.test(Integer.valueOf(3), Integer.valueOf(3)));
+        assertFalse(p.test(null, Integer.valueOf(3)));
+        assertFalse(p.test(Integer.valueOf(3), null));
 
-        assertFalse(p.test(new Integer(3), new Integer(4)));
-        assertFalse(p.test(new Integer(4), new Integer(3)));
-        assertFalse(p.test("3", new Integer(3)));
-        assertFalse(p.test(new Integer(3), "3"));
+        assertFalse(p.test(Integer.valueOf(3), Integer.valueOf(4)));
+        assertFalse(p.test(Integer.valueOf(4), Integer.valueOf(3)));
+        assertFalse(p.test("3", Integer.valueOf(3)));
+        assertFalse(p.test(Integer.valueOf(3), "3"));
     }
 
     @Test
@@ -79,8 +79,8 @@ public class TestIsEqual extends BaseFun
 
     @Test
     public void testToPredicate() {
-       Predicate<Integer> isEqual = IsEqual.to(new Integer(1));
-       assertTrue(isEqual.test(new Integer(1)));
-       assertFalse(isEqual.test(new Integer(2)));
+       Predicate<Integer> isEqual = IsEqual.to(Integer.valueOf(1));
+       assertTrue(isEqual.test(Integer.valueOf(1)));
+       assertFalse(isEqual.test(Integer.valueOf(2)));
     }
 }

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNotEqual.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNotEqual.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNotEqual.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNotEqual.java Wed Nov 13 18:54:05 2013
@@ -44,38 +44,38 @@ public class TestIsNotEqual extends Base
     @Test
     public void testTest() throws Exception {
         IsNotEqual<Object, Object> p = new IsNotEqual<Object, Object>();
-        assertTrue("For symmetry, two nulls should be equal",!p.test(null,null));
-        assertTrue(!p.test("foo","foo"));
-        assertTrue(p.test(null,"foo"));
-        assertTrue(p.test("foo",null));
-        assertTrue(!p.test(new Integer(3),new Integer(3)));
-        assertTrue(p.test(null,new Integer(3)));
-        assertTrue(p.test(new Integer(3),null));
+        assertTrue("For symmetry, two nulls should be equal", !p.test(null, null));
+        assertTrue(!p.test("foo", "foo"));
+        assertTrue(p.test(null, "foo"));
+        assertTrue(p.test("foo", null));
+        assertTrue(!p.test(Integer.valueOf(3), Integer.valueOf(3)));
+        assertTrue(p.test(null, Integer.valueOf(3)));
+        assertTrue(p.test(Integer.valueOf(3), null));
 
-        assertTrue(p.test(new Integer(3),new Integer(4)));
-        assertTrue(p.test(new Integer(4),new Integer(3)));
-        assertTrue(p.test("3",new Integer(3)));
-        assertTrue(p.test(new Integer(3),"3"));
+        assertTrue(p.test(Integer.valueOf(3), Integer.valueOf(4)));
+        assertTrue(p.test(Integer.valueOf(4), Integer.valueOf(3)));
+        assertTrue(p.test("3", Integer.valueOf(3)));
+        assertTrue(p.test(Integer.valueOf(3), "3"));
     }
 
     @Test
     public void testEquals() throws Exception {
         BinaryPredicate<Object, Object> p = new IsNotEqual<Object, Object>();
-        assertEquals(p,p);
-        assertObjectsAreEqual(p,new IsNotEqual<Object, Object>());
-        assertObjectsAreEqual(p,IsNotEqual.instance());
-        assertObjectsAreNotEqual(p,Constant.truePredicate());
+        assertEquals(p, p);
+        assertObjectsAreEqual(p, new IsNotEqual<Object, Object>());
+        assertObjectsAreEqual(p, IsNotEqual.instance());
+        assertObjectsAreNotEqual(p, Constant.truePredicate());
     }
 
     @Test
     public void testConstant() throws Exception {
-        assertEquals(IsNotEqual.instance(),IsNotEqual.instance());
+        assertEquals(IsNotEqual.instance(), IsNotEqual.instance());
     }
 
     @Test
     public void testToPredicate() {
-        Predicate<Integer> isNotEqual = IsNotEqual.to(new Integer(1));
-        assertTrue(isNotEqual.test(new Integer(2)));
-        assertFalse(isNotEqual.test(new Integer(1)));
+        Predicate<Integer> isNotEqual = IsNotEqual.to(Integer.valueOf(1));
+        assertTrue(isNotEqual.test(Integer.valueOf(2)));
+        assertFalse(isNotEqual.test(Integer.valueOf(1)));
     }
 }

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNotNull.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNotNull.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNotNull.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNotNull.java Wed Nov 13 18:54:05 2013
@@ -44,20 +44,20 @@ public class TestIsNotNull extends BaseF
         Predicate<Object> p = new IsNotNull<Object>();
         assertTrue(!p.test(null));
         assertTrue(p.test("foo"));
-        assertTrue(p.test(new Integer(3)));
+        assertTrue(p.test(Integer.valueOf(3)));
     }
 
     @Test
     public void testEquals() throws Exception {
         Predicate<Object> p = new IsNotNull<Object>();
-        assertEquals(p,p);
-        assertObjectsAreEqual(p,new IsNotNull<Object>());
-        assertObjectsAreEqual(p,IsNotNull.instance());
-        assertObjectsAreNotEqual(p,Constant.TRUE);
+        assertEquals(p, p);
+        assertObjectsAreEqual(p, new IsNotNull<Object>());
+        assertObjectsAreEqual(p, IsNotNull.instance());
+        assertObjectsAreNotEqual(p, Constant.TRUE);
     }
 
     @Test
     public void testConstant() throws Exception {
-        assertEquals(IsNotNull.instance(),IsNotNull.instance());
+        assertEquals(IsNotNull.instance(), IsNotNull.instance());
     }
 }

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNotSame.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNotSame.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNotSame.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNotSame.java Wed Nov 13 18:54:05 2013
@@ -50,14 +50,14 @@ public class TestIsNotSame extends BaseF
         assertFalse(p.test("foo", "foo"));
         assertTrue(p.test(null, "foo"));
         assertTrue(p.test("foo", null));
-        assertTrue(p.test(new Integer(3), new Integer(3)));
-        assertTrue(p.test(null, new Integer(3)));
-        assertTrue(p.test(new Integer(3), null));
+        assertTrue(p.test(new Integer(3), Integer.valueOf(3)));
+        assertTrue(p.test(null, Integer.valueOf(3)));
+        assertTrue(p.test(Integer.valueOf(3), null));
 
-        assertTrue(p.test(new Integer(3), new Integer(4)));
-        assertTrue(p.test(new Integer(4), new Integer(3)));
-        assertTrue(p.test("3", new Integer(3)));
-        assertTrue(p.test(new Integer(3), "3"));
+        assertTrue(p.test(Integer.valueOf(3), Integer.valueOf(4)));
+        assertTrue(p.test(Integer.valueOf(4), Integer.valueOf(3)));
+        assertTrue(p.test("3", Integer.valueOf(3)));
+        assertTrue(p.test(Integer.valueOf(3), "3"));
     }
 
     @Test
@@ -79,9 +79,9 @@ public class TestIsNotSame extends BaseF
 
     @Test
     public void testAsPredicate() {
-        Integer one = new Integer(1);
+        Integer one = Integer.valueOf(1);
         Predicate<Integer> isNotSame = IsNotSame.as(one);
-        assertTrue(isNotSame.test(new Integer(2)));
+        assertTrue(isNotSame.test(Integer.valueOf(2)));
         assertFalse(isNotSame.test(one));
     }
 }

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNull.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNull.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNull.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsNull.java Wed Nov 13 18:54:05 2013
@@ -45,28 +45,28 @@ public class TestIsNull extends BaseFunc
         Predicate<Object> p = new IsNull<Object>();
         assertTrue(p.test(null));
         assertFalse(p.test("foo"));
-        assertFalse(p.test(new Integer(3)));
+        assertFalse(p.test(Integer.valueOf(3)));
     }
 
     @Test
     public void testAsBinary() throws Exception {
-        assertTrue(IsNull.left().test(null,"not null"));
-        assertFalse(IsNull.left().test("not null",null));
-        assertTrue(IsNull.right().test("not null",null));
-        assertFalse(IsNull.right().test(null,"not null"));
+        assertTrue(IsNull.left().test(null, "not null"));
+        assertFalse(IsNull.left().test("not null", null));
+        assertTrue(IsNull.right().test("not null", null));
+        assertFalse(IsNull.right().test(null, "not null"));
     }
 
     @Test
     public void testEquals() throws Exception {
         Predicate<Object> p = new IsNull<Object>();
-        assertEquals(p,p);
-        assertObjectsAreEqual(p,new IsNull<Object>());
-        assertObjectsAreEqual(p,IsNull.instance());
-        assertObjectsAreNotEqual(p,Constant.TRUE);
+        assertEquals(p, p);
+        assertObjectsAreEqual(p, new IsNull<Object>());
+        assertObjectsAreEqual(p, IsNull.instance());
+        assertObjectsAreNotEqual(p, Constant.TRUE);
     }
 
     @Test
     public void testConstant() throws Exception {
-        assertEquals(IsNull.instance(),IsNull.instance());
+        assertEquals(IsNull.instance(), IsNull.instance());
     }
 }

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsSame.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsSame.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsSame.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestIsSame.java Wed Nov 13 18:54:05 2013
@@ -50,14 +50,14 @@ public class TestIsSame extends BaseFunc
         assertTrue(p.test("foo", "foo"));
         assertFalse(p.test(null, "foo"));
         assertFalse(p.test("foo", null));
-        assertFalse(p.test(new Integer(3), new Integer(3)));
-        assertFalse(p.test(null, new Integer(3)));
-        assertFalse(p.test(new Integer(3), null));
+        assertFalse(p.test(new Integer(3), Integer.valueOf(3)));
+        assertFalse(p.test(null, Integer.valueOf(3)));
+        assertFalse(p.test(Integer.valueOf(3), null));
 
-        assertFalse(p.test(new Integer(3), new Integer(4)));
-        assertFalse(p.test(new Integer(4), new Integer(3)));
-        assertFalse(p.test("3", new Integer(3)));
-        assertFalse(p.test(new Integer(3), "3"));
+        assertFalse(p.test(Integer.valueOf(3), Integer.valueOf(4)));
+        assertFalse(p.test(Integer.valueOf(4), Integer.valueOf(3)));
+        assertFalse(p.test("3", Integer.valueOf(3)));
+        assertFalse(p.test(Integer.valueOf(3), "3"));
     }
 
     @Test
@@ -79,9 +79,9 @@ public class TestIsSame extends BaseFunc
 
     @Test
     public void testAsPredicate() {
-        Integer one = new Integer(1);
+        Integer one = Integer.valueOf(1);
         Predicate<Integer> isSame = IsSame.as(one);
         assertTrue(isSame.test(one));
-        assertFalse(isSame.test(new Integer(2)));
+        assertFalse(isSame.test(Integer.valueOf(2)));
     }
 }

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestLeftIdentity.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestLeftIdentity.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestLeftIdentity.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestLeftIdentity.java Wed Nov 13 18:54:05 2013
@@ -55,8 +55,8 @@ public class TestLeftIdentity extends Ba
         assertNull(f.evaluate(null,"xyzzy"));
         assertEquals("xyzzy",f.evaluate("xyzzy","abcdefg"));
         assertEquals("xyzzy",f.evaluate("xyzzy",null));
-        assertEquals(new Integer(3),f.evaluate(new Integer(3),null));
-        Object obj = new Long(12345L);
+        assertEquals(Integer.valueOf(3),f.evaluate(Integer.valueOf(3),null));
+        Object obj = Long.valueOf(12345L);
         assertSame(obj,f.evaluate(obj,null));
         assertSame(obj,f.evaluate(obj,obj));
     }

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestRightIdentity.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestRightIdentity.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestRightIdentity.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/TestRightIdentity.java Wed Nov 13 18:54:05 2013
@@ -55,8 +55,8 @@ public class TestRightIdentity extends B
         assertNull(f.evaluate("xyzzy",null));
         assertEquals("xyzzy",f.evaluate("abcdefg","xyzzy"));
         assertEquals("xyzzy",f.evaluate(null,"xyzzy"));
-        assertEquals(new Integer(3),f.evaluate(null,new Integer(3)));
-        Object obj = new Long(12345L);
+        assertEquals(Integer.valueOf(3),f.evaluate(null,Integer.valueOf(3)));
+        Object obj = Long.valueOf(12345L);
         assertSame(obj,f.evaluate(null,obj));
         assertSame(obj,f.evaluate(obj,obj));
     }

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFindWithinGenerator.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFindWithinGenerator.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFindWithinGenerator.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFindWithinGenerator.java Wed Nov 13 18:54:05 2013
@@ -44,55 +44,62 @@ public class TestFindWithinGenerator ext
     @Test
     public void testObjectEqualsWithIfNone() throws Exception {
         Object obj = new FindWithinGenerator<Object>(1);
-        assertEquals("equals must be reflexive",obj,obj);
-        assertEquals("hashCode must be reflexive",obj.hashCode(),obj.hashCode());
-        assertTrue(! obj.equals(null) ); // should be able to compare to null
+        assertEquals("equals must be reflexive", obj, obj);
+        assertEquals("hashCode must be reflexive", obj.hashCode(), obj.hashCode());
+        assertTrue(!obj.equals(null)); // should be able to compare to null
 
         Object obj2 = new FindWithinGenerator<Object>(1);
         if (obj.equals(obj2)) {
-            assertEquals("equals implies hash equals",obj.hashCode(),obj2.hashCode());
-            assertEquals("equals must be symmetric",obj2,obj);
+            assertEquals("equals implies hash equals", obj.hashCode(), obj2.hashCode());
+            assertEquals("equals must be symmetric", obj2, obj);
         } else {
-            assertTrue("equals must be symmetric",! obj2.equals(obj));
+            assertTrue("equals must be symmetric", !obj2.equals(obj));
         }
     }
 
     @Test
     public void testObjectEqualsWithNullDefault() throws Exception {
         Object obj = new FindWithinGenerator<Object>(null);
-        assertEquals("equals must be reflexive",obj,obj);
-        assertEquals("hashCode must be reflexive",obj.hashCode(),obj.hashCode());
-        assertTrue(! obj.equals(null) ); // should be able to compare to null
+        assertEquals("equals must be reflexive", obj, obj);
+        assertEquals("hashCode must be reflexive", obj.hashCode(), obj.hashCode());
+        assertTrue(!obj.equals(null)); // should be able to compare to null
 
         Object obj2 = new FindWithinGenerator<Object>(null);
         if (obj.equals(obj2)) {
-            assertEquals("equals implies hash equals",obj.hashCode(),obj2.hashCode());
-            assertEquals("equals must be symmetric",obj2,obj);
+            assertEquals("equals implies hash equals", obj.hashCode(), obj2.hashCode());
+            assertEquals("equals must be symmetric", obj2, obj);
         } else {
-            assertTrue("equals must be symmetric",! obj2.equals(obj));
+            assertTrue("equals must be symmetric", !obj2.equals(obj));
         }
     }
 
     @Test
     public void testEquals() {
         FindWithinGenerator<Object> f = new FindWithinGenerator<Object>();
-        assertEquals(f,f);
+        assertEquals(f, f);
 
-        assertObjectsAreEqual(f,new FindWithinGenerator<Object>());
-        assertObjectsAreEqual(new FindWithinGenerator<Object>(new Double(0)),new FindWithinGenerator<Object>(new Double(0)));
-        assertObjectsAreNotEqual(f, new FindWithinGenerator<Object>(new Integer(0)));
+        assertObjectsAreEqual(f, new FindWithinGenerator<Object>());
+        assertObjectsAreEqual(new FindWithinGenerator<Object>(Double.valueOf(0)), new FindWithinGenerator<Object>(
+            Double.valueOf(0)));
+        assertObjectsAreNotEqual(f, new FindWithinGenerator<Object>(Integer.valueOf(0)));
     }
 
-    @Test(expected=NoSuchElementException.class)
+    @Test(expected = NoSuchElementException.class)
     public void testDetect() {
-        assertEquals(new Integer(3),new FindWithinGenerator<Integer>().evaluate(IteratorToGeneratorAdapter.adapt(numbers.iterator()),equalsThree));
-        new FindWithinGenerator<Integer>().evaluate(IteratorToGeneratorAdapter.adapt(numbers.iterator()),equalsTwentyThree);
+        assertEquals(Integer.valueOf(3), new FindWithinGenerator<Integer>().evaluate(
+            IteratorToGeneratorAdapter.adapt(numbers.iterator()), equalsThree));
+        new FindWithinGenerator<Integer>().evaluate(IteratorToGeneratorAdapter.adapt(numbers.iterator()),
+            equalsTwentyThree);
     }
 
     @Test
     public void testDetectIfNone() {
-        assertEquals(new Integer(3),new FindWithinGenerator<Integer>(new Integer(3)).evaluate(IteratorToGeneratorAdapter.adapt(numbers.iterator()),equalsThree));
-        assertEquals("Xyzzy",new FindWithinGenerator<String>("Xyzzy").evaluate(IteratorToGeneratorAdapter.adapt(strings.iterator()),equalsXyZ));
+        assertEquals(
+            Integer.valueOf(3),
+            new FindWithinGenerator<Integer>(Integer.valueOf(3)).evaluate(
+                IteratorToGeneratorAdapter.adapt(numbers.iterator()), equalsThree));
+        assertEquals("Xyzzy", new FindWithinGenerator<String>("Xyzzy").evaluate(
+            IteratorToGeneratorAdapter.adapt(strings.iterator()), equalsXyZ));
     }
 
     @Test
@@ -103,10 +110,10 @@ public class TestFindWithinGenerator ext
     // Attributes
     // ------------------------------------------------------------------------
 
-    private List<Integer> numbers = Arrays.asList(0,1,2,3,4,5,6,7,8,9);
+    private List<Integer> numbers = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
     private List<String> strings = Arrays.asList("Zyx", "xxyZ");
-    private Predicate<Integer> equalsThree = LeftBoundPredicate.bind(IsEqual.instance(),new Integer(3));
-    private Predicate<Integer> equalsTwentyThree = LeftBoundPredicate.bind(IsEqual.instance(),new Integer(23));
-    private Predicate<String> equalsXyZ = LeftBoundPredicate.bind(IsEqual.instance(),"xyZ");
+    private Predicate<Integer> equalsThree = LeftBoundPredicate.bind(IsEqual.instance(), Integer.valueOf(3));
+    private Predicate<Integer> equalsTwentyThree = LeftBoundPredicate.bind(IsEqual.instance(), Integer.valueOf(23));
+    private Predicate<String> equalsXyZ = LeftBoundPredicate.bind(IsEqual.instance(), "xyZ");
 
 }

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFoldLeft.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFoldLeft.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFoldLeft.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestFoldLeft.java Wed Nov 13 18:54:05 2013
@@ -41,12 +41,12 @@ public class TestFoldLeft extends BaseFu
     public void testFoldLeft() {
         FoldLeft<Integer> foldLeft = new FoldLeft<Integer>(new BinaryFunction<Integer, Integer, Integer>() {
             public Integer evaluate(Integer a, Integer b) {
-                return new Integer(a + b);
+                return Integer.valueOf(a + b);
             }
         });
-        assertEquals(new Integer(sum), foldLeft.evaluate(IteratorToGeneratorAdapter.adapt(list.iterator())));
-        assertEquals(new Integer(sum), foldLeft.evaluate(IteratorToGeneratorAdapter.adapt(list.iterator()), new Integer(0)));
-        assertEquals(new Integer(0), foldLeft.evaluate(IteratorToGeneratorAdapter.adapt(new ArrayList<Integer>(0).iterator()), new Integer(0)), new Integer(0));
+        assertEquals(Integer.valueOf(sum), foldLeft.evaluate(IteratorToGeneratorAdapter.adapt(list.iterator())));
+        assertEquals(Integer.valueOf(sum), foldLeft.evaluate(IteratorToGeneratorAdapter.adapt(list.iterator()), Integer.valueOf(0)));
+        assertEquals(Integer.valueOf(0), foldLeft.evaluate(IteratorToGeneratorAdapter.adapt(new ArrayList<Integer>(0).iterator()), Integer.valueOf(0)), Integer.valueOf(0));
     }
 
     // Attributes
@@ -60,7 +60,7 @@ public class TestFoldLeft extends BaseFu
     static class Sum implements BinaryFunction<Integer, Integer, Integer> {
         
         public Integer evaluate(Integer a, Integer b) {
-            return new Integer(a + b);
+            return Integer.valueOf(a + b);
         }
         
         @Override

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestGeneratorContains.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestGeneratorContains.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestGeneratorContains.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestGeneratorContains.java Wed Nov 13 18:54:05 2013
@@ -42,15 +42,17 @@ public class TestGeneratorContains exten
 
     @Test
     public void testContains() {
-        assertTrue(new GeneratorContains<Integer>().test(IteratorToGeneratorAdapter.adapt(list.iterator()),equalsThree));
-        assertFalse(new GeneratorContains<Integer>().test(IteratorToGeneratorAdapter.adapt(list.iterator()),equalsTwentyThree));
+        assertTrue(new GeneratorContains<Integer>()
+            .test(IteratorToGeneratorAdapter.adapt(list.iterator()), equalsThree));
+        assertFalse(new GeneratorContains<Integer>().test(IteratorToGeneratorAdapter.adapt(list.iterator()),
+            equalsTwentyThree));
     }
 
     // Attributes
     // ------------------------------------------------------------------------
 
-    private List<Integer> list = Arrays.asList(0,1,2,3,4,5,6,7,8,9);
-    private Predicate<Integer> equalsThree = LeftBoundPredicate.bind(IsEqual.instance(),new Integer(3));
-    private Predicate<Integer> equalsTwentyThree = LeftBoundPredicate.bind(IsEqual.instance(),new Integer(23));
+    private List<Integer> list = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
+    private Predicate<Integer> equalsThree = LeftBoundPredicate.bind(IsEqual.instance(), Integer.valueOf(3));
+    private Predicate<Integer> equalsTwentyThree = LeftBoundPredicate.bind(IsEqual.instance(), Integer.valueOf(23));
 
 }

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestInPlaceTransform.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestInPlaceTransform.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestInPlaceTransform.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestInPlaceTransform.java Wed Nov 13 18:54:05 2013
@@ -41,9 +41,9 @@ public class TestInPlaceTransform extend
     public void setUp() throws Exception {
         list = new ArrayList<Integer>();
         doubled = new ArrayList<Integer>();
-        for (int i=0;i<10;i++) {
-            list.add(new Integer(i));
-            doubled.add(new Integer(i*2));
+        for (int i = 0; i < 10; i++) {
+            list.add(Integer.valueOf(i));
+            doubled.add(Integer.valueOf(i * 2));
         }
     }
 
@@ -63,15 +63,12 @@ public class TestInPlaceTransform extend
 
     @Test
     public void testTransform() {
-        new InPlaceTransform<Integer>().run(
-            list.listIterator(),
-            new Function<Integer, Integer>() {
-                public Integer evaluate(Integer obj) {
-                    return new Integer(obj*2);
-                }
+        new InPlaceTransform<Integer>().run(list.listIterator(), new Function<Integer, Integer>() {
+            public Integer evaluate(Integer obj) {
+                return Integer.valueOf(obj * 2);
             }
-        );
-        assertEquals(doubled,list);
+        });
+        assertEquals(doubled, list);
     }
 
     public void testInstance() {
@@ -88,7 +85,7 @@ public class TestInPlaceTransform extend
 
     static class Doubler implements Function<Integer, Integer> {
         public Integer evaluate(Integer obj) {
-            return new Integer(2*obj);
+            return Integer.valueOf(2 * obj);
         }
     }
 

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestIndexOfInGenerator.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestIndexOfInGenerator.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestIndexOfInGenerator.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestIndexOfInGenerator.java Wed Nov 13 18:54:05 2013
@@ -47,6 +47,6 @@ public class TestIndexOfInGenerator exte
     // ------------------------------------------------------------------------
 
     private List<Integer> list = Arrays.asList(0,1,2,3,4,5,6,7,8,9);
-    private Predicate<Integer> equalsThree = LeftBoundPredicate.bind(IsEqual.instance(),new Integer(3));
+    private Predicate<Integer> equalsThree = LeftBoundPredicate.bind(IsEqual.instance(),Integer.valueOf(3));
 
 }

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRecursiveEvaluation.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRecursiveEvaluation.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRecursiveEvaluation.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRecursiveEvaluation.java Wed Nov 13 18:54:05 2013
@@ -35,13 +35,13 @@ public class TestRecursiveEvaluation ext
 
     @Test
     public void testRecurse() {
-        assertEquals(new Integer(5), new RecursiveEvaluation(new RecFunc(0, false)).evaluate());
+        assertEquals(Integer.valueOf(5), new RecursiveEvaluation(new RecFunc(0, false)).evaluate());
 
         // this version will return a function. since it is not the same type
         // as RecFunc recursion will end.
         @SuppressWarnings({ "unchecked", "rawtypes" })
         NullaryFunction<Object> func = (NullaryFunction) new RecursiveEvaluation(new RecFunc(0, true)).evaluate();
-        assertEquals(new Integer(5), func.evaluate());
+        assertEquals(Integer.valueOf(5), func.evaluate());
     }
     
     @Test
@@ -77,7 +77,7 @@ public class TestRecursiveEvaluation ext
                 if (returnFunc) {
                     return new InnerNullaryFunction(times);
                 } else {
-                    return new Integer(times);
+                    return Integer.valueOf(times);
                 }
             }
         }
@@ -109,7 +109,7 @@ public class TestRecursiveEvaluation ext
         }
         
         public Object evaluate() {
-            return new Integer(times);
+            return Integer.valueOf(times);
         }
         
         @Override

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRemoveMatching.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRemoveMatching.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRemoveMatching.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRemoveMatching.java Wed Nov 13 18:54:05 2013
@@ -41,10 +41,10 @@ public class TestRemoveMatching extends 
     public void setUp() throws Exception {
         list = new ArrayList<Integer>();
         evens = new ArrayList<Integer>();
-        for (int i=0;i<10;i++) {
-            list.add(new Integer(i));
-            if (i%2 == 0) {
-                evens.add(new Integer(i));
+        for (int i = 0; i < 10; i++) {
+            list.add(Integer.valueOf(i));
+            if (i % 2 == 0) {
+                evens.add(Integer.valueOf(i));
             }
         }
     }
@@ -65,8 +65,8 @@ public class TestRemoveMatching extends 
 
     @Test
     public void testRemove() {
-        new RemoveMatching<Integer>().run(list.iterator(),isOdd);
-        assertEquals(evens,list);
+        new RemoveMatching<Integer>().run(list.iterator(), isOdd);
+        assertEquals(evens, list);
     }
 
     // Attributes
@@ -84,7 +84,7 @@ public class TestRemoveMatching extends 
 
     static class Doubler implements Function<Integer, Integer> {
         public Integer evaluate(Integer obj) {
-            return new Integer(2*obj);
+            return Integer.valueOf(2 * obj);
         }
     }
 

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRetainMatching.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRetainMatching.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRetainMatching.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/algorithm/TestRetainMatching.java Wed Nov 13 18:54:05 2013
@@ -41,10 +41,10 @@ public class TestRetainMatching extends 
     public void setUp() throws Exception {
         list = new ArrayList<Integer>();
         odds = new ArrayList<Integer>();
-        for (int i=0;i<10;i++) {
-            list.add(new Integer(i));
-            if (i%2 != 0) {
-                odds.add(new Integer(i));
+        for (int i = 0; i < 10; i++) {
+            list.add(Integer.valueOf(i));
+            if (i % 2 != 0) {
+                odds.add(Integer.valueOf(i));
             }
         }
     }
@@ -65,8 +65,8 @@ public class TestRetainMatching extends 
 
     @Test
     public void testRemove() {
-        new RetainMatching<Integer>().run(list.iterator(),isOdd);
-        assertEquals(odds,list);
+        new RetainMatching<Integer>().run(list.iterator(), isOdd);
+        assertEquals(odds, list);
     }
 
     // Attributes
@@ -84,7 +84,7 @@ public class TestRetainMatching extends 
 
     static class Doubler implements Function<Integer, Integer> {
         public Integer evaluate(Integer obj) {
-            return new Integer(2*obj);
+            return Integer.valueOf(2 * obj);
         }
     }
 

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestFilteredIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestFilteredIterator.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestFilteredIterator.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestFilteredIterator.java Wed Nov 13 18:54:05 2013
@@ -43,17 +43,17 @@ public class TestFilteredIterator extend
     public Object makeFunctor() {
         List<String> list = new ArrayList<String>();
         list.add("xyzzy");
-        return FilteredIterator.filter(list.iterator(),Constant.truePredicate());
+        return FilteredIterator.filter(list.iterator(), Constant.truePredicate());
     }
 
     @Before
     public void setUp() throws Exception {
         list = new ArrayList<Integer>();
         evens = new ArrayList<Integer>();
-        for (int i=0;i<10;i++) {
-            list.add(new Integer(i));
-            if (i%2 == 0) {
-                evens.add(new Integer(i));
+        for (int i = 0; i < 10; i++) {
+            list.add(Integer.valueOf(i));
+            if (i % 2 == 0) {
+                evens.add(Integer.valueOf(i));
             }
         }
     }
@@ -70,10 +70,10 @@ public class TestFilteredIterator extend
     @Test
     public void testSomePass() {
         Iterator<Integer> expected = evens.iterator();
-        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(),isEven);
-        while(expected.hasNext()) {
+        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(), isEven);
+        while (expected.hasNext()) {
             assertTrue(testing.hasNext());
-            assertEquals(expected.next(),testing.next());
+            assertEquals(expected.next(), testing.next());
         }
         assertTrue(!testing.hasNext());
     }
@@ -81,10 +81,10 @@ public class TestFilteredIterator extend
     @Test
     public void testAllPass() {
         Iterator<Integer> expected = list.iterator();
-        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(),Constant.truePredicate());
-        while(expected.hasNext()) {
+        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(), Constant.truePredicate());
+        while (expected.hasNext()) {
             assertTrue(testing.hasNext());
-            assertEquals(expected.next(),testing.next());
+            assertEquals(expected.next(), testing.next());
         }
         assertTrue(!testing.hasNext());
     }
@@ -92,61 +92,62 @@ public class TestFilteredIterator extend
     @Test
     public void testAllPass2() {
         Iterator<Integer> expected = list.iterator();
-        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(),Constant.truePredicate());
-        while(expected.hasNext()) {
+        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(), Constant.truePredicate());
+        while (expected.hasNext()) {
             assertTrue(testing.hasNext());
-            assertEquals(expected.next(),testing.next());
+            assertEquals(expected.next(), testing.next());
         }
         assertTrue(!testing.hasNext());
     }
 
     @Test
     public void testEmptyList() {
-        Iterator<Integer> testing = new FilteredIterator<Integer>(new ArrayList<Integer>().iterator(),isEven);
+        Iterator<Integer> testing = new FilteredIterator<Integer>(new ArrayList<Integer>().iterator(), isEven);
         assertTrue(!testing.hasNext());
     }
 
     @Test
     public void testNonePass() {
-        Iterator<Integer> testing = new FilteredIterator<Integer>(new ArrayList<Integer>().iterator(),Constant.falsePredicate());
+        Iterator<Integer> testing =
+            new FilteredIterator<Integer>(new ArrayList<Integer>().iterator(), Constant.falsePredicate());
         assertTrue(!testing.hasNext());
     }
 
     @Test
     public void testNextWithoutHasNext() {
-        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(),isEven);
+        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(), isEven);
         Iterator<Integer> expected = evens.iterator();
-        while(expected.hasNext()) {
-            assertEquals(expected.next(),testing.next());
+        while (expected.hasNext()) {
+            assertEquals(expected.next(), testing.next());
         }
         assertTrue(!(testing.hasNext()));
     }
 
-    @Test(expected=NoSuchElementException.class)
+    @Test(expected = NoSuchElementException.class)
     public void testNextAfterEndOfList() {
-        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(),isEven);
+        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(), isEven);
         Iterator<Integer> expected = evens.iterator();
-        while(expected.hasNext()) {
-            assertEquals(expected.next(),testing.next());
+        while (expected.hasNext()) {
+            assertEquals(expected.next(), testing.next());
         }
         testing.next();
     }
 
-    @Test(expected=NoSuchElementException.class)
+    @Test(expected = NoSuchElementException.class)
     public void testNextOnEmptyList() {
-        Iterator<Integer> testing = new FilteredIterator<Integer>(new ArrayList<Integer>().iterator(),isEven);
+        Iterator<Integer> testing = new FilteredIterator<Integer>(new ArrayList<Integer>().iterator(), isEven);
         testing.next();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void testRemoveBeforeNext() {
-        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(),isEven);
+        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(), isEven);
         testing.remove();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void testRemoveAfterNext() {
-        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(),isEven);
+        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(), isEven);
         testing.next();
         testing.remove();
         testing.remove();
@@ -154,20 +155,20 @@ public class TestFilteredIterator extend
 
     @Test
     public void testRemoveSome() {
-        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(),isEven);
-        while(testing.hasNext()) {
+        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(), isEven);
+        while (testing.hasNext()) {
             testing.next();
             testing.remove();
         }
         for (Iterator<Integer> iter = list.iterator(); iter.hasNext();) {
-            assertTrue(! isEven.test(iter.next()) );
+            assertTrue(!isEven.test(iter.next()));
         }
     }
 
     @Test
     public void testRemoveAll() {
-        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(),Constant.truePredicate());
-        while(testing.hasNext()) {
+        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(), Constant.truePredicate());
+        while (testing.hasNext()) {
             testing.next();
             testing.remove();
         }
@@ -176,8 +177,8 @@ public class TestFilteredIterator extend
 
     @Test
     public void testRemoveWithoutHasNext() {
-        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(),Constant.truePredicate());
-        for (int i=0,m = list.size();i<m;i++) {
+        Iterator<Integer> testing = new FilteredIterator<Integer>(list.iterator(), Constant.truePredicate());
+        for (int i = 0, m = list.size(); i < m; i++) {
             testing.next();
             testing.remove();
         }
@@ -186,30 +187,30 @@ public class TestFilteredIterator extend
 
     @Test
     public void testFilterWithNullIteratorReturnsNull() {
-        assertNull(FilteredIterator.filter(null,Constant.truePredicate()));
+        assertNull(FilteredIterator.filter(null, Constant.truePredicate()));
     }
 
     @Test
     public void testFilterWithNullPredicateReturnsIdentity() {
         Iterator<Integer> iter = list.iterator();
-        assertSame(iter,FilteredIterator.filter(iter,null));
+        assertSame(iter, FilteredIterator.filter(iter, null));
     }
 
     @Test(expected = NullPointerException.class)
     public void testConstructorProhibitsNull() {
-        new FilteredIterator<Integer>(null,null);
+        new FilteredIterator<Integer>(null, null);
     }
 
     @Test(expected = NullPointerException.class)
     public void testConstructorProhibitsNull2() {
-        new FilteredIterator<Integer>(null,Constant.truePredicate());
+        new FilteredIterator<Integer>(null, Constant.truePredicate());
     }
 
     @Test(expected = NullPointerException.class)
     public void testConstructorProhibitsNull3() {
-        new FilteredIterator<Integer>(list.iterator(),null);
+        new FilteredIterator<Integer>(list.iterator(), null);
     }
-    
+
     @Test
     public void testEquals() {
         Iterator<Integer> iter = list.iterator();
@@ -224,7 +225,7 @@ public class TestFilteredIterator extend
                 return obj.intValue() % 2 != 0;
             }
         };
-        assertEquals(t,new FilteredIterator<Integer>(iter, isEven));
+        assertEquals(t, new FilteredIterator<Integer>(iter, isEven));
         assertTrue(!t.equals(new FilteredIterator<Integer>(list.iterator(), isOdd)));
         assertTrue(!t.equals(new FilteredIterator<Float>(Arrays.asList(0.0f, 0.1f).iterator(), isOddFloat)));
         assertTrue(!t.equals(null));

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestIsElementOf.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestIsElementOf.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestIsElementOf.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestIsElementOf.java Wed Nov 13 18:54:05 2013
@@ -48,17 +48,17 @@ public class TestIsElementOf extends Bas
     @Test
     public void testTestCollection() throws Exception {
         List<Integer> list = new ArrayList<Integer>();
-        list.add(new Integer(5));
-        list.add(new Integer(10));
-        list.add(new Integer(15));
+        list.add(Integer.valueOf(5));
+        list.add(Integer.valueOf(10));
+        list.add(Integer.valueOf(15));
 
         Predicate<Integer> p = IsElementOf.instance(list);
-        assertTrue(p.test(new Integer(5)));
-        assertTrue(p.test(new Integer(10)));
-        assertTrue(p.test(new Integer(15)));
+        assertTrue(p.test(Integer.valueOf(5)));
+        assertTrue(p.test(Integer.valueOf(10)));
+        assertTrue(p.test(Integer.valueOf(15)));
 
-        assertTrue(!p.test(new Integer(4)));
-        assertTrue(!p.test(new Integer(11)));
+        assertTrue(!p.test(Integer.valueOf(4)));
+        assertTrue(!p.test(Integer.valueOf(11)));
 
     }
 
@@ -67,19 +67,19 @@ public class TestIsElementOf extends Bas
         int[] list = new int[] { 5, 10, 15 };
 
         Predicate<Integer> p = IsElementOf.instance(list);
-        assertTrue(p.test(new Integer(5)));
-        assertTrue(p.test(new Integer(10)));
-        assertTrue(p.test(new Integer(15)));
+        assertTrue(p.test(Integer.valueOf(5)));
+        assertTrue(p.test(Integer.valueOf(10)));
+        assertTrue(p.test(Integer.valueOf(15)));
 
-        assertTrue(!p.test(new Integer(4)));
-        assertTrue(!p.test(new Integer(11)));
+        assertTrue(!p.test(Integer.valueOf(4)));
+        assertTrue(!p.test(Integer.valueOf(11)));
     }
 
     @Test
     public void testTestArrayWithNull() throws Exception {
         assertTrue(! IsElementOf.instance().test(null,new int[] { 5, 10, 15 }));
-        assertTrue(IsElementOf.instance().test(null,new Integer[] { new Integer(5), null, new Integer(15) }));
-        assertTrue(IsElementOf.instance().test(new Integer(15),new Integer[] { new Integer(5), null, new Integer(15) }));
+        assertTrue(IsElementOf.instance().test(null,new Integer[] { Integer.valueOf(5), null, Integer.valueOf(15) }));
+        assertTrue(IsElementOf.instance().test(Integer.valueOf(15),new Integer[] { Integer.valueOf(5), null, Integer.valueOf(15) }));
     }
 
     @Test
@@ -95,7 +95,7 @@ public class TestIsElementOf extends Bas
     @Test
     public void testWrapNonCollection() {
         try {
-            IsElementOf.instance(new Integer(3));
+            IsElementOf.instance(Integer.valueOf(3));
             fail("expected IllegalArgumentException");
         } catch (IllegalArgumentException e) {
             // expected
@@ -104,13 +104,13 @@ public class TestIsElementOf extends Bas
 
     @Test(expected = NullPointerException.class)
     public void testTestNull() {
-        IsElementOf.instance().test(new Integer(5),null);
+        IsElementOf.instance().test(Integer.valueOf(5),null);
     }
 
     @Test
     public void testTestNonCollection() {
         try {
-            IsElementOf.instance().test(new Integer(5),new Long(5));
+            IsElementOf.instance().test(Integer.valueOf(5),Long.valueOf(5));
             fail("expected IllegalArgumentException");
         } catch (IllegalArgumentException e) {
             // expected

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestIsEmpty.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestIsEmpty.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestIsEmpty.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestIsEmpty.java Wed Nov 13 18:54:05 2013
@@ -75,24 +75,24 @@ public class TestIsEmpty extends BaseFun
     @Test
     public void testTestNonCollection() throws Exception {
         try {
-            IsEmpty.instance().test(new Integer(3));
+            IsEmpty.instance().test(Integer.valueOf(3));
             fail("Expected IllegalArgumentException");
-        } catch(IllegalArgumentException e) {
+        } catch (IllegalArgumentException e) {
             // expected
         }
     }
 
     @Test
     public void testTestArray() throws Exception {
-        assertTrue(! IsEmpty.instance().test(new int[10]));
-        assertTrue(! IsEmpty.instance().test(new Object[10]));
+        assertTrue(!IsEmpty.instance().test(new int[10]));
+        assertTrue(!IsEmpty.instance().test(new Object[10]));
         assertTrue(IsEmpty.instance().test(new int[0]));
         assertTrue(IsEmpty.instance().test(new Object[0]));
     }
 
     @Test
     public void testTestString() throws Exception {
-        assertTrue(! IsEmpty.instance().test("xyzzy"));
+        assertTrue(!IsEmpty.instance().test("xyzzy"));
         assertTrue(IsEmpty.instance().test(""));
     }
 
@@ -100,17 +100,17 @@ public class TestIsEmpty extends BaseFun
     public void testTestMap() throws Exception {
         Map<String, String> map = new HashMap<String, String>();
         assertTrue(IsEmpty.instance().test(map));
-        map.put("x","y");
-        assertTrue(! IsEmpty.instance().test(map));
+        map.put("x", "y");
+        assertTrue(!IsEmpty.instance().test(map));
     }
 
     @Test
     public void testEquals() throws Exception {
         Predicate<String> p = new IsEmpty<String>();
-        assertEquals(p,p);
-        assertObjectsAreEqual(p,new IsEmpty<Long>());
-        assertObjectsAreEqual(p,IsEmpty.instance());
-        assertObjectsAreNotEqual(p,new Constant<Boolean>(Boolean.TRUE));
+        assertEquals(p, p);
+        assertObjectsAreEqual(p, new IsEmpty<Long>());
+        assertObjectsAreEqual(p, IsEmpty.instance());
+        assertObjectsAreNotEqual(p, new Constant<Boolean>(Boolean.TRUE));
     }
 
 }

Modified: commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestSize.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestSize.java?rev=1541658&r1=1541657&r2=1541658&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestSize.java (original)
+++ commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/core/collection/TestSize.java Wed Nov 13 18:54:05 2013
@@ -50,24 +50,24 @@ public class TestSize extends BaseFuncto
 
     @Test
     public void testEvaluate() throws Exception {
-        assertEquals(new Integer(0),Size.instance().evaluate(Collections.EMPTY_LIST));
-        assertEquals(new Integer(0),Size.instance().evaluate(Collections.EMPTY_SET));
+        assertEquals(Integer.valueOf(0), Size.instance().evaluate(Collections.EMPTY_LIST));
+        assertEquals(Integer.valueOf(0), Size.instance().evaluate(Collections.EMPTY_SET));
         {
             List<Integer> list = new ArrayList<Integer>();
-            assertEquals(new Integer(0),Size.instance().evaluate(list));
-            for (int i=0;i<2;i++) {
-                assertEquals(new Integer(i),Size.instance().evaluate(list));
-                list.add(new Integer(i));
-                assertEquals(new Integer(i+1),Size.instance().evaluate(list));
+            assertEquals(Integer.valueOf(0), Size.instance().evaluate(list));
+            for (int i = 0; i < 2; i++) {
+                assertEquals(Integer.valueOf(i), Size.instance().evaluate(list));
+                list.add(Integer.valueOf(i));
+                assertEquals(Integer.valueOf(i + 1), Size.instance().evaluate(list));
             }
         }
         {
             Set<Integer> set = new HashSet<Integer>();
-            assertEquals(new Integer(0),Size.instance().evaluate(set));
-            for (int i=0;i<2;i++) {
-                assertEquals(new Integer(i),Size.instance().evaluate(set));
-                set.add(new Integer(i));
-                assertEquals(new Integer(i+1),Size.instance().evaluate(set));
+            assertEquals(Integer.valueOf(0), Size.instance().evaluate(set));
+            for (int i = 0; i < 2; i++) {
+                assertEquals(Integer.valueOf(i), Size.instance().evaluate(set));
+                set.add(Integer.valueOf(i));
+                assertEquals(Integer.valueOf(i + 1), Size.instance().evaluate(set));
             }
         }
     }
@@ -80,33 +80,33 @@ public class TestSize extends BaseFuncto
     @Test
     public void testEvaluateNonCollection() throws Exception {
         try {
-            Size.instance().evaluate(new Integer(3));
+            Size.instance().evaluate(Integer.valueOf(3));
             fail("Expected IllegalArgumentException");
-        } catch(IllegalArgumentException e) {
+        } catch (IllegalArgumentException e) {
             // expected
         }
     }
 
     @Test
     public void testEvaluateArray() throws Exception {
-        assertEquals(new Integer(10),Size.instance().evaluate(new int[10]));
-        assertEquals(new Integer(7),Size.instance().evaluate(new String[7]));
+        assertEquals(Integer.valueOf(10), Size.instance().evaluate(new int[10]));
+        assertEquals(Integer.valueOf(7), Size.instance().evaluate(new String[7]));
     }
 
     @Test
     public void testEvaluateString() throws Exception {
-        assertEquals(new Integer("xyzzy".length()),Size.instance().evaluate("xyzzy"));
+        assertEquals(Integer.valueOf("xyzzy".length()), Size.instance().evaluate("xyzzy"));
     }
 
     @Test
     public void testEquals() throws Exception {
         Function<Object, Integer> f = new Size<Object>();
-        assertEquals(f,f);
-        assertObjectsAreEqual(f,new Size<Object>());
-        assertObjectsAreEqual(f,Size.instance());
-        assertSame(Size.instance(),Size.instance());
-        assertObjectsAreNotEqual(f,new Constant<Object>(null));
-        assertTrue(! f.equals((Size<?>) null) );
+        assertEquals(f, f);
+        assertObjectsAreEqual(f, new Size<Object>());
+        assertObjectsAreEqual(f, Size.instance());
+        assertSame(Size.instance(), Size.instance());
+        assertObjectsAreNotEqual(f, new Constant<Object>(null));
+        assertTrue(!f.equals((Size<?>) null));
     }
 
 }



Mime
View raw message