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

IN PROGRESS - BATCH-712: Upgrade ItemReaders to use Parameterized types

Browse Source 
Parameterized the ItemReader interface, key implementations and collaborators.
This commit is contained in:
robokaso
2008-07-18 11:25:35 +00:00
parent d643538a10
commit e6a08ac88f
23 changed files with 93 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/CommonItemReaderTests.java
View File

@@ -10,12 +10,12 @@ import org.springframework.batch.item.sample.Foo;
*/
public abstract class CommonItemReaderTests extends TestCase {
protected ItemReader tested;
protected ItemReader<Foo> tested;
/**
* @return configured ItemReader ready for use.
*/
protected abstract ItemReader getItemReader() throws Exception;
protected abstract ItemReader<Foo> getItemReader() throws Exception;
protected void setUp() throws Exception {
tested = getItemReader();
@@ -26,19 +26,19 @@ public abstract class CommonItemReaderTests extends TestCase {
*/
public void testRead() throws Exception {
Foo foo1 = (Foo) tested.read();
Foo foo1 = tested.read();
assertEquals(1, foo1.getValue());
Foo foo2 = (Foo) tested.read();
Foo foo2 = tested.read();
assertEquals(2, foo2.getValue());
Foo foo3 = (Foo) tested.read();
Foo foo3 = tested.read();
assertEquals(3, foo3.getValue());
Foo foo4 = (Foo) tested.read();
Foo foo4 = tested.read();
assertEquals(4, foo4.getValue());
Foo foo5 = (Foo) tested.read();
Foo foo5 = tested.read();
assertEquals(5, foo5.getValue());
assertNull(tested.read());
@@ -49,15 +49,15 @@ public abstract class CommonItemReaderTests extends TestCase {
* interval can change dynamically.
*/
public void testReset() throws Exception {
Foo foo1 = (Foo) tested.read();
Foo foo1 = tested.read();
assertEquals(1, foo1.getValue());
tested.mark();
Foo foo2 = (Foo) tested.read();
Foo foo2 = tested.read();
assertEquals(2, foo2.getValue());
Foo foo3 = (Foo) tested.read();
Foo foo3 = tested.read();
assertEquals(3, foo3.getValue());
tested.reset();
@@ -72,12 +72,12 @@ public abstract class CommonItemReaderTests extends TestCase {
assertEquals(foo3, tested.read());
Foo foo4 = (Foo) tested.read();
Foo foo4 = tested.read();
assertEquals(4, foo4.getValue());
tested.mark();
Foo foo5 = (Foo) tested.read();
Foo foo5 = tested.read();
assertEquals(5, foo5.getValue());
tested.reset();
@@ -104,7 +104,7 @@ public abstract class CommonItemReaderTests extends TestCase {
* @param tested
* the reader
*/
protected abstract void pointToEmptyInput(ItemReader tested)
protected abstract void pointToEmptyInput(ItemReader<Foo> tested)
throws Exception;
}

20
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/CommonItemStreamItemReaderTests.java
View File

@@ -37,10 +37,10 @@ public abstract class CommonItemStreamItemReaderTests extends CommonItemReaderTe
testedAsStream().update(executionContext);
Foo foo1 = (Foo) tested.read();
Foo foo1 = tested.read();
assertEquals(1, foo1.getValue());
Foo foo2 = (Foo) tested.read();
Foo foo2 = tested.read();
assertEquals(2, foo2.getValue());
testedAsStream().update(executionContext);
@@ -50,7 +50,7 @@ public abstract class CommonItemStreamItemReaderTests extends CommonItemReaderTe
testedAsStream().open(executionContext);
Foo fooAfterRestart = (Foo) tested.read();
Foo fooAfterRestart = tested.read();
assertEquals(3, fooAfterRestart.getValue());
}
@@ -63,15 +63,15 @@ public abstract class CommonItemStreamItemReaderTests extends CommonItemReaderTe
testedAsStream().update(executionContext);
Foo foo1 = (Foo) tested.read();
Foo foo1 = tested.read();
assertEquals(1, foo1.getValue());
Foo foo2 = (Foo) tested.read();
Foo foo2 = tested.read();
assertEquals(2, foo2.getValue());
tested.mark();
Foo foo3 = (Foo) tested.read();
Foo foo3 = tested.read();
assertEquals(3, foo3.getValue());
tested.reset();
@@ -83,17 +83,17 @@ public abstract class CommonItemStreamItemReaderTests extends CommonItemReaderTe
testedAsStream().open(executionContext);
Foo fooAfterRestart = (Foo) tested.read();
Foo fooAfterRestart = tested.read();
assertEquals(3, fooAfterRestart.getValue());
}
public void testReopen() throws Exception {
testedAsStream().update(executionContext);
Foo foo1 = (Foo) tested.read();
Foo foo1 = tested.read();
assertEquals(1, foo1.getValue());
Foo foo2 = (Foo) tested.read();
Foo foo2 = tested.read();
assertEquals(2, foo2.getValue());
testedAsStream().update(executionContext);
@@ -103,7 +103,7 @@ public abstract class CommonItemStreamItemReaderTests extends CommonItemReaderTe
testedAsStream().open(executionContext);
Foo fooAfterRestart = (Foo) tested.read();
Foo fooAfterRestart = tested.read();
assertEquals(3, fooAfterRestart.getValue());
}

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemProviderTests.java
View File

@@ -23,8 +23,8 @@ import junit.framework.TestCase;
public class ItemProviderTests extends TestCase {
ItemReader provider = new AbstractItemReader() {
public Object read() {
ItemReader<String> provider = new AbstractItemReader<String>() {
public String read() {
return "foo";
}
};