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

RESOLVED - issue BATCH-1272: Write skips do not work in a multi-threaded step

Browse Source 
http://jira.springframework.org/browse/BATCH-1272
This commit is contained in:
dsyer
2009-06-04 16:12:22 +00:00
parent a4645563ca
commit 19a12f0036
4 changed files with 60 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/StepContextRepeatCallbackTests.java
View File

@@ -15,10 +15,13 @@
*/
package org.springframework.batch.core.scope.context;
import static org.junit.Assert.fail;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.concurrent.CountDownLatch;
import org.junit.After;
import org.junit.Test;
import org.springframework.batch.core.ExitStatus;
@@ -28,6 +31,7 @@ import org.springframework.batch.core.scope.context.StepContextRepeatCallback;
import org.springframework.batch.core.scope.context.StepSynchronizationManager;
import org.springframework.batch.repeat.RepeatContext;
import org.springframework.batch.repeat.RepeatStatus;
import org.springframework.batch.repeat.context.RepeatContextSupport;
/**
* @author Dave Syer
@@ -58,7 +62,7 @@ public class StepContextRepeatCallbackTests {
}
@Test
public void testUnfinishedWork() throws Exception {
public void testAddingAttributes() throws Exception {
StepSynchronizationManager.register(stepExecution);
StepContextRepeatCallback callback = new StepContextRepeatCallback(stepExecution) {
@Override
@@ -73,11 +77,37 @@ public class StepContextRepeatCallbackTests {
return RepeatStatus.FINISHED;
}
};
callback.doInIteration(null);
assertEquals(RepeatStatus.FINISHED, callback.doInIteration(null));
assertTrue(addedAttribute);
callback.doInIteration(null);
assertTrue(removedAttribute);
callback.doInIteration(null);
assertFalse(removedAttribute);
}
@Test
public void testUnfinishedWork() throws Exception {
StepSynchronizationManager.register(stepExecution);
final CountDownLatch latch = new CountDownLatch(2);
final StepContextRepeatCallback callback = new StepContextRepeatCallback(stepExecution) {
@Override
public RepeatStatus doInChunkContext(RepeatContext context, ChunkContext chunkContext) throws Exception {
if (context==null) latch.await();
return RepeatStatus.FINISHED;
}
};
new Thread(new Runnable() {
public void run() {
try {
callback.doInIteration(null);
}
catch (Exception e) {
fail(e.getMessage());
}
}
}).start();
assertEquals(RepeatStatus.CONTINUABLE, callback.doInIteration(new RepeatContextSupport(null)));
latch.countDown();
}
}

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

@@ -12,7 +12,6 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.JobExecution;
@@ -358,7 +357,6 @@ public class FaultTolerantStepFactoryBeanRollbackTests {
}
@Test
@Ignore
public void testMultithreadedSkipInWriter() throws Exception {
writer.setFailures("1", "2", "3", "4", "5");
factory.setCommitInterval(3);