Skip to content

Commit de9ce2d

Browse files
fmbenhassinefmbenhassine
committed
Use JdbcTestUtils where appropriate in tests
1 parent 3742931 commit de9ce2d

30 files changed

+154
-125
lines changed

‎spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobLauncherIntegrationTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2014 the original author or authors.
2+
* Copyright 2009-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
3232
import org.springframework.jdbc.core.JdbcTemplate;
3333
import org.springframework.test.context.ContextConfiguration;
3434
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
35+
import org.springframework.test.jdbc.JdbcTestUtils;
3536

3637
@ContextConfiguration
3738
@RunWith(SpringJUnit4ClassRunner.class)
@@ -53,13 +54,13 @@ public void setDataSource(DataSource dataSource) {
5354
@Test
5455
public void testLaunchAndRelaunch() throws Exception {
5556

56-
int before = jdbcTemplate.queryForObject("select count(*) from BATCH_JOB_INSTANCE", Integer.class);
57+
int before = JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_JOB_INSTANCE");
5758

5859
JobExecution jobExecution = launch(true,0);
5960
launch(false, jobExecution.getId());
6061
launch(false, jobExecution.getId());
6162

62-
int after = jdbcTemplate.queryForObject("select count(*) from BATCH_JOB_INSTANCE", Integer.class);
63+
int after = JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_JOB_INSTANCE");
6364
assertEquals(before+1, after);
6465

6566
}

‎spring-batch-core/src/test/java/org/springframework/batch/core/partition/RestartIntegrationTests.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.springframework.jdbc.core.JdbcTemplate;
3535
import org.springframework.test.context.ContextConfiguration;
3636
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
37+
import org.springframework.test.jdbc.JdbcTestUtils;
3738

3839
/**
3940
* @author Dave Syer
@@ -75,8 +76,8 @@ public void testLaunchJob() throws Exception {
7576
ExampleItemReader.fail = true;
7677
JobParameters jobParameters = new JobParametersBuilder().addString("restart", "yes").toJobParameters();
7778

78-
int beforeManager = jdbcTemplate.queryForObject("SELECT COUNT(*) from BATCH_STEP_EXECUTION where STEP_NAME='step1:manager'", Integer.class);
79-
int beforePartition = jdbcTemplate.queryForObject("SELECT COUNT(*) from BATCH_STEP_EXECUTION where STEP_NAME like 'step1:partition%'", Integer.class);
79+
int beforeManager = JdbcTestUtils.countRowsInTableWhere(jdbcTemplate, "BATCH_STEP_EXECUTION", "STEP_NAME='step1:manager'");
80+
int beforePartition = JdbcTestUtils.countRowsInTableWhere(jdbcTemplate, "BATCH_STEP_EXECUTION", "STEP_NAME like 'step1:partition%'");
8081

8182
ExampleItemWriter.clear();
8283
JobExecution execution = jobLauncher.run(job, jobParameters);
@@ -89,8 +90,8 @@ public void testLaunchJob() throws Exception {
8990
// Only 4 because the others were processed in the first attempt
9091
assertEquals(4, ExampleItemWriter.getItems().size());
9192

92-
int afterManager = jdbcTemplate.queryForObject("SELECT COUNT(*) from BATCH_STEP_EXECUTION where STEP_NAME='step1:manager'", Integer.class);
93-
int afterPartition = jdbcTemplate.queryForObject("SELECT COUNT(*) from BATCH_STEP_EXECUTION where STEP_NAME like 'step1:partition%'", Integer.class);
93+
int afterManager = JdbcTestUtils.countRowsInTableWhere(jdbcTemplate, "BATCH_STEP_EXECUTION", "STEP_NAME='step1:manager'");
94+
int afterPartition = JdbcTestUtils.countRowsInTableWhere(jdbcTemplate, "BATCH_STEP_EXECUTION", "STEP_NAME like 'step1:partition%'");
9495

9596
// Two attempts
9697
assertEquals(2, afterManager-beforeManager);

‎spring-batch-core/src/test/java/org/springframework/batch/core/partition/VanillaIntegrationTests.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.springframework.jdbc.core.JdbcTemplate;
3030
import org.springframework.test.context.ContextConfiguration;
3131
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
32+
import org.springframework.test.jdbc.JdbcTestUtils;
3233

3334
/**
3435
* @author Dave Syer
@@ -59,11 +60,11 @@ public void testSimpleProperties() throws Exception {
5960

6061
@Test
6162
public void testLaunchJob() throws Exception {
62-
int beforeManager = jdbcTemplate.queryForObject("SELECT COUNT(*) from BATCH_STEP_EXECUTION where STEP_NAME='step1:manager'", Integer.class);
63-
int beforePartition = jdbcTemplate.queryForObject("SELECT COUNT(*) from BATCH_STEP_EXECUTION where STEP_NAME like 'step1:partition%'", Integer.class);
63+
int beforeManager = JdbcTestUtils.countRowsInTableWhere(jdbcTemplate, "BATCH_STEP_EXECUTION", "STEP_NAME='step1:manager'");
64+
int beforePartition = JdbcTestUtils.countRowsInTableWhere(jdbcTemplate, "BATCH_STEP_EXECUTION", "STEP_NAME like 'step1:partition%'");
6465
assertNotNull(jobLauncher.run(job, new JobParameters()));
65-
int afterManager = jdbcTemplate.queryForObject("SELECT COUNT(*) from BATCH_STEP_EXECUTION where STEP_NAME='step1:manager'", Integer.class);
66-
int afterPartition = jdbcTemplate.queryForObject("SELECT COUNT(*) from BATCH_STEP_EXECUTION where STEP_NAME like 'step1:partition%'", Integer.class);
66+
int afterManager = JdbcTestUtils.countRowsInTableWhere(jdbcTemplate, "BATCH_STEP_EXECUTION", "STEP_NAME='step1:manager'");
67+
int afterPartition = JdbcTestUtils.countRowsInTableWhere(jdbcTemplate, "BATCH_STEP_EXECUTION", "STEP_NAME like 'step1:partition%'");
6768
assertEquals(1, afterManager-beforeManager);
6869
// Should be same as grid size in step splitter
6970
assertEquals(2, afterPartition-beforePartition);

‎spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/JdbcJobRepositoryTests.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006-2019 the original author or authors.
2+
* Copyright 2006-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -40,6 +40,7 @@
4040
import org.springframework.jdbc.core.JdbcTemplate;
4141
import org.springframework.test.context.ContextConfiguration;
4242
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
43+
import org.springframework.test.jdbc.JdbcTestUtils;
4344

4445
import static org.junit.Assert.assertEquals;
4546
import static org.junit.Assert.assertNotNull;
@@ -84,7 +85,7 @@ public void testFindOrCreateJob() throws Exception {
8485
job.setName("foo");
8586
int before = 0;
8687
JobExecution execution = repository.createJobExecution(job.getName(), new JobParameters());
87-
int after = jdbcTemplate.queryForObject("SELECT COUNT(*) FROM BATCH_JOB_INSTANCE", Integer.class);
88+
int after = JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_JOB_INSTANCE");;
8889
assertEquals(before + 1, after);
8990
assertNotNull(execution.getId());
9091
}
@@ -96,7 +97,7 @@ public void testFindOrCreateJobWithExecutionContext() throws Exception {
9697
JobExecution execution = repository.createJobExecution(job.getName(), new JobParameters());
9798
execution.getExecutionContext().put("foo", "bar");
9899
repository.updateExecutionContext(execution);
99-
int after = jdbcTemplate.queryForObject("SELECT COUNT(*) FROM BATCH_JOB_EXECUTION_CONTEXT", Integer.class);
100+
int after = JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_JOB_EXECUTION_CONTEXT");
100101
assertEquals(before + 1, after);
101102
assertNotNull(execution.getId());
102103
JobExecution last = repository.getLastJobExecution(job.getName(), new JobParameters());
@@ -126,7 +127,7 @@ public void testFindOrCreateJobConcurrently() throws Exception {
126127

127128
assertNotNull(execution);
128129

129-
int after = jdbcTemplate.queryForObject("SELECT COUNT(*) FROM BATCH_JOB_INSTANCE", Integer.class);
130+
int after = JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_JOB_INSTANCE");
130131
assertNotNull(execution.getId());
131132
assertEquals(before + 1, after);
132133

@@ -147,7 +148,7 @@ public void testFindOrCreateJobConcurrentlyWhenJobAlreadyExists() throws Excepti
147148
repository.update(execution);
148149
execution.setStatus(BatchStatus.FAILED);
149150

150-
int before = jdbcTemplate.queryForObject("SELECT COUNT(*) FROM BATCH_JOB_INSTANCE", Integer.class);
151+
int before = JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_JOB_INSTANCE");
151152
assertEquals(1, before);
152153

153154
long t0 = System.currentTimeMillis();
@@ -160,7 +161,7 @@ public void testFindOrCreateJobConcurrentlyWhenJobAlreadyExists() throws Excepti
160161
}
161162
long t1 = System.currentTimeMillis();
162163

163-
int after = jdbcTemplate.queryForObject("SELECT COUNT(*) FROM BATCH_JOB_INSTANCE", Integer.class);
164+
int after = JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_JOB_INSTANCE");
164165
assertNotNull(execution.getId());
165166
assertEquals(before, after);
166167

‎spring-batch-core/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanIntegrationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2019 the original author or authors.
2+
* Copyright 2010-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -226,7 +226,7 @@ public String mapRow(ResultSet rs, int rowNum) throws SQLException {
226226

227227
public void clear() {
228228
written.clear();
229-
jdbcTemplate.update("DELETE FROM ERROR_LOG where STEP_NAME='written'");
229+
JdbcTestUtils.deleteFromTableWhere(jdbcTemplate, "ERROR_LOG", "STEP_NAME='written'");
230230
}
231231

232232
@Override
@@ -272,7 +272,7 @@ public String mapRow(ResultSet rs, int rowNum) throws SQLException {
272272

273273
public void clear() {
274274
processed.clear();
275-
jdbcTemplate.update("DELETE FROM ERROR_LOG where STEP_NAME='processed'");
275+
JdbcTestUtils.deleteFromTableWhere(jdbcTemplate, "ERROR_LOG", "STEP_NAME='processed'");
276276
}
277277

278278
@Nullable

‎spring-batch-core/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanRollbackIntegrationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2019 the original author or authors.
2+
* Copyright 2010-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -251,7 +251,7 @@ public String mapRow(ResultSet rs, int rowNum) throws SQLException {
251251

252252
public void clear() {
253253
written.clear();
254-
jdbcTemplate.update("DELETE FROM ERROR_LOG where STEP_NAME='written'");
254+
JdbcTestUtils.deleteFromTableWhere(jdbcTemplate, "ERROR_LOG", "STEP_NAME='written'");
255255
}
256256

257257
@Override
@@ -304,7 +304,7 @@ public String mapRow(ResultSet rs, int rowNum) throws SQLException {
304304

305305
public void clear() {
306306
processed.clear();
307-
jdbcTemplate.update("DELETE FROM ERROR_LOG where STEP_NAME='processed'");
307+
JdbcTestUtils.deleteFromTableWhere(jdbcTemplate, "ERROR_LOG", "STEP_NAME='processed'");
308308
}
309309

310310
@Nullable

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/config/DatasourceTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
2323
import org.springframework.test.context.ContextConfiguration;
2424
import org.springframework.beans.factory.annotation.Autowired;
25+
import org.springframework.test.jdbc.JdbcTestUtils;
2526
import org.springframework.transaction.annotation.Transactional;
2627
import org.junit.runner.RunWith;
2728
import org.junit.Test;
@@ -36,8 +37,8 @@ public class DatasourceTests {
3637
@Transactional @Test
3738
public void testTemplate() throws Exception {
3839
System.err.println(System.getProperty("java.class.path"));
39-
jdbcTemplate.execute("delete from T_BARS");
40-
int count = jdbcTemplate.queryForObject("select count(*) from T_BARS", Integer.class);
40+
JdbcTestUtils.deleteFromTables(jdbcTemplate, "T_BARS");
41+
int count = JdbcTestUtils.countRowsInTable(jdbcTemplate, "T_BARS");
4142
assertEquals(0, count);
4243

4344
jdbcTemplate.update("INSERT into T_BARS (id,name,foo_date) values (?,?,null)", 0, "foo");

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006-2012 the original author or authors.
2+
* Copyright 2006-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -48,6 +48,7 @@
4848
/**
4949
* @author Dave Syer
5050
* @author Michael Minella
51+
* @author Mahmoud Ben Hassine
5152
* @since 2.1
5253
*/
5354
@RunWith(SpringJUnit4ClassRunner.class)
@@ -74,7 +75,6 @@ public void testInit() {
7475
String[] names = {"Foo", "Bar", "Baz", "Foo", "Bar", "Baz", "Foo", "Bar", "Baz"};
7576
String[] codes = {"A", "B", "A", "B", "B", "B", "A", "B", "A"};
7677
JdbcTestUtils.deleteFromTables(jdbcTemplate, "T_FOOS");
77-
// jdbcTemplate.update("DELETE from T_FOOS");
7878
for(int i = 0; i < names.length; i++) {
7979
jdbcTemplate.update("INSERT into T_FOOS (ID,NAME, CODE, VALUE) values (?, ?, ?, ?)", maxId, names[i], codes[i], i);
8080
maxId++;
@@ -85,7 +85,6 @@ public void testInit() {
8585
@After
8686
public void destroy() {
8787
JdbcTestUtils.deleteFromTables(jdbcTemplate, "T_FOOS");
88-
// jdbcTemplate.update("DELETE from T_FOOS");
8988
}
9089

9190
@Test

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqliteMaxValueIncrementerTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014 the original author or authors.
2+
* Copyright 2014-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,9 +24,11 @@
2424
import org.junit.Test;
2525
import org.springframework.jdbc.core.JdbcTemplate;
2626
import org.springframework.jdbc.datasource.SimpleDriverDataSource;
27+
import org.springframework.test.jdbc.JdbcTestUtils;
2728

2829
/**
2930
* @author Luke Taylor
31+
* @author Mahmoud Ben Hassine
3032
*/
3133
public class SqliteMaxValueIncrementerTests {
3234
static String dbFile;
@@ -59,6 +61,6 @@ public void testNextKey() throws Exception {
5961
assertEquals(1, mvi.getNextKey());
6062
assertEquals(2, mvi.getNextKey());
6163
assertEquals(3, mvi.getNextKey());
62-
assertEquals(1, template.queryForObject("select count(*) from max_value", Integer.class).intValue());
64+
assertEquals(1, JdbcTestUtils.countRowsInTable(template, "max_value"));
6365
}
6466
}

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.springframework.retry.support.RetryTemplate;
4040
import org.springframework.test.context.ContextConfiguration;
4141
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
42+
import org.springframework.test.jdbc.JdbcTestUtils;
4243
import org.springframework.transaction.PlatformTransactionManager;
4344
import org.springframework.transaction.TransactionStatus;
4445
import org.springframework.transaction.support.TransactionCallback;
@@ -73,7 +74,7 @@ public class ExternalRetryInBatchTests {
7374
@Before
7475
public void onSetUp() throws Exception {
7576
getMessages(); // drain queue
76-
jdbcTemplate.execute("delete from T_BARS");
77+
JdbcTestUtils.deleteFromTables(jdbcTemplate, "T_BARS");
7778
jmsTemplate.convertAndSend("queue", "foo");
7879
jmsTemplate.convertAndSend("queue", "bar");
7980
provider = new ItemReader<String>() {
@@ -91,11 +92,11 @@ public String read() {
9192
@After
9293
public void onTearDown() throws Exception {
9394
getMessages(); // drain queue
94-
jdbcTemplate.execute("delete from T_BARS");
95+
JdbcTestUtils.deleteFromTables(jdbcTemplate, "T_BARS");
9596
}
9697

9798
private void assertInitialState() {
98-
int count = jdbcTemplate.queryForObject("select count(*) from T_BARS", Integer.class);
99+
int count = JdbcTestUtils.countRowsInTable(jdbcTemplate, "T_BARS");
99100
assertEquals(0, count);
100101
}
101102

@@ -189,7 +190,7 @@ public String recover(RetryContext context) {
189190
assertEquals(2, recovered.size());
190191

191192
// The database portion committed once...
192-
int count = jdbcTemplate.queryForObject("select count(*) from T_BARS", Integer.class);
193+
int count = JdbcTestUtils.countRowsInTable(jdbcTemplate, "T_BARS");
193194
assertEquals(0, count);
194195

195196
// ... and so did the message session.

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/jms/AsynchronousTests.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.springframework.test.annotation.DirtiesContext;
3737
import org.springframework.test.context.ContextConfiguration;
3838
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
39+
import org.springframework.test.jdbc.JdbcTestUtils;
3940

4041
import static org.junit.Assert.assertEquals;
4142
import static org.junit.Assert.assertNull;
@@ -63,7 +64,7 @@ public void onSetUp() throws Exception {
6364
foo = (String) jmsTemplate.receiveAndConvert("queue");
6465
count++;
6566
}
66-
jdbcTemplate.execute("delete from T_BARS");
67+
JdbcTestUtils.deleteFromTables(jdbcTemplate, "T_BARS");
6768

6869
// Queue is now drained...
6970
assertNull(foo);
@@ -90,7 +91,7 @@ public void onTearDown() throws Exception {
9091
private volatile List<String> list = new ArrayList<>();
9192

9293
private void assertInitialState() {
93-
int count = jdbcTemplate.queryForObject("select count(*) from T_BARS", Integer.class);
94+
int count = JdbcTestUtils.countRowsInTable(jdbcTemplate, "T_BARS");
9495
assertEquals(0, count);
9596
}
9697

@@ -122,7 +123,7 @@ public void onMessage(Message message, Session session) throws JMSException {
122123
String foo = (String) jmsTemplate.receiveAndConvert("queue");
123124
assertEquals(null, foo);
124125

125-
int count = jdbcTemplate.queryForObject("select count(*) from T_BARS", Integer.class);
126+
int count = JdbcTestUtils.countRowsInTable(jdbcTemplate, "T_BARS");
126127
assertEquals(2, count);
127128

128129
}
@@ -169,7 +170,7 @@ public void onMessage(Message message, Session session) throws JMSException {
169170
msgs.add(text);
170171
}
171172

172-
int count = jdbcTemplate.queryForObject("select count(*) from T_BARS", Integer.class);
173+
int count = JdbcTestUtils.countRowsInTable(jdbcTemplate, "T_BARS");
173174
assertEquals(0, count);
174175

175176
assertTrue("Foo not on queue", msgs.contains("foo"));

0 commit comments

Comments
 (0)