Fix up raw types

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@890328 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2009-12-14 13:54:06 +00:00
parent 128b94d1d9
commit 7a8356e0fb

View File

@ -210,8 +210,8 @@ private static class CY extends CX implements IB, IC {
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
public void test_convertClassNamesToClasses_List() { public void test_convertClassNamesToClasses_List() {
List list = new ArrayList(); List<String> list = new ArrayList<String>();
List result = ClassUtils.convertClassNamesToClasses(list); List<Class<?>> result = ClassUtils.convertClassNamesToClasses(list);
assertEquals(0, result.size()); assertEquals(0, result.size());
list.add("java.lang.String"); list.add("java.lang.String");
@ -223,17 +223,19 @@ public void test_convertClassNamesToClasses_List() {
assertEquals(null, result.get(1)); assertEquals(null, result.get(1));
assertEquals(Object.class, result.get(2)); assertEquals(Object.class, result.get(2));
list.add(new Object()); @SuppressWarnings("unchecked") // test what happens when non-gneric code adds wrong type of element
List<Object> olist = (List<Object>)(List<?>)list;
olist.add(new Object());
try { try {
ClassUtils.convertClassNamesToClasses(list); ClassUtils.convertClassNamesToClasses(list);
fail(); fail("Should not have been able to convert list");
} catch (ClassCastException ex) {} } catch (ClassCastException expected) {}
assertEquals(null, ClassUtils.convertClassNamesToClasses(null)); assertEquals(null, ClassUtils.convertClassNamesToClasses(null));
} }
public void test_convertClassesToClassNames_List() { public void test_convertClassesToClassNames_List() {
List list = new ArrayList(); List<Class<?>> list = new ArrayList<Class<?>>();
List result = ClassUtils.convertClassesToClassNames(list); List<String> result = ClassUtils.convertClassesToClassNames(list);
assertEquals(0, result.size()); assertEquals(0, result.size());
list.add(String.class); list.add(String.class);
@ -245,11 +247,13 @@ public void test_convertClassesToClassNames_List() {
assertEquals(null, result.get(1)); assertEquals(null, result.get(1));
assertEquals("java.lang.Object", result.get(2)); assertEquals("java.lang.Object", result.get(2));
list.add(new Object()); @SuppressWarnings("unchecked") // test what happens when non-gneric code adds wrong type of element
List<Object> olist = (List<Object>)(List<?>)list;
olist.add(new Object());
try { try {
ClassUtils.convertClassesToClassNames(list); ClassUtils.convertClassesToClassNames(list);
fail(); fail("Should not have been able to convert list");
} catch (ClassCastException ex) {} } catch (ClassCastException expected) {}
assertEquals(null, ClassUtils.convertClassesToClassNames(null)); assertEquals(null, ClassUtils.convertClassesToClassNames(null));
} }