You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2013/04/29 01:15:55 UTC

svn commit: r1476855 [2/2] - in /commons/proper/collections/trunk/src: main/java/org/apache/commons/collections4/functors/ test/java/org/apache/commons/collections4/ test/java/org/apache/commons/collections4/bag/ test/java/org/apache/commons/collection...

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/TreeListTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/TreeListTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/TreeListTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/TreeListTest.java Sun Apr 28 23:15:54 2013
@@ -57,7 +57,7 @@ public class TreeListTest<E> extends Abs
     public static void benchmark(final List<? super Integer> l) {
         long start = System.currentTimeMillis();
         for (int i = 0; i < 100000; i++) {
-            l.add(new Integer(i));
+            l.add(Integer.valueOf(i));
         }
         System.out.print(System.currentTimeMillis() - start + ";");
 
@@ -79,7 +79,7 @@ public class TreeListTest<E> extends Abs
         start = System.currentTimeMillis();
         for (int i = 0; i < 10000; i++) {
             final int j = (int) (Math.random() * 100000);
-            l.add(j, new Integer(-j));
+            l.add(j, Integer.valueOf(-j));
         }
         System.out.print(System.currentTimeMillis() - start + ";");
 
@@ -93,7 +93,7 @@ public class TreeListTest<E> extends Abs
         start = System.currentTimeMillis();
         for (int i = 0; i < 200; i++) {
             final int j = (int) (Math.random() * 100000);
-            l.indexOf(new Integer(j));
+            l.indexOf(Integer.valueOf(j));
         }
         System.out.print(System.currentTimeMillis() - start + ";");
 
@@ -219,32 +219,32 @@ public class TreeListTest<E> extends Abs
 //    }
 
     public void testBug35258() {
-        final Object objectToRemove = new Integer(3);
+        final Object objectToRemove = Integer.valueOf(3);
 
         final List<Integer> treelist = new TreeList<Integer>();
-        treelist.add(new Integer(0));
-        treelist.add(new Integer(1));
-        treelist.add(new Integer(2));
-        treelist.add(new Integer(3));
-        treelist.add(new Integer(4));
+        treelist.add(Integer.valueOf(0));
+        treelist.add(Integer.valueOf(1));
+        treelist.add(Integer.valueOf(2));
+        treelist.add(Integer.valueOf(3));
+        treelist.add(Integer.valueOf(4));
 
         // this cause inconsistence of ListIterator()
         treelist.remove(objectToRemove);
 
         final ListIterator<Integer> li = treelist.listIterator();
-        assertEquals(new Integer(0), li.next());
-        assertEquals(new Integer(0), li.previous());
-        assertEquals(new Integer(0), li.next());
-        assertEquals(new Integer(1), li.next());
+        assertEquals(Integer.valueOf(0), li.next());
+        assertEquals(Integer.valueOf(0), li.previous());
+        assertEquals(Integer.valueOf(0), li.next());
+        assertEquals(Integer.valueOf(1), li.next());
         // this caused error in bug 35258
-        assertEquals(new Integer(1), li.previous());
-        assertEquals(new Integer(1), li.next());
-        assertEquals(new Integer(2), li.next());
-        assertEquals(new Integer(2), li.previous());
-        assertEquals(new Integer(2), li.next());
-        assertEquals(new Integer(4), li.next());
-        assertEquals(new Integer(4), li.previous());
-        assertEquals(new Integer(4), li.next());
+        assertEquals(Integer.valueOf(1), li.previous());
+        assertEquals(Integer.valueOf(1), li.next());
+        assertEquals(Integer.valueOf(2), li.next());
+        assertEquals(Integer.valueOf(2), li.previous());
+        assertEquals(Integer.valueOf(2), li.next());
+        assertEquals(Integer.valueOf(4), li.next());
+        assertEquals(Integer.valueOf(4), li.previous());
+        assertEquals(Integer.valueOf(4), li.next());
         assertEquals(false, li.hasNext());
     }
     

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java Sun Apr 28 23:15:54 2013
@@ -72,7 +72,7 @@ public class UnmodifiableListTest<E> ext
     protected void setupList() {
         list = makeFullCollection();
         array = new ArrayList<E>();
-        array.add((E) new Integer(1));
+        array.add((E) Integer.valueOf(1));
     }
 
     /**
@@ -87,13 +87,13 @@ public class UnmodifiableListTest<E> ext
     @SuppressWarnings("unchecked")
     protected void verifyUnmodifiable(final List<E> list) {
         try {
-            list.add(0, (E) new Integer(0));
+            list.add(0, (E) Integer.valueOf(0));
             fail("Expecting UnsupportedOperationException.");
         } catch (final UnsupportedOperationException e) {
             // expected
         }
         try {
-            list.add((E) new Integer(0));
+            list.add((E) Integer.valueOf(0));
              fail("Expecting UnsupportedOperationException.");
         } catch (final UnsupportedOperationException e) {
             // expected
@@ -123,7 +123,7 @@ public class UnmodifiableListTest<E> ext
             // expected
         }
         try {
-            list.remove(new Integer(0));
+            list.remove(Integer.valueOf(0));
              fail("Expecting UnsupportedOperationException.");
         } catch (final UnsupportedOperationException e) {
             // expected
@@ -141,7 +141,7 @@ public class UnmodifiableListTest<E> ext
             // expected
         }
         try {
-            list.set(0, (E) new Integer(0));
+            list.set(0, (E) Integer.valueOf(0));
              fail("Expecting UnsupportedOperationException.");
         } catch (final UnsupportedOperationException e) {
             // expected

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java Sun Apr 28 23:15:54 2013
@@ -86,7 +86,7 @@ public class CaseInsensitiveMapTest<K, V
         map.put("Two", "Two");
         map.put("one", "Three");
         map.put(null, "Four");
-        map.put(new Integer(20), "Five");
+        map.put(Integer.valueOf(20), "Five");
         final Map<Object, String> caseInsensitiveMap = new CaseInsensitiveMap<Object, String>(map);
         assertEquals(4, caseInsensitiveMap.size()); // ones collapsed
         final Set<Object> keys = caseInsensitiveMap.keySet();

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java Sun Apr 28 23:15:54 2013
@@ -119,7 +119,7 @@ public class DefaultedMapTest<K, V> exte
         assertEquals(0, base.size());
         assertEquals(false, map.containsKey("NotInMap"));
         assertEquals("NULL", map.get("NotInMap"));
-        assertEquals("NULL_OBJECT", map.get(new Integer(0)));
+        assertEquals("NULL_OBJECT", map.get(Integer.valueOf(0)));
 
         map.put((K) "Key", (V) "Value");
         assertEquals(1, map.size());
@@ -128,7 +128,7 @@ public class DefaultedMapTest<K, V> exte
         assertEquals("Value", map.get("Key"));
         assertEquals(false, map.containsKey("NotInMap"));
         assertEquals("NULL", map.get("NotInMap"));
-        assertEquals("NULL_OBJECT", map.get(new Integer(0)));
+        assertEquals("NULL_OBJECT", map.get(Integer.valueOf(0)));
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java Sun Apr 28 23:15:54 2013
@@ -38,9 +38,9 @@ import org.apache.commons.collections4.m
  */
 public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
-    private static final Integer ONE = new Integer(1);
-    private static final Integer TWO = new Integer(2);
-    private static final Integer THREE = new Integer(3);
+    private static final Integer ONE = Integer.valueOf(1);
+    private static final Integer TWO = Integer.valueOf(2);
+    private static final Integer THREE = Integer.valueOf(3);
     private static final String TEN = "10";
     private static final String TWENTY = "20";
     private static final String THIRTY = "30";
@@ -412,17 +412,17 @@ public class Flat3MapTest<K, V> extends 
 
     public void testCollections261() {
         final Flat3Map<Integer, Integer> m = new Flat3Map<Integer, Integer>();
-        m.put( new Integer(1), new Integer(1) );
-        m.put( new Integer(0), new Integer(0) );
-        assertEquals( new Integer(1), m.remove( new Integer(1) ) ); 
-        assertEquals( new Integer(0), m.remove( new Integer(0) ) ); 
-
-        m.put( new Integer(2), new Integer(2) );
-        m.put( new Integer(1), new Integer(1) );
-        m.put( new Integer(0), new Integer(0) );
-        assertEquals( new Integer(2), m.remove( new Integer(2) ) ); 
-        assertEquals( new Integer(1), m.remove( new Integer(1) ) ); 
-        assertEquals( new Integer(0), m.remove( new Integer(0) ) ); 
+        m.put( Integer.valueOf(1), Integer.valueOf(1) );
+        m.put( Integer.valueOf(0), Integer.valueOf(0) );
+        assertEquals( Integer.valueOf(1), m.remove( Integer.valueOf(1) ) ); 
+        assertEquals( Integer.valueOf(0), m.remove( Integer.valueOf(0) ) ); 
+
+        m.put( Integer.valueOf(2), Integer.valueOf(2) );
+        m.put( Integer.valueOf(1), Integer.valueOf(1) );
+        m.put( Integer.valueOf(0), Integer.valueOf(0) );
+        assertEquals( Integer.valueOf(2), m.remove( Integer.valueOf(2) ) ); 
+        assertEquals( Integer.valueOf(1), m.remove( Integer.valueOf(1) ) ); 
+        assertEquals( Integer.valueOf(0), m.remove( Integer.valueOf(0) ) ); 
     }
 
 }

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java Sun Apr 28 23:15:54 2013
@@ -149,7 +149,7 @@ public class ListOrderedMapTest<K, V> ex
 
         for (int i = 0; i < lom.size(); i++) {
             final V value = lom.getValue(i);
-            final Object input = new Integer(i);
+            final Object input = Integer.valueOf(i);
             assertEquals(value, lom.setValue(i, (V) input));
             assertEquals(input, lom.getValue(i));
         }
