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

Fix [cast] compiler warnings

Browse Source
This commit is contained in:
Phillip Webb
2012-12-18 18:06:44 -08:00
committed by Chris Beams
parent b0986049a3
commit 6c14eaad61
63 changed files with 122 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
View File

@@ -995,15 +995,15 @@ public final class BeanWrapperTests {
bw.setPropertyValues(pvs);
assertEquals(tb5, bean.getArray()[0]);
assertEquals(tb4, bean.getArray()[1]);
assertEquals(tb3, ((TestBean) bean.getList().get(0)));
assertEquals(tb2, ((TestBean) bean.getList().get(1)));
assertEquals(tb0, ((TestBean) bean.getList().get(2)));
assertEquals(null, ((TestBean) bean.getList().get(3)));
assertEquals(tb1, ((TestBean) bean.getList().get(4)));
assertEquals(tb1, ((TestBean) bean.getMap().get("key1")));
assertEquals(tb0, ((TestBean) bean.getMap().get("key2")));
assertEquals(tb4, ((TestBean) bean.getMap().get("key5")));
assertEquals(tb5, ((TestBean) bean.getMap().get("key9")));
assertEquals(tb3, (bean.getList().get(0)));
assertEquals(tb2, (bean.getList().get(1)));
assertEquals(tb0, (bean.getList().get(2)));
assertEquals(null, (bean.getList().get(3)));
assertEquals(tb1, (bean.getList().get(4)));
assertEquals(tb1, (bean.getMap().get("key1")));
assertEquals(tb0, (bean.getMap().get("key2")));
assertEquals(tb4, (bean.getMap().get("key5")));
assertEquals(tb5, (bean.getMap().get("key9")));
assertEquals(tb5, bw.getPropertyValue("array[0]"));
assertEquals(tb4, bw.getPropertyValue("array[1]"));
assertEquals(tb3, bw.getPropertyValue("list[0]"));

4
spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
View File

@@ -497,7 +497,7 @@ public class DefaultListableBeanFactoryTests {
int count = (new PropertiesBeanDefinitionReader(lbf)).registerBeanDefinitions(p, PREFIX);
assertTrue("2 beans registered, not " + count, count == 2);
TestBean kerry = (TestBean) lbf.getBean("kerry", TestBean.class);
TestBean kerry = lbf.getBean("kerry", TestBean.class);
assertTrue("Kerry name is Kerry", "Kerry".equals(kerry.getName()));
ITestBean spouse = kerry.getSpouse();
assertTrue("Kerry spouse is non null", spouse != null);
@@ -516,7 +516,7 @@ public class DefaultListableBeanFactoryTests {
assertTrue("1 beans registered, not " + count, count == 1);
assertEquals(1, lbf.getBeanDefinitionCount());
TestBean tb = (TestBean) lbf.getBean("tb", TestBean.class);
TestBean tb = lbf.getBean("tb", TestBean.class);
assertEquals("my.value", tb.getSomeMap().get("my.key"));
}

2
spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
View File

@@ -113,7 +113,7 @@ public class ObjectFactoryCreatingFactoryBeanTests {
factory.setTargetBeanName(targetBeanName);
factory.setBeanFactory(beanFactory);
factory.afterPropertiesSet();
ObjectFactory<?> objectFactory = (ObjectFactory<?>) factory.getObject();
ObjectFactory<?> objectFactory = factory.getObject();
Object actualSingleton = objectFactory.getObject();
assertSame(expectedSingleton, actualSingleton);

16
spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
View File

@@ -42,7 +42,7 @@ public final class PropertiesFactoryBeanTests {
PropertiesFactoryBean pfb = new PropertiesFactoryBean();
pfb.setLocation(TEST_PROPS);
pfb.afterPropertiesSet();
Properties props = (Properties) pfb.getObject();
Properties props = pfb.getObject();
assertEquals("99", props.getProperty("tb.array[0].age"));
}
@@ -51,7 +51,7 @@ public final class PropertiesFactoryBeanTests {
PropertiesFactoryBean pfb = new PropertiesFactoryBean();
pfb.setLocation(TEST_PROPS_XML);
pfb.afterPropertiesSet();
Properties props = (Properties) pfb.getObject();
Properties props = pfb.getObject();
assertEquals("99", props.getProperty("tb.array[0].age"));
}
@@ -62,7 +62,7 @@ public final class PropertiesFactoryBeanTests {
localProps.setProperty("key2", "value2");
pfb.setProperties(localProps);
pfb.afterPropertiesSet();
Properties props = (Properties) pfb.getObject();
Properties props = pfb.getObject();
assertEquals("value2", props.getProperty("key2"));
}
@@ -75,7 +75,7 @@ public final class PropertiesFactoryBeanTests {
localProps.setProperty("tb.array[0].age", "0");
pfb.setProperties(localProps);
pfb.afterPropertiesSet();
Properties props = (Properties) pfb.getObject();
Properties props = pfb.getObject();
assertEquals("99", props.getProperty("tb.array[0].age"));
assertEquals("value2", props.getProperty("key2"));
}
@@ -100,7 +100,7 @@ public final class PropertiesFactoryBeanTests {
pfb.setPropertiesArray(new Properties[] {props1, props2, props3});
pfb.afterPropertiesSet();
Properties props = (Properties) pfb.getObject();
Properties props = pfb.getObject();
assertEquals("99", props.getProperty("tb.array[0].age"));
assertEquals("value2", props.getProperty("key2"));
assertEquals("framework", props.getProperty("spring"));
@@ -119,7 +119,7 @@ public final class PropertiesFactoryBeanTests {
pfb.setProperties(localProps);
pfb.setLocalOverride(true);
pfb.afterPropertiesSet();
Properties props = (Properties) pfb.getObject();
Properties props = pfb.getObject();
assertEquals("0", props.getProperty("tb.array[0].age"));
assertEquals("value2", props.getProperty("key2"));
}
@@ -133,10 +133,10 @@ public final class PropertiesFactoryBeanTests {
localProps.setProperty("key2", "value2");
pfb.setProperties(localProps);
pfb.afterPropertiesSet();
Properties props = (Properties) pfb.getObject();
Properties props = pfb.getObject();
assertEquals("99", props.getProperty("tb.array[0].age"));
assertEquals("value2", props.getProperty("key2"));
Properties newProps = (Properties) pfb.getObject();
Properties newProps = pfb.getObject();
assertTrue(props != newProps);
assertEquals("99", newProps.getProperty("tb.array[0].age"));
assertEquals("value2", newProps.getProperty("key2"));

6
spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java
View File

@@ -33,7 +33,7 @@ public class ManagedListTests extends TestCase {
ManagedList child = new ManagedList();
child.add("three");
child.setMergeEnabled(true);
List mergedList = (List) child.merge(parent);
List mergedList = child.merge(parent);
assertEquals("merge() obviously did not work.", 3, mergedList.size());
}
@@ -72,7 +72,7 @@ public class ManagedListTests extends TestCase {
parent.add("two");
ManagedList child = new ManagedList();
child.setMergeEnabled(true);
List mergedList = (List) child.merge(parent);
List mergedList = child.merge(parent);
assertEquals("merge() obviously did not work.", 2, mergedList.size());
}
@@ -84,7 +84,7 @@ public class ManagedListTests extends TestCase {
ManagedList child = new ManagedList();
child.add("one");
child.setMergeEnabled(true);
List mergedList = (List) child.merge(parent);
List mergedList = child.merge(parent);
assertEquals("merge() obviously did not work.", 3, mergedList.size());
}

6
spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java
View File

@@ -33,7 +33,7 @@ public class ManagedSetTests extends TestCase {
ManagedSet child = new ManagedSet();
child.add("three");
child.setMergeEnabled(true);
Set mergedSet = (Set) child.merge(parent);
Set mergedSet = child.merge(parent);
assertEquals("merge() obviously did not work.", 3, mergedSet.size());
}
@@ -72,7 +72,7 @@ public class ManagedSetTests extends TestCase {
parent.add("two");
ManagedSet child = new ManagedSet();
child.setMergeEnabled(true);
Set mergedSet = (Set) child.merge(parent);
Set mergedSet = child.merge(parent);
assertEquals("merge() obviously did not work.", 2, mergedSet.size());
}
@@ -84,7 +84,7 @@ public class ManagedSetTests extends TestCase {
ManagedSet child = new ManagedSet();
child.add("one");
child.setMergeEnabled(true);
Set mergedSet = (Set) child.merge(parent);
Set mergedSet = child.merge(parent);
assertEquals("merge() obviously did not work.", 2, mergedSet.size());
}