diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java index e821c09b8..6be487047 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java @@ -171,11 +171,11 @@ public class StepParser { String exitStatus = StringUtils.hasText(statusName) ? statusName : batchStatus.toString(); endBuilder.addConstructorArgValue(new ExitStatus(exitStatus)); - String endName = PAUSE.equals(name) ? "end" + (endCounter++) : null; + String endName = "end" + (endCounter++); endBuilder.addConstructorArgValue(endName); String nextOnEnd = StringUtils.hasText(statusName) ? null : nextAttribute; - endState = getStateTransitionReference(parserContext, endBuilder.getBeanDefinition(), onAttribute, nextOnEnd); + endState = getStateTransitionReference(parserContext, endBuilder.getBeanDefinition(), "*", nextOnEnd); nextAttribute = endName; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests.java index cf28533bc..89efea69c 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests.java @@ -17,14 +17,17 @@ package org.springframework.batch.core.configuration.xml; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +48,9 @@ public class EndTransitionJobParserTests { @Autowired private JobRepository jobRepository; + @Autowired + private ArrayList stepNamesList; + @Before public void setUp() { MapJobRepositoryFactoryBean.clear(); @@ -52,16 +58,34 @@ public class EndTransitionJobParserTests { @Test public void testEndTransition() throws Exception { + + // + // First Launch + // assertNotNull(job); JobExecution jobExecution = jobRepository.createJobExecution(job.getName(), new JobParameters()); job.execute(jobExecution); + assertEquals(2, stepNamesList.size()); + assertTrue(stepNamesList.contains("step1")); + assertTrue(stepNamesList.contains("failingStep")); // TODO: BATCH-1011 - assertEquals(BatchStatus.FAILED, jobExecution.getStatus()); // assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); // assertEquals("EARLY TERMINATION (COMPLETE)", jobExecution.getExitStatus().getExitCode()); - assertEquals(1, jobExecution.getStepExecutions().size()); - } + // + // Second Launch + // + stepNamesList.clear(); + try{ + jobExecution = jobRepository.createJobExecution(job.getName(), new JobParameters()); + // TODO: BATCH-1011 + //fail("JobInstanceAlreadyCompleteException expected"); + } + catch(JobInstanceAlreadyCompleteException e) + { + + } + } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests.java index 20194a7f5..946b67ca8 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests.java @@ -17,6 +17,9 @@ package org.springframework.batch.core.configuration.xml; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; import org.junit.Before; import org.junit.Test; @@ -45,6 +48,9 @@ public class FailTransitionJobParserTests { @Autowired private JobRepository jobRepository; + @Autowired + private ArrayList stepNamesList; + @Before public void setUp() { MapJobRepositoryFactoryBean.clear(); @@ -52,15 +58,35 @@ public class FailTransitionJobParserTests { @Test public void testFailTransition() throws Exception { + + // + // First Launch + // assertNotNull(job); JobExecution jobExecution = jobRepository.createJobExecution(job.getName(), new JobParameters()); job.execute(jobExecution); + assertEquals(2, stepNamesList.size()); + assertTrue(stepNamesList.contains("step1")); + assertTrue(stepNamesList.contains("failingStep")); + assertEquals(BatchStatus.FAILED, jobExecution.getStatus()); - // TODO: BATCH-1011 - // assertEquals("EARLY TERMINATION (FAIL)", jobExecution.getExitStatus().getExitCode()); + // assertEquals("EARLY TERMINATION (COMPLETE)", jobExecution.getExitStatus().getExitCode()); - assertEquals(1, jobExecution.getStepExecutions().size()); + + // + // Second Launch + // + stepNamesList.clear(); + jobExecution = jobRepository.createJobExecution(job.getName(), new JobParameters()); + job.execute(jobExecution); + assertEquals(1, stepNamesList.size()); //step1 is not executed + assertTrue(stepNamesList.contains("failingStep")); + + assertEquals(BatchStatus.FAILED, jobExecution.getStatus()); + // TODO: BATCH-1011 + // assertEquals("EARLY TERMINATION (COMPLETE)", jobExecution.getExitStatus().getExitCode()); + } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailingTasklet.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailingTasklet.java index 2fc024030..5d8fc00ec 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailingTasklet.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailingTasklet.java @@ -1,17 +1,36 @@ +/* + * Copyright 2006-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.batch.core.configuration.xml; import org.springframework.batch.core.StepContribution; import org.springframework.batch.core.scope.context.ChunkContext; -import org.springframework.batch.core.step.tasklet.Tasklet; import org.springframework.batch.repeat.RepeatStatus; /** + * This tasklet will call + * {@link NameStoringTasklet#execute(StepContribution, ChunkContext)} and then + * throw an exeception. + * * @author Dan Garrette * @since 2.0 */ -public class FailingTasklet implements Tasklet { +public class FailingTasklet extends NameStoringTasklet { public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { + super.execute(contribution, chunkContext); throw new RuntimeException(); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NameStoringTasklet.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NameStoringTasklet.java new file mode 100644 index 000000000..cf10ac325 --- /dev/null +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NameStoringTasklet.java @@ -0,0 +1,55 @@ +/* + * Copyright 2006-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.batch.core.configuration.xml; + +import java.util.List; + +import org.springframework.batch.core.ExitStatus; +import org.springframework.batch.core.StepContribution; +import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.listener.StepExecutionListenerSupport; +import org.springframework.batch.core.scope.context.ChunkContext; +import org.springframework.batch.core.step.tasklet.Tasklet; +import org.springframework.batch.repeat.RepeatStatus; + +/** + * This class will store the step name when it is executed. + * + * @author Dan Garrette + * @since 2.0 + */ +public class NameStoringTasklet extends StepExecutionListenerSupport implements Tasklet { + + private String stepName = null; + private List stepNamesList = null; + + public void beforeStep(StepExecution stepExecution) { + stepName = stepExecution.getStepName(); + } + + public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { + if (stepNamesList != null) { + stepNamesList.add(stepName); + } + contribution.setExitStatus(ExitStatus.COMPLETED); + return RepeatStatus.FINISHED; + } + + public void setStepNamesList(List stepNamesList) { + this.stepNamesList = stepNamesList; + } + +} diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java index 92548f461..ab7e4c111 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java @@ -17,11 +17,15 @@ package org.springframework.batch.core.configuration.xml; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.ExitStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; @@ -49,6 +53,9 @@ public class StopJobParserTests { @Autowired private JobRepository jobRepository; + @Autowired + private ArrayList stepNamesList; + @Before public void setUp() { MapJobRepositoryFactoryBean.clear(); @@ -57,14 +64,30 @@ public class StopJobParserTests { @Test public void testStopState() throws Exception { assertNotNull(job); + + // + // First Launch + // JobExecution jobExecution = jobRepository.createJobExecution(job.getName(), new JobParameters()); job.execute(jobExecution); + assertEquals(1, stepNamesList.size()); + assertTrue(stepNamesList.contains("step1")); + assertEquals(BatchStatus.STOPPED, jobExecution.getStatus()); - assertEquals(1, jobExecution.getStepExecutions().size()); + // TODO: BATCH-1011 + //assertEquals(BatchStatus.STOPPED.toString(), jobExecution.getExitStatus().getExitCode()); + + + // + // Second Launch + // + stepNamesList.clear(); jobExecution = jobRepository.createJobExecution(job.getName(), new JobParameters()); job.execute(jobExecution); + assertEquals(1, stepNamesList.size()); //step1 is not executed + assertTrue(stepNamesList.contains("step2")); assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); - assertEquals(1, jobExecution.getStepExecutions().size()); + assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus()); } public static class TestDecider implements JobExecutionDecider { diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests-context.xml index 807a23b48..68f6947f0 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests-context.xml @@ -9,6 +9,7 @@ + diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests-context.xml index ecb66c45c..6086acc88 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests-context.xml @@ -9,6 +9,7 @@ + diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/common-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/common-context.xml index f9e2d3a92..2fe7d570c 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/common-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/common-context.xml @@ -13,22 +13,25 @@ - - - + + - + - + + + + + \ No newline at end of file