From 7b28b2a8f19cbae17f5b11b8a19faf2c3f1e29ec Mon Sep 17 00:00:00 2001 From: dsyer Date: Sat, 17 Oct 2009 12:49:57 +0000 Subject: [PATCH] RESOLVED - issue BATCH-1420: Late Binding only happens first time when using inner bean definition with collection property --- .../sample/ParallelJobFunctionalTests.java | 40 ------------------- .../PartitionFileJobFunctionalTests.java | 6 +-- .../PartitionJdbcJobFunctionalTests.java | 6 +-- .../common/OutputFileListenerTests.java | 4 +- 4 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 spring-batch-samples/src/test/java/org/springframework/batch/sample/ParallelJobFunctionalTests.java diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/ParallelJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/ParallelJobFunctionalTests.java deleted file mode 100644 index ccb3c2ea8..000000000 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/ParallelJobFunctionalTests.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.springframework.batch.sample; - -import static org.junit.Assert.assertEquals; - -import javax.sql.DataSource; - -import org.junit.runner.RunWith; -import org.springframework.batch.sample.common.StagingItemWriter; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration() -public class ParallelJobFunctionalTests extends AbstractValidatingBatchLauncherTests { - - private SimpleJdbcTemplate jdbcTemplate; - - @Autowired - public void setDataSource(DataSource dataSource) { - this.jdbcTemplate = new SimpleJdbcTemplate(dataSource); - } - - @Override - protected void validatePostConditions() throws Exception { - int count; - count = jdbcTemplate.queryForInt( - "SELECT COUNT(*) from BATCH_STAGING where PROCESSED=?", - StagingItemWriter.NEW); - assertEquals(0, count); - int total = jdbcTemplate.queryForInt( - "SELECT COUNT(*) from BATCH_STAGING"); - count = jdbcTemplate.queryForInt( - "SELECT COUNT(*) from BATCH_STAGING where PROCESSED=?", - StagingItemWriter.DONE); - assertEquals(total, count); - } - -} diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java index be836e103..2943e32b4 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java @@ -47,10 +47,6 @@ public class PartitionFileJobFunctionalTests extends AbstractJobTests { @Qualifier("inputTestReader") private ItemReader inputReader; - @Autowired - @Qualifier("outputTestReader") - private ItemReader outputReader; - /** * Check the resulting credits correspond to inputs increased by fixed * amount. @@ -68,6 +64,8 @@ public class PartitionFileJobFunctionalTests extends AbstractJobTests { JobExecution jobExecution = this.launchJob(); assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); + @SuppressWarnings("unchecked") + ItemReader outputReader = (ItemReader) getApplicationContext().getBean("outputTestReader"); open(outputReader); List outputs = new ArrayList(getCredits(outputReader)); close(outputReader); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java index a6a1b576b..eb27806e8 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java @@ -47,10 +47,6 @@ public class PartitionJdbcJobFunctionalTests extends AbstractJobTests { @Qualifier("inputTestReader") private ItemReader inputReader; - @Autowired - @Qualifier("outputTestReader") - private ItemReader outputReader; - /** * Check the resulting credits correspond to inputs increased by fixed * amount. @@ -68,6 +64,8 @@ public class PartitionJdbcJobFunctionalTests extends AbstractJobTests { JobExecution jobExecution = this.launchJob(); assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); + @SuppressWarnings("unchecked") + ItemReader outputReader = (ItemReader) getApplicationContext().getBean("outputTestReader"); open(outputReader); List outputs = new ArrayList(getCredits(outputReader)); close(outputReader); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/OutputFileListenerTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/OutputFileListenerTests.java index 17b0869c3..ef1df4846 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/OutputFileListenerTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/OutputFileListenerTests.java @@ -1,6 +1,6 @@ package org.springframework.batch.sample.common; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; import org.springframework.batch.core.JobExecution; @@ -38,7 +38,7 @@ public class OutputFileListenerTests { listener.setInputKeyName("spam"); stepExecution.getExecutionContext().putString("spam", "bar"); listener.createOutputNameFromInput(stepExecution); - assertEquals("{outputFile=bar.csv, spam=bar}", stepExecution.getExecutionContext().toString()); + assertEquals("bar.csv", stepExecution.getExecutionContext().getString("outputFile")); } }