Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deleting unnecessary TODOs and suppressing warnings.

Browse Source
This commit is contained in:
Sam Brannen
2011-08-13 13:38:54 +00:00
parent 03c267e93a
commit 2d6340af74
9 changed files with 14 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
org.springframework.core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java
View File

@@ -41,6 +41,7 @@ import static org.junit.Assert.assertNull;
* @author Keith Donald
* @author Andy Clement
*/
@SuppressWarnings("rawtypes")
public class TypeDescriptorTests {
public List<String> listOfString;
@@ -204,7 +205,7 @@ public class TypeDescriptorTests {
@Test
public void propertyComplex() throws Exception {
Property property = new Property(getClass(), getClass().getMethod("getComplexProperty", null), getClass().getMethod("setComplexProperty", Map.class));
Property property = new Property(getClass(), getClass().getMethod("getComplexProperty"), getClass().getMethod("setComplexProperty", Map.class));
TypeDescriptor desc = new TypeDescriptor(property);
assertEquals(String.class, desc.getMapKeyTypeDescriptor().getType());
assertEquals(Integer.class, desc.getMapValueTypeDescriptor().getElementTypeDescriptor().getElementTypeDescriptor().getType());
@@ -221,7 +222,7 @@ public class TypeDescriptorTests {
@Test
public void propertyGenericType() throws Exception {
GenericType<Integer> genericBean = new IntegerType();
Property property = new Property(getClass(), genericBean.getClass().getMethod("getProperty", null), genericBean.getClass().getMethod("setProperty", Integer.class));
Property property = new Property(getClass(), genericBean.getClass().getMethod("getProperty"), genericBean.getClass().getMethod("setProperty", Integer.class));
TypeDescriptor desc = new TypeDescriptor(property);
assertEquals(Integer.class, desc.getType());
}
@@ -229,7 +230,7 @@ public class TypeDescriptorTests {
@Test
public void propertyTypeCovariance() throws Exception {
GenericType<Number> genericBean = new NumberType();
Property property = new Property(getClass(), genericBean.getClass().getMethod("getProperty", null), genericBean.getClass().getMethod("setProperty", Number.class));
Property property = new Property(getClass(), genericBean.getClass().getMethod("getProperty"), genericBean.getClass().getMethod("setProperty", Number.class));
TypeDescriptor desc = new TypeDescriptor(property);
assertEquals(Integer.class, desc.getType());
}
@@ -237,7 +238,7 @@ public class TypeDescriptorTests {
@Test
public void propertyGenericTypeList() throws Exception {
GenericType<Integer> genericBean = new IntegerType();
Property property = new Property(getClass(), genericBean.getClass().getMethod("getListProperty", null), genericBean.getClass().getMethod("setListProperty", List.class));
Property property = new Property(getClass(), genericBean.getClass().getMethod("getListProperty"), genericBean.getClass().getMethod("setListProperty", List.class));
TypeDescriptor desc = new TypeDescriptor(property);
assertEquals(List.class, desc.getType());
assertEquals(Integer.class, desc.getElementTypeDescriptor().getType());
@@ -257,25 +258,18 @@ public class TypeDescriptorTests {
public class IntegerType implements GenericType<Integer> {
public Integer getProperty() {
// TODO Auto-generated method stub
return null;
}
public void setProperty(Integer t) {
// TODO Auto-generated method stub
}
public List<Integer> getListProperty() {
// TODO Auto-generated method stub
return null;
}
public void setListProperty(List<Integer> t) {
// TODO Auto-generated method stub
}
}
public class NumberType implements GenericType<Number> {
@@ -298,7 +292,7 @@ public class TypeDescriptorTests {
@Test
public void propertyGenericClassList() throws Exception {
IntegerClass genericBean = new IntegerClass();
Property property = new Property(genericBean.getClass(), genericBean.getClass().getMethod("getListProperty", null), genericBean.getClass().getMethod("setListProperty", List.class));
Property property = new Property(genericBean.getClass(), genericBean.getClass().getMethod("getListProperty"), genericBean.getClass().getMethod("setListProperty", List.class));
TypeDescriptor desc = new TypeDescriptor(property);
assertEquals(List.class, desc.getType());
assertEquals(Integer.class, desc.getElementTypeDescriptor().getType());
@@ -330,7 +324,7 @@ public class TypeDescriptorTests {
@Test
public void property() throws Exception {
Property property = new Property(getClass(), getClass().getMethod("getProperty", null), getClass().getMethod("setProperty", Map.class));
Property property = new Property(getClass(), getClass().getMethod("getProperty"), getClass().getMethod("setProperty", Map.class));
TypeDescriptor desc = new TypeDescriptor(property);
assertEquals(Map.class, desc.getType());
assertEquals(Integer.class, desc.getMapKeyTypeDescriptor().getElementTypeDescriptor().getType());
@@ -600,7 +594,7 @@ public class TypeDescriptorTests {
@Test
public void nestedPropertyTypeMapTwoLevels() throws Exception {
Property property = new Property(getClass(), getClass().getMethod("getTest4", null), getClass().getMethod("setTest4", List.class));
Property property = new Property(getClass(), getClass().getMethod("getTest4"), getClass().getMethod("setTest4", List.class));
TypeDescriptor t1 = TypeDescriptor.nested(property, 2);
assertEquals(String.class, t1.getType());
}
@@ -804,22 +798,4 @@ public class TypeDescriptorTests {
public Map<CharSequence, Number> isAssignableMapKeyValueTypes;
private void assignabilityExamples() {
Number num = null;
Integer integer = null;
num = integer;
List list = null;
List<String> listString = null;
list = listString;
listString = list;
Map map = null;
Map<String, String> mapString = null;
map = mapString;
mapString = map;
Map<String, String> mapString2 = null;
mapString = mapString2;
}
}

16
org.springframework.core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java
View File

@@ -116,6 +116,7 @@ public class CollectionToCollectionConverterTests {
}
@Test
@SuppressWarnings("unchecked")
public void arrayCollectionToObjectInteraction() throws Exception {
List<String>[] array = new List[2];
array[0] = Arrays.asList("9", "12");
@@ -127,6 +128,7 @@ public class CollectionToCollectionConverterTests {
}
@Test
@SuppressWarnings("unchecked")
public void objectToCollection() throws Exception {
List<List<String>> list = new ArrayList<List<String>>();
list.add(Arrays.asList("9", "12"));
@@ -147,6 +149,7 @@ public class CollectionToCollectionConverterTests {
public List<List<List<Integer>>> objectToCollection;
@Test
@SuppressWarnings("unchecked")
public void stringToCollection() throws Exception {
List<List<String>> list = new ArrayList<List<String>>();
list.add(Arrays.asList("9,12"));
@@ -220,62 +223,50 @@ public class CollectionToCollectionConverterTests {
public static abstract class BaseResource implements Resource {
public InputStream getInputStream() throws IOException {
// TODO Auto-generated method stub
return null;
}
public boolean exists() {
// TODO Auto-generated method stub
return false;
}
public boolean isReadable() {
// TODO Auto-generated method stub
return false;
}
public boolean isOpen() {
// TODO Auto-generated method stub
return false;
}
public URL getURL() throws IOException {
// TODO Auto-generated method stub
return null;
}
public URI getURI() throws IOException {
// TODO Auto-generated method stub
return null;
}
public File getFile() throws IOException {
// TODO Auto-generated method stub
return null;
}
public long contentLength() throws IOException {
// TODO Auto-generated method stub
return 0;
}
public long lastModified() throws IOException {
// TODO Auto-generated method stub
return 0;
}
public Resource createRelative(String relativePath) throws IOException {
// TODO Auto-generated method stub
return null;
}
public String getFilename() {
// TODO Auto-generated method stub
return null;
}
public String getDescription() {
// TODO Auto-generated method stub
return null;
}
}
@@ -298,6 +289,7 @@ public class CollectionToCollectionConverterTests {
testCollectionConversionToArrayList(vector);
}
@SuppressWarnings("rawtypes")
private void testCollectionConversionToArrayList(Collection<String> aSource) {
Object myConverted = (new CollectionToCollectionConverter(new GenericConversionService())).convert(
aSource, TypeDescriptor.forObject(aSource), TypeDescriptor.forObject(new ArrayList()));