Apache
/
commons-collections
mirror of https://github.com/apache/commons-collections.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tidy tests - split into smaller unit and use expected tag 

enable test that was overlooked

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1023855 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2010-10-18 15:36:04 +00:00
parent 0c73a54d14
commit 759f45057a
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/test/org/apache/commons/collections/TestCollectionUtils.java
View File

@ -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 MockTestCase {
// -----------------------------------------------------------------------
@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 MockTestCase {
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) {
}
}
// -----------------------------------------------------------------------
@ -746,6 +743,8 @@ public class TestCollectionUtils extends MockTestCase {
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 MockTestCase {
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);