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

BATCH-798: Fixed bug in skip on process (the wrong state was being used for retry).

Browse Source
This commit is contained in:
dsyer
2008-08-30 12:16:15 +00:00
parent d264bf2aaa
commit dd46e7c2f6
7 changed files with 255 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,83 @@
/*
* 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.step.item;
import static org.junit.Assert.*;
import org.junit.Test;
/**
* @author Dave Syer
*
*/
public class ItemWrapperTests {
private Exception exception = new RuntimeException();
/**
* Test method for {@link org.springframework.batch.core.step.item.ItemWrapper#ItemWrapper(java.lang.Object)}.
*/
@Test
public void testItemWrapperT() {
ItemWrapper<String> wrapper = new ItemWrapper<String>("foo");
assertEquals("foo", wrapper.getItem());
assertEquals(null, wrapper.getException());
assertEquals(0, wrapper.getSkipCount());
}
/**
* Test method for {@link org.springframework.batch.core.step.item.ItemWrapper#ItemWrapper(java.lang.Object, int)}.
*/
@Test
public void testItemWrapperTInt() {
ItemWrapper<String> wrapper = new ItemWrapper<String>("foo",2);
assertEquals("foo", wrapper.getItem());
assertEquals(null, wrapper.getException());
assertEquals(2, wrapper.getSkipCount());
}
/**
* Test method for {@link org.springframework.batch.core.step.item.ItemWrapper#ItemWrapper(java.lang.Object, java.lang.Exception)}.
*/
@Test
public void testItemWrapperTException() {
ItemWrapper<String> wrapper = new ItemWrapper<String>("foo",exception);
assertEquals("foo", wrapper.getItem());
assertEquals(exception, wrapper.getException());
assertEquals(0, wrapper.getSkipCount());
}
/**
* Test method for {@link org.springframework.batch.core.step.item.ItemWrapper#ItemWrapper(java.lang.Object, java.lang.Exception, int)}.
*/
@Test
public void testItemWrapperTExceptionInt() {
ItemWrapper<String> wrapper = new ItemWrapper<String>("foo", exception, 2);
assertEquals("foo", wrapper.getItem());
assertEquals(exception , wrapper.getException());
assertEquals(2, wrapper.getSkipCount());
}
/**
* Test method for {@link org.springframework.batch.core.step.item.ItemWrapper#toString()}.
*/
@Test
public void testToString() {
ItemWrapper<String> wrapper = new ItemWrapper<String>("foo");
assertTrue("foo", wrapper.toString().contains("foo"));
}
}

77
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryTaskletTests.java
View File

