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

Merge conflict

Browse Source
This commit is contained in:
Michael Minella
2013-07-26 17:00:05 -05:00
parent 1061041f29 853c960bdf
commit 7e85b50616
41 changed files with 720 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessorTests.java
View File

@@ -486,6 +486,80 @@ public class FaultTolerantChunkProcessorTests {
assertEquals(1, contribution.getWriteCount());
assertEquals(0, contribution.getFilterCount());
}
@Test
// BATCH-2036
public void testProcessFilterAndSkippableException() throws Exception {
final List<String> processedItems = new ArrayList<String>();
processor.setProcessorTransactional(false);
processor.setProcessSkipPolicy(new AlwaysSkipItemSkipPolicy());
processor.setItemProcessor(new ItemProcessor<String, String>() {
@Override
public String process(String item) throws Exception {
processedItems.add(item);
if (item.contains("fail")) {
throw new IllegalArgumentException("Expected Skippable Exception!");
}
if (item.contains("skip")) {
return null;
}
return item;
}
});
processor.afterPropertiesSet();
Chunk<String> inputs = new Chunk<String>(Arrays.asList("1", "2", "skip", "skip", "3", "fail", "fail", "4", "5"));
try {
processor.process(contribution, inputs);
fail("Expected IllegalArgumentException");
} catch (IllegalArgumentException e) {
assertEquals("Expected Skippable Exception!", e.getMessage());
}
try {
processor.process(contribution, inputs);
fail("Expected IllegalArgumentException");
} catch (IllegalArgumentException e) {
assertEquals("Expected Skippable Exception!", e.getMessage());
}
processor.process(contribution, inputs);
assertEquals(5, list.size());
assertEquals("[1, 2, 3, 4, 5]", list.toString());
assertEquals(2, contribution.getFilterCount());
assertEquals(2, contribution.getProcessSkipCount());
assertEquals(9, processedItems.size());
assertEquals("[1, 2, skip, skip, 3, fail, fail, 4, 5]", processedItems.toString());
}
@Test
// BATCH-2036
public void testProcessFilterAndSkippableExceptionNoRollback() throws Exception {
final List<String> processedItems = new ArrayList<String>();
processor.setProcessorTransactional(false);
processor.setProcessSkipPolicy(new AlwaysSkipItemSkipPolicy());
processor.setItemProcessor(new ItemProcessor<String, String>() {
@Override
public String process(String item) throws Exception {
processedItems.add(item);
if (item.contains("fail")) {
throw new IllegalArgumentException("Expected Skippable Exception!");
}
if (item.contains("skip")) {
return null;
}
return item;
}
});
processor.setRollbackClassifier(new BinaryExceptionClassifier(Collections
.<Class<? extends Throwable>> singleton(IllegalArgumentException.class), false));
processor.afterPropertiesSet();
Chunk<String> inputs = new Chunk<String>(Arrays.asList("1", "2", "skip", "skip", "3", "fail", "fail", "4", "5"));
processor.process(contribution, inputs);
assertEquals(5, list.size());
assertEquals("[1, 2, 3, 4, 5]", list.toString());
assertEquals(2, contribution.getFilterCount());
assertEquals(2, contribution.getProcessSkipCount());
assertEquals(9, processedItems.size());
assertEquals("[1, 2, skip, skip, 3, fail, fail, 4, 5]", processedItems.toString());
}
protected void processAndExpectPlannedRuntimeException(Chunk<String> chunk)
throws Exception {