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

relaxed test conditions

This commit is contained in:
Juergen Hoeller 2010-02-12 00:02:32 +00:00
parent 5f781e6266
commit 315c16de5f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
View File

@ -97,12 +97,12 @@ public class ConversionServiceFactoryBeanTests {
ResourceTestBean tb = ctx.getBean("resourceTestBean", ResourceTestBean.class); ResourceTestBean tb = ctx.getBean("resourceTestBean", ResourceTestBean.class);
assertTrue(tb.getResource() instanceof ClassPathResource); assertTrue(tb.getResource() instanceof ClassPathResource);
assertTrue(tb.getResourceArray().length > 0); assertTrue(tb.getResourceArray().length > 0);
assertTrue(tb.getResourceArray()[0] instanceof FileSystemResource); assertTrue(tb.getResourceArray()[0] instanceof ClassPathResource);
assertTrue(tb.getResourceMap().size() == 1); assertTrue(tb.getResourceMap().size() == 1);
assertTrue(tb.getResourceMap().get("key1") instanceof ClassPathResource); assertTrue(tb.getResourceMap().get("key1") instanceof ClassPathResource);
assertTrue(tb.getResourceArrayMap().size() == 1); assertTrue(tb.getResourceArrayMap().size() == 1);
assertTrue(tb.getResourceArrayMap().get("key1").length > 0); assertTrue(tb.getResourceArrayMap().get("key1").length > 0);
assertTrue(tb.getResourceArrayMap().get("key1")[0] instanceof FileSystemResource); assertTrue(tb.getResourceArrayMap().get("key1")[0] instanceof ClassPathResource);
} }

4
org.springframework.context/src/test/java/org/springframework/context/support/conversionService.xml
View File

@ -15,7 +15,7 @@
<bean id="resourceTestBean" class="org.springframework.beans.ResourceTestBean"> <bean id="resourceTestBean" class="org.springframework.beans.ResourceTestBean">
<property name="resource" value="org/springframework/context/support/conversionService.xml"/> <property name="resource" value="org/springframework/context/support/conversionService.xml"/>
<property name="resourceArray" value="org/springframework/context/support/*.xml"/> <property name="resourceArray" value="org/springframework/context/support/conversionService.xml"/>
<property name="resourceMap"> <property name="resourceMap">
<map> <map>
<entry key="key1" value="org/springframework/context/support/conversionService.xml"/> <entry key="key1" value="org/springframework/context/support/conversionService.xml"/>
@ -23,7 +23,7 @@
</property> </property>
<property name="resourceArrayMap"> <property name="resourceArrayMap">
<map> <map>
<entry key="key1" value="org/springframework/context/support/*.xml"/> <entry key="key1" value="org/springframework/context/support/conversionService.xml"/>
</map> </map>
</property> </property>
</bean> </bean>