diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java index 8b743e277..08ca468f5 100644 --- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java +++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java @@ -46,13 +46,13 @@ public class BatchMessageListenerContainerTests extends TestCase { template.setCompletionPolicy(new SimpleCompletionPolicy(2)); container = getContainer(template); - MockControl sessionControl = MockControl.createNiceControl(Session.class); - MockControl consumerControl = MockControl.createControl(MessageConsumer.class); - MockControl messageControl = MockControl.createControl(Message.class); + MockControl sessionControl = MockControl.createNiceControl(Session.class); + MockControl consumerControl = MockControl.createControl(MessageConsumer.class); + MockControl messageControl = MockControl.createControl(Message.class); - Session session = (Session) sessionControl.getMock(); - MessageConsumer consumer = (MessageConsumer) consumerControl.getMock(); - Message message = (Message) messageControl.getMock(); + Session session = sessionControl.getMock(); + MessageConsumer consumer = consumerControl.getMock(); + Message message = messageControl.getMock(); // Expect two calls to consumer (chunk size)... consumerControl.expectAndReturn(consumer.receive(1000), message); @@ -76,11 +76,11 @@ public class BatchMessageListenerContainerTests extends TestCase { template.setCompletionPolicy(new SimpleCompletionPolicy(2)); container = getContainer(template); - MockControl sessionControl = MockControl.createNiceControl(Session.class); - MockControl consumerControl = MockControl.createControl(MessageConsumer.class); + MockControl sessionControl = MockControl.createNiceControl(Session.class); + MockControl consumerControl = MockControl.createControl(MessageConsumer.class); - Session session = (Session) sessionControl.getMock(); - MessageConsumer consumer = (MessageConsumer) consumerControl.getMock(); + Session session = sessionControl.getMock(); + MessageConsumer consumer = consumerControl.getMock(); Message message = null; // Expect one call to consumer (chunk size is 2 but terminates on @@ -137,8 +137,8 @@ public class BatchMessageListenerContainerTests extends TestCase { } private BatchMessageListenerContainer getContainer(RepeatTemplate template) { - MockControl connectionFactoryControl = MockControl.createControl(ConnectionFactory.class); - ConnectionFactory connectionFactory = (ConnectionFactory) connectionFactoryControl.getMock(); + MockControl connectionFactoryControl = MockControl.createControl(ConnectionFactory.class); + ConnectionFactory connectionFactory = connectionFactoryControl.getMock(); // Yuck: we need to turn these method in base class to no-ops because the invoker is a private class // we can't create for test purposes... BatchMessageListenerContainer container = new BatchMessageListenerContainer() { @@ -168,13 +168,13 @@ public class BatchMessageListenerContainerTests extends TestCase { } }); - MockControl sessionControl = MockControl.createNiceControl(Session.class); - MockControl consumerControl = MockControl.createNiceControl(MessageConsumer.class); - MockControl messageControl = MockControl.createNiceControl(Message.class); + MockControl sessionControl = MockControl.createNiceControl(Session.class); + MockControl consumerControl = MockControl.createNiceControl(MessageConsumer.class); + MockControl messageControl = MockControl.createNiceControl(Message.class); - Session session = (Session) sessionControl.getMock(); - MessageConsumer consumer = (MessageConsumer) consumerControl.getMock(); - Message message = (Message) messageControl.getMock(); + Session session = sessionControl.getMock(); + MessageConsumer consumer = consumerControl.getMock(); + Message message = messageControl.getMock(); sessionControl.expectAndReturn(session.getTransacted(), true, expectGetTransactionCount); diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java index b4bf0f660..065c02645 100644 --- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java +++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java @@ -23,7 +23,7 @@ import org.springframework.util.ClassUtils; public abstract class AbstractStaxEventWriterItemWriterTests extends TestCase { - private StaxEventItemWriter writer = new StaxEventItemWriter(); + private StaxEventItemWriter writer = new StaxEventItemWriter(); private Resource resource; @@ -43,7 +43,7 @@ public abstract class AbstractStaxEventWriterItemWriterTests extends TestCase { * Write list of domain objects and check the output file. */ public void testWrite() throws Exception { - for (Iterator iterator = objects.listIterator(); iterator.hasNext();) { + for (Iterator iterator = objects.listIterator(); iterator.hasNext();) { writer.write(iterator.next()); } writer.close(null); @@ -58,7 +58,7 @@ public abstract class AbstractStaxEventWriterItemWriterTests extends TestCase { resource = new FileSystemResource(outputFile); writer.setResource(resource); - MarshallingEventWriterSerializer mapper = new MarshallingEventWriterSerializer(getMarshaller()); + MarshallingEventWriterSerializer mapper = new MarshallingEventWriterSerializer(getMarshaller()); writer.setSerializer(mapper); writer.open(new ExecutionContext()); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/transform/ItemTransformerItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/transform/ItemTransformerItemWriter.java index c185e89b1..e9fd0b80d 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/transform/ItemTransformerItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/transform/ItemTransformerItemWriter.java @@ -12,7 +12,7 @@ import org.springframework.util.Assert; */ public class ItemTransformerItemWriter extends DelegatingItemWriter { - private ItemTransformer itemTransformer; + private ItemTransformer itemTransformer; /** * Transform the item using the {@link #setItemTransformer(ItemTransformer)}. @@ -25,7 +25,7 @@ public class ItemTransformerItemWriter extends DelegatingItemWriter { * @param itemTransformer will transform the item before * it is passed to {@link ItemWriter}. */ - public void setItemTransformer(ItemTransformer itemTransformer) { + public void setItemTransformer(ItemTransformer itemTransformer) { this.itemTransformer = itemTransformer; } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java index 88b15f2bc..f13e665dc 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java @@ -24,6 +24,9 @@ import org.springframework.batch.sample.domain.Trade; @SuppressWarnings("unchecked") +/** + * TODO type safety + */ public class TradeFieldSetMapper implements FieldSetMapper { public static final int ISIN_COLUMN = 0; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java index a9d78e13f..08fea87d8 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java @@ -16,17 +16,15 @@ package org.springframework.batch.sample; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Test; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.launch.JobLauncher; -import org.springframework.test.AbstractDependencyInjectionSpringContextTests; -import org.springframework.util.ClassUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; -import org.springframework.beans.factory.annotation.Autowired; -import org.apache.commons.logging.LogFactory; -import org.apache.commons.logging.Log; -import org.junit.Test; /** * Abstract unit test for running functional tests by getting context locations diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java index 310a40f19..bfbac3d5c 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java @@ -25,6 +25,7 @@ import java.sql.SQLException; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.file.FlatFileItemReader; +import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.LineTokenizer; import org.springframework.batch.sample.domain.Trade; import org.springframework.batch.sample.mapping.TradeFieldSetMapper; @@ -51,7 +52,7 @@ public class FixedLengthImportJobFunctionalTests extends AbstractValidatingBatch //auto-injected attributes private JdbcOperations jdbcTemplate; private Resource fileLocator; - private FlatFileItemReader inputSource; + private FlatFileItemReader inputSource; private LineTokenizer lineTokenizer; @Autowired @@ -69,8 +70,12 @@ public class FixedLengthImportJobFunctionalTests extends AbstractValidatingBatch public void onSetUp() throws Exception { jdbcTemplate.update("delete from TRADE"); fileLocator = new ClassPathResource("data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt"); - inputSource = new FlatFileItemReader(); - inputSource.setFieldSetMapper(new TradeFieldSetMapper()); + inputSource = new FlatFileItemReader(); + + @SuppressWarnings("unchecked") + FieldSetMapper mapper = new TradeFieldSetMapper(); + inputSource.setFieldSetMapper(mapper); + inputSource.setLineTokenizer(lineTokenizer); inputSource.setResource(fileLocator); } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java index 567493748..311cc5a3c 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java @@ -22,7 +22,7 @@ public class RetrySampleFunctionalTests extends AbstractValidatingBatchLauncherT private GeneratingItemReader itemGenerator; @Autowired - private RetrySampleItemWriter itemProcessor; + private RetrySampleItemWriter itemProcessor; protected void validatePostConditions() throws Exception { //items processed = items read + 2 exceptions diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java index ddebfd108..3fc061508 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java @@ -26,7 +26,7 @@ public class SkipSampleFunctionalTests extends AbstractValidatingBatchLauncherTe JdbcTemplate jdbcTemplate; @Autowired - ItemTrackingItemWriter writer; + ItemTrackingItemWriter writer; @Autowired public void setDataSource(DataSource dataSource) { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java index b5cf43fdb..79c5ee495 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java @@ -94,7 +94,7 @@ public class FlatFileCustomerCreditDaoTests { verify(output); } - private interface ResourceLifecycleItemWriter extends ItemWriter, ItemStream{ + private interface ResourceLifecycleItemWriter extends ItemWriter, ItemStream{ } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java index 026e4e969..55919e59b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java @@ -25,8 +25,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.TestCase; - +import org.junit.Before; +import org.junit.Test; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.item.file.transform.LineAggregator; import org.springframework.batch.item.support.AbstractItemWriter; @@ -37,25 +37,23 @@ import org.springframework.batch.sample.domain.BillingInfo; import org.springframework.batch.sample.domain.Customer; import org.springframework.batch.sample.domain.LineItem; import org.springframework.batch.sample.domain.Order; -import org.junit.Before; -import org.junit.Test; public class FlatFileOrderWriterTests { List list = new ArrayList(); - private ItemWriter output = new AbstractItemWriter() { + private ItemWriter output = new AbstractItemWriter() { public void write(Object output) { list.add(output); } }; - private ItemTransformerItemWriter writer; + private ItemTransformerItemWriter writer; @Before public void setUp() throws Exception { //create new writer - writer = new ItemTransformerItemWriter(); + writer = new ItemTransformerItemWriter(); writer.setDelegate(output); } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java index 553921a67..b682435e2 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java @@ -16,23 +16,22 @@ package org.springframework.batch.sample.dao; import static org.junit.Assert.assertEquals; + import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.batch.sample.domain.Player; -import org.springframework.jdbc.core.RowCallbackHandler; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.transaction.BeforeTransaction; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; -import org.junit.runner.RunWith; +import javax.sql.DataSource; + import org.junit.Before; import org.junit.Test; - -import javax.sql.DataSource; +import org.junit.runner.RunWith; +import org.springframework.batch.sample.domain.Player; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowCallbackHandler; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.transaction.annotation.Transactional; /** * @author Lucas Ward diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java index 67ae9ca0e..facd3d788 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java @@ -16,24 +16,24 @@ package org.springframework.batch.sample.dao; import static org.junit.Assert.assertEquals; + import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.batch.sample.domain.Trade; -import org.springframework.jdbc.core.RowCallbackHandler; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.support.incrementer.AbstractDataFieldMaxValueIncrementer; -import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; -import org.junit.runner.RunWith; -import org.junit.Test; - import javax.sql.DataSource; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.batch.sample.domain.Trade; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowCallbackHandler; +import org.springframework.jdbc.support.incrementer.AbstractDataFieldMaxValueIncrementer; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.transaction.annotation.Transactional; + @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"/data-source-context.xml"}) public class JdbcTradeWriterTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java index 51283aac5..88b39ecfc 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java @@ -16,7 +16,6 @@ package org.springframework.batch.sample.dao; import static org.junit.Assert.assertTrue; -import org.junit.Test; import java.math.BigDecimal; import java.util.ArrayList; @@ -24,8 +23,7 @@ import java.util.Collection; import java.util.Date; import java.util.HashMap; -import junit.framework.TestCase; - +import org.junit.Test; import org.springframework.batch.item.file.transform.DelimitedLineAggregator; import org.springframework.batch.item.file.transform.LineAggregator; import org.springframework.batch.sample.domain.Address; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/StagingItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/StagingItemReaderTests.java index 3ee21dade..859a40502 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/StagingItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/StagingItemReaderTests.java @@ -36,10 +36,10 @@ public class StagingItemReaderTests { private PlatformTransactionManager transactionManager; @Autowired - private StagingItemWriter writer; + private StagingItemWriter writer; @Autowired - private StagingItemReader reader; + private StagingItemReader reader; private Long jobId = 11L; @@ -81,7 +81,7 @@ public class StagingItemReaderTests { new Object[] { id }, String.class); assertEquals(StagingItemWriter.NEW, before); - Object item = reader.read(); + String item = reader.read(); assertEquals("FOO", item); String after = (String) getJdbcTemplate().queryForObject("SELECT PROCESSED from BATCH_STAGING where ID=?", diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java index 6b00a607f..751a80d3c 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java @@ -10,7 +10,7 @@ import org.junit.Test; public class CustomerCreditUpdateProcessorTests { - private MockControl daoControl; + private MockControl daoControl; private CustomerCreditDao dao; private CustomerCreditUpdateWriter writer; private static final double CREDIT_FILTER = 355.0; @@ -19,7 +19,7 @@ public class CustomerCreditUpdateProcessorTests { public void setUp() { //create mock writer daoControl = MockControl.createControl(CustomerCreditDao.class); - dao = (CustomerCreditDao) daoControl.getMock(); + dao = daoControl.getMock(); //create processor, set writer and credit filter writer = new CustomerCreditUpdateWriter(); writer.setDao(dao); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java index e764356db..4bad672c8 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java @@ -10,7 +10,7 @@ import org.junit.Test; */ public class RetrySampleItemWriterTests { - private RetrySampleItemWriter processor = new RetrySampleItemWriter(); + private RetrySampleItemWriter processor = new RetrySampleItemWriter(); /** * Processing throws exception on 2nd and 3rd call. diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/StagingItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/StagingItemWriterTests.java index 0101b0bf5..3224e2698 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/StagingItemWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/StagingItemWriterTests.java @@ -17,23 +17,21 @@ package org.springframework.batch.sample.item.writer; import static org.junit.Assert.assertEquals; +import javax.sql.DataSource; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobInstance; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.StepExecution; -import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.util.ClassUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; -import org.junit.runner.RunWith; -import org.junit.Before; -import org.junit.Test; - -import javax.sql.DataSource; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration() @@ -42,7 +40,7 @@ public class StagingItemWriterTests { private JdbcOperations jdbcTemplate; @Autowired - private StagingItemWriter writer; + private StagingItemWriter writer; public JdbcOperations getJdbcTemplate() { return jdbcTemplate; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/TradeProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/TradeProcessorTests.java index 986e1ee7b..8502a776a 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/TradeProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/TradeProcessorTests.java @@ -1,15 +1,14 @@ package org.springframework.batch.sample.item.writer; import org.easymock.MockControl; -import org.springframework.batch.sample.dao.TradeDao; -import org.springframework.batch.sample.domain.Trade; -import org.springframework.batch.sample.item.writer.TradeWriter; import org.junit.Before; import org.junit.Test; +import org.springframework.batch.sample.dao.TradeDao; +import org.springframework.batch.sample.domain.Trade; public class TradeProcessorTests { - private MockControl writerControl; + private MockControl writerControl; private TradeDao writer; private TradeWriter processor; @@ -18,7 +17,7 @@ public class TradeProcessorTests { //create mock writer writerControl = MockControl.createControl(TradeDao.class); - writer = (TradeDao)writerControl.getMock(); + writer = writerControl.getMock(); //create processor processor = new TradeWriter(); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractFieldSetMapperTests.java index 0b097ac9e..2bd7e5de7 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractFieldSetMapperTests.java @@ -27,7 +27,7 @@ public abstract class AbstractFieldSetMapperTests { * @return mapper which takes this.fieldSet() and maps it to * domain object. */ - protected abstract FieldSetMapper fieldSetMapper(); + protected abstract FieldSetMapper fieldSetMapper(); /** diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractRowMapperTests.java index 7d671a79b..c6d183d42 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractRowMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractRowMapperTests.java @@ -19,8 +19,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 = (ResultSet) rsControl.getMock(); + private MockControl rsControl = MockControl.createControl(ResultSet.class); + private ResultSet rs = rsControl.getMock(); /** * @return Expected result of mapping the mock ResultSet by @@ -36,7 +36,7 @@ public abstract class AbstractRowMapperTests extends TestCase { /** * Define the behaviour of mock ResultSet. */ - abstract protected void setUpResultSetMock(ResultSet rs, MockControl rsControl) throws SQLException; + abstract protected void setUpResultSetMock(ResultSet rs, MockControl rsControl) throws SQLException; /** diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java index 7937c9bbb..9b01493ff 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java @@ -47,7 +47,7 @@ public class AddressFieldSetMapperTests extends AbstractFieldSetMapperTests { return new DefaultFieldSet(tokens, columnNames); } - protected FieldSetMapper fieldSetMapper() { + protected FieldSetMapper
fieldSetMapper() { return new AddressFieldSetMapper(); } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java index 85a298f2d..3ca0bb8c6 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java @@ -27,7 +27,7 @@ public class BillingFieldSetMapperTests extends AbstractFieldSetMapperTests{ return new DefaultFieldSet(tokens, columnNames); } - protected FieldSetMapper fieldSetMapper() { + protected FieldSetMapper fieldSetMapper() { return new BillingFieldSetMapper(); } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java index d7d7a8fc5..ce7abb636 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java @@ -6,7 +6,6 @@ import java.sql.SQLException; import org.easymock.MockControl; import org.springframework.batch.sample.domain.CustomerCredit; -import org.springframework.batch.sample.mapping.CustomerCreditRowMapper; import org.springframework.jdbc.core.RowMapper; public class CustomerCreditRowMapperTests extends AbstractRowMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java index 921f055ed..d4edb468e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java @@ -50,7 +50,7 @@ public class CustomerFieldSetMapperTests extends AbstractFieldSetMapperTests { return new DefaultFieldSet(tokens, columnNames); } - protected FieldSetMapper fieldSetMapper() { + protected FieldSetMapper fieldSetMapper() { return new CustomerFieldSetMapper(); } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java index 635cd9af4..2da8f002f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java @@ -34,7 +34,7 @@ public class HeaderFieldSetMapperTests extends AbstractFieldSetMapperTests { return new DefaultFieldSet(tokens, columnNames); } - protected FieldSetMapper fieldSetMapper() { + protected FieldSetMapper fieldSetMapper() { return new HeaderFieldSetMapper(); } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java index 80f9d32da..95bb42307 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java @@ -55,7 +55,7 @@ public class OrderItemFieldSetMapperTests extends AbstractFieldSetMapperTests{ return new DefaultFieldSet(tokens, columnNames); } - protected FieldSetMapper fieldSetMapper() { + protected FieldSetMapper fieldSetMapper() { return new OrderItemFieldSetMapper(); } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java index 9d0f36e40..f3bd329dc 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java @@ -30,7 +30,7 @@ public class ShippingFieldSetMapperTests extends AbstractFieldSetMapperTests{ return new DefaultFieldSet(tokens, columnNames); } - protected FieldSetMapper fieldSetMapper() { + protected FieldSetMapper fieldSetMapper() { return new ShippingFieldSetMapper(); } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java index d89a85da3..4d7deb780 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java @@ -10,11 +10,14 @@ import org.springframework.batch.sample.domain.Trade; import java.math.BigDecimal; -public class TradeFieldSetMapperTests extends AbstractFieldSetMapperTests{ +public class TradeFieldSetMapperTests extends AbstractFieldSetMapperTests { private static final String CUSTOMER = "Mike Tomcat"; + private static final BigDecimal PRICE = new BigDecimal(1.3); + private static final long QUANTITY = 7; + private static final String ISIN = "fj893gnsalX"; protected Object expectedDomainObject() { @@ -32,22 +35,26 @@ public class TradeFieldSetMapperTests extends AbstractFieldSetMapperTests{ tokens[TradeFieldSetMapper.QUANTITY_COLUMN] = String.valueOf(QUANTITY); tokens[TradeFieldSetMapper.PRICE_COLUMN] = String.valueOf(PRICE); tokens[TradeFieldSetMapper.CUSTOMER_COLUMN] = CUSTOMER; - + return new DefaultFieldSet(tokens); } - protected FieldSetMapper fieldSetMapper() { - return new TradeFieldSetMapper(); + protected FieldSetMapper fieldSetMapper() { + @SuppressWarnings("unchecked") + FieldSetMapper mapper = new TradeFieldSetMapper(); + return mapper; } - + @Test public void testBeginRecord() throws Exception { - assertEquals(AggregateItemReader.BEGIN_RECORD, fieldSetMapper().mapLine(new DefaultFieldSet(new String[] {"BEGIN"}), -1)); + assertEquals(AggregateItemReader.BEGIN_RECORD, fieldSetMapper().mapLine( + new DefaultFieldSet(new String[] { "BEGIN" }), -1)); } @Test public void testEndRecord() throws Exception { - assertEquals(AggregateItemReader.END_RECORD, fieldSetMapper().mapLine(new DefaultFieldSet(new String[] {"END"}), -1)); + assertEquals(AggregateItemReader.END_RECORD, fieldSetMapper().mapLine( + new DefaultFieldSet(new String[] { "END" }), -1)); } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java index 7f0f1ae41..8eb4c4862 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java @@ -6,7 +6,6 @@ import java.sql.SQLException; import org.easymock.MockControl; import org.springframework.batch.sample.domain.Trade; -import org.springframework.batch.sample.mapping.TradeRowMapper; import org.springframework.jdbc.core.RowMapper; public class TradeRowMapperTests extends AbstractRowMapperTests {