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

IN PROGRESS - BATCH-774: Split item count into read/write/filter

Browse Source 
removed itemCount from StepExecution
This commit is contained in:
robokaso
2008-09-03 13:33:42 +00:00
parent 740d299c80
commit 9e07cda1b3
11 changed files with 31 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-batch-core/src/test/java/org/springframework/batch/core/StepExecutionTests.java
View File

@@ -110,15 +110,6 @@ public class StepExecutionTests extends TestCase {
assertEquals(123, execution.getCommitCount());
}
/**
* Test method for
* {@link org.springframework.batch.core.StepExecution#getItemCount()}.
*/
public void testGetTaskCount() {
execution.setItemCount(123);
assertEquals(123, execution.getItemCount());
}
public void testGetFilterCount() {
execution.setFilterCount(123);
assertEquals(123, execution.getFilterCount());
@@ -132,14 +123,12 @@ public class StepExecutionTests extends TestCase {
StepContribution contribution = execution.createStepContribution();
contribution.incrementReadSkipCount();
contribution.incrementWriteSkipCount();
contribution.incrementItemCount();
contribution.incrementReadCount();
contribution.incrementWriteCount();
contribution.incrementFilterCount(1);
execution.apply(contribution);
assertEquals(1, execution.getReadSkipCount());
assertEquals(1, execution.getWriteSkipCount());
assertEquals(1, execution.getItemCount());
assertEquals(1, execution.getReadCount());
assertEquals(1, execution.getWriteCount());
assertEquals(1, execution.getFilterCount());
@@ -162,7 +151,9 @@ public class StepExecutionTests extends TestCase {
}
public void testToString() throws Exception {
assertTrue("Should contain item count: " + execution.toString(), execution.toString().indexOf("item") >= 0);
assertTrue("Should contain read count: " + execution.toString(), execution.toString().indexOf("read") >= 0);
assertTrue("Should contain write count: " + execution.toString(), execution.toString().indexOf("write") >= 0);
assertTrue("Should contain filter count: " + execution.toString(), execution.toString().indexOf("filter") >= 0);
assertTrue("Should contain commit count: " + execution.toString(), execution.toString().indexOf("commit") >= 0);
assertTrue("Should contain rollback count: " + execution.toString(),
execution.toString().indexOf("rollback") >= 0);

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

@@ -37,7 +37,7 @@ public class NoWorkFoundStepExecutionListenerTests extends TestCase {
new JobExecution(
new JobInstance(new Long(1), new JobParameters(), "NoProcessingJob")));
stepExecution.setItemCount(0);
stepExecution.setReadCount(0);
try {
tested.afterStep(stepExecution);

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

@@ -99,7 +99,7 @@ public class SkipLimitStepFactoryBeanTests {
List<String> expectedOutput = Arrays.asList(StringUtils.commaDelimitedListToStringArray("1,3,5"));
assertEquals(expectedOutput, writer.written);
assertEquals(4, stepExecution.getItemCount());
assertEquals(4, stepExecution.getReadCount());
}
@@ -126,7 +126,7 @@ public class SkipLimitStepFactoryBeanTests {
// no rollbacks
assertEquals(0, stepExecution.getRollbackCount());
assertEquals(4, stepExecution.getItemCount());
assertEquals(4, stepExecution.getReadCount());
}

10
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBeanTests.java
View File

@@ -168,7 +168,7 @@ public class StatefulRetryStepFactoryBeanTests {
assertEquals(2, processed.size());
// []
assertEquals(0, recovered.size());
assertEquals(2, stepExecution.getItemCount());
assertEquals(2, stepExecution.getReadCount());
assertEquals(0, stepExecution.getReadSkipCount());
}
@@ -200,7 +200,7 @@ public class StatefulRetryStepFactoryBeanTests {
assertEquals(2, stepExecution.getSkipCount());
// b is processed once and skipped, plus 1, plus c, plus the null at end
assertEquals(7, count);
assertEquals(4, stepExecution.getItemCount());
assertEquals(4, stepExecution.getReadCount());
}
@Test
@@ -381,7 +381,7 @@ public class StatefulRetryStepFactoryBeanTests {
assertEquals(4, processed.size());
// []
assertEquals(0, recovered.size());
assertEquals(1, stepExecution.getItemCount());
assertEquals(1, stepExecution.getReadCount());
}
@Test
@@ -438,7 +438,7 @@ public class StatefulRetryStepFactoryBeanTests {
assertEquals(1, processed.size());
// []
assertEquals(0, recovered.size());
assertEquals(1, stepExecution.getItemCount());
assertEquals(1, stepExecution.getReadCount());
}
@Test
@@ -484,7 +484,7 @@ public class StatefulRetryStepFactoryBeanTests {
assertEquals(4, processed.size());
// []
assertEquals(0, recovered.size());
assertEquals(1, stepExecution.getItemCount());
assertEquals(1, stepExecution.getReadCount());
}
@Test

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

@@ -114,7 +114,7 @@ public class StatefulRetryTaskletTests {
retryTemplate, rollbackClassifier, readSkipPolicy, writeSkipPolicy, writeSkipPolicy);
StepContribution contribution = new StepExecution("foo", null).createStepContribution();
handler.execute(contribution, new BasicAttributeAccessor());
assertEquals(limit, contribution.getItemCount());
assertEquals(limit, contribution.getReadCount());
}
@Test
@@ -159,7 +159,7 @@ public class StatefulRetryTaskletTests {
}
assertTrue(attributes.hasAttribute("OUTPUT_BUFFER_KEY"));
handler.execute(contribution, attributes);
assertEquals(1, contribution.getItemCount());
assertEquals(1, contribution.getReadCount());
assertEquals(1, contribution.getWriteSkipCount());
assertEquals(1, written.size());
}
@@ -210,7 +210,7 @@ public class StatefulRetryTaskletTests {
// expected
}
assertTrue(attributes.hasAttribute("OUTPUT_BUFFER_KEY"));
assertEquals(3, contribution.getItemCount());
assertEquals(3, contribution.getReadCount());
assertEquals(2, contribution.getWriteSkipCount());
assertEquals(5, written.size());
}
@@ -249,7 +249,7 @@ public class StatefulRetryTaskletTests {
handler.execute(contribution, attributes);
assertEquals(1, chunk.getSkips().size());
assertEquals(2, contribution.getItemCount());
assertEquals(2, contribution.getReadCount());
assertEquals(1, contribution.getProcessSkipCount());
assertEquals(5, processed.size());
assertEquals("[p1, p2]", written.toString());

8
spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TasketStepTests.java
View File

@@ -134,7 +134,7 @@ public class TasketStepTests {
step.execute(stepExecution);
assertEquals(1, processed.size());
assertEquals(1, stepExecution.getItemCount());
assertEquals(1, stepExecution.getReadCount());
assertEquals(1, stepExecution.getCommitCount());
}
@@ -155,7 +155,7 @@ public class TasketStepTests {
step.execute(stepExecution);
assertEquals(3, processed.size());
assertEquals(3, stepExecution.getItemCount());
assertEquals(3, stepExecution.getReadCount());
assertTrue(3 <= jobRepository.updateCount);
}
@@ -804,7 +804,7 @@ public class TasketStepTests {
step.execute(stepExecution);
assertEquals(3, processed.size());
assertEquals(3, stepExecution.getItemCount());
assertEquals(3, stepExecution.getReadCount());
}
/**
@@ -845,7 +845,7 @@ public class TasketStepTests {
public void update(StepExecution stepExecution) {
updateCount++;
if (updateCount <= 3) {
assertEquals(updateCount, stepExecution.getItemCount());
assertEquals(updateCount, stepExecution.getReadCount());
}
}