From e6018afe8b05028e71ae58d030e87042e68c4575 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Sat, 17 Apr 2010 06:31:34 +0000
Subject: [PATCH] restored resource conversion test

---
 .../support/ConversionServiceFactoryBeanTests.java | 14 +++++++-------
 .../context/support/conversionService.xml          |  9 ++++++++-
 2 files changed, 15 insertions(+), 8 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 f28fa55eb11..37cb0dfebba 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
@@ -95,14 +95,14 @@ public class ConversionServiceFactoryBeanTests {
 	public void conversionServiceInApplicationContext() {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("conversionService.xml", getClass());
 		ResourceTestBean tb = ctx.getBean("resourceTestBean", ResourceTestBean.class);
-		//assertTrue(tb.getResource() instanceof ClassPathResource);
-		//assertTrue(tb.getResourceArray().length > 0);
-		//assertTrue(tb.getResourceArray()[0] instanceof ClassPathResource);
-		//assertTrue(tb.getResourceMap().size() == 1);
+		assertTrue(tb.getResource() instanceof ClassPathResource);
+		assertTrue(tb.getResourceArray().length > 0);
+		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 ClassPathResource);
+		assertTrue(tb.getResourceArrayMap().size() == 1);
+		assertTrue(tb.getResourceArrayMap().get("key1").length > 0);
+		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 21436ed1033..28972f0c5c4 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
@@ -14,7 +14,14 @@
 	<bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean"/>
 
 	<bean id="resourceTestBean" class="org.springframework.beans.ResourceTestBean">
-		<property name="resourceMap">
+		<property name="resource" value="org/springframework/context/support/conversionService.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/conversionService.xml"/>
 			</map>