From bbe8a7270a25e0f3d4eec0631920c06da7a1a49a Mon Sep 17 00:00:00 2001 From: trisberg Date: Mon, 28 Jul 2008 17:44:50 +0000 Subject: [PATCH] IN PROGRESS - BATCH-672: updated tests to use SimpleJdbcTemplate --- .../AbstractCustomerCreditIncreaseTests.java | 35 +++++++++---------- .../HibernateFailureJobFunctionalTests.java | 4 +-- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java index 0af6d0b1b..9fd9eb5b9 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java @@ -12,9 +12,9 @@ import javax.sql.DataSource; import org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseWriter; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.JdbcOperations; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.core.RowMapper; +import org.springframework.jdbc.core.RowCallbackHandler; +import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; +import org.springframework.jdbc.core.simple.ParameterizedRowMapper; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; @@ -29,7 +29,7 @@ import org.springframework.transaction.support.TransactionTemplate; */ public abstract class AbstractCustomerCreditIncreaseTests extends AbstractValidatingBatchLauncherTests { - protected JdbcOperations jdbcTemplate; + protected SimpleJdbcTemplate simpleJdbcTemplate; protected PlatformTransactionManager transactionManager; @@ -52,7 +52,7 @@ public abstract class AbstractCustomerCreditIncreaseTests extends AbstractValida @Autowired public void setDataSource(DataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.simpleJdbcTemplate = new SimpleJdbcTemplate(dataSource); } @Autowired @@ -68,10 +68,9 @@ public abstract class AbstractCustomerCreditIncreaseTests extends AbstractValida super.validatePreConditions(); ensureState(); creditsBeforeUpdate = (List) new TransactionTemplate(transactionManager).execute(new TransactionCallback() { - public Object doInTransaction(TransactionStatus status) { - - return jdbcTemplate.query(ALL_CUSTOMERS, new RowMapper() { - public Object mapRow(ResultSet rs, int rowNum) throws SQLException { + public Object doInTransaction(TransactionStatus status) { + return simpleJdbcTemplate.query(ALL_CUSTOMERS, new ParameterizedRowMapper() { + public BigDecimal mapRow(ResultSet rs, int rowNum) throws SQLException { return rs.getBigDecimal(CREDIT_COLUMN); } }); @@ -87,9 +86,9 @@ public abstract class AbstractCustomerCreditIncreaseTests extends AbstractValida new TransactionTemplate(transactionManager).execute(new TransactionCallback(){ public Object doInTransaction(TransactionStatus status) { - jdbcTemplate.update(DELETE_CUSTOMERS); + simpleJdbcTemplate.update(DELETE_CUSTOMERS); for (String customer : customers) { - jdbcTemplate.update(customer); + simpleJdbcTemplate.update(customer); } return null; } @@ -106,20 +105,18 @@ public abstract class AbstractCustomerCreditIncreaseTests extends AbstractValida new TransactionTemplate(transactionManager).execute(new TransactionCallback() { public Object doInTransaction(TransactionStatus status) { - jdbcTemplate.query(ALL_CUSTOMERS, new RowMapper() { + simpleJdbcTemplate.getJdbcOperations().query(ALL_CUSTOMERS, new RowCallbackHandler() { - public Object mapRow(ResultSet rs, int rowNum) throws SQLException { - final BigDecimal creditBeforeUpdate = creditsBeforeUpdate.get(rowNum); - System.out.print("BEFORE:" + creditBeforeUpdate); + private int i = 0; + + public void processRow(ResultSet rs) throws SQLException { + final BigDecimal creditBeforeUpdate = creditsBeforeUpdate.get(i++); final BigDecimal expectedCredit = creditBeforeUpdate.add(CREDIT_INCREASE); - System.out.print(" EXPECTED:" + expectedCredit); if (expectedCredit.equals(rs.getBigDecimal(CREDIT_COLUMN))) { matches.add(rs.getBigDecimal(ID_COLUMN)); } - System.out.println(" ACTUAL: " + rs.getBigDecimal(CREDIT_COLUMN)); - return null; } - + }); return null; } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java index cf6cb69ce..44f3bf609 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java @@ -48,7 +48,7 @@ public class HibernateFailureJobFunctionalTests extends AbstractCustomerCreditIn setJobParameters(params); writer.setFailOnFlush(2); - int before = jdbcTemplate.queryForInt("SELECT COUNT(*) from CUSTOMER"); + int before = simpleJdbcTemplate.queryForInt("SELECT COUNT(*) from CUSTOMER"); assertTrue(before > 0); try { super.testLaunchJob(); @@ -62,7 +62,7 @@ public class HibernateFailureJobFunctionalTests extends AbstractCustomerCreditIn // assertEquals(1, writer.getErrors().size()); throw e; } - int after = jdbcTemplate.queryForInt("SELECT COUNT(*) from CUSTOMER"); + int after = simpleJdbcTemplate.queryForInt("SELECT COUNT(*) from CUSTOMER"); assertEquals(before, after); }