IN PROGRESS - BATCH-354: added an ItemReader implementation for JPA, modified CommonItemReaderTests and subclasses to run as JUnit4 tests
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
package org.springframework.batch.item;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
import org.junit.Test;
|
||||
import org.junit.Before;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
import org.springframework.batch.item.sample.Foo;
|
||||
@@ -8,7 +12,7 @@ import org.springframework.batch.item.sample.Foo;
|
||||
* Common tests for {@link ItemReader} implementations. Expected input is five
|
||||
* {@link Foo} objects with values 1 to 5.
|
||||
*/
|
||||
public abstract class CommonItemReaderTests extends TestCase {
|
||||
public abstract class CommonItemReaderTests {
|
||||
|
||||
protected ItemReader<Foo> tested;
|
||||
|
||||
@@ -17,13 +21,15 @@ public abstract class CommonItemReaderTests extends TestCase {
|
||||
*/
|
||||
protected abstract ItemReader<Foo> getItemReader() throws Exception;
|
||||
|
||||
protected void setUp() throws Exception {
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
tested = getItemReader();
|
||||
}
|
||||
|
||||
/**
|
||||
* Regular scenario - read the input and eventually return null.
|
||||
*/
|
||||
@Test
|
||||
public void testRead() throws Exception {
|
||||
|
||||
Foo foo1 = tested.read();
|
||||
@@ -48,6 +54,7 @@ public abstract class CommonItemReaderTests extends TestCase {
|
||||
* Rollback scenario - reader resets to last marked point. Note the commit
|
||||
* interval can change dynamically.
|
||||
*/
|
||||
@Test
|
||||
public void testReset() throws Exception {
|
||||
Foo foo1 = tested.read();
|
||||
assertEquals(1, foo1.getValue());
|
||||
@@ -92,6 +99,7 @@ public abstract class CommonItemReaderTests extends TestCase {
|
||||
* Empty input should be handled gracefully - null is returned on first
|
||||
* read.
|
||||
*/
|
||||
@Test
|
||||
public void testEmptyInput() throws Exception {
|
||||
pointToEmptyInput(tested);
|
||||
assertNull(tested.read());
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
package org.springframework.batch.item;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
import org.springframework.batch.item.sample.Foo;
|
||||
import org.junit.Before;
|
||||
import org.junit.After;
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
* Common tests for readers implementing both {@link ItemReader} and
|
||||
@@ -18,13 +23,14 @@ public abstract class CommonItemStreamItemReaderTests extends CommonItemReaderTe
|
||||
return (ItemStream) tested;
|
||||
}
|
||||
|
||||
protected void setUp() throws Exception {
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
super.setUp();
|
||||
testedAsStream().open(executionContext);
|
||||
}
|
||||
|
||||
protected void tearDown() throws Exception {
|
||||
super.tearDown();
|
||||
@After
|
||||
public void tearDown() throws Exception {
|
||||
testedAsStream().close(executionContext);
|
||||
}
|
||||
|
||||
@@ -33,6 +39,7 @@ public abstract class CommonItemStreamItemReaderTests extends CommonItemReaderTe
|
||||
* reader and restore from restart data - the new input source should
|
||||
* continue where the old one finished.
|
||||
*/
|
||||
@Test
|
||||
public void testRestart() throws Exception {
|
||||
|
||||
testedAsStream().update(executionContext);
|
||||
@@ -59,6 +66,7 @@ public abstract class CommonItemStreamItemReaderTests extends CommonItemReaderTe
|
||||
* execution context, create new reader and restore from restart data - the
|
||||
* new input source should continue where the old one finished.
|
||||
*/
|
||||
@Test
|
||||
public void testResetAndRestart() throws Exception {
|
||||
|
||||
testedAsStream().update(executionContext);
|
||||
@@ -87,6 +95,7 @@ public abstract class CommonItemStreamItemReaderTests extends CommonItemReaderTe
|
||||
assertEquals(3, fooAfterRestart.getValue());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testReopen() throws Exception {
|
||||
testedAsStream().update(executionContext);
|
||||
|
||||
|
||||
@@ -4,17 +4,21 @@ import javax.sql.DataSource;
|
||||
|
||||
import org.springframework.batch.item.CommonItemStreamItemReaderTests;
|
||||
import org.springframework.context.support.ClassPathXmlApplicationContext;
|
||||
import org.junit.Before;
|
||||
import org.junit.After;
|
||||
|
||||
public abstract class CommonDatabaseItemStreamItemReaderTests extends CommonItemStreamItemReaderTests {
|
||||
|
||||
private ClassPathXmlApplicationContext ctx;
|
||||
|
||||
protected void setUp() throws Exception {
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
ctx = new ClassPathXmlApplicationContext("org/springframework/batch/item/database/data-source-context.xml");
|
||||
super.setUp();
|
||||
}
|
||||
|
||||
protected void tearDown() throws Exception {
|
||||
@After
|
||||
public void tearDown() throws Exception {
|
||||
super.tearDown();
|
||||
ctx.close();
|
||||
}
|
||||
|
||||
@@ -7,7 +7,10 @@ import org.springframework.batch.item.sample.Foo;
|
||||
import org.springframework.core.io.ClassPathResource;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.orm.hibernate3.LocalSessionFactoryBean;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.internal.runners.JUnit4ClassRunner;
|
||||
|
||||
@RunWith(JUnit4ClassRunner.class)
|
||||
public class HibernateCursorItemReaderCommonTests extends CommonDatabaseItemStreamItemReaderTests {
|
||||
|
||||
protected ItemReader<Foo> getItemReader() throws Exception {
|
||||
|
||||
@@ -6,10 +6,13 @@ import org.springframework.batch.item.database.support.IbatisKeyCollector;
|
||||
import org.springframework.batch.item.sample.Foo;
|
||||
import org.springframework.core.io.ClassPathResource;
|
||||
import org.springframework.orm.ibatis.SqlMapClientFactoryBean;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.internal.runners.JUnit4ClassRunner;
|
||||
|
||||
import com.ibatis.sqlmap.client.SqlMapClient;
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@RunWith(JUnit4ClassRunner.class)
|
||||
public class IbatisItemReaderCommonTests extends CommonDatabaseItemStreamItemReaderTests {
|
||||
|
||||
protected ItemReader<Foo> getItemReader() throws Exception {
|
||||
|
||||
@@ -3,7 +3,11 @@ package org.springframework.batch.item.database;
|
||||
import org.springframework.batch.item.ExecutionContext;
|
||||
import org.springframework.batch.item.ItemReader;
|
||||
import org.springframework.batch.item.sample.Foo;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.internal.runners.JUnit4ClassRunner;
|
||||
import org.junit.Test;
|
||||
|
||||
@RunWith(JUnit4ClassRunner.class)
|
||||
public class JdbcCursorItemReaderCommonTests extends CommonDatabaseItemStreamItemReaderTests {
|
||||
|
||||
protected ItemReader<Foo> getItemReader() throws Exception {
|
||||
@@ -24,6 +28,7 @@ public class JdbcCursorItemReaderCommonTests extends CommonDatabaseItemStreamIte
|
||||
return result;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRestartWithDriverSupportsAbsolute() throws Exception {
|
||||
tested = getItemReader();
|
||||
((JdbcCursorItemReader<Foo>) tested).setDriverSupportsAbsolute(true);
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
package org.springframework.batch.item.database;
|
||||
|
||||
import org.springframework.batch.item.sample.Foo;
|
||||
import org.springframework.batch.item.ItemReader;
|
||||
import org.springframework.batch.item.ExecutionContext;
|
||||
import org.springframework.batch.item.CommonItemStreamItemReaderTests;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
|
||||
import org.springframework.test.context.ContextConfiguration;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.Test;
|
||||
|
||||
import javax.persistence.EntityManagerFactory;
|
||||
|
||||
@RunWith(SpringJUnit4ClassRunner.class)
|
||||
@ContextConfiguration
|
||||
public class JpaPagingItemReaderCommonTests extends CommonItemStreamItemReaderTests {
|
||||
|
||||
@Autowired
|
||||
private EntityManagerFactory entityManagerFactory;
|
||||
|
||||
protected ItemReader<Foo> getItemReader() throws Exception {
|
||||
|
||||
String jpqlQuery = "select f from Foo f";
|
||||
|
||||
JpaPagingItemReader<Foo> reader = new JpaPagingItemReader<Foo>();
|
||||
reader.setQueryString(jpqlQuery);
|
||||
reader.setEntityManagerFactory(entityManagerFactory);
|
||||
reader.setPageSize(3);
|
||||
reader.afterPropertiesSet();
|
||||
reader.setSaveState(true);
|
||||
|
||||
return reader;
|
||||
}
|
||||
|
||||
protected void pointToEmptyInput(ItemReader<Foo> tested) throws Exception {
|
||||
JpaPagingItemReader<Foo> reader = (JpaPagingItemReader<Foo>) tested;
|
||||
reader.close(new ExecutionContext());
|
||||
reader.setQueryString("select f from Foo f where f.id = -1");
|
||||
reader.afterPropertiesSet();
|
||||
reader.open(new ExecutionContext());
|
||||
}
|
||||
|
||||
|
||||
@Transactional @Test
|
||||
public void testRestart() throws Exception {
|
||||
super.testRestart();
|
||||
}
|
||||
|
||||
@Transactional @Test
|
||||
public void testResetAndRestart() throws Exception {
|
||||
super.testResetAndRestart();
|
||||
}
|
||||
|
||||
@Transactional @Test
|
||||
public void testReopen() throws Exception {
|
||||
super.testReopen();
|
||||
}
|
||||
|
||||
@Transactional @Test
|
||||
public void testRead() throws Exception {
|
||||
super.testRead();
|
||||
}
|
||||
|
||||
@Transactional @Test
|
||||
public void testReset() throws Exception {
|
||||
super.testReset();
|
||||
}
|
||||
|
||||
@Transactional @Test
|
||||
public void testEmptyInput() throws Exception {
|
||||
super.testEmptyInput();
|
||||
}
|
||||
}
|
||||
@@ -5,7 +5,10 @@ import org.springframework.batch.item.ItemReader;
|
||||
import org.springframework.batch.item.database.support.SingleColumnJdbcKeyCollector;
|
||||
import org.springframework.batch.item.sample.Foo;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.internal.runners.JUnit4ClassRunner;
|
||||
|
||||
@RunWith(JUnit4ClassRunner.class)
|
||||
public class SingleColumnJdbcDrivingQueryItemReaderCommonTests extends CommonDatabaseItemStreamItemReaderTests {
|
||||
|
||||
protected ItemReader<Foo> getItemReader() throws Exception {
|
||||
|
||||
@@ -8,7 +8,10 @@ import org.springframework.batch.item.file.mapping.FieldSetMapper;
|
||||
import org.springframework.batch.item.sample.Foo;
|
||||
import org.springframework.core.io.ByteArrayResource;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.internal.runners.JUnit4ClassRunner;
|
||||
|
||||
@RunWith(JUnit4ClassRunner.class)
|
||||
public class FlatFileItemReaderCommonTests extends CommonItemStreamItemReaderTests {
|
||||
|
||||
private static final String FOOS = "1 \n 2 \n 3 \n 4 \n 5 \n";
|
||||
|
||||
@@ -10,7 +10,10 @@ import org.springframework.batch.item.file.mapping.FieldSetMapper;
|
||||
import org.springframework.batch.item.sample.Foo;
|
||||
import org.springframework.core.io.ByteArrayResource;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.internal.runners.JUnit4ClassRunner;
|
||||
|
||||
@RunWith(JUnit4ClassRunner.class)
|
||||
public class MultiResourceItemReaderFlatFileTests extends
|
||||
CommonItemStreamItemReaderTests {
|
||||
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
package org.springframework.batch.item.file;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.internal.runners.JUnit4ClassRunner;
|
||||
|
||||
import java.util.Comparator;
|
||||
|
||||
import javax.xml.stream.XMLEventReader;
|
||||
@@ -16,6 +20,7 @@ import org.springframework.batch.item.xml.StaxEventItemReader;
|
||||
import org.springframework.core.io.ByteArrayResource;
|
||||
import org.springframework.core.io.Resource;
|
||||
|
||||
@RunWith(JUnit4ClassRunner.class)
|
||||
public class MultiResourceItemReaderXmlTests extends CommonItemStreamItemReaderTests {
|
||||
|
||||
protected ItemReader<Foo> getItemReader() throws Exception {
|
||||
|
||||
@@ -3,11 +3,18 @@ package org.springframework.batch.item.sample;
|
||||
import org.apache.commons.lang.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang.builder.HashCodeBuilder;
|
||||
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import javax.persistence.Id;
|
||||
|
||||
/**
|
||||
* Simple domain object for testing purposes.
|
||||
*/
|
||||
@Entity
|
||||
@Table(name = "T_FOOS")
|
||||
public class Foo {
|
||||
|
||||
@Id
|
||||
private int id;
|
||||
private String name;
|
||||
private int value;
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
package org.springframework.batch.item.xml;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.internal.runners.JUnit4ClassRunner;
|
||||
|
||||
import javax.xml.stream.XMLEventReader;
|
||||
import javax.xml.stream.XMLStreamException;
|
||||
import javax.xml.stream.events.Attribute;
|
||||
@@ -11,6 +15,7 @@ import org.springframework.batch.item.ItemReader;
|
||||
import org.springframework.batch.item.sample.Foo;
|
||||
import org.springframework.core.io.ByteArrayResource;
|
||||
|
||||
@RunWith(JUnit4ClassRunner.class)
|
||||
public class StaxEventItemReaderCommonTests extends CommonItemStreamItemReaderTests {
|
||||
|
||||
private final static String FOOS = "<foos> <foo value=\"1\"/> <foo value=\"2\"/> <foo value=\"3\"/> <foo value=\"4\"/> <foo value=\"5\"/> </foos>";
|
||||
|
||||
Reference in New Issue
Block a user