From 36f44c6ba7fecf66361ac77d028e40c8f2b5e9ac Mon Sep 17 00:00:00 2001 From: dhgarrette Date: Fri, 6 Feb 2009 08:30:35 +0000 Subject: [PATCH] BATCH-1011: Added test cases for default "status" attribute --- ...TransitionDefaultStatusJobParserTests.java | 71 ++++++++++++++++++ .../xml/EndTransitionJobParserTests.java | 5 +- ...TransitionDefaultStatusJobParserTests.java | 73 +++++++++++++++++++ .../xml/FailTransitionJobParserTests.java | 7 +- ...ionDefaultStatusJobParserTests-context.xml | 17 +++++ .../EndTransitionJobParserTests-context.xml | 4 +- ...ionDefaultStatusJobParserTests-context.xml | 17 +++++ .../FailTransitionJobParserTests-context.xml | 4 +- 8 files changed, 184 insertions(+), 14 deletions(-) create mode 100644 spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests.java create mode 100644 spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests.java create mode 100644 spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests-context.xml create mode 100644 spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests-context.xml 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 new file mode 100644 index 000000000..5f006ecff --- /dev/null +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests.java @@ -0,0 +1,71 @@ +/* + * 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 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.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 EndTransitionDefaultStatusJobParserTests { + + @Autowired + private Job job; + + @Autowired + private JobRepository jobRepository; + + @Autowired + private ArrayList stepNamesList; + + @Before + public void setUp() { + MapJobRepositoryFactoryBean.clear(); + } + + @Test + public void testEndTransitionDefaultStatus() throws Exception { + + assertNotNull(job); + JobExecution jobExecution = jobRepository.createJobExecution(job.getName(), new JobParameters()); + job.execute(jobExecution); + assertEquals(1, stepNamesList.size()); + assertTrue(stepNamesList.contains("failingStep")); + // TODO: BATCH-1011 + // assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); + // assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus()); + + } +} 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 89efea69c..8ad02d338 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 @@ -68,11 +68,9 @@ public class EndTransitionJobParserTests { assertEquals(2, stepNamesList.size()); assertTrue(stepNamesList.contains("step1")); assertTrue(stepNamesList.contains("failingStep")); - // TODO: BATCH-1011 // assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); - // assertEquals("EARLY TERMINATION (COMPLETE)", jobExecution.getExitStatus().getExitCode()); - + // assertEquals("EARLY TERMINATION (FAIL)", jobExecution.getExitStatus().getExitCode()); // // Second Launch @@ -87,5 +85,6 @@ public class EndTransitionJobParserTests { { } + } } 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 new file mode 100644 index 000000000..ff20631d3 --- /dev/null +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests.java @@ -0,0 +1,73 @@ +/* + * 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 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.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 FailTransitionDefaultStatusJobParserTests { + + @Autowired + private Job job; + + @Autowired + private JobRepository jobRepository; + + @Autowired + private ArrayList stepNamesList; + + @Before + public void setUp() { + MapJobRepositoryFactoryBean.clear(); + } + + @Test + public void testFailTransitionDefaultStatus() throws Exception { + + assertNotNull(job); + JobExecution jobExecution = jobRepository.createJobExecution(job.getName(), new JobParameters()); + job.execute(jobExecution); + assertEquals(1, stepNamesList.size()); + assertTrue(stepNamesList.contains("step1")); + assertEquals(BatchStatus.FAILED, jobExecution.getStatus()); + // TODO: BATCH-1011 + // assertEquals(ExitStatus.FAILED, jobExecution.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 946b67ca8..a2e33f9bc 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 @@ -68,11 +68,9 @@ public class FailTransitionJobParserTests { assertEquals(2, stepNamesList.size()); assertTrue(stepNamesList.contains("step1")); assertTrue(stepNamesList.contains("failingStep")); - assertEquals(BatchStatus.FAILED, jobExecution.getStatus()); // TODO: BATCH-1011 - // assertEquals("EARLY TERMINATION (COMPLETE)", jobExecution.getExitStatus().getExitCode()); - + // assertEquals("EARLY TERMINATION (FAIL)", jobExecution.getExitStatus().getExitCode()); // // Second Launch @@ -82,10 +80,9 @@ public class FailTransitionJobParserTests { 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()); + // assertEquals("EARLY TERMINATION (FAIL)", jobExecution.getExitStatus().getExitCode()); } diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests-context.xml new file mode 100644 index 000000000..83e6ca1d7 --- /dev/null +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests-context.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + \ No newline at end of file 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 68f6947f0..18bb5f0bf 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 @@ -11,10 +11,8 @@ - - + - \ No newline at end of file diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests-context.xml new file mode 100644 index 000000000..441f6df04 --- /dev/null +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests-context.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + \ No newline at end of file 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 6086acc88..b0b06df67 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 @@ -12,9 +12,7 @@ - - - + \ No newline at end of file