relaxed test conditions

Author: jhoeller

org.springframework.context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java

@@ -97,12 +97,12 @@ public void conversionServiceInApplicationContext() {
 		ResourceTestBean tb = ctx.getBean("resourceTestBean", ResourceTestBean.class);
 		assertTrue(tb.getResource() instanceof ClassPathResource);
 		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().get("key1") instanceof ClassPathResource);
 		assertTrue(tb.getResourceArrayMap().size() == 1);
 		assertTrue(tb.getResourceArrayMap().get("key1").length > 0);
-		assertTrue(tb.getResourceArrayMap().get("key1")[0] instanceof FileSystemResource);
+		assertTrue(tb.getResourceArrayMap().get("key1")[0] instanceof ClassPathResource);
 	}
 
 

org.springframework.context/src/test/java/org/springframework/context/support/conversionService.xml

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