From 92a03420b1188834ab3b857b4c3365b107d9262a Mon Sep 17 00:00:00 2001
From: lucasward <lucasward@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Thu, 4 Sep 2008 20:16:46 +0000
Subject: [PATCH] BATCH-453: Database shutdown tests now use JobOperator rather
 than direct database calls.

---
 .../main/resources/adhoc-job-launcher-context.xml |  1 +
 .../resources/simple-job-launcher-context.xml     | 15 +++++++++++++++
 .../sample/DatabaseShutdownFunctionalTests.java   | 14 ++++++++++----
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml b/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml
index 97f42d2e4..d29d65bc0 100644
--- a/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml
+++ b/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml
@@ -30,6 +30,7 @@
 			</bean>
 		</property>
 	</bean>
+	 
 	<bean id="notificationPublisher" class="org.springframework.batch.sample.jmx.JobExecutionNotificationPublisher" />
 	<bean id="jobRegistry" class="org.springframework.batch.core.configuration.support.MapJobRegistry" />
 	<bean id="jobOperator" class="org.springframework.batch.core.launch.support.SimpleJobOperator">
diff --git a/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml b/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
index 100d46630..2fbf4bfb9 100644
--- a/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
+++ b/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
@@ -13,17 +13,32 @@
 		class="org.springframework.batch.core.launch.support.SimpleJobLauncher">
 		<property name="jobRepository" ref="jobRepository" />
 	</bean>
+	
 	<bean id="jobRepository"
 		class="org.springframework.batch.core.repository.support.JobRepositoryFactoryBean"
 		p:databaseType="${environment}" p:dataSource-ref="dataSource"
 		p:transactionManager-ref="transactionManager" />
+	
 	<bean id="mapJobRepository"
 		class="org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean"
 		lazy-init="true" autowire-candidate="false" />
+		
+	<bean id="jobOperator" class="org.springframework.batch.core.launch.support.SimpleJobOperator"
+	p:jobLauncher-ref="jobLauncher" p:jobExplorer-ref="jobExplorer" p:jobRepository-ref="jobRepository" 
+	p:jobRegistry-ref="jobRegistry" />
+		
+	<bean id="jobExplorer" class="org.springframework.batch.core.explore.support.JobExplorerFactoryBean" 
+		p:databaseType="${environment}" p:dataSource-ref="dataSource" />
+		
+	<bean id="jobRegistry" class="org.springframework.batch.core.configuration.support.MapJobRegistry" />
+	
 	<bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
 		<property name="dataSource" ref="dataSource" />
 	</bean>
+	
 	<bean id="logAdvice" class="org.springframework.batch.sample.common.LogAdvice" />
+	
 	<bean id="eventAdvice"
 		class="org.springframework.batch.sample.jmx.StepExecutionApplicationEventAdvice" />
+	
 </beans>
\ No newline at end of file
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DatabaseShutdownFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DatabaseShutdownFunctionalTests.java
index 240185d7f..330de02a6 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DatabaseShutdownFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DatabaseShutdownFunctionalTests.java
@@ -25,6 +25,8 @@ import org.junit.runner.RunWith;
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.launch.JobOperator;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -41,6 +43,13 @@ import org.springframework.transaction.annotation.Transactional;
 @ContextConfiguration()
 public class DatabaseShutdownFunctionalTests extends AbstractBatchLauncherTests {
 	
+	private JobOperator jobOperator;
+	
+	@Autowired
+	public void setJobOperator(JobOperator jobOperator) {
+		this.jobOperator = jobOperator;
+	}
+	
 	@Transactional @Test
 	public void testLaunchJob() throws Exception {
 
@@ -53,10 +62,7 @@ public class DatabaseShutdownFunctionalTests extends AbstractBatchLauncherTests
 		assertEquals(BatchStatus.STARTED, jobExecution.getStatus());
 		assertTrue(jobExecution.isRunning());
 
-		//jobExecution.stop();
-		JdbcTemplate jdbcTemplate = (JdbcTemplate)applicationContext.getBean("jdbcTemplate");
-		jdbcTemplate.update("UPDATE BATCH_JOB_EXECUTION set STATUS = ?", new Object[]{BatchStatus.STOPPING.toString()});
-		
+		jobOperator.stop(jobExecution.getId());
 		
 		int count = 0;
 		while(jobExecution.isRunning() && count <= 10){