diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessorTests.java index bd1900bb9..d0e2de168 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessorTests.java @@ -172,6 +172,14 @@ public class FaultTolerantChunkProcessorTests { catch (RuntimeException e) { assertEquals("Expected Exception!", e.getMessage()); } + // BATCH-1518: ideally we would not want this to be necessary, but it still is... + try { + processor.process(contribution, inputs); + fail("Expected RuntimeException"); + } + catch (RuntimeException e) { + assertEquals("Expected Exception!", e.getMessage()); + } processor.process(contribution, inputs); assertEquals(1, contribution.getSkipCount()); assertEquals(0, contribution.getWriteCount()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRetryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRetryTests.java index 8a17ed88c..21decea49 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRetryTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRetryTests.java @@ -304,7 +304,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { assertEquals(expectedOutput, written); assertEquals("[a, b, c, d, e, f, null]", provided.toString()); - assertEquals("[a, b, b, b, b, b, c, d, d, d, d, d, e, f]", processed.toString()); + assertEquals("[a, b, b, b, b, b, b, c, d, d, d, d, d, d, e, f]", processed.toString()); assertEquals("[b, d]", recovered.toString()); } @@ -405,7 +405,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { assertEquals(1, provided.size()); // the failed items are tried up to the limit (but only precisely so if // the commit interval is 1) - assertEquals("[b, b, b, b]", processed.toString()); + assertEquals("[b, b, b, b, b]", processed.toString()); // [] assertEquals(0, recovered.size()); assertEquals(1, stepExecution.getReadCount()); @@ -496,7 +496,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { assertEquals(0, stepExecution.getSkipCount()); // [b] assertEquals(1, provided.size()); - assertEquals("[b, b, b, b]", processed.toString()); + assertEquals("[b, b, b, b, b]", processed.toString()); // [] assertEquals(0, recovered.size()); assertEquals(1, stepExecution.getReadCount());