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

RESOLVED - issue BATCH-461: skip counting

Browse Source 
http://jira.springframework.org/browse/BATCH-461

ItemOrientedStep now increments StepExecution's skipCount from StepContribution on rollback.
Simple assert checking the correct value of StepExecution#skipCount added to SkipLimitStepFactoryBeanTests.

Btw. renamed StepContribution#taskCount to itemCount
This commit is contained in:
robokaso
2008-03-17 10:20:48 +00:00
parent c506f28d8c
commit f202dd4b44
6 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-batch-core/src/test/java/org/springframework/batch/core/StepContributionTests.java
View File

@@ -29,12 +29,12 @@ public class StepContributionTests extends TestCase {
/**
* Test method for
* {@link org.springframework.batch.core.StepContribution#incrementTaskCount()}.
* {@link org.springframework.batch.core.StepContribution#incrementItemCount()}.
*/
public void testIncrementTaskCount() {
assertEquals(0, contribution.getTaskCount());
contribution.incrementTaskCount();
assertEquals(1, contribution.getTaskCount());
assertEquals(0, contribution.getItemCount());
contribution.incrementItemCount();
assertEquals(1, contribution.getItemCount());
}
/**

2
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java
View File

@@ -140,7 +140,7 @@ public class ItemOrientedStepTests extends TestCase {
itemOrientedStep.processChunk(stepExecution, contribution);
assertEquals(1, processed.size());
assertEquals(0, stepExecution.getItemCount().intValue());
assertEquals(1, contribution.getTaskCount());
assertEquals(1, contribution.getItemCount());
}

4
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBeanTests.java
View File

@@ -68,12 +68,13 @@ public class SkipLimitStepFactoryBeanTests extends TestCase {
StepExecution stepExecution = new StepExecution(step, jobExecution);
step.execute(stepExecution);
assertEquals(2, stepExecution.getSkipCount());
assertTrue(reader.skipped.contains("2"));
assertTrue(reader.skipped.contains("4"));
// writer did not skip "2" as it never made it to writer, only "4" did
assertTrue(writer.skipped.contains("4"));
// TODO when reader throws exception on "2", it results in writer skipping "1"
String[] expectedOutput = { "1", "3", "5" };
for (int i = 0; i < expectedOutput.length; i++) {
@@ -81,6 +82,7 @@ public class SkipLimitStepFactoryBeanTests extends TestCase {
.contains(expectedOutput[i]));
}
assertTrue(writer.written.size() == expectedOutput.length);
}
/**