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 2010/10/18 17:47:28 UTC
svn commit: r1023862 - in
/commons/proper/collections/trunk/src/test/org/apache/commons/collections:
./ buffer/ comparators/ functors/ iterators/ map/
Author: sebb
Date: Mon Oct 18 15:47:27 2010
New Revision: 1023862
URL: http://svn.apache.org/viewvc?rev=1023862&view=rev
Log:
Fix boxing and some raw types warninga
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestMapUtils.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestPredicateUtils.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/AbstractTestAnyAllOnePredicate.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/MockPredicateTestBase.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestAllPredicate.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestEqualPredicate.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java
Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestMapUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestMapUtils.java?rev=1023862&r1=1023861&r2=1023862&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestMapUtils.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestMapUtils.java Mon Oct 18 15:47:27 2010
@@ -49,6 +49,7 @@ import org.apache.commons.collections.co
* @author Janek Bogucki
* @author Neil O'Toole
*/
+@SuppressWarnings("boxing")
public class TestMapUtils extends BulkTest {
public TestMapUtils(String name) {
@@ -744,7 +745,7 @@ public class TestMapUtils extends BulkTe
public void testPopulateMap() {
// Setup Test Data
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
list.add("1");
list.add("3");
list.add("5");
@@ -754,27 +755,27 @@ public class TestMapUtils extends BulkTe
list.add("6");
// Now test key transform population
- Map map = new HashMap();
+ Map<Object, Object> map = new HashMap<Object, Object>();
MapUtils.populateMap(map, list, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
assertEquals(list.size(), map.size());
for (int i = 0; i < list.size(); i++) {
- assertEquals(true, map.containsKey(new Integer((String) list.get(i))));
+ assertEquals(true, map.containsKey(new Integer(list.get(i))));
assertEquals(false, map.containsKey(list.get(i)));
assertEquals(true, map.containsValue(list.get(i)));
- assertEquals(list.get(i), map.get(new Integer((String) list.get(i))));
+ assertEquals(list.get(i), map.get(new Integer(list.get(i))));
}
// Now test both Key-Value transform population
- map = new HashMap();
+ map = new HashMap<Object, Object>();
MapUtils.populateMap(map, list, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
assertEquals(list.size(), map.size());
for (int i = 0; i < list.size(); i++) {
- assertEquals(true, map.containsKey(new Integer((String) list.get(i))));
+ assertEquals(true, map.containsKey(new Integer(list.get(i))));
assertEquals(false, map.containsKey(list.get(i)));
- assertEquals(true, map.containsValue(new Integer((String) list.get(i))));
- assertEquals(new Integer((String) list.get(i)), map.get(new Integer((String) list.get(i))));
+ assertEquals(true, map.containsValue(new Integer(list.get(i))));
+ assertEquals(new Integer(list.get(i)), map.get(new Integer(list.get(i))));
}
}
Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestPredicateUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestPredicateUtils.java?rev=1023862&r1=1023861&r2=1023862&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestPredicateUtils.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestPredicateUtils.java Mon Oct 18 15:47:27 2010
@@ -49,6 +49,7 @@ import org.junit.Test;
* @author Stephen Colebourne
* @author Matt Benson
*/
+@SuppressWarnings("boxing")
public class TestPredicateUtils extends BasicPredicateTestBase {
/**
* Set up instance variables required by this test case.
Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java?rev=1023862&r1=1023861&r2=1023862&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/buffer/TestPriorityBuffer.java Mon Oct 18 15:47:27 2010
@@ -39,6 +39,7 @@ import org.apache.commons.collections.co
* @author Michael A. Smith
* @author Steve Phelps
*/
+@SuppressWarnings("boxing")
public class TestPriorityBuffer<E> extends AbstractTestCollection<E> {
public TestPriorityBuffer(String testName) {
Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java?rev=1023862&r1=1023861&r2=1023862&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java Mon Oct 18 15:47:27 2010
@@ -27,6 +27,7 @@ import java.util.List;
*
* @author Rodney Waldhoff
*/
+@SuppressWarnings("boxing")
public class TestBooleanComparator extends AbstractTestComparator<Boolean> {
// conventional
Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java?rev=1023862&r1=1023861&r2=1023862&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/comparators/TestComparableComparator.java Mon Oct 18 15:47:27 2010
@@ -25,8 +25,8 @@ import java.util.List;
*
* @version $Revision$ $Date$
*
- * @author Unknown
*/
+@SuppressWarnings("boxing")
public class TestComparableComparator extends AbstractTestComparator<Integer> {
public TestComparableComparator(String testName) {
Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/AbstractTestAnyAllOnePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/AbstractTestAnyAllOnePredicate.java?rev=1023862&r1=1023861&r2=1023862&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/AbstractTestAnyAllOnePredicate.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/AbstractTestAnyAllOnePredicate.java Mon Oct 18 15:47:27 2010
@@ -73,6 +73,7 @@ public abstract class AbstractTestAnyAll
* Tests creating composite predicate instances with single predicates and verifies that the composite returns
* the same value as the single predicate does.
*/
+ @SuppressWarnings("boxing")
public final void singleValues() {
assertTrue(getPredicateInstance(true).evaluate(null));
assertFalse(getPredicateInstance(false).evaluate(null));
Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/MockPredicateTestBase.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/MockPredicateTestBase.java?rev=1023862&r1=1023861&r2=1023862&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/MockPredicateTestBase.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/MockPredicateTestBase.java Mon Oct 18 15:47:27 2010
@@ -91,7 +91,7 @@ public abstract class MockPredicateTestB
*
* @return a single mock predicate.
*/
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({"unchecked", "boxing"})
protected final Predicate<T> createMockPredicate(final Boolean returnValue) {
final Predicate<T> mockPredicate = EasyMock.createMock(Predicate.class);
if (returnValue != null) {
Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestAllPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestAllPredicate.java?rev=1023862&r1=1023861&r2=1023862&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestAllPredicate.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestAllPredicate.java Mon Oct 18 15:47:27 2010
@@ -18,6 +18,7 @@ import java.util.Collections;
*
* @author Edwin Tellman
*/
+@SuppressWarnings("boxing")
public class TestAllPredicate extends AbstractTestAnyAllOnePredicate<Integer> {
/**
Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestEqualPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestEqualPredicate.java?rev=1023862&r1=1023861&r2=1023862&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestEqualPredicate.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/functors/TestEqualPredicate.java Mon Oct 18 15:47:27 2010
@@ -45,6 +45,7 @@ public class TestEqualPredicate extends
assertTrue(equalPredicate(TRUE_OBJECT), TRUE_OBJECT);
}
+ @SuppressWarnings("boxing")
@Test
public void testPredicateTypeCanBeSuperClassOfObject() throws Exception {
Predicate<Number> predicate = equalPredicate((Number) 4);
Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java?rev=1023862&r1=1023861&r2=1023862&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestCollatingIterator.java Mon Oct 18 15:47:27 2010
@@ -27,6 +27,7 @@ import org.apache.commons.collections.co
* @version $Revision$ $Date$
* @author Rodney Waldhoff
*/
+@SuppressWarnings("boxing")
public class TestCollatingIterator extends AbstractTestIterator<Integer> {
//------------------------------------------------------------ Conventional
Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java?rev=1023862&r1=1023861&r2=1023862&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterListIterator.java Mon Oct 18 15:47:27 2010
@@ -31,6 +31,7 @@ import org.apache.commons.collections.Pr
*
* @author Rodney Waldhoff
*/
+@SuppressWarnings("boxing")
public class TestFilterListIterator extends TestCase {
public TestFilterListIterator(String testName) {
super(testName);
Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java?rev=1023862&r1=1023861&r2=1023862&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java Mon Oct 18 15:47:27 2010
@@ -35,6 +35,7 @@ import org.junit.Test;
*
* @author Phil Steitz
*/
+@SuppressWarnings("boxing")
public class TestLazyMap<K, V> extends AbstractTestIterableMap<K, V> {
private static final Factory<Integer> oneFactory = FactoryUtils.constantFactory(1);
Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java?rev=1023862&r1=1023861&r2=1023862&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazySortedMap.java Mon Oct 18 15:47:27 2010
@@ -38,6 +38,7 @@ import org.junit.Test;
*
* @author Phil Steitz
*/
+@SuppressWarnings("boxing")
public class TestLazySortedMap<K, V> extends AbstractTestSortedMap<K, V> {
private static final Factory<Integer> oneFactory = FactoryUtils.constantFactory(1);