@@ -233,10 +233,10 @@ public class ListOrderedMapTest<K, V> ex
         }
 
         // put where key does exist
-        final Integer i1 = new Integer(1);
-        final Integer i1b = new Integer(1);
-        final Integer i2 = new Integer(2);
-        final Integer i3 = new Integer(3);
+        final Integer i1 = Integer.valueOf(1);
+        final Integer i1b = Integer.valueOf(1);
+        final Integer i2 = Integer.valueOf(2);
+        final Integer i3 = Integer.valueOf(3);
 
         resetEmpty();
         lom = getMap();
@@ -368,7 +368,7 @@ public class ListOrderedMapTest<K, V> ex
         resetFull();
         final ListOrderedMap<K, V> lom = getMap();
         for (int i = 0; i < lom.size(); i++) {
-            final Object input = new Integer(i);
+            final Object input = Integer.valueOf(i);
             final V expected = lom.getValue(i);
             assertEquals(expected, lom.valueList().set(i, (V) input));
             assertEquals(input, lom.getValue(i));

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java Sun Apr 28 23:15:54 2013
@@ -33,14 +33,14 @@ import org.apache.commons.collections4.m
  */
 public class MultiKeyMapTest<K, V> extends AbstractIterableMapTest<MultiKey<? extends K>, V> {
 
-    static final Integer I1 = new Integer(1);
-    static final Integer I2 = new Integer(2);
-    static final Integer I3 = new Integer(3);
-    static final Integer I4 = new Integer(4);
-    static final Integer I5 = new Integer(5);
-    static final Integer I6 = new Integer(6);
-    static final Integer I7 = new Integer(7);
-    static final Integer I8 = new Integer(8);
+    static final Integer I1 = Integer.valueOf(1);
+    static final Integer I2 = Integer.valueOf(2);
+    static final Integer I3 = Integer.valueOf(3);
+    static final Integer I4 = Integer.valueOf(4);
+    static final Integer I5 = Integer.valueOf(5);
+    static final Integer I6 = Integer.valueOf(6);
+    static final Integer I7 = Integer.valueOf(7);
+    static final Integer I8 = Integer.valueOf(8);
 
     public MultiKeyMapTest(final String testName) {
         super(testName);

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java Sun Apr 28 23:15:54 2013
@@ -178,7 +178,7 @@ public class MultiValueMapTest<K, V> ext
     @SuppressWarnings("unchecked")
     public void testMapEquals() {
         final MultiValueMap<K, V> one = new MultiValueMap<K, V>();
-        final Integer value = new Integer(1);
+        final Integer value = Integer.valueOf(1);
         one.put((K) "One", value);
         one.remove("One", value);
 

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java Sun Apr 28 23:15:54 2013
@@ -78,27 +78,27 @@ public class PredicatedMapTest<K, V> ext
     public void testPut() {
         final Map<K, V> map = makeTestMap();
         try {
-            map.put((K) "Hi", (V) new Integer(3));
+            map.put((K) "Hi", (V) Integer.valueOf(3));
             fail("Illegal value should raise IllegalArgument");
         } catch (final IllegalArgumentException e) {
             // expected
         }
 
         try {
-            map.put((K) new Integer(3), (V) "Hi");
+            map.put((K) Integer.valueOf(3), (V) "Hi");
             fail("Illegal key should raise IllegalArgument");
         } catch (final IllegalArgumentException e) {
             // expected
         }
 
-        assertTrue(!map.containsKey(new Integer(3)));
-        assertTrue(!map.containsValue(new Integer(3)));
+        assertTrue(!map.containsKey(Integer.valueOf(3)));
+        assertTrue(!map.containsValue(Integer.valueOf(3)));
 
         final Map<K, V> map2 = new HashMap<K, V>();
         map2.put((K) "A", (V) "a");
         map2.put((K) "B", (V) "b");
         map2.put((K) "C", (V) "c");
-        map2.put((K) "c", (V) new Integer(3));
+        map2.put((K) "c", (V) Integer.valueOf(3));
 
         try {
             map.putAll(map2);
@@ -111,7 +111,7 @@ public class PredicatedMapTest<K, V> ext
         Iterator<Map.Entry<K, V>> iterator = map.entrySet().iterator();
         try {
             final Map.Entry<K, V> entry = iterator.next();
-            entry.setValue((V) new Integer(3));
+            entry.setValue((V) Integer.valueOf(3));
             fail("Illegal value should raise IllegalArgument");
         } catch (final IllegalArgumentException e) {
             // expected

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java Sun Apr 28 23:15:54 2013
@@ -92,27 +92,27 @@ public class PredicatedSortedMapTest<K, 
     public void testPut() {
         final Map<K, V> map = makeTestMap();
         try {
-            map.put((K) "Hi", (V) new Integer(3));
+            map.put((K) "Hi", (V) Integer.valueOf(3));
             fail("Illegal value should raise IllegalArgument");
         } catch (final IllegalArgumentException e) {
             // expected
         }
 
         try {
-            map.put((K) new Integer(3), (V) "Hi");
+            map.put((K) Integer.valueOf(3), (V) "Hi");
             fail("Illegal key should raise IllegalArgument");
         } catch (final IllegalArgumentException e) {
             // expected
         }
 
-        assertTrue(!map.containsKey(new Integer(3)));
-        assertTrue(!map.containsValue(new Integer(3)));
+        assertTrue(!map.containsKey(Integer.valueOf(3)));
+        assertTrue(!map.containsValue(Integer.valueOf(3)));
 
         final Map<K, V> map2 = new HashMap<K, V>();
         map2.put((K) "A", (V) "a");
         map2.put((K) "B", (V) "b");
         map2.put((K) "C", (V) "c");
-        map2.put((K) "c", (V) new Integer(3));
+        map2.put((K) "c", (V) Integer.valueOf(3));
 
         try {
             map.putAll(map2);
@@ -125,7 +125,7 @@ public class PredicatedSortedMapTest<K, 
         Iterator<Map.Entry<K, V>> iterator = map.entrySet().iterator();
         try {
             final Map.Entry<K, V> entry = iterator.next();
-            entry.setValue((V) new Integer(3));
+            entry.setValue((V) Integer.valueOf(3));
             fail("Illegal value should raise IllegalArgument");
         } catch (final IllegalArgumentException e) {
             // expected

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java Sun Apr 28 23:15:54 2013
@@ -34,10 +34,10 @@ import org.apache.commons.collections4.m
  */
 public class ReferenceIdentityMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
-    private static final Integer I1A = new Integer(1);
-    private static final Integer I1B = new Integer(1);
-    private static final Integer I2A = new Integer(2);
-    private static final Integer I2B = new Integer(2);
+    private static final Integer I1A = Integer.valueOf(1);
+    private static final Integer I1B = Integer.valueOf(1);
+    private static final Integer I2A = Integer.valueOf(2);
+    private static final Integer I2B = Integer.valueOf(2);
 
     public ReferenceIdentityMapTest(final String testName) {
         super(testName);
@@ -196,12 +196,12 @@ public class ReferenceIdentityMapTest<K,
     public void testGetAfterGC() {
         ReferenceIdentityMap map = new ReferenceIdentityMap(ReferenceIdentityMap.WEAK, ReferenceIdentityMap.WEAK);
         for (int i = 0; i < 10; i++) {
-            map.put(new Integer(i), new Integer(i));
+            map.put(Integer.valueOf(i), Integer.valueOf(i));
         }
 
         gc();
         for (int i = 0; i < 10; i++) {
-            Integer I = new Integer(i);
+            Integer I = Integer.valueOf(i);
             assertTrue("map.containsKey should return false for GC'd element", !map.containsKey(I));
             assertTrue("map.get should return null for GC'd element", map.get(I) == null);
         }
@@ -212,8 +212,8 @@ public class ReferenceIdentityMapTest<K,
         ReferenceIdentityMap map = new ReferenceIdentityMap(ReferenceIdentityMap.WEAK, ReferenceIdentityMap.WEAK);
         Object[] hard = new Object[10];
         for (int i = 0; i < 10; i++) {
-            hard[i] = new Integer(10 + i);
-            map.put(new Integer(i), new Integer(i));
+            hard[i] = Integer.valueOf(10 + i);
+            map.put(Integer.valueOf(i), Integer.valueOf(i));
             map.put(hard[i], hard[i]);
         }
 
@@ -233,8 +233,8 @@ public class ReferenceIdentityMapTest<K,
         ReferenceIdentityMap map = new ReferenceIdentityMap(ReferenceIdentityMap.WEAK, ReferenceIdentityMap.WEAK);
         Object[] hard = new Object[10];
         for (int i = 0; i < 10; i++) {
-            hard[i] = new Integer(10 + i);
-            map.put(new Integer(i), new Integer(i));
+            hard[i] = Integer.valueOf(10 + i);
+            map.put(Integer.valueOf(i), Integer.valueOf(i));
             map.put(hard[i], hard[i]);
         }
 
@@ -255,8 +255,8 @@ public class ReferenceIdentityMapTest<K,
         ReferenceIdentityMap map = new ReferenceIdentityMap(ReferenceIdentityMap.WEAK, ReferenceIdentityMap.WEAK);
         Object[] hard = new Object[10];
         for (int i = 0; i < 10; i++) {
-            hard[i] = new Integer(10 + i);
-            map.put(new Integer(i), new Integer(i));
+            hard[i] = Integer.valueOf(10 + i);
+            map.put(Integer.valueOf(i), Integer.valueOf(i));
             map.put(hard[i], hard[i]);
         }
 

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java Sun Apr 28 23:15:54 2013
@@ -129,12 +129,12 @@ public class ReferenceMapTest<K, V> exte
     public void testGetAfterGC() {
         ReferenceMap map = new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.WEAK);
         for (int i = 0; i < 10; i++) {
-            map.put(new Integer(i), new Integer(i));
+            map.put(Integer.valueOf(i), Integer.valueOf(i));
         }
 
         gc();
         for (int i = 0; i < 10; i++) {
-            Integer I = new Integer(i);
+            Integer I = Integer.valueOf(i);
             assertTrue("map.containsKey should return false for GC'd element", !map.containsKey(I));
             assertTrue("map.get should return null for GC'd element", map.get(I) == null);
         }
@@ -145,8 +145,8 @@ public class ReferenceMapTest<K, V> exte
         ReferenceMap map = new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.WEAK);
         Object[] hard = new Object[10];
         for (int i = 0; i < 10; i++) {
-            hard[i] = new Integer(10 + i);
-            map.put(new Integer(i), new Integer(i));
+            hard[i] = Integer.valueOf(10 + i);
+            map.put(Integer.valueOf(i), Integer.valueOf(i));
             map.put(hard[i], hard[i]);
         }
 
@@ -166,8 +166,8 @@ public class ReferenceMapTest<K, V> exte
         ReferenceMap map = new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.WEAK);
         Object[] hard = new Object[10];
         for (int i = 0; i < 10; i++) {
-            hard[i] = new Integer(10 + i);
-            map.put(new Integer(i), new Integer(i));
+            hard[i] = Integer.valueOf(10 + i);
+            map.put(Integer.valueOf(i), Integer.valueOf(i));
             map.put(hard[i], hard[i]);
         }
 
@@ -188,8 +188,8 @@ public class ReferenceMapTest<K, V> exte
         ReferenceMap map = new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.WEAK);
         Object[] hard = new Object[10];
         for (int i = 0; i < 10; i++) {
-            hard[i] = new Integer(10 + i);
-            map.put(new Integer(i), new Integer(i));
+            hard[i] = Integer.valueOf(10 + i);
+            map.put(Integer.valueOf(i), Integer.valueOf(i));
             map.put(hard[i], hard[i]);
         }
 

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java Sun Apr 28 23:15:54 2013
@@ -34,8 +34,8 @@ import org.apache.commons.collections4.m
  */
 public class SingletonMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
-    private static final Integer ONE = new Integer(1);
-    private static final Integer TWO = new Integer(2);
+    private static final Integer ONE = Integer.valueOf(1);
+    private static final Integer TWO = Integer.valueOf(2);
     private static final String TEN = "10";
 
     public SingletonMapTest(final String testName) {

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java Sun Apr 28 23:15:54 2013
@@ -60,38 +60,38 @@ public class TransformedMapTest<K, V> ex
         for (int i = 0; i < els.length; i++) {
             map.put((K) els[i], (V) els[i]);
             assertEquals(i + 1, map.size());
-            assertEquals(true, map.containsKey(new Integer((String) els[i])));
+            assertEquals(true, map.containsKey(Integer.valueOf((String) els[i])));
             assertEquals(false, map.containsKey(els[i]));
             assertEquals(true, map.containsValue(els[i]));
-            assertEquals(els[i], map.get(new Integer((String) els[i])));
+            assertEquals(els[i], map.get(Integer.valueOf((String) els[i])));
         }
 
         assertEquals(null, map.remove(els[0]));
-        assertEquals(els[0], map.remove(new Integer((String) els[0])));
+        assertEquals(els[0], map.remove(Integer.valueOf((String) els[0])));
 
         map = TransformedMap.transformingMap(new HashMap(), null, TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, map.size());
         for (int i = 0; i < els.length; i++) {
             map.put((K) els[i], (V) els[i]);
             assertEquals(i + 1, map.size());
-            assertEquals(true, map.containsValue(new Integer((String) els[i])));
+            assertEquals(true, map.containsValue(Integer.valueOf((String) els[i])));
             assertEquals(false, map.containsValue(els[i]));
             assertEquals(true, map.containsKey(els[i]));
-            assertEquals(new Integer((String) els[i]), map.get(els[i]));
+            assertEquals(Integer.valueOf((String) els[i]), map.get(els[i]));
         }
 
-        assertEquals(new Integer((String) els[0]), map.remove(els[0]));
+        assertEquals(Integer.valueOf((String) els[0]), map.remove(els[0]));
 
         final Set<Map.Entry<K, V>> entrySet = map.entrySet();
         final Map.Entry<K, V>[] array = entrySet.toArray(new Map.Entry[0]);
         array[0].setValue((V) "66");
-        assertEquals(new Integer(66), array[0].getValue());
-        assertEquals(new Integer(66), map.get(array[0].getKey()));
+        assertEquals(Integer.valueOf(66), array[0].getValue());
+        assertEquals(Integer.valueOf(66), map.get(array[0].getKey()));
 
         final Map.Entry entry = entrySet.iterator().next();
         entry.setValue("88");
-        assertEquals(new Integer(88), entry.getValue());
-        assertEquals(new Integer(88), map.get(entry.getKey()));
+        assertEquals(Integer.valueOf(88), entry.getValue());
+        assertEquals(Integer.valueOf(88), map.get(entry.getKey()));
     }
 
     //-----------------------------------------------------------------------
@@ -112,7 +112,7 @@ public class TransformedMapTest<K, V> ex
         assertEquals("2", trans.get("B"));
         assertEquals("3", trans.get("C"));
         trans.put((K) "D", (V) "4");
-        assertEquals(new Integer(4), trans.get("D"));
+        assertEquals(Integer.valueOf(4), trans.get("D"));
     }
 
     @SuppressWarnings("unchecked")
@@ -128,11 +128,11 @@ public class TransformedMapTest<K, V> ex
                         null,
                         (Transformer<? super V, ? extends V>) TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(3, trans.size());
-        assertEquals(new Integer(1), trans.get("A"));
-        assertEquals(new Integer(2), trans.get("B"));
-        assertEquals(new Integer(3), trans.get("C"));
+        assertEquals(Integer.valueOf(1), trans.get("A"));
+        assertEquals(Integer.valueOf(2), trans.get("B"));
+        assertEquals(Integer.valueOf(3), trans.get("C"));
         trans.put((K) "D", (V) "4");
-        assertEquals(new Integer(4), trans.get("D"));
+        assertEquals(Integer.valueOf(4), trans.get("D"));
     }
 
     //-----------------------------------------------------------------------

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java Sun Apr 28 23:15:54 2013
@@ -104,20 +104,20 @@ public class TransformedSortedMapTest<K,
         for (int i = 0; i < els.length; i++) {
             map.put((K) els[i], (V) els[i]);
             assertEquals(i + 1, map.size());
-            assertEquals(true, map.containsKey(new Integer((String) els[i])));
+            assertEquals(true, map.containsKey(Integer.valueOf((String) els[i])));
             try {
                 map.containsKey(els[i]);
                 fail();
             } catch (final ClassCastException ex) {}
             assertEquals(true, map.containsValue(els[i]));
-            assertEquals(els[i], map.get(new Integer((String) els[i])));
+            assertEquals(els[i], map.get(Integer.valueOf((String) els[i])));
         }
 
         try {
             map.remove(els[0]);
             fail();
         } catch (final ClassCastException ex) {}
-        assertEquals(els[0], map.remove(new Integer((String) els[0])));
+        assertEquals(els[0], map.remove(Integer.valueOf((String) els[0])));
 
         map = TransformedSortedMap
                 .transformingSortedMap(
@@ -128,24 +128,24 @@ public class TransformedSortedMapTest<K,
         for (int i = 0; i < els.length; i++) {
             map.put((K) els[i], (V) els[i]);
             assertEquals(i + 1, map.size());
-            assertEquals(true, map.containsValue(new Integer((String) els[i])));
+            assertEquals(true, map.containsValue(Integer.valueOf((String) els[i])));
             assertEquals(false, map.containsValue(els[i]));
             assertEquals(true, map.containsKey(els[i]));
-            assertEquals(new Integer((String) els[i]), map.get(els[i]));
+            assertEquals(Integer.valueOf((String) els[i]), map.get(els[i]));
         }
 
-        assertEquals(new Integer((String) els[0]), map.remove(els[0]));
+        assertEquals(Integer.valueOf((String) els[0]), map.remove(els[0]));
 
         final Set<Map.Entry<K, V>> entrySet = map.entrySet();
         final Map.Entry<K, V>[] array = entrySet.toArray(new Map.Entry[0]);
         array[0].setValue((V) "66");
-        assertEquals(new Integer(66), array[0].getValue());
-        assertEquals(new Integer(66), map.get(array[0].getKey()));
+        assertEquals(Integer.valueOf(66), array[0].getValue());
+        assertEquals(Integer.valueOf(66), map.get(array[0].getKey()));
 
         final Map.Entry<K, V> entry = entrySet.iterator().next();
         entry.setValue((V) "88");
-        assertEquals(new Integer(88), entry.getValue());
-        assertEquals(new Integer(88), map.get(entry.getKey()));
+        assertEquals(Integer.valueOf(88), entry.getValue());
+        assertEquals(Integer.valueOf(88), map.get(entry.getKey()));
     }
 
     //-----------------------------------------------------------------------
@@ -166,7 +166,7 @@ public class TransformedSortedMapTest<K,
         assertEquals("2", trans.get("B"));
         assertEquals("3", trans.get("C"));
         trans.put((K) "D", (V) "4");
-        assertEquals(new Integer(4), trans.get("D"));
+        assertEquals(Integer.valueOf(4), trans.get("D"));
     }
 
     @SuppressWarnings("unchecked")
@@ -182,11 +182,11 @@ public class TransformedSortedMapTest<K,
                         null,
                         (Transformer<? super V, ? extends V>) TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(3, trans.size());
-        assertEquals(new Integer(1), trans.get("A"));
-        assertEquals(new Integer(2), trans.get("B"));
-        assertEquals(new Integer(3), trans.get("C"));
+        assertEquals(Integer.valueOf(1), trans.get("A"));
+        assertEquals(Integer.valueOf(2), trans.get("B"));
+        assertEquals(Integer.valueOf(3), trans.get("C"));
         trans.put((K) "D", (V) "4");
-        assertEquals(new Integer(4), trans.get("D"));
+        assertEquals(Integer.valueOf(4), trans.get("D"));
     }
 
     //-----------------------------------------------------------------------

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java Sun Apr 28 23:15:54 2013
@@ -74,12 +74,12 @@ public class TransformedQueueTest<E> ext
         for (int i = 0; i < els.length; i++) {
             queue.add(els[i]);
             assertEquals(i + 1, queue.size());
-            assertEquals(true, queue.contains(new Integer((String) els[i])));
+            assertEquals(true, queue.contains(Integer.valueOf((String) els[i])));
             assertEquals(false, queue.contains(els[i]));
         }
         
         assertEquals(false, queue.remove(els[0]));
-        assertEquals(true, queue.remove(new Integer((String) els[0])));
+        assertEquals(true, queue.remove(Integer.valueOf((String) els[0])));
         
     }
 
@@ -94,12 +94,12 @@ public class TransformedQueueTest<E> ext
                 TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(els.length, queue.size());
         for (final Object el : els) {
-            assertEquals(true, queue.contains(new Integer((String) el)));
+            assertEquals(true, queue.contains(Integer.valueOf((String) el)));
             assertEquals(false, queue.contains(el));
         }
         
         assertEquals(false, queue.remove(els[0]));
-        assertEquals(true, queue.remove(new Integer((String) els[0])));
+        assertEquals(true, queue.remove(Integer.valueOf((String) els[0])));
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java Sun Apr 28 23:15:54 2013
@@ -123,7 +123,7 @@ public abstract class AbstractSortedSetT
         final Object[] elements = new Object[30];
 
         for (int i = 0; i < 30; i++) {
-            elements[i] = new Integer(i + i + 1);
+            elements[i] = Integer.valueOf(i + i + 1);
         }
         return (E[]) elements;
     }
@@ -136,7 +136,7 @@ public abstract class AbstractSortedSetT
     public E[] getOtherNonNullElements() {
         final Object[] elements = new Object[30];
         for (int i = 0; i < 30; i++) {
-            elements[i] = new Integer(i + i + 2);
+            elements[i] = Integer.valueOf(i + i + 2);
         }
         return (E[]) elements;
     }

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java Sun Apr 28 23:15:54 2013
@@ -29,10 +29,10 @@ import java.util.List;
  */
 public class ListOrderedSet2Test<E> extends AbstractSetTest<E> {
 
-    private static final Integer ZERO = new Integer(0);
-    private static final Integer ONE = new Integer(1);
-    private static final Integer TWO = new Integer(2);
-    private static final Integer THREE = new Integer(3);
+    private static final Integer ZERO = Integer.valueOf(0);
+    private static final Integer ONE = Integer.valueOf(1);
+    private static final Integer TWO = Integer.valueOf(2);
+    private static final Integer THREE = Integer.valueOf(3);
 
     public ListOrderedSet2Test(final String testName) {
         super(testName);

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java Sun Apr 28 23:15:54 2013
@@ -33,13 +33,13 @@ import java.util.Set;
 public class ListOrderedSetTest<E>
     extends AbstractSetTest<E> {
 
-    private static final Integer ZERO = new Integer(0);
+    private static final Integer ZERO = Integer.valueOf(0);
 
-    private static final Integer ONE = new Integer(1);
+    private static final Integer ONE = Integer.valueOf(1);
 
-    private static final Integer TWO = new Integer(2);
+    private static final Integer TWO = Integer.valueOf(2);
 
-    private static final Integer THREE = new Integer(3);
+    private static final Integer THREE = Integer.valueOf(3);
 
     public ListOrderedSetTest(final String testName) {
         super(testName);

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java Sun Apr 28 23:15:54 2013
@@ -75,7 +75,7 @@ public class PredicatedSetTest<E> extend
     @SuppressWarnings("unchecked")
     public void testIllegalAdd() {
         final Set<E> set = makeTestSet();
-        final Integer i = new Integer(3);
+        final Integer i = Integer.valueOf(3);
         try {
             set.add((E) i);
             fail("Integer should fail string predicate.");
@@ -92,7 +92,7 @@ public class PredicatedSetTest<E> extend
         final Set<E> elements = new HashSet<E>();
         elements.add((E) "one");
         elements.add((E) "two");
-        elements.add((E) new Integer(3));
+        elements.add((E) Integer.valueOf(3));
         elements.add((E) "four");
         try {
             set.addAll(elements);
@@ -105,7 +105,7 @@ public class PredicatedSetTest<E> extend
         assertTrue("Set shouldn't contain illegal element",
          !set.contains("two"));
         assertTrue("Set shouldn't contain illegal element",
-         !set.contains(new Integer(3)));
+         !set.contains(Integer.valueOf(3)));
         assertTrue("Set shouldn't contain illegal element",
          !set.contains("four"));
     }

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java Sun Apr 28 23:15:54 2013
@@ -73,12 +73,12 @@ public class TransformedSetTest<E> exten
         for (int i = 0; i < els.length; i++) {
             set.add(els[i]);
             assertEquals(i + 1, set.size());
-            assertEquals(true, set.contains(new Integer((String) els[i])));
+            assertEquals(true, set.contains(Integer.valueOf((String) els[i])));
             assertEquals(false, set.contains(els[i]));
         }
 
         assertEquals(false, set.remove(els[0]));
-        assertEquals(true, set.remove(new Integer((String) els[0])));
+        assertEquals(true, set.remove(Integer.valueOf((String) els[0])));
 
     }
 
@@ -91,12 +91,12 @@ public class TransformedSetTest<E> exten
         final Set<?> set = TransformedSet.transformedSet(originalSet, TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(els.length, set.size());
         for (final Object el : els) {
-            assertEquals(true, set.contains(new Integer((String) el)));
+            assertEquals(true, set.contains(Integer.valueOf((String) el)));
             assertEquals(false, set.contains(el));
         }
         
         assertEquals(false, set.remove(els[0]));
-        assertEquals(true, set.remove(new Integer((String) els[0])));
+        assertEquals(true, set.remove(Integer.valueOf((String) els[0])));
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java Sun Apr 28 23:15:54 2013
@@ -69,10 +69,10 @@ public class TransformedSortedSetTest<E>
         for (int i = 0; i < els.length; i++) {
             set.add(els[i]);
             assertEquals(i + 1, set.size());
-            assertEquals(true, set.contains(new Integer((String) els[i])));
+            assertEquals(true, set.contains(Integer.valueOf((String) els[i])));
         }
 
-        assertEquals(true, set.remove(new Integer((String) els[0])));
+        assertEquals(true, set.remove(Integer.valueOf((String) els[0])));
     }
 
     public void testTransformedSet_decorateTransform() {
@@ -84,10 +84,10 @@ public class TransformedSortedSetTest<E>
         final Set<?> set = TransformedSortedSet.transformedSet(originalSet, TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(els.length, set.size());
         for (final Object el : els) {
-            assertEquals(true, set.contains(new Integer((String) el)));
+            assertEquals(true, set.contains(Integer.valueOf((String) el)));
         }
         
-        assertEquals(true, set.remove(new Integer((String) els[0])));
+        assertEquals(true, set.remove(Integer.valueOf((String) els[0])));
     }
 
     @Override

Modified: commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java?rev=1476855&r1=1476854&r2=1476855&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java (original)
+++ commons/proper/collections/trunk/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java Sun Apr 28 23:15:54 2013
@@ -74,7 +74,7 @@ public class UnmodifiableSortedSetTest<E
     protected void setupSet() {
         set = makeFullCollection();
         array = new ArrayList<E>();
-        array.add((E) new Integer(1));
+        array.add((E) Integer.valueOf(1));
     }
 
     /**
@@ -84,9 +84,9 @@ public class UnmodifiableSortedSetTest<E
     public void testUnmodifiable() {
         setupSet();
         verifyUnmodifiable(set);
-        verifyUnmodifiable(set.headSet((E) new Integer(1)));
-        verifyUnmodifiable(set.tailSet((E) new Integer(1)));
-        verifyUnmodifiable(set.subSet((E) new Integer(1), (E) new Integer(3)));
+        verifyUnmodifiable(set.headSet((E) Integer.valueOf(1)));
+        verifyUnmodifiable(set.tailSet((E) Integer.valueOf(1)));
+        verifyUnmodifiable(set.subSet((E) Integer.valueOf(1), (E) Integer.valueOf(3)));
     }
 
     /**