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 2009/09/16 14:14:07 UTC
svn commit: r815733 -
/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestCollectionUtils.java
Author: sebb
Date: Wed Sep 16 12:14:07 2009
New Revision: 815733
URL: http://svn.apache.org/viewvc?rev=815733&view=rev
Log:
Avoid ambiguous reference to assertEquals(double, double)
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestCollectionUtils.java
Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestCollectionUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestCollectionUtils.java?rev=815733&r1=815732&r2=815733&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestCollectionUtils.java (original)
+++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestCollectionUtils.java Wed Sep 16 12:14:07 2009
@@ -215,31 +215,31 @@
assertEquals(1, CollectionUtils.cardinality(null, list));
{
Map<String, Integer> freq = CollectionUtils.getCardinalityMap(list);
- assertEquals(1, freq.get(null));
+ assertEquals(Integer.valueOf(1), freq.get(null));
}
list.add("B");
assertEquals(1, CollectionUtils.cardinality(null, list));
{
Map<String, Integer> freq = CollectionUtils.getCardinalityMap(list);
- assertEquals(1, freq.get(null));
+ assertEquals(Integer.valueOf(1), freq.get(null));
}
list.add(null);
assertEquals(2, CollectionUtils.cardinality(null, list));
{
Map<String, Integer> freq = CollectionUtils.getCardinalityMap(list);
- assertEquals(2, freq.get(null));
+ assertEquals(Integer.valueOf(2), freq.get(null));
}
list.add("B");
assertEquals(2, CollectionUtils.cardinality(null, list));
{
Map<String, Integer> freq = CollectionUtils.getCardinalityMap(list);
- assertEquals(2, freq.get(null));
+ assertEquals(Integer.valueOf(2), freq.get(null));
}
list.add(null);
assertEquals(3, CollectionUtils.cardinality(null, list));
{
Map<String, Integer> freq = CollectionUtils.getCardinalityMap(list);
- assertEquals(3, freq.get(null));
+ assertEquals(Integer.valueOf(3), freq.get(null));
}
}
@@ -276,19 +276,19 @@
public void union() {
Collection<Integer> col = CollectionUtils.union(iterableA, iterableC);
Map<Integer, Integer> freq = CollectionUtils.getCardinalityMap(col);
- assertEquals(1, freq.get(1));
- assertEquals(4, freq.get(2));
- assertEquals(3, freq.get(3));
- assertEquals(4, freq.get(4));
- assertEquals(1, freq.get(5));
+ assertEquals(Integer.valueOf(1), freq.get(1));
+ assertEquals(Integer.valueOf(4), freq.get(2));
+ assertEquals(Integer.valueOf(3), freq.get(3));
+ assertEquals(Integer.valueOf(4), freq.get(4));
+ assertEquals(Integer.valueOf(1), freq.get(5));
Collection<Number> col2 = CollectionUtils.union(collectionC2, iterableA);
Map<Number, Integer> freq2 = CollectionUtils.getCardinalityMap(col2);
- assertEquals(1, freq2.get(1));
- assertEquals(4, freq2.get(2));
- assertEquals(3, freq2.get(3));
- assertEquals(4, freq2.get(4));
- assertEquals(1, freq2.get(5));
+ assertEquals(Integer.valueOf(1), freq2.get(1));
+ assertEquals(Integer.valueOf(4), freq2.get(2));
+ assertEquals(Integer.valueOf(3), freq2.get(3));
+ assertEquals(Integer.valueOf(4), freq2.get(4));
+ assertEquals(Integer.valueOf(1), freq2.get(5));
}
@Test
@@ -296,17 +296,17 @@
Collection<Integer> col = CollectionUtils.intersection(iterableA, iterableC);
Map<Integer, Integer> freq = CollectionUtils.getCardinalityMap(col);
assertNull(freq.get(1));
- assertEquals(2, freq.get(2));
- assertEquals(3, freq.get(3));
- assertEquals(2, freq.get(4));
+ assertEquals(Integer.valueOf(2), freq.get(2));
+ assertEquals(Integer.valueOf(3), freq.get(3));
+ assertEquals(Integer.valueOf(2), freq.get(4));
assertNull(freq.get(5));
Collection<Number> col2 = CollectionUtils.intersection(collectionC2, collectionA);
Map<Number, Integer> freq2 = CollectionUtils.getCardinalityMap(col2);
assertNull(freq2.get(1));
- assertEquals(2, freq2.get(2));
- assertEquals(3, freq2.get(3));
- assertEquals(2, freq2.get(4));
+ assertEquals(Integer.valueOf(2), freq2.get(2));
+ assertEquals(Integer.valueOf(3), freq2.get(3));
+ assertEquals(Integer.valueOf(2), freq2.get(4));
assertNull(freq2.get(5));
}
@@ -314,11 +314,11 @@
public void disjunction() {
Collection<Integer> col = CollectionUtils.disjunction(iterableA, iterableC);
Map<Integer, Integer> freq = CollectionUtils.getCardinalityMap(col);
- assertEquals(1, freq.get(1));
- assertEquals(2, freq.get(2));
+ assertEquals(Integer.valueOf(1), freq.get(1));
+ assertEquals(Integer.valueOf(2), freq.get(2));
assertNull(freq.get(3));
- assertEquals(2, freq.get(4));
- assertEquals(1, freq.get(5));
+ assertEquals(Integer.valueOf(2), freq.get(4));
+ assertEquals(Integer.valueOf(1), freq.get(5));
Collection<Number> col2 = CollectionUtils.disjunction(collectionC2, collectionA);
Map<Number, Integer> freq2 = CollectionUtils.getCardinalityMap(col2);