Skip to content

Commit bc4accb

Browse files
committed
Add tests that paging queries that require table qualifiers don't break
1 parent 4d6a2a6 commit bc4accb

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/AbstractItemReaderTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@ public void testRead() throws Exception {
7171
@Test
7272
public void testEmptyInput() throws Exception {
7373
pointToEmptyInput(tested);
74-
tested.read();
75-
assertNull(tested.read());
74+
75+
final Foo nullFoo = tested.read();
76+
assertNull(nullFoo);
7677
}
7778

7879
/**

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderMultiTableTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected ItemReader<Foo> createItemReader() throws Exception {
4343
HsqlPagingQueryProvider queryProvider = new HsqlPagingQueryProvider();
4444
queryProvider.setSelectClause("select T_FOOS.ID, T_FOOS.NAME, T_FOOS.VALUE");
4545
queryProvider.setFromClause("from T_FOOS, T_BARS");
46-
queryProvider.setWhereClause("where T_BARS.ID = 1");
46+
queryProvider.setWhereClause("where T_BARS.ID = 1");
4747
Map<String, Order> sortKeys = new LinkedHashMap<String, Order>();
4848
sortKeys.put("T_FOOS.ID", Order.ASCENDING);
4949
queryProvider.setSortKeys(sortKeys);

spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/database/JdbcPagingItemReaderMultiTableTests-context.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<property name="dataSource" ref="dataSource"/>
99
<property name="initScripts">
1010
<list>
11-
<value>classpath:org/springframework/batch/item/database/init-foo-schema-hsqldb.sql</value>
12-
<value>classpath:org/springframework/batch/item/database/init-bar-schema-hsqldb.sql</value>
11+
<value>classpath:org/springframework/batch/item/database/init-foo-schema-hsqldb.sql</value>
12+
<value>classpath:org/springframework/batch/item/database/init-bar-schema-hsqldb.sql</value>
1313
</list>
1414
</property>
1515
</bean>

0 commit comments

Comments
 (0)