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

BATCH-1667: Update to update the StepExecution as the listener is being processed

Browse Source
This commit is contained in:
Michael Minella
2013-01-08 14:17:20 -06:00
committed by Dave Syer
parent e0667121f5
commit f88e8b6ff1
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeStepExecutionListenerTests.java
View File

@@ -21,6 +21,7 @@ import java.util.List;
import junit.framework.TestCase;
import org.springframework.batch.core.ExitStatus;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.StepExecutionListener;
@@ -40,9 +41,12 @@ public class CompositeStepExecutionListenerTests extends TestCase {
* .
*/
public void testSetListeners() {
JobExecution jobExecution = new JobExecution(1l);
StepExecution stepExecution = new StepExecution("s1", jobExecution);
listener.setListeners(new StepExecutionListener[] { new StepExecutionListenerSupport() {
@Override
public ExitStatus afterStep(StepExecution stepExecution) {
assertEquals(ExitStatus.STOPPED, stepExecution.getExitStatus());
list.add("fail");
return ExitStatus.FAILED;
}
@@ -50,10 +54,10 @@ public class CompositeStepExecutionListenerTests extends TestCase {
@Override
public ExitStatus afterStep(StepExecution stepExecution) {
list.add("continue");
return ExitStatus.EXECUTING;
return ExitStatus.STOPPED;
}
} });
assertEquals(ExitStatus.FAILED, listener.afterStep(null));
assertEquals(ExitStatus.FAILED, listener.afterStep(stepExecution));
assertEquals(2, list.size());
}
@@ -63,6 +67,8 @@ public class CompositeStepExecutionListenerTests extends TestCase {
* .
*/
public void testSetListener() {
JobExecution jobExecution = new JobExecution(1l);
StepExecution stepExecution = new StepExecution("s1", jobExecution);
listener.register(new StepExecutionListenerSupport() {
@Override
public ExitStatus afterStep(StepExecution stepExecution) {
@@ -70,7 +76,7 @@ public class CompositeStepExecutionListenerTests extends TestCase {
return ExitStatus.FAILED;
}
});
assertEquals(ExitStatus.FAILED, listener.afterStep(null));
assertEquals(ExitStatus.FAILED, listener.afterStep(stepExecution));
assertEquals(1, list.size());
}

9
spring-batch-core/src/test/java/org/springframework/batch/core/listener/MulticasterBatchListenerTests.java
View File

@@ -24,6 +24,7 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.springframework.batch.core.ExitStatus;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.scope.context.ChunkContext;
@@ -46,6 +47,8 @@ public class MulticasterBatchListenerTests {
@Test
public void testSetListeners() {
JobExecution jobExecution = new JobExecution(1l);
StepExecution stepExecution = new StepExecution("s1", jobExecution);
multicast.setListeners(Arrays.asList(new StepListenerSupport<Integer, String>() {
@Override
public ExitStatus afterStep(StepExecution stepExecution) {
@@ -53,7 +56,7 @@ public class MulticasterBatchListenerTests {
return super.afterStep(stepExecution);
}
}));
multicast.afterStep(null);
multicast.afterStep(stepExecution);
// setListeners is cumulative (should be OK if used for DI)
assertEquals(2, count);
}
@@ -65,6 +68,8 @@ public class MulticasterBatchListenerTests {
*/
@Test
public void testRegister() {
JobExecution jobExecution = new JobExecution(1l);
StepExecution stepExecution = new StepExecution("s1", jobExecution);
multicast.register(new StepListenerSupport<Integer, String>() {
@Override
public ExitStatus afterStep(StepExecution stepExecution) {
@@ -72,7 +77,7 @@ public class MulticasterBatchListenerTests {
return super.afterStep(stepExecution);
}
});
multicast.afterStep(null);
multicast.afterStep(stepExecution);
assertEquals(2, count);
}