diff --git a/spring-batch-core/.springBeans b/spring-batch-core/.springBeans index 20277dd79..8bb3a49b4 100644 --- a/spring-batch-core/.springBeans +++ b/spring-batch-core/.springBeans @@ -1,7 +1,7 @@ 1 - + @@ -43,7 +43,6 @@ src/test/resources/org/springframework/batch/core/configuration/xml/StepWithSimpleTaskJobParserTests-context.xml src/test/resources/org/springframework/batch/core/configuration/xml/StopJobParserTests-context.xml src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests-context.xml - src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeDefaultFailureJobParserTests-context.xml src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeMultipleFinalJobParserTests-context.xml src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadRetryListenerTests-context.xml src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadStepListenerTests-context.xml diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NextAttributeDefaultFailureJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NextAttributeDefaultFailureJobParserTests.java deleted file mode 100644 index 55f2db47e..000000000 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NextAttributeDefaultFailureJobParserTests.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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 static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -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.JobRepository; -import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * @author Dan Garrette - * @since 2.0 - */ -@ContextConfiguration -@RunWith(SpringJUnit4ClassRunner.class) -public class NextAttributeDefaultFailureJobParserTests { - - @Autowired - private Job job; - - @Autowired - private JobRepository jobRepository; - - @Before - public void setUp() { - MapJobRepositoryFactoryBean.clear(); - } - - @Test - public void testNextAttributeFailedDefault() throws Exception { - assertNotNull(job); - JobExecution jobExecution = jobRepository.createJobExecution(job.getName(), new JobParameters()); - job.execute(jobExecution); - assertEquals(BatchStatus.INCOMPLETE, jobExecution.getStatus()); - assertEquals(1, jobExecution.getStepExecutions().size()); - } - -} 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 4117f72c3..5035fbb92 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 @@ -17,46 +17,44 @@ 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 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.ExitStatus; import org.springframework.batch.core.JobExecution; -import org.springframework.batch.core.JobParameters; -import org.springframework.batch.core.repository.JobRepository; -import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.batch.core.StepExecution; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** - * @author Dave Syer - * + * @author Dan Garrette + * @since 2.0 */ @ContextConfiguration @RunWith(SpringJUnit4ClassRunner.class) -public class NextAttributeJobParserTests { - - @Autowired - private Job job; - - @Autowired - private JobRepository jobRepository; - - @Before - public void setUp() { - MapJobRepositoryFactoryBean.clear(); - } +public class NextAttributeJobParserTests extends AbstractJobParserTests { @Test - public void testNextAttributeSunnyDay() throws Exception { + public void testNextAttributeFailedDefault() throws Exception { assertNotNull(job); - JobExecution jobExecution = jobRepository.createJobExecution(job.getName(), new JobParameters()); + JobExecution jobExecution = createJobExecution(); job.execute(jobExecution); - assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); - assertEquals(2, jobExecution.getStepExecutions().size()); + assertEquals(2, stepNamesList.size()); //s2 is not executed + assertTrue(stepNamesList.contains("s1")); + assertTrue(stepNamesList.contains("fail")); + + assertEquals(BatchStatus.INCOMPLETE, jobExecution.getStatus()); + assertEquals("FAILED", jobExecution.getExitStatus().getExitCode()); + + StepExecution stepExecution1 = getStepExecution(jobExecution, "s1"); + assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus()); + assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus()); + + StepExecution stepExecution2 = getStepExecution(jobExecution, "fail"); + assertEquals(BatchStatus.INCOMPLETE, stepExecution2.getStatus()); + assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution2.getExitStatus().getExitCode()); } } diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeDefaultFailureJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeDefaultFailureJobParserTests-context.xml deleted file mode 100644 index bb3a2c74d..000000000 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeDefaultFailureJobParserTests-context.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeJobParserTests-context.xml index 924ddf420..0213daa66 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeJobParserTests-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeJobParserTests-context.xml @@ -1,14 +1,17 @@ - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file