From 7c3e80eed87cdb883d96a87634395c08925651cc Mon Sep 17 00:00:00 2001 From: trisberg Date: Mon, 28 Jul 2008 17:25:08 +0000 Subject: [PATCH] IN PROGRESS - BATCH-672: Updated tests to use EasyMock 2.4 API --- .../CustomerCreditRowMapperTests.java | 15 ++++++------- .../CustomerCreditUpdateProcessorTests.java | 18 +++++++--------- .../FlatFileCustomerCreditDaoTests.java | 2 -- .../trade/internal/TradeProcessorTests.java | 12 +++++------ .../trade/internal/TradeRowMapperTests.java | 21 +++++++------------ .../support/AbstractRowMapperTests.java | 18 ++++++++-------- 6 files changed, 35 insertions(+), 51 deletions(-) diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapperTests.java index 1a23ea7ff..714d698b2 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditRowMapperTests.java @@ -1,12 +1,12 @@ package org.springframework.batch.sample.domain.trade.internal; +import static org.easymock.EasyMock.*; + import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; -import org.easymock.MockControl; import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.internal.CustomerCreditRowMapper; import org.springframework.batch.sample.support.AbstractRowMapperTests; import org.springframework.jdbc.core.RowMapper; @@ -31,13 +31,10 @@ public class CustomerCreditRowMapperTests extends AbstractRowMapperTests { return new CustomerCreditRowMapper(); } - protected void setUpResultSetMock(ResultSet rs, MockControl rsControl) throws SQLException { - rs.getInt(CustomerCreditRowMapper.ID_COLUMN); - rsControl.setReturnValue(ID); - rs.getString(CustomerCreditRowMapper.NAME_COLUMN); - rsControl.setReturnValue(CUSTOMER); - rs.getBigDecimal(CustomerCreditRowMapper.CREDIT_COLUMN); - rsControl.setReturnValue(CREDIT); + protected void setUpResultSetMock(ResultSet rs) throws SQLException { + expect(rs.getInt(CustomerCreditRowMapper.ID_COLUMN)).andReturn(ID); + expect(rs.getString(CustomerCreditRowMapper.NAME_COLUMN)).andReturn(CUSTOMER); + expect(rs.getBigDecimal(CustomerCreditRowMapper.CREDIT_COLUMN)).andReturn(CREDIT); } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateProcessorTests.java index 5506eafcc..b7cbf9879 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateProcessorTests.java @@ -1,17 +1,16 @@ package org.springframework.batch.sample.domain.trade.internal; +import static org.easymock.EasyMock.*; + import java.math.BigDecimal; -import org.easymock.MockControl; import org.junit.Before; import org.junit.Test; import org.springframework.batch.sample.domain.trade.CustomerCredit; import org.springframework.batch.sample.domain.trade.CustomerCreditDao; -import org.springframework.batch.sample.domain.trade.internal.CustomerCreditUpdateWriter; public class CustomerCreditUpdateProcessorTests { - private MockControl daoControl; private CustomerCreditDao dao; private CustomerCreditUpdateWriter writer; private static final double CREDIT_FILTER = 355.0; @@ -19,8 +18,7 @@ public class CustomerCreditUpdateProcessorTests { @Before public void setUp() { //create mock writer - daoControl = MockControl.createControl(CustomerCreditDao.class); - dao = daoControl.getMock(); + dao = createMock(CustomerCreditDao.class); //create processor, set writer and credit filter writer = new CustomerCreditUpdateWriter(); writer.setDao(dao); @@ -31,7 +29,7 @@ public class CustomerCreditUpdateProcessorTests { public void testProcess() throws Exception { //set-up mock writer - no writer's method should be called - daoControl.replay(); + replay(dao); //create credit and set it to same value as credit filter CustomerCredit credit = new CustomerCredit(); @@ -40,20 +38,20 @@ public class CustomerCreditUpdateProcessorTests { writer.write(credit); //verify method calls - no method should be called //because credit is not greater then credit filter - daoControl.verify(); + verify(dao); //change credit to be greater than credit filter credit.setCredit(new BigDecimal(CREDIT_FILTER + 1)); //reset and set-up writer - write method is expected to be called - daoControl.reset(); + reset(dao); dao.writeCredit(credit); - daoControl.replay(); + replay(dao); //call tested method writer.write(credit); //verify method calls - daoControl.verify(); + verify(dao); } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java index 8c042852a..4c9827406 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java @@ -27,11 +27,9 @@ import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemStream; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.batch.sample.domain.trade.internal.FlatFileCustomerCreditDao; public class FlatFileCustomerCreditDaoTests { - //private MockControl outputControl; private ResourceLifecycleItemWriter output; private FlatFileCustomerCreditDao writer; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessorTests.java index 999da7a34..d0f6216d2 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessorTests.java @@ -1,15 +1,14 @@ package org.springframework.batch.sample.domain.trade.internal; -import org.easymock.MockControl; +import static org.easymock.EasyMock.*; + import org.junit.Before; import org.junit.Test; import org.springframework.batch.sample.domain.trade.Trade; import org.springframework.batch.sample.domain.trade.TradeDao; -import org.springframework.batch.sample.domain.trade.internal.TradeWriter; public class TradeProcessorTests { - private MockControl writerControl; private TradeDao writer; private TradeWriter processor; @@ -17,8 +16,7 @@ public class TradeProcessorTests { public void setUp() { //create mock writer - writerControl = MockControl.createControl(TradeDao.class); - writer = writerControl.getMock(); + writer = createMock(TradeDao.class); //create processor processor = new TradeWriter(); @@ -31,13 +29,13 @@ public class TradeProcessorTests { Trade trade = new Trade(); //set-up mock writer writer.writeTrade(trade); - writerControl.replay(); + replay(writer); //call tested method processor.write(trade); //verify method calls - writerControl.verify(); + verify(writer); } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapperTests.java index 02845dad9..5c99f4552 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeRowMapperTests.java @@ -1,12 +1,12 @@ package org.springframework.batch.sample.domain.trade.internal; +import static org.easymock.EasyMock.*; + import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; -import org.easymock.MockControl; import org.springframework.batch.sample.domain.trade.Trade; -import org.springframework.batch.sample.domain.trade.internal.TradeRowMapper; import org.springframework.batch.sample.support.AbstractRowMapperTests; import org.springframework.jdbc.core.RowMapper; @@ -30,18 +30,11 @@ public class TradeRowMapperTests extends AbstractRowMapperTests { return new TradeRowMapper(); } - protected void setUpResultSetMock(ResultSet rs, MockControl rsControl) throws SQLException { - rs.getString(TradeRowMapper.ISIN_COLUMN); - rsControl.setReturnValue(ISIN); - - rs.getLong(TradeRowMapper.QUANTITY_COLUMN); - rsControl.setReturnValue(QUANTITY); - - rs.getBigDecimal(TradeRowMapper.PRICE_COLUMN); - rsControl.setReturnValue(PRICE); - - rs.getString(TradeRowMapper.CUSTOMER_COLUMN); - rsControl.setReturnValue(CUSTOMER); + protected void setUpResultSetMock(ResultSet rs) throws SQLException { + expect(rs.getString(TradeRowMapper.ISIN_COLUMN)).andReturn(ISIN); + expect(rs.getLong(TradeRowMapper.QUANTITY_COLUMN)).andReturn(QUANTITY); + expect(rs.getBigDecimal(TradeRowMapper.PRICE_COLUMN)).andReturn(PRICE); + expect(rs.getString(TradeRowMapper.CUSTOMER_COLUMN)).andReturn(CUSTOMER); } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractRowMapperTests.java index 064983f8f..6ce1fde3f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractRowMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractRowMapperTests.java @@ -1,11 +1,12 @@ package org.springframework.batch.sample.support; +import static org.easymock.EasyMock.*; + import java.sql.ResultSet; import java.sql.SQLException; import junit.framework.TestCase; -import org.easymock.MockControl; import org.springframework.jdbc.core.RowMapper; /** @@ -19,9 +20,8 @@ public abstract class AbstractRowMapperTests extends TestCase { private static final int IGNORED_ROW_NUMBER = 0; //mock result set - private MockControl rsControl = MockControl.createControl(ResultSet.class); - private ResultSet rs = rsControl.getMock(); - + private ResultSet rs = createMock(ResultSet.class); + /** * @return Expected result of mapping the mock ResultSet by * the mapper being tested. @@ -33,18 +33,18 @@ public abstract class AbstractRowMapperTests extends TestCase { */ abstract protected RowMapper rowMapper(); - /** + /* * Define the behaviour of mock ResultSet. */ - abstract protected void setUpResultSetMock(ResultSet rs, MockControl rsControl) throws SQLException; + abstract protected void setUpResultSetMock(ResultSet rs) throws SQLException; - /** + /* * Regular usage scenario. */ public void testRegularUse() throws SQLException { - setUpResultSetMock(rs, rsControl); - rsControl.replay(); + setUpResultSetMock(rs); + replay(rs); assertEquals(expectedDomainObject(), rowMapper().mapRow(rs, IGNORED_ROW_NUMBER)); }