From 315c16de5f2de43c8570de4a48681357827363a8 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Fri, 12 Feb 2010 00:02:32 +0000
Subject: [PATCH] relaxed test conditions

---
 .../context/support/ConversionServiceFactoryBeanTests.java    | 4 ++--
 .../org/springframework/context/support/conversionService.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java b/org.springframework.context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
index 9efc8dc8cd..37cb0dfebb 100644
--- a/org.springframework.context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
@@ -97,12 +97,12 @@ public class ConversionServiceFactoryBeanTests {
 		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);
 	}
 
 
diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/conversionService.xml b/org.springframework.context/src/test/java/org/springframework/context/support/conversionService.xml
index 115b36904b..38ae17a603 100644
--- a/org.springframework.context/src/test/java/org/springframework/context/support/conversionService.xml
+++ b/org.springframework.context/src/test/java/org/springframework/context/support/conversionService.xml
@@ -15,7 +15,7 @@
 
 	<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"/>
@@ -23,7 +23,7 @@
 		</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>