Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

samples and infrastructure-tests should have no more generics warnings (remaining are easymock deprecations)

Browse Source
This commit is contained in:
robokaso
2008-07-24 11:17:37 +00:00
parent 66736f2ac2
commit e47df988ec
29 changed files with 113 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java
View File

@@ -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<Session> sessionControl = MockControl.createNiceControl(Session.class);
MockControl<MessageConsumer> consumerControl = MockControl.createControl(MessageConsumer.class);
MockControl<Message> 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<Session> sessionControl = MockControl.createNiceControl(Session.class);
MockControl<MessageConsumer> 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<ConnectionFactory> 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<Session> sessionControl = MockControl.createNiceControl(Session.class);
MockControl<MessageConsumer> consumerControl = MockControl.createNiceControl(MessageConsumer.class);
MockControl<Message> 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);

6
spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java
View File

@@ -23,7 +23,7 @@ import org.springframework.util.ClassUtils;
public abstract class AbstractStaxEventWriterItemWriterTests extends TestCase {
private StaxEventItemWriter writer = new StaxEventItemWriter();
private StaxEventItemWriter<Trade> writer = new StaxEventItemWriter<Trade>();
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<Trade> 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<Trade> mapper = new MarshallingEventWriterSerializer<Trade>(getMarshaller());
writer.setSerializer(mapper);
writer.open(new ExecutionContext());