IN PROGRESS - BATCH-711: Upgrade ItemWriter and implementations to use parameterized types

This commit is contained in:
robokaso
2008-07-23 09:39:36 +00:00
parent d882c91297
commit e7b99313cd
9 changed files with 36 additions and 36 deletions

View File

@@ -16,7 +16,7 @@ import org.springframework.batch.item.ItemWriter;
public class CompositeItemWriterTests extends TestCase {
// object under test
private CompositeItemWriter itemProcessor = new CompositeItemWriter();
private CompositeItemWriter<Object> itemProcessor = new CompositeItemWriter<Object>();
/**
* Regular usage scenario.
@@ -24,13 +24,13 @@ public class CompositeItemWriterTests extends TestCase {
*/
public void testProcess() throws Exception {
final int NUMBER_OF_PROCESSORS = 10;
final int NUMBER_OF_WRITERS = 10;
Object data = new Object();
List<MockControl> controls = new ArrayList<MockControl>(NUMBER_OF_PROCESSORS);
List<ItemWriter> writers = new ArrayList<ItemWriter>(NUMBER_OF_PROCESSORS);
List<MockControl> controls = new ArrayList<MockControl>(NUMBER_OF_WRITERS);
List<ItemWriter<Object>> writers = new ArrayList<ItemWriter<Object>>(NUMBER_OF_WRITERS);
for (int i = 0; i < NUMBER_OF_PROCESSORS; i++) {
for (int i = 0; i < NUMBER_OF_WRITERS; i++) {
MockControl control = MockControl.createStrictControl(ItemWriter.class);
ItemWriter writer = (ItemWriter) control.getMock();

View File

@@ -27,9 +27,9 @@ import org.springframework.batch.item.support.DelegatingItemWriter;
*/
public class DelegatingItemWriterTests extends TestCase {
MockControl writerControl = MockControl.createControl(ItemWriter.class);
ItemWriter itemWriter;
DelegatingItemWriter delegatingWriter;
MockControl<ItemWriter> writerControl = MockControl.createControl(ItemWriter.class);
ItemWriter<Object> itemWriter;
DelegatingItemWriter<Object, Object> delegatingWriter;
/* (non-Javadoc)
* @see junit.framework.TestCase#setUp()
@@ -37,8 +37,8 @@ public class DelegatingItemWriterTests extends TestCase {
protected void setUp() throws Exception {
super.setUp();
itemWriter = (ItemWriter)writerControl.getMock();
delegatingWriter = new DelegatingItemWriter();
itemWriter = writerControl.getMock();
delegatingWriter = new DelegatingItemWriter<Object, Object>();
delegatingWriter.setDelegate(itemWriter);
}

View File

@@ -12,17 +12,17 @@ import org.springframework.batch.item.ItemWriter;
*/
public class ItemTransformerItemWriterTests extends TestCase {
private ItemTransformerItemWriter processor = new ItemTransformerItemWriter();
private ItemTransformerItemWriter<Object, Object> processor = new ItemTransformerItemWriter<Object, Object>();
private ItemTransformer transformer;
private ItemTransformer<Object, Object> transformer;
private ItemWriter<Object> itemWriter;
private MockControl tControl = MockControl.createControl(ItemTransformer.class);
private MockControl outControl = MockControl.createControl(ItemWriter.class);
private MockControl<ItemTransformer> tControl = MockControl.createControl(ItemTransformer.class);
private MockControl<ItemWriter> outControl = MockControl.createControl(ItemWriter.class);
protected void setUp() throws Exception {
transformer = (ItemTransformer) tControl.getMock();
itemWriter = (ItemWriter<Object>) outControl.getMock();
transformer = tControl.getMock();
itemWriter = outControl.getMock();
processor.setItemTransformer(transformer);
processor.setDelegate(itemWriter);

View File

@@ -27,7 +27,7 @@ import org.springframework.xml.transform.StaxResult;
public class StaxEventItemWriterTests extends TestCase {
// object under test
private StaxEventItemWriter writer;
private StaxEventItemWriter<Object> writer;
// output file
private Resource resource;
@@ -58,7 +58,7 @@ public class StaxEventItemWriterTests extends TestCase {
public void testFlush() throws Exception {
writer.open(executionContext);
InputCheckMarshaller marshaller = new InputCheckMarshaller();
MarshallingEventWriterSerializer serializer = new MarshallingEventWriterSerializer(marshaller);
MarshallingEventWriterSerializer<Object> serializer = new MarshallingEventWriterSerializer<Object>(marshaller);
writer.setSerializer(serializer);
// see asserts in the marshaller
@@ -274,12 +274,12 @@ public class StaxEventItemWriterTests extends TestCase {
/**
* @return new instance of fully configured writer
*/
private StaxEventItemWriter createItemWriter() throws Exception {
StaxEventItemWriter source = new StaxEventItemWriter();
private StaxEventItemWriter<Object> createItemWriter() throws Exception {
StaxEventItemWriter<Object> source = new StaxEventItemWriter<Object>();
source.setResource(resource);
Marshaller marshaller = new SimpleMarshaller();
MarshallingEventWriterSerializer serializer = new MarshallingEventWriterSerializer(marshaller);
MarshallingEventWriterSerializer<Object> serializer = new MarshallingEventWriterSerializer<Object>(marshaller);
source.setSerializer(serializer);
source.setEncoding("UTF-8");

View File

@@ -38,7 +38,7 @@ import org.springframework.oxm.XmlMappingException;
*/
public class MarshallingObjectToXmlSerializerTests extends TestCase {
MarshallingEventWriterSerializer xmlSerializer;
MarshallingEventWriterSerializer<Object> xmlSerializer;
MockMarshaller mockMarshaller = new MockMarshaller();
@@ -47,7 +47,7 @@ public class MarshallingObjectToXmlSerializerTests extends TestCase {
protected void setUp() throws Exception {
super.setUp();
xmlSerializer = new MarshallingEventWriterSerializer(mockMarshaller);
xmlSerializer = new MarshallingEventWriterSerializer<Object>(mockMarshaller);
writer = new StubXmlEventWriter();
}

View File

@@ -33,8 +33,8 @@ public class ItemReaderRepeatCallbackTests extends TestCase {
public void testDoWithRepeat() throws Exception {
callback = new ItemReaderRepeatCallback<String>(new ListItemReader<String>(Arrays.asList(new String[] { "foo", "bar" })),
new AbstractItemWriter() {
public void write(Object data) {
new AbstractItemWriter<String>() {
public void write(String data) {
list.add(data);
}
});