@@ -49,7 +49,7 @@ import org.springframework.batch.support.Classifier;
*
*/
public class StatefulRetryTaskletTests {
private Log logger = LogFactory.getLog(getClass());
private int count = 0;
@@ -61,7 +61,7 @@ public class StatefulRetryTaskletTests {
private List<String> written = new ArrayList<String>();
private List<Integer> processed = new ArrayList<Integer>();
private StatefulRetryTasklet<Integer, String> handler;
private RepeatTemplate chunkOperations = new RepeatTemplate();
@@ -85,7 +85,7 @@ public class StatefulRetryTaskletTests {
};
private RetryTemplate retryTemplate = new RetryTemplate();
private Classifier<Throwable, Boolean> rollbackClassifier = new Classifier<Throwable, Boolean>() {
public Boolean classify(Throwable classifiable) {
return true;
@@ -103,7 +103,6 @@ public class StatefulRetryTaskletTests {
private ItemSkipPolicy writeSkipPolicy = readSkipPolicy;
@Before
public void setUp() {
retryTemplate.setRetryPolicy(new NeverRetryPolicy());
@@ -124,7 +123,8 @@ public class StatefulRetryTaskletTests {
public Integer read() throws Exception, UnexpectedInputException, NoWorkFoundException, ParseException {
throw new RuntimeException("Barf!");
}
}, itemProcessor, itemWriter, chunkOperations, retryTemplate, rollbackClassifier, readSkipPolicy, writeSkipPolicy, writeSkipPolicy);
}, itemProcessor, itemWriter, chunkOperations, retryTemplate, rollbackClassifier, readSkipPolicy,
writeSkipPolicy, writeSkipPolicy);
chunkOperations.setCompletionPolicy(new SimpleCompletionPolicy(1));
StepContribution contribution = new StepExecution("foo", null).createStepContribution();
BasicAttributeAccessor attributes = new BasicAttributeAccessor();
@@ -168,7 +168,7 @@ public class StatefulRetryTaskletTests {
public void testSkipMultipleItemsOnWrite() throws Exception {
handler = new StatefulRetryTasklet<Integer, String>(itemReader, itemProcessor, new ItemWriter<String>() {
public void write(List<? extends String> items) throws Exception {
logger.debug("Writing items: "+items);
logger.debug("Writing items: " + items);
written.addAll(items);
throw new RuntimeException("Barf!");
}
@@ -176,12 +176,12 @@ public class StatefulRetryTaskletTests {
chunkOperations.setCompletionPolicy(new SimpleCompletionPolicy(2));
StepContribution contribution = new StepExecution("foo", null).createStepContribution();
BasicAttributeAccessor attributes = new BasicAttributeAccessor();
// Count to 3: (try + skip + skip)
// Count to 3: (try + skip + skip)
for (int i = 0; i < 3; i++) {
try {
handler.execute(contribution, attributes);
fail("Expected RuntimeException on i="+i);
fail("Expected RuntimeException on i=" + i);
}
catch (Exception e) {
assertEquals("Barf!", e.getMessage());
@@ -216,24 +216,64 @@ public class StatefulRetryTaskletTests {
}
@Test
public void testSkipMultipleItemsOnProcess() throws Exception {
public void testSkipSingleItemOnProcess() throws Exception {
handler = new StatefulRetryTasklet<Integer, String>(itemReader, new ItemProcessor<Integer, String>() {
public String process(Integer item) throws Exception {
logger.debug("Processing item: "+item);
logger.debug("Processing item: " + item);
processed.add(item);
if (item == 3) {
throw new RuntimeException("Barf!");
}
return "p" + item;
}
}, itemWriter, chunkOperations, retryTemplate, rollbackClassifier, readSkipPolicy, writeSkipPolicy,
writeSkipPolicy);
chunkOperations.setCompletionPolicy(new SimpleCompletionPolicy(3));
StepContribution contribution = new StepExecution("foo", null).createStepContribution();
BasicAttributeAccessor attributes = new BasicAttributeAccessor();
// try
try {
handler.execute(contribution, attributes);
fail("Expected RuntimeException");
}
catch (Exception e) {
assertEquals("Barf!", e.getMessage());
}
assertTrue(attributes.hasAttribute("INPUT_BUFFER_KEY"));
@SuppressWarnings("unchecked")
Chunk<Integer> chunk = (Chunk<Integer>) attributes.getAttribute("INPUT_BUFFER_KEY");
// skip...
handler.execute(contribution, attributes);
assertEquals(1, chunk.getSkips().size());
assertEquals(2, contribution.getItemCount());
assertEquals(1, contribution.getProcessSkipCount());
assertEquals(5, processed.size());
assertEquals("[p1, p2]", written.toString());
}
@Test
public void testSkipOverLimitOnProcess() throws Exception {
handler = new StatefulRetryTasklet<Integer, String>(itemReader, new ItemProcessor<Integer, String>() {
public String process(Integer item) throws Exception {
logger.debug("Processing item: " + item);
processed.add(item);
throw new RuntimeException("Barf!");
}
}
, itemWriter, chunkOperations, retryTemplate, rollbackClassifier, readSkipPolicy, writeSkipPolicy, writeSkipPolicy);
}, itemWriter, chunkOperations, retryTemplate, rollbackClassifier, readSkipPolicy, writeSkipPolicy,
writeSkipPolicy);
chunkOperations.setCompletionPolicy(new SimpleCompletionPolicy(2));
StepContribution contribution = new StepExecution("foo", null).createStepContribution();
BasicAttributeAccessor attributes = new BasicAttributeAccessor();
// Count to 3: (try + skip + try)
for (int i = 0; i < 3; i++) {
// Count to 3: (try + skip + try)
for (int i = 0; i < 2; i++) {
try {
handler.execute(contribution, attributes);
fail("Expected RuntimeException on i="+i);
fail("Expected RuntimeException on i=" + i);
}
catch (Exception e) {
assertEquals("Barf!", e.getMessage());
@@ -264,8 +304,9 @@ public class StatefulRetryTaskletTests {
// expected
}
assertTrue(attributes.hasAttribute("INPUT_BUFFER_KEY"));
assertEquals(3, contribution.getItemCount());
assertEquals(0, contribution.getItemCount());
assertEquals(2, contribution.getProcessSkipCount());
// Just before the skip at the end we process once more
assertEquals(3, processed.size());
}
}