From a20e73b148b27f95728201c452cc6d8bb29cfad8 Mon Sep 17 00:00:00 2001 From: Agim Emruli Date: Thu, 24 Mar 2011 11:06:32 +0000 Subject: [PATCH] fixed compile error in test with javac compiler --- .../xml/NestedBeansElementAttributeRecursionTests.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java index 93cc77b27b..a6feaedcec 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java @@ -63,18 +63,18 @@ public class NestedBeansElementAttributeRecursionTests { TestBean topLevel = bf.getBean("topLevelConcreteTestBean", TestBean.class); // has the concrete child bean values - assertThat(topLevel.getSomeList(), hasItems("charlie", "delta")); + assertThat((Iterable) topLevel.getSomeList(), hasItems("charlie", "delta")); // but does not merge the parent values - assertThat(topLevel.getSomeList(), not(hasItems("alpha", "bravo"))); + assertThat((Iterable) topLevel.getSomeList(), not(hasItems("alpha", "bravo"))); TestBean firstLevel = bf.getBean("firstLevelNestedTestBean", TestBean.class); // merges all values - assertThat(firstLevel.getSomeList(), + assertThat((Iterable) firstLevel.getSomeList(), hasItems("charlie", "delta", "echo", "foxtrot")); TestBean secondLevel = bf.getBean("secondLevelNestedTestBean", TestBean.class); // merges all values - assertThat(secondLevel.getSomeList(), + assertThat((Iterable)secondLevel.getSomeList(), hasItems("charlie", "delta", "echo", "foxtrot", "golf", "hotel")); }