BATCH-1745: Added test to verify restart behavior

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletStepAllowStartIfCompleteTest.java

@@ -1,5 +1,22 @@
 package org.springframework.batch.core.configuration.xml;
 
+<<<<<<< HEAD
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Date;
+
+import javax.annotation.Resource;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.AbstractStep;
+import org.springframework.beans.factory.annotation.Autowired;
+=======
 import static org.junit.Assert.assertTrue;
 
 import javax.annotation.Resource;
@@ -8,15 +25,51 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.core.step.AbstractStep;
+>>>>>>> a9edfc18765552d54ac46f721d128260ceaf1e72
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+<<<<<<< HEAD
+=======
 //@Ignore
+>>>>>>> a9edfc18765552d54ac46f721d128260ceaf1e72
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
 public class TaskletStepAllowStartIfCompleteTest {
 
+<<<<<<< HEAD
+	@Autowired
+	Job job;
+
+	@Autowired
+	JobRepository jobRepository;
+
+	@Resource
+	private ApplicationContext context;
+
+	@Test
+	public void test() throws Exception {
+		//retrieve the step from the context and see that it's allow is set
+		AbstractStep abstractStep = (AbstractStep) context.getBean("simpleJob.step1");
+		assertTrue(abstractStep.isAllowStartIfComplete());
+	}
+
+	@Test
+	public void testRestart() throws Exception {
+		JobParametersBuilder paramBuilder = new JobParametersBuilder();
+		paramBuilder.addDate("value", new Date());
+		JobExecution jobExecution = jobRepository.createJobExecution(job.getName(), paramBuilder.toJobParameters());
+
+		job.execute(jobExecution);
+
+		jobExecution = jobRepository.createJobExecution(job.getName(), paramBuilder.toJobParameters());
+		job.execute(jobExecution);
+
+		int count = jobRepository.getStepExecutionCount(jobExecution.getJobInstance(), "simpleJob.step1");
+		assertEquals(2, count);
+	}
+=======
 	@Resource
 	private ApplicationContext context;
 	
@@ -27,4 +80,5 @@ public class TaskletStepAllowStartIfCompleteTest {
 		assertTrue(abstractStep.isAllowStartIfComplete());	
 	}
 
+>>>>>>> a9edfc18765552d54ac46f721d128260ceaf1e72
 }