Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-1318: Fixed tests

Browse Source
This commit is contained in:
dhgarrette
2009-07-05 17:59:22 +00:00
parent 19942cc469
commit 9e65f9819a
3 changed files with 102 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ExceptionThrowingTaskletStub.java Normal file
View File

@@ -0,0 +1,57 @@
/*
* Copyright 2006-2009 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.step.item;
import java.lang.reflect.Constructor;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
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;
import org.springframework.batch.support.transaction.TransactionAwareProxyFactory;
/**
* @author Dan Garrette
* @since 2.0.2
*/
public class ExceptionThrowingTaskletStub implements Tasklet {
protected Log logger = LogFactory.getLog(getClass());
private List<Integer> committed = TransactionAwareProxyFactory.createTransactionalList();
private Constructor<? extends Exception> exception;
public ExceptionThrowingTaskletStub() throws Exception {
exception = SkippableRuntimeException.class.getConstructor(String.class);
}
public void setExceptionType(Class<? extends Exception> exceptionType) throws Exception {
exception = exceptionType.getConstructor(String.class);
}
public List<Integer> getCommitted() {
return committed;
}
public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception {
committed.add(1);
throw exception.newInstance("Expected exception");
}
}

23
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantExceptionClassesTests.java
View File

@@ -42,6 +42,8 @@ public class FaultTolerantExceptionClassesTests {
private static SkipReaderStub<String> reader;
private static SkipWriterStub<String> writer;
private static ExceptionThrowingTaskletStub tasklet;
@SuppressWarnings("unchecked")
@BeforeClass
@@ -52,6 +54,7 @@ public class FaultTolerantExceptionClassesTests {
jobLauncher = (JobLauncher) ctx.getBean("jobLauncher");
reader = (SkipReaderStub<String>) ctx.getBean("reader");
writer = (SkipWriterStub<String>) ctx.getBean("writer");
tasklet = (ExceptionThrowingTaskletStub) ctx.getBean("tasklet");
}
@Before
@@ -118,9 +121,9 @@ public class FaultTolerantExceptionClassesTests {
public void testSkippableChecked() throws Exception {
writer.setExceptionType(SkippableException.class);
StepExecution stepExecution = launchStep("skippableStep");
// TODO BATCH-1318: assertEquals(BatchStatus.COMPLETED, stepExecution.getStatus());
// TODO BATCH-1318: assertEquals("[1, 2, 3, 1, 2, 3, 4]", writer.getWritten().toString());
// TODO BATCH-1318: assertEquals("[1, 2, 4]", writer.getCommitted().toString());
assertEquals(BatchStatus.COMPLETED, stepExecution.getStatus());
assertEquals("[1, 2, 3, 1, 2, 3, 4]", writer.getWritten().toString());
assertEquals("[1, 2, 4]", writer.getCommitted().toString());
}
@Test
@@ -128,8 +131,8 @@ public class FaultTolerantExceptionClassesTests {
writer.setExceptionType(FatalException.class);
StepExecution stepExecution = launchStep("skippableStep");
assertEquals(BatchStatus.FAILED, stepExecution.getStatus());
// TODO BATCH-1318: assertEquals("[1, 2, 3]", writer.getWritten().toString());
// TODO BATCH-1318: assertEquals("[]", writer.getCommitted().toString());
assertEquals("[1, 2, 3]", writer.getWritten().toString());
assertEquals("[]", writer.getCommitted().toString());
}
@Test
@@ -172,9 +175,9 @@ public class FaultTolerantExceptionClassesTests {
public void testRetryableSkippableChecked() throws Exception {
writer.setExceptionType(SkippableException.class);
StepExecution stepExecution = launchStep("retryable");
// TODO BATCH-1318: assertEquals(BatchStatus.COMPLETED, stepExecution.getStatus());
// TODO BATCH-1318: assertEquals("[1, 2, 3, 1, 2, 3, 1, 2, 3, 4]", writer.getWritten().toString());
// TODO BATCH-1318: assertEquals("[1, 2, 4]", writer.getCommitted().toString());
assertEquals(BatchStatus.COMPLETED, stepExecution.getStatus());
assertEquals("[1, 2, 3, 1, 2, 3, 1, 2, 3, 4]", writer.getWritten().toString());
assertEquals("[1, 2, 4]", writer.getCommitted().toString());
}
@Test
@@ -182,8 +185,8 @@ public class FaultTolerantExceptionClassesTests {
writer.setExceptionType(FatalException.class);
StepExecution stepExecution = launchStep("retryable");
assertEquals(BatchStatus.FAILED, stepExecution.getStatus());
assertEquals("[1, 2, 3, 1, 2, 3, 1, 2, 3]", writer.getWritten().toString());
// TODO BATCH-1318: assertEquals("[]", writer.getCommitted().toString());
// TODO BATCH-1318: assertEquals("[1, 2, 3, 1, 2, 3, 1, 2, 3]", writer.getWritten().toString());
assertEquals("[]", writer.getCommitted().toString());
}
private StepExecution launchStep(String stepName) throws JobExecutionAlreadyRunningException, JobRestartException,