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:36:04 UTC
svn commit: r1023855 -
/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestCollectionUtils.java
Author: sebb
Date: Mon Oct 18 15:36:04 2010
New Revision: 1023855
URL: http://svn.apache.org/viewvc?rev=1023855&view=rev
Log:
Tidy tests - split into smaller unit and use expected tag
enable test that was overlooked
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=1023855&r1=1023854&r2=1023855&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 Mon Oct 18 15:36:04 2010
@@ -49,6 +49,7 @@ import org.junit.Test;
*
* @version $Revision$ $Date$
*/
+@SuppressWarnings("boxing")
public class TestCollectionUtils extends MockTestCase {
/**
@@ -666,9 +667,9 @@ public class TestCollectionUtils extends
// -----------------------------------------------------------------------
@Test
public void testSize_List() {
- List list = null;
+ List<String> list = null;
assertEquals(0, CollectionUtils.size(list));
- list = new ArrayList();
+ list = new ArrayList<String>();
assertEquals(0, CollectionUtils.size(list));
list.add("a");
assertEquals(1, CollectionUtils.size(list));
@@ -732,13 +733,9 @@ public class TestCollectionUtils extends
assertEquals(2, CollectionUtils.size(list.iterator()));
}
- @Test
+ @Test(expected=IllegalArgumentException.class)
public void testSize_Other() {
- try {
- CollectionUtils.size("not a list");
- fail("Expecting IllegalArgumentException");
- } catch (IllegalArgumentException e) {
- }
+ CollectionUtils.size("not a list");
}
// -----------------------------------------------------------------------
@@ -746,6 +743,8 @@ public class TestCollectionUtils extends
public void testSizeIsEmpty_Null() {
assertEquals(true, CollectionUtils.sizeIsEmpty(null));
}
+
+ @Test
public void testSizeIsEmpty_List() {
List<String> list = new ArrayList<String>();
assertEquals(true, CollectionUtils.sizeIsEmpty(list));
@@ -1359,26 +1358,23 @@ public class TestCollectionUtils extends
assertTrue(collectionA.contains(5));
}
+ @Test(expected=IndexOutOfBoundsException.class)
+ public void getNegative() {
+ CollectionUtils.get((Object)collectionA, -3);
+ }
+
+ @Test(expected=IndexOutOfBoundsException.class)
+ public void getPositiveOutOfBounds() {
+ CollectionUtils.get((Object)collectionA.iterator(), 30);
+ }
+
+ @Test(expected=IllegalArgumentException.class)
+ public void get1() {
+ CollectionUtils.get((Object)null, 0);
+ }
+
@Test
public void get() {
- try {
- CollectionUtils.get((Object)collectionA, -3);
- fail();
- } catch(IndexOutOfBoundsException e) {
- ;
- }
- try {
- CollectionUtils.get((Object)collectionA.iterator(), 30);
- fail();
- } catch(IndexOutOfBoundsException e) {
- ;
- }
- try {
- CollectionUtils.get((Object)null, 0);
- fail();
- } catch(IllegalArgumentException e) {
- ;
- }
assertEquals(2, CollectionUtils.get((Object)collectionA, 2));
assertEquals(2, CollectionUtils.get((Object)collectionA.iterator(), 2));
Map<Integer, Integer> map = CollectionUtils.getCardinalityMap(collectionA);