diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java index 515226ff8..8965434ce 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java @@ -3,9 +3,6 @@ package org.springframework.batch.core.configuration.xml; import java.util.ArrayList; import java.util.List; -import org.springframework.batch.core.JobInterruptedException; -import org.springframework.batch.core.Step; -import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.job.flow.FlowExecutionStatus; import org.springframework.batch.core.job.flow.FlowExecutor; import org.springframework.batch.core.job.flow.State; @@ -102,8 +99,7 @@ public class SimpleFlowFactoryBean implements FactoryBean, InitializingBean { } String stateName = prefix + oldName; if (state instanceof StepState) { - Step step = ((StepState) state).getStep(); - return new StepState(stateName, new DelegateStep(stateName, step)); + return new StepState(stateName, ((StepState) state).getStep()); } return new DelegateState(stateName, state); } @@ -141,44 +137,4 @@ public class SimpleFlowFactoryBean implements FactoryBean, InitializingBean { } } - /** - * A Step that proxies a delegate and changes its name but leaves its - * behaviour unchanged. - * - * @author Dave Syer - * - */ - private static class DelegateStep implements Step { - - private final Step step; - - private final String name; - - private DelegateStep(String name, Step step) { - this.step = step; - this.name = name; - } - - public boolean isAllowStartIfComplete() { - return step.isAllowStartIfComplete(); - } - - public int getStartLimit() { - return step.getStartLimit(); - } - - public String getName() { - return name; - } - - public void execute(StepExecution stepExecution) throws JobInterruptedException { - step.execute(stepExecution); - } - - @Override - public String toString() { - return step.toString(); - } - } - } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/BranchStepJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/BranchStepJobParserTests.java index ee2e22837..c16991617 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/BranchStepJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/BranchStepJobParserTests.java @@ -60,8 +60,7 @@ public class BranchStepJobParserTests { for (StepExecution stepExecution : jobExecution.getStepExecutions()) { names.add(stepExecution.getStepName()); } - assertTrue(names.contains("job.s3")); - assertFalse(names.contains("job.s2")); + assertEquals("[s1, s3]", names.toString()); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultFailureJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultFailureJobParserTests.java index 8d1b029e4..822e0b739 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultFailureJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultFailureJobParserTests.java @@ -41,17 +41,17 @@ public class DefaultFailureJobParserTests extends AbstractJobParserTests { JobExecution jobExecution = createJobExecution(); job.execute(jobExecution); assertEquals(2, stepNamesList.size()); - assertTrue(stepNamesList.contains("job.s1")); - assertTrue(stepNamesList.contains("job.fail")); + assertTrue(stepNamesList.contains("s1")); + assertTrue(stepNamesList.contains("fail")); assertEquals(BatchStatus.FAILED, jobExecution.getStatus()); assertEquals(ExitStatus.FAILED.getExitCode(), jobExecution.getExitStatus().getExitCode()); - StepExecution stepExecution1 = getStepExecution(jobExecution, "job.s1"); + StepExecution stepExecution1 = getStepExecution(jobExecution, "s1"); assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus()); assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus()); - StepExecution stepExecution2 = getStepExecution(jobExecution, "job.fail"); + StepExecution stepExecution2 = getStepExecution(jobExecution, "fail"); assertEquals(BatchStatus.FAILED, stepExecution2.getStatus()); assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution2.getExitStatus().getExitCode()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultSuccessJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultSuccessJobParserTests.java index ad9c99372..4aafa2fbc 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultSuccessJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultSuccessJobParserTests.java @@ -16,7 +16,6 @@ package org.springframework.batch.core.configuration.xml; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; @@ -41,17 +40,16 @@ public class DefaultSuccessJobParserTests extends AbstractJobParserTests { JobExecution jobExecution = createJobExecution(); job.execute(jobExecution); assertEquals(2, stepNamesList.size()); - assertTrue(stepNamesList.contains("job.s1")); - assertTrue(stepNamesList.contains("job.s2")); + assertEquals("[s1, s2]", stepNamesList.toString()); assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus()); - StepExecution stepExecution1 = getStepExecution(jobExecution, "job.s1"); + StepExecution stepExecution1 = getStepExecution(jobExecution, "s1"); assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus()); assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus()); - StepExecution stepExecution2 = getStepExecution(jobExecution, "job.s2"); + StepExecution stepExecution2 = getStepExecution(jobExecution, "s2"); assertEquals(BatchStatus.COMPLETED, stepExecution2.getStatus()); assertEquals(ExitStatus.COMPLETED, stepExecution2.getExitStatus()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests.java index 2e6d778b8..6eab69b15 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests.java @@ -41,12 +41,12 @@ public class EndTransitionDefaultStatusJobParserTests extends AbstractJobParserT JobExecution jobExecution = createJobExecution(); job.execute(jobExecution); assertEquals(1, stepNamesList.size()); - assertTrue(stepNamesList.contains("job.fail")); + assertTrue(stepNamesList.contains("fail")); assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus()); - StepExecution stepExecution1 = getStepExecution(jobExecution, "job.fail"); + StepExecution stepExecution1 = getStepExecution(jobExecution, "fail"); assertEquals(BatchStatus.FAILED, stepExecution1.getStatus()); assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution1.getExitStatus().getExitCode()); 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 2fcb7f45b..f46a2c90d 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 @@ -46,17 +46,17 @@ public class EndTransitionJobParserTests extends AbstractJobParserTests { JobExecution jobExecution = createJobExecution(); job.execute(jobExecution); assertEquals(2, stepNamesList.size()); - assertTrue(stepNamesList.contains("job.s1")); - assertTrue(stepNamesList.contains("job.fail")); + assertTrue(stepNamesList.contains("s1")); + assertTrue(stepNamesList.contains("fail")); assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); assertEquals("EARLY TERMINATION", jobExecution.getExitStatus().getExitCode()); - StepExecution stepExecution1 = getStepExecution(jobExecution, "job.s1"); + StepExecution stepExecution1 = getStepExecution(jobExecution, "s1"); assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus()); assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus()); - StepExecution stepExecution2 = getStepExecution(jobExecution, "job.fail"); + StepExecution stepExecution2 = getStepExecution(jobExecution, "fail"); assertEquals(BatchStatus.FAILED, stepExecution2.getStatus()); assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution2.getExitStatus().getExitCode()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests.java index 22b4e54ea..0971c0517 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests.java @@ -41,12 +41,12 @@ public class FailTransitionDefaultStatusJobParserTests extends AbstractJobParser JobExecution jobExecution = createJobExecution(); job.execute(jobExecution); assertEquals(1, stepNamesList.size()); - assertTrue(stepNamesList.contains("job.s1")); + assertTrue(stepNamesList.contains("s1")); assertEquals(BatchStatus.FAILED, jobExecution.getStatus()); assertEquals(ExitStatus.FAILED, jobExecution.getExitStatus()); - StepExecution stepExecution1 = getStepExecution(jobExecution, "job.s1"); + StepExecution stepExecution1 = getStepExecution(jobExecution, "s1"); assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus()); assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus()); 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 98dbcd69d..e74b7bdab 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 @@ -44,18 +44,18 @@ public class FailTransitionJobParserTests extends AbstractJobParserTests { JobExecution jobExecution = createJobExecution(); job.execute(jobExecution); assertEquals(2, stepNamesList.size()); - assertTrue(stepNamesList.contains("job.s1")); - assertTrue(stepNamesList.contains("job.fail")); + assertTrue(stepNamesList.contains("s1")); + assertTrue(stepNamesList.contains("fail")); assertEquals(BatchStatus.FAILED, jobExecution.getStatus()); assertEquals("EARLY TERMINATION", jobExecution.getExitStatus() .getExitCode()); - StepExecution stepExecution1 = getStepExecution(jobExecution, "job.s1"); + StepExecution stepExecution1 = getStepExecution(jobExecution, "s1"); assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus()); assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus()); - StepExecution stepExecution2 = getStepExecution(jobExecution, "job.fail"); + StepExecution stepExecution2 = getStepExecution(jobExecution, "fail"); assertEquals(BatchStatus.FAILED, stepExecution2.getStatus()); assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution2 .getExitStatus().getExitCode()); @@ -67,7 +67,7 @@ public class FailTransitionJobParserTests extends AbstractJobParserTests { jobExecution = createJobExecution(); job.execute(jobExecution); assertEquals(1, stepNamesList.size()); - assertTrue(stepNamesList.contains("job.fail")); + assertTrue(stepNamesList.contains("fail")); assertEquals(BatchStatus.FAILED, jobExecution.getStatus()); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowJobParserTests.java index 69bbccceb..eca377b95 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowJobParserTests.java @@ -80,7 +80,7 @@ public class FlowJobParserTests { assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); List stepNames = getStepNames(jobExecution); assertEquals(4, stepNames.size()); - assertEquals("[job1.s1, job1.flow.s2, job1.flow.s3, job1.s4]", stepNames.toString()); + assertEquals("[s1, s2, s3, s4]", stepNames.toString()); } @Test @@ -92,7 +92,7 @@ public class FlowJobParserTests { assertEquals(3, jobExecution.getStepExecutions().size()); List stepNames = getStepNames(jobExecution); assertEquals(3, stepNames.size()); - assertEquals("[job2.flow.s2, job2.flow.s3, job2.s1]", stepNames.toString()); + assertEquals("[s2, s3, job2.s1]", stepNames.toString()); } @Test @@ -103,7 +103,7 @@ public class FlowJobParserTests { assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); List stepNames = getStepNames(jobExecution); assertEquals(2, stepNames.size()); - assertEquals("[job3.flow.s2, job3.flow.s3]", stepNames.toString()); + assertEquals("[s2, s3]", stepNames.toString()); } @Test @@ -114,7 +114,7 @@ public class FlowJobParserTests { assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); List stepNames = getStepNames(jobExecution); assertEquals(4, stepNames.size()); - assertEquals("[job4.split.0.s2, job4.split.0.s3, job4.split.1.s2, job4.split.1.s3]", stepNames.toString()); + assertEquals("[s2, s3, s2, s3]", stepNames.toString()); } private List getStepNames(JobExecution jobExecution) { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowStepParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowStepParserTests.java index cfb44aa7a..5e3324fc5 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowStepParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowStepParserTests.java @@ -72,18 +72,18 @@ public class FlowStepParserTests { assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); List stepNames = getStepNames(jobExecution); assertEquals(5, stepNames.size()); - assertEquals("[job1.s1, job1.flow, job1.flow.s2, job1.flow.s3, job1.s4]", stepNames.toString()); + assertEquals("[s1, job1.flow, s2, s3, s4]", stepNames.toString()); } @Test public void testFlowExternalStep() throws Exception { assertNotNull(job2); - JobExecution jobExecution = jobRepository.createJobExecution(job1.getName(), new JobParameters()); + JobExecution jobExecution = jobRepository.createJobExecution(job2.getName(), new JobParameters()); job2.execute(jobExecution); assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); List stepNames = getStepNames(jobExecution); assertEquals(5, stepNames.size()); - assertEquals("[job2.s1, job2.flow, flow.step.s2, flow.step.s3, job2.s4]", stepNames.toString()); + assertEquals("[job2.s1, job2.flow, s2, s3, job2.s4]", stepNames.toString()); } private List getStepNames(JobExecution jobExecution) { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NextAttributeJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NextAttributeJobParserTests.java index f6b49aec2..3da2b9d1d 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NextAttributeJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NextAttributeJobParserTests.java @@ -44,17 +44,17 @@ public class NextAttributeJobParserTests extends AbstractJobParserTests { JobExecution jobExecution = createJobExecution(); job.execute(jobExecution); assertEquals(2, stepNamesList.size()); //s2 is not executed - assertTrue(stepNamesList.contains("job.s1")); - assertTrue(stepNamesList.contains("job.fail")); + assertTrue(stepNamesList.contains("s1")); + assertTrue(stepNamesList.contains("fail")); assertEquals(BatchStatus.FAILED, jobExecution.getStatus()); assertEquals("FAILED", jobExecution.getExitStatus().getExitCode()); - StepExecution stepExecution1 = getStepExecution(jobExecution, "job.s1"); + StepExecution stepExecution1 = getStepExecution(jobExecution, "s1"); assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus()); assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus()); - StepExecution stepExecution2 = getStepExecution(jobExecution, "job.fail"); + StepExecution stepExecution2 = getStepExecution(jobExecution, "fail"); assertEquals(BatchStatus.FAILED, stepExecution2.getStatus()); assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution2.getExitStatus().getExitCode()); @@ -65,12 +65,12 @@ public class NextAttributeJobParserTests extends AbstractJobParserTests { jobExecution = createJobExecution(); job.execute(jobExecution); assertEquals(1, stepNamesList.size()); //s1,s2 are not executed - assertTrue(stepNamesList.contains("job.fail")); + assertTrue(stepNamesList.contains("fail")); assertEquals(BatchStatus.FAILED, jobExecution.getStatus()); assertEquals("FAILED", jobExecution.getExitStatus().getExitCode()); - StepExecution stepExecution3 = getStepExecution(jobExecution, "job.fail"); + StepExecution stepExecution3 = getStepExecution(jobExecution, "fail"); assertEquals(BatchStatus.FAILED, stepExecution3.getStatus()); assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution3.getExitStatus().getExitCode()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailFirstJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailFirstJobParserTests.java index 888af29c1..5413bddc2 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailFirstJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailFirstJobParserTests.java @@ -16,7 +16,6 @@ package org.springframework.batch.core.configuration.xml; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; @@ -41,17 +40,16 @@ public class SplitDifferentResultsFailFirstJobParserTests extends AbstractJobPar JobExecution jobExecution = createJobExecution(); job.execute(jobExecution); assertEquals(2, stepNamesList.size()); - assertTrue("Wrong step names: "+stepNamesList, stepNamesList.contains("job.split1.1.s1")); - assertTrue(stepNamesList.contains("job.split1.0.fail")); + assertEquals("Wrong step names: "+stepNamesList, "[fail, s1]", stepNamesList.toString()); assertEquals(BatchStatus.FAILED, jobExecution.getStatus()); assertEquals(ExitStatus.FAILED, jobExecution.getExitStatus()); - StepExecution stepExecution1 = getStepExecution(jobExecution, "job.split1.1.s1"); + StepExecution stepExecution1 = getStepExecution(jobExecution, "s1"); assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus()); assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus()); - StepExecution stepExecution2 = getStepExecution(jobExecution, "job.split1.0.fail"); + StepExecution stepExecution2 = getStepExecution(jobExecution, "fail"); assertEquals(BatchStatus.FAILED, stepExecution2.getStatus()); assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution2.getExitStatus().getExitCode()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests.java index 632fab209..b1ade7c37 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests.java @@ -41,23 +41,23 @@ public class SplitDifferentResultsFailSecondJobParserTests extends AbstractJobPa JobExecution jobExecution = createJobExecution(); job.execute(jobExecution); assertEquals("Wrong step names: "+stepNamesList, 3, stepNamesList.size()); - assertTrue("Wrong step names: "+stepNamesList, stepNamesList.contains("job.split1.0.s1")); - assertTrue("Wrong step names: "+stepNamesList, stepNamesList.contains("job.split1.1.fail")); - assertTrue(stepNamesList.contains("job.s3")); + assertTrue("Wrong step names: "+stepNamesList, stepNamesList.contains("s1")); + assertTrue("Wrong step names: "+stepNamesList, stepNamesList.contains("fail")); + assertTrue(stepNamesList.contains("s3")); assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); // You can't suppress a FAILED exit status assertEquals(ExitStatus.FAILED, jobExecution.getExitStatus()); - StepExecution stepExecution1 = getStepExecution(jobExecution, "job.split1.0.s1"); + StepExecution stepExecution1 = getStepExecution(jobExecution, "s1"); assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus()); assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus()); - StepExecution stepExecution2 = getStepExecution(jobExecution, "job.split1.1.fail"); + StepExecution stepExecution2 = getStepExecution(jobExecution, "fail"); assertEquals(BatchStatus.FAILED, stepExecution2.getStatus()); assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution2.getExitStatus().getExitCode()); - StepExecution stepExecution3 = getStepExecution(jobExecution, "job.s3"); + StepExecution stepExecution3 = getStepExecution(jobExecution, "s3"); assertEquals(BatchStatus.COMPLETED, stepExecution3.getStatus()); assertEquals(ExitStatus.COMPLETED, stepExecution3.getExitStatus()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitInterruptedJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitInterruptedJobParserTests.java index f3f8a6199..55c411ed7 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitInterruptedJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitInterruptedJobParserTests.java @@ -52,9 +52,9 @@ public class SplitInterruptedJobParserTests extends AbstractJobParserTests { assertEquals(BatchStatus.STOPPED, jobExecution.getStatus()); assertEquals(ExitStatus.STOPPED.getExitCode(), jobExecution.getExitStatus().getExitCode()); - assertTrue("Wrong step names: "+stepNamesList, stepNamesList.contains("job.split1.0.stop")); + assertTrue("Wrong step names: "+stepNamesList, stepNamesList.contains("stop")); - StepExecution stepExecution = getStepExecution(jobExecution, "job.split1.0.stop"); + StepExecution stepExecution = getStepExecution(jobExecution, "stop"); assertEquals(BatchStatus.STOPPED, stepExecution.getStatus()); assertEquals(ExitStatus.STOPPED.getExitCode(), stepExecution.getExitStatus().getExitCode()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithSimpleTaskJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithSimpleTaskJobParserTests.java index 5417228c9..45ba2d511 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithSimpleTaskJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithSimpleTaskJobParserTests.java @@ -76,8 +76,9 @@ public class StepWithSimpleTaskJobParserTests { } private TestTasklet assertTasklet(Job job, String stepName, String taskletName) { - Step step = (Step) ReflectionTestUtils.getField(((FlowJob) job).getStep(stepName), "step"); - assertTrue(step instanceof TaskletStep); + System.err.println(((FlowJob) job).getStepNames()); + Step step = ((FlowJob) job).getStep(stepName); + assertTrue("Wong type for step name="+stepName+": "+step, step instanceof TaskletStep); Object tasklet = ReflectionTestUtils.getField(step, "tasklet"); assertTrue(tasklet instanceof TestTasklet); TestTasklet testTasklet = (TestTasklet) tasklet; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartFailedJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartFailedJobParserTests.java index 2664a1644..4547664f0 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartFailedJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartFailedJobParserTests.java @@ -43,8 +43,8 @@ public class StopAndRestartFailedJobParserTests extends AbstractJobParserTests { // // First Launch // - JobExecution jobExecution = launchAndAssert("[job.s0, job.s1]"); - StepExecution stepExecution = getStepExecution(jobExecution, "job.s1"); + JobExecution jobExecution = launchAndAssert("[s0, s1]"); + StepExecution stepExecution = getStepExecution(jobExecution, "s1"); assertEquals(BatchStatus.ABANDONED, stepExecution.getStatus()); assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution.getExitStatus().getExitCode()); @@ -52,8 +52,8 @@ public class StopAndRestartFailedJobParserTests extends AbstractJobParserTests { // Second Launch // stepNamesList.clear(); - jobExecution = launchAndAssert("[job.s0, job.s2]"); - stepExecution = getStepExecution(jobExecution, "job.s2"); + jobExecution = launchAndAssert("[s0, s2]"); + stepExecution = getStepExecution(jobExecution, "s2"); assertEquals(BatchStatus.COMPLETED, stepExecution.getStatus()); assertEquals(ExitStatus.COMPLETED.getExitCode(), stepExecution.getExitStatus().getExitCode()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartJobParserTests.java index 88317e29a..6cfddd524 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartJobParserTests.java @@ -44,12 +44,12 @@ public class StopAndRestartJobParserTests extends AbstractJobParserTests { JobExecution jobExecution = createJobExecution(); job.execute(jobExecution); assertEquals(1, stepNamesList.size()); - assertTrue(stepNamesList.contains("job.s1")); + assertEquals("[s1]", stepNamesList.toString()); assertEquals(BatchStatus.STOPPED, jobExecution.getStatus()); assertEquals(ExitStatus.STOPPED.getExitCode(), jobExecution.getExitStatus().getExitCode()); - StepExecution stepExecution1 = getStepExecution(jobExecution, "job.s1"); + StepExecution stepExecution1 = getStepExecution(jobExecution, "s1"); assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus()); assertEquals(ExitStatus.COMPLETED.getExitCode(), stepExecution1.getExitStatus().getExitCode()); @@ -60,12 +60,12 @@ public class StopAndRestartJobParserTests extends AbstractJobParserTests { jobExecution = createJobExecution(); job.execute(jobExecution); assertEquals(1, stepNamesList.size()); // step1 is not executed - assertTrue(stepNamesList.contains("job.s2")); + assertEquals("[s2]", stepNamesList.toString()); assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus()); - StepExecution stepExecution2 = getStepExecution(jobExecution, "job.s2"); + StepExecution stepExecution2 = getStepExecution(jobExecution, "s2"); assertEquals(BatchStatus.COMPLETED, stepExecution2.getStatus()); assertEquals(ExitStatus.COMPLETED, stepExecution2.getExitStatus()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopCustomStatusJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopCustomStatusJobParserTests.java index 12c111609..f59ddb588 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopCustomStatusJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopCustomStatusJobParserTests.java @@ -43,13 +43,13 @@ public class StopCustomStatusJobParserTests extends AbstractJobParserTests { // JobExecution jobExecution = createJobExecution(); job.execute(jobExecution); - assertTrue("Wrong steps executed: "+stepNamesList, stepNamesList.contains("job.stop")); assertEquals(1, stepNamesList.size()); + assertEquals("Wrong steps executed: "+stepNamesList, "[stop]", stepNamesList.toString()); assertEquals(BatchStatus.STOPPED, jobExecution.getStatus()); assertEquals(ExitStatus.STOPPED.getExitCode(), jobExecution.getExitStatus().getExitCode()); - StepExecution stepExecution1 = getStepExecution(jobExecution, "job.stop"); + StepExecution stepExecution1 = getStepExecution(jobExecution, "stop"); assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus()); assertEquals("FOO", stepExecution1.getExitStatus().getExitCode()); @@ -59,13 +59,13 @@ public class StopCustomStatusJobParserTests extends AbstractJobParserTests { stepNamesList.clear(); jobExecution = createJobExecution(); job.execute(jobExecution); - assertTrue("Wrong steps executed: "+stepNamesList, stepNamesList.contains("job.s2")); assertEquals(1, stepNamesList.size()); // step1 is not executed + assertEquals("Wrong steps executed: "+stepNamesList, "[s2]", stepNamesList.toString()); assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus()); - StepExecution stepExecution2 = getStepExecution(jobExecution, "job.s2"); + StepExecution stepExecution2 = getStepExecution(jobExecution, "s2"); assertEquals(BatchStatus.COMPLETED, stepExecution2.getStatus()); assertEquals(ExitStatus.COMPLETED, stepExecution2.getExitStatus()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopIncompleteJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopIncompleteJobParserTests.java index ba56f04c6..cdbe36077 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopIncompleteJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopIncompleteJobParserTests.java @@ -43,13 +43,13 @@ public class StopIncompleteJobParserTests extends AbstractJobParserTests { // JobExecution jobExecution = createJobExecution(); job.execute(jobExecution); - assertTrue("Wrong steps executed: "+stepNamesList, stepNamesList.contains("job.fail")); assertEquals(1, stepNamesList.size()); + assertEquals("Wrong steps executed: "+stepNamesList, "[fail]", stepNamesList.toString()); assertEquals(BatchStatus.STOPPED, jobExecution.getStatus()); assertEquals(ExitStatus.STOPPED.getExitCode(), jobExecution.getExitStatus().getExitCode()); - StepExecution stepExecution1 = getStepExecution(jobExecution, "job.fail"); + StepExecution stepExecution1 = getStepExecution(jobExecution, "fail"); assertEquals(BatchStatus.ABANDONED, stepExecution1.getStatus()); assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution1.getExitStatus().getExitCode()); @@ -59,13 +59,13 @@ public class StopIncompleteJobParserTests extends AbstractJobParserTests { stepNamesList.clear(); jobExecution = createJobExecution(); job.execute(jobExecution); - assertTrue("Wrong steps executed: "+stepNamesList, stepNamesList.contains("job.s2")); assertEquals(1, stepNamesList.size()); // step1 is not executed + assertEquals("Wrong steps executed: "+stepNamesList, "[s2]", stepNamesList.toString()); assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus()); - StepExecution stepExecution2 = getStepExecution(jobExecution, "job.s2"); + StepExecution stepExecution2 = getStepExecution(jobExecution, "s2"); assertEquals(BatchStatus.COMPLETED, stepExecution2.getStatus()); assertEquals(ExitStatus.COMPLETED, stepExecution2.getExitStatus()); 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 0d45b2e3b..bcbe30528 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 @@ -46,12 +46,12 @@ public class StopJobParserTests extends AbstractJobParserTests { JobExecution jobExecution = createJobExecution(); job.execute(jobExecution); assertEquals(1, stepNamesList.size()); - assertTrue(stepNamesList.contains("job.s1")); + assertTrue(stepNamesList.contains("s1")); assertEquals(BatchStatus.STOPPED, jobExecution.getStatus()); assertEquals(ExitStatus.STOPPED.getExitCode(), jobExecution.getExitStatus().getExitCode()); - StepExecution stepExecution1 = getStepExecution(jobExecution, "job.s1"); + StepExecution stepExecution1 = getStepExecution(jobExecution, "s1"); assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus()); assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus()); @@ -62,12 +62,12 @@ public class StopJobParserTests extends AbstractJobParserTests { jobExecution = createJobExecution(); job.execute(jobExecution); assertEquals(1, stepNamesList.size()); // step1 is not executed - assertTrue(stepNamesList.contains("job.s2")); + assertTrue(stepNamesList.contains("s2")); assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus()); - StepExecution stepExecution2 = getStepExecution(jobExecution, "job.s2"); + StepExecution stepExecution2 = getStepExecution(jobExecution, "s2"); assertEquals(BatchStatus.COMPLETED, stepExecution2.getStatus()); assertEquals(ExitStatus.COMPLETED, stepExecution2.getExitStatus()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnCompletedStepJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnCompletedStepJobParserTests.java index 83175e54e..a8b6a6ded 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnCompletedStepJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnCompletedStepJobParserTests.java @@ -43,13 +43,13 @@ public class StopRestartOnCompletedStepJobParserTests extends AbstractJobParserT // // First Launch // - launchAndAssert("[job.s1]"); + launchAndAssert("[s1]"); // // Second Launch // stepNamesList.clear(); - launchAndAssert("[job.s1]"); + launchAndAssert("[s1]"); } @@ -62,7 +62,7 @@ public class StopRestartOnCompletedStepJobParserTests extends AbstractJobParserT assertEquals(BatchStatus.STOPPED, jobExecution.getStatus()); assertEquals(ExitStatus.STOPPED.getExitCode(), jobExecution.getExitStatus().getExitCode()); - StepExecution stepExecution1 = getStepExecution(jobExecution, "job.s1"); + StepExecution stepExecution1 = getStepExecution(jobExecution, "s1"); assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus()); assertEquals(ExitStatus.COMPLETED.getExitCode(), stepExecution1.getExitStatus().getExitCode()); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests.java index e2b3695f6..70fb3d694 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopRestartOnFailedStepJobParserTests.java @@ -43,13 +43,13 @@ public class StopRestartOnFailedStepJobParserTests extends AbstractJobParserTest // // First Launch // - launchAndAssert("[job.s0, job.fail]"); + launchAndAssert("[s0, fail]"); // // Second Launch // stepNamesList.clear(); - launchAndAssert("[job.fail]"); + launchAndAssert("[fail]"); } @@ -62,7 +62,7 @@ public class StopRestartOnFailedStepJobParserTests extends AbstractJobParserTest assertEquals(BatchStatus.STOPPED, jobExecution.getStatus()); assertEquals(ExitStatus.STOPPED.getExitCode(), jobExecution.getExitStatus().getExitCode()); - StepExecution stepExecution1 = getStepExecution(jobExecution, "job.fail"); + StepExecution stepExecution1 = getStepExecution(jobExecution, "fail"); assertEquals(BatchStatus.FAILED, stepExecution1.getStatus()); assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution1.getExitStatus().getExitCode()); } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CustomerFilterJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CustomerFilterJobFunctionalTests.java index 3907a0dd9..e71ad5993 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CustomerFilterJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CustomerFilterJobFunctionalTests.java @@ -105,7 +105,6 @@ public class CustomerFilterJobFunctionalTests { private Map getStepExecution(JobExecution jobExecution, String stepName) { Long jobExecutionId = jobExecution.getId(); - stepName = jobExecution.getJobInstance().getJobName()+"."+stepName; return simpleJdbcTemplate.queryForMap( "SELECT * from BATCH_STEP_EXECUTION where JOB_EXECUTION_ID = ? and STEP_NAME = ?", jobExecutionId, stepName); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java index d225622b2..5e025afa4 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java @@ -174,9 +174,9 @@ public class SkipSampleFunctionalTests { assertEquals(2, SimpleJdbcTestUtils.countRowsInTable(simpleJdbcTemplate, "ERROR_LOG")); assertEquals("2 records were skipped!", simpleJdbcTemplate.queryForObject( - "SELECT MESSAGE from ERROR_LOG where JOB_NAME = ? and STEP_NAME = ?", String.class, "skipJob", "skipJob.step1")); + "SELECT MESSAGE from ERROR_LOG where JOB_NAME = ? and STEP_NAME = ?", String.class, "skipJob", "step1")); assertEquals("2 records were skipped!", simpleJdbcTemplate.queryForObject( - "SELECT MESSAGE from ERROR_LOG where JOB_NAME = ? and STEP_NAME = ?", String.class, "skipJob", "skipJob.step2")); + "SELECT MESSAGE from ERROR_LOG where JOB_NAME = ? and STEP_NAME = ?", String.class, "skipJob", "step2")); System.err.println(jobExecution.getExecutionContext()); assertEquals(new BigDecimal("340.45"), jobExecution.getExecutionContext().get(TradeWriter.TOTAL_AMOUNT_KEY)); @@ -204,7 +204,6 @@ public class SkipSampleFunctionalTests { private Map getStepExecutionAsMap(JobExecution jobExecution, String stepName) { long jobExecutionId = jobExecution.getId(); - stepName = jobExecution.getJobInstance().getJobName() + "." + stepName; return simpleJdbcTemplate.queryForMap( "SELECT * from BATCH_STEP_EXECUTION where JOB_EXECUTION_ID = ? and STEP_NAME = ?", jobExecutionId, stepName);