From ac8b1d9d49a631f01dbc8b6ea4cacc4208fcc449 Mon Sep 17 00:00:00 2001
From: robokaso <robokaso@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Wed, 2 Jul 2008 11:22:17 +0000
Subject: [PATCH] RESOLVED - BATCH-702: TradeJobFunctionalTests fails on Oracle

applied patch
---
 .../src/main/resources/jobs/tradeJob.xml      | 154 +++++++++---------
 .../batch/sample/TradeJobFunctionalTests.java |   2 +-
 2 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
index ee1f3b0bd..b794e74fa 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:aop="http://www.springframework.org/schema/aop"
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:aop="http://www.springframework.org/schema/aop"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
        		http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
        		http://www.springframework.org/schema/aop
@@ -13,78 +13,78 @@
 	<bean id="tradeJob" parent="simpleJob">
 		<property name="steps">
 			<list>
-				<bean id="step1" parent="simpleStep">
-					<property name="transactionAttribute" value="PROPAGATION_REQUIRED,ISOLATION_READ_UNCOMMITTED"/>
+				<bean id="step1" parent="simpleStep">
+					<property name="transactionAttribute" value="PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED"/>
 					<property name="streams" ref="fileItemReader" />
 					<property name="itemReader">
-						<bean
-							class="org.springframework.batch.item.validator.ValidatingItemReader">
-							<property name="itemReader"
-								ref="fileItemReader" />
-							<property name="validator"
-								ref="tradeValidator" />
-						</bean>
-					</property>
-					<property name="itemWriter">
-						<bean
-							class="org.springframework.batch.sample.item.writer.TradeWriter"
-							p:dao-ref="tradeDao" />
-					</property>
-				</bean>
-				<bean id="step2" parent="simpleStep">
-					<property name="itemReader"
-						ref="tradeSqlItemReader" />
-					<property name="itemWriter">
-						<bean
-							class="org.springframework.batch.sample.item.writer.CustomerUpdateWriter"
-							p:dao-ref="customerDao" />
-					</property>
-				</bean>
-				<bean id="step3" parent="simpleStep">
-					<property name="itemReader"
-						ref="customerSqlItemReader" />
-					<property name="itemWriter">
-						<bean
-							class="org.springframework.batch.sample.item.writer.CustomerCreditUpdateWriter"
-							p:dao-ref="customerReportItemWriter" />
-					</property>
-				</bean>
-			</list>
-		</property>
-	</bean>
-
-	<bean id="tradeSqlItemReader"
-		class="org.springframework.batch.item.database.JdbcCursorItemReader">
-		<property name="dataSource" ref="dataSource" />
-		<property name="sql"
-			value="SELECT id, quantity, price, customer from TRADE" />
-		<property name="mapper">
-			<bean
-				class="org.springframework.batch.sample.mapping.TradeRowMapper" />
-		</property>
-	</bean>
-
-	<bean id="customerSqlItemReader"
-		class="org.springframework.batch.item.database.JdbcCursorItemReader">
-		<property name="dataSource" ref="dataSource" />
-		<property name="sql"
-			value="SELECT id, name, credit FROM customer " />
-		<property name="mapper">
-			<bean
-				class="org.springframework.batch.sample.mapping.CustomerCreditRowMapper" />
-		</property>
-	</bean>
-
-	<bean id="fileLocator"
-		class="org.springframework.core.io.ClassPathResource">
-		<constructor-arg type="java.lang.String"
-			value="data/tradeJob/input/20070122.teststream.ImportTradeDataStep.txt" />
-	</bean>
-
-	<bean id="customerFileLocator"
-		class="org.springframework.core.io.FileSystemResource">
-		<constructor-arg type="java.lang.String"
-			value="target/test-outputs/20070122.testStream.CustomerReportStep.TEMP.txt" />
-	</bean>
-
+						<bean
+							class="org.springframework.batch.item.validator.ValidatingItemReader">
+							<property name="itemReader"
+								ref="fileItemReader" />
+							<property name="validator"
+								ref="tradeValidator" />
+						</bean>
+					</property>
+					<property name="itemWriter">
+						<bean
+							class="org.springframework.batch.sample.item.writer.TradeWriter"
+							p:dao-ref="tradeDao" />
+					</property>
+				</bean>
+				<bean id="step2" parent="simpleStep">
+					<property name="itemReader"
+						ref="tradeSqlItemReader" />
+					<property name="itemWriter">
+						<bean
+							class="org.springframework.batch.sample.item.writer.CustomerUpdateWriter"
+							p:dao-ref="customerDao" />
+					</property>
+				</bean>
+				<bean id="step3" parent="simpleStep">
+					<property name="itemReader"
+						ref="customerSqlItemReader" />
+					<property name="itemWriter">
+						<bean
+							class="org.springframework.batch.sample.item.writer.CustomerCreditUpdateWriter"
+							p:dao-ref="customerReportItemWriter" />
+					</property>
+				</bean>
+			</list>
+		</property>
+	</bean>
+
+	<bean id="tradeSqlItemReader"
+		class="org.springframework.batch.item.database.JdbcCursorItemReader">
+		<property name="dataSource" ref="dataSource" />
+		<property name="sql"
+			value="SELECT id, quantity, price, customer from TRADE" />
+		<property name="mapper">
+			<bean
+				class="org.springframework.batch.sample.mapping.TradeRowMapper" />
+		</property>
+	</bean>
+
+	<bean id="customerSqlItemReader"
+		class="org.springframework.batch.item.database.JdbcCursorItemReader">
+		<property name="dataSource" ref="dataSource" />
+		<property name="sql"
+			value="SELECT id, name, credit FROM customer " />
+		<property name="mapper">
+			<bean
+				class="org.springframework.batch.sample.mapping.CustomerCreditRowMapper" />
+		</property>
+	</bean>
+
+	<bean id="fileLocator"
+		class="org.springframework.core.io.ClassPathResource">
+		<constructor-arg type="java.lang.String"
+			value="data/tradeJob/input/20070122.teststream.ImportTradeDataStep.txt" />
+	</bean>
+
+	<bean id="customerFileLocator"
+		class="org.springframework.core.io.FileSystemResource">
+		<constructor-arg type="java.lang.String"
+			value="target/test-outputs/20070122.testStream.CustomerReportStep.TEMP.txt" />
+	</bean>
+
 </beans>
\ No newline at end of file
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java
index 003558a16..2280ed449 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java
@@ -61,7 +61,7 @@ public class TradeJobFunctionalTests extends AbstractValidatingBatchLauncherTest
 		List list = jdbcTemplate.queryForList("select name, CREDIT from customer");
 		for (Iterator iterator = list.iterator(); iterator.hasNext();) {
 			Map map = (Map) iterator.next();
-			credits.put(map.get("NAME"), map.get("CREDIT"));
+			credits.put(map.get("NAME"), new Double(((Number)map.get("CREDIT")).doubleValue()));
 		}
 	}