From e6ffdc3f03f34b0598f5f7f9deaf86a39c861e8c Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Sat, 26 Mar 2011 11:43:41 +0000 Subject: [PATCH] Decrease likelihood of contention in integration tests that misbehave since 2.1.7 --- .../step/FaultTolerantStepFactoryBeanIntegrationTests.java | 4 +--- .../FaultTolerantStepFactoryBeanRollbackIntegrationTests.java | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/spring-batch-core-tests/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanIntegrationTests.java b/spring-batch-core-tests/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanIntegrationTests.java index a2f8e9e98..64fd0a17c 100644 --- a/spring-batch-core-tests/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanIntegrationTests.java +++ b/spring-batch-core-tests/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanIntegrationTests.java @@ -52,8 +52,6 @@ public class FaultTolerantStepFactoryBeanIntegrationTests { private FaultTolerantStepFactoryBean factory; - private SkipReaderStub reader; - private SkipProcessorStub processor; private SkipWriterStub writer; @@ -74,7 +72,6 @@ public class FaultTolerantStepFactoryBeanIntegrationTests { @Before public void setUp() throws Exception { - reader = new SkipReaderStub(); writer = new SkipWriterStub(dataSource); processor = new SkipProcessorStub(dataSource); @@ -119,6 +116,7 @@ public class FaultTolerantStepFactoryBeanIntegrationTests { SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(dataSource); + SkipReaderStub reader = new SkipReaderStub(); reader.clear(); reader.setItems("1", "2", "3", "4", "5"); factory.setItemReader(reader); diff --git a/spring-batch-core-tests/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanRollbackIntegrationTests.java b/spring-batch-core-tests/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanRollbackIntegrationTests.java index 92a5dafe1..2ba066f78 100644 --- a/spring-batch-core-tests/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanRollbackIntegrationTests.java +++ b/spring-batch-core-tests/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanRollbackIntegrationTests.java @@ -55,8 +55,6 @@ public class FaultTolerantStepFactoryBeanRollbackIntegrationTests { private FaultTolerantStepFactoryBean factory; - private SkipReaderStub reader; - private SkipProcessorStub processor; private SkipWriterStub writer; @@ -77,7 +75,6 @@ public class FaultTolerantStepFactoryBeanRollbackIntegrationTests { @Before public void setUp() throws Exception { - reader = new SkipReaderStub(); writer = new SkipWriterStub(dataSource); processor = new SkipProcessorStub(dataSource); @@ -135,6 +132,7 @@ public class FaultTolerantStepFactoryBeanRollbackIntegrationTests { try { + SkipReaderStub reader = new SkipReaderStub(); reader.clear(); reader.setItems("1", "2", "3", "4", "5"); factory.setItemReader(reader);