root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fixed compile error in test with javac compiler

This commit is contained in:
Agim Emruli 2011-03-24 11:06:32 +00:00
parent 6f80578a38
commit a20e73b148
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java
View File

@ -63,18 +63,18 @@ public class NestedBeansElementAttributeRecursionTests {
TestBean topLevel = bf.getBean("topLevelConcreteTestBean", TestBean.class); TestBean topLevel = bf.getBean("topLevelConcreteTestBean", TestBean.class);
// has the concrete child bean values // has the concrete child bean values
assertThat(topLevel.getSomeList(), hasItems("charlie", "delta")); assertThat((Iterable<String>) topLevel.getSomeList(), hasItems("charlie", "delta"));
// but does not merge the parent values // but does not merge the parent values
assertThat(topLevel.getSomeList(), not(hasItems("alpha", "bravo"))); assertThat((Iterable<String>) topLevel.getSomeList(), not(hasItems("alpha", "bravo")));
TestBean firstLevel = bf.getBean("firstLevelNestedTestBean", TestBean.class); TestBean firstLevel = bf.getBean("firstLevelNestedTestBean", TestBean.class);
// merges all values // merges all values
assertThat(firstLevel.getSomeList(), assertThat((Iterable<String>) firstLevel.getSomeList(),
hasItems("charlie", "delta", "echo", "foxtrot")); hasItems("charlie", "delta", "echo", "foxtrot"));
TestBean secondLevel = bf.getBean("secondLevelNestedTestBean", TestBean.class); TestBean secondLevel = bf.getBean("secondLevelNestedTestBean", TestBean.class);
// merges all values // merges all values
assertThat(secondLevel.getSomeList(), assertThat((Iterable<String>)secondLevel.getSomeList(),
hasItems("charlie", "delta", "echo", "foxtrot", "golf", "hotel")); hasItems("charlie", "delta", "echo", "foxtrot", "golf", "hotel"));
} }