From d025bb6dc1de9f97e0ef451423bddc8dda75fc0b Mon Sep 17 00:00:00 2001
From: robokaso <robokaso@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Thu, 11 Dec 2008 11:41:48 +0000
Subject: [PATCH] RESOLVED - BATCH-961: integration tests for JobOperator

tested multiple instances running simultaneously
---
 .../main/resources/jobs/infiniteLoopJob.xml   |  3 +++
 .../sample/JobOperatorFunctionalTests.java    | 27 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml b/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml
index d61ca1057..2d5bdc5e7 100644
--- a/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml
@@ -17,6 +17,9 @@
 	</bean>
 
 	<bean id="infiniteLoopJob" parent="simpleJob">
+		<property name="jobParametersIncrementer">
+			<bean class="org.springframework.batch.sample.common.InfiniteLoopIncrementer" />	
+		</property>
 		<property name="steps">
 			<!--bean id="step1" parent="taskletStep">
 				<property name="tasklet">
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobOperatorFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobOperatorFunctionalTests.java
index 02957e1f5..94890119b 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobOperatorFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobOperatorFunctionalTests.java
@@ -4,6 +4,7 @@ import static org.junit.Assert.*;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -37,7 +38,8 @@ public class JobOperatorFunctionalTests {
 
 	@Before
 	public void setUp() throws Exception {
-		jobRegistry.register(new ReferenceJobFactory(job));
+		if (!jobRegistry.getJobNames().contains(job.getName()))
+			jobRegistry.register(new ReferenceJobFactory(job));
 	}
 
 	@Test
@@ -94,4 +96,27 @@ public class JobOperatorFunctionalTests {
 		assertTrue(summaries.values().toString().contains(STOPPED.toString()));
 	}
 
+	@Test
+	public void testMultipleSimultaneousInstances() throws Exception {
+		String jobName = job.getName();
+
+		Set<String> names = tested.getJobNames();
+		assertEquals(1, names.size());
+		assertTrue(names.contains(jobName));
+
+		long exec1 = tested.startNextInstance(jobName);
+		long exec2 = tested.startNextInstance(jobName);
+
+		assertTrue(exec1 != exec2);
+		assertTrue(tested.getParameters(exec1) != tested.getParameters(exec2));
+
+		Set<Long> executions = tested.getRunningExecutions(jobName);
+		assertTrue(executions.contains(exec1));
+		assertTrue(executions.contains(exec2));
+
+		tested.stop(exec1);
+		tested.stop(exec2);
+
+	}
+
 }