Skip to content

Commit 9dda1cb

Browse files
committed
Updated to do some polishing after rebase and merge
1 parent dc115df commit 9dda1cb

File tree

48 files changed

+66
-207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+66
-207
lines changed

.vscode/launch.json

Lines changed: 0 additions & 84 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

spring-batch-sample-apps/tasklet-sample-app/.vscode/launch.json

Lines changed: 0 additions & 29 deletions
This file was deleted.

spring-batch-sample-apps/tasklet-sample-app/.vscode/settings.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

spring-batch-samples/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,6 @@
162162
<groupId>org.junit.jupiter</groupId>
163163
<artifactId>junit-jupiter-engine</artifactId>
164164
<version>${junit-jupiter.version}</version>
165-
</dependency>
166-
<dependency>
167-
<groupId>org.junit.jupiter</groupId>
168-
<artifactId>junit-jupiter-api</artifactId>
169-
<version>${junit-jupiter.version}</version>
170165
<scope>test</scope>
171166
</dependency>
172167
<dependency>

spring-batch-samples/src/test/java/org/springframework/batch/sample/AMQPJobFunctionalTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
@ExtendWith(SpringExtension.class)
4545
@ContextConfiguration(
4646
locations = { "/simple-job-launcher-context.xml", "/jobs/amqp-example-job.xml", "/job-runner-context.xml" })
47-
public class AMQPJobFunctionalTests {
47+
class AMQPJobFunctionalTests {
4848

4949
@Autowired
5050
private JobLauncherTestUtils jobLauncherTestUtils;

spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
@ExtendWith(SpringExtension.class)
4343
@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/compositeItemWriterSampleJob.xml",
4444
"/job-runner-context.xml" })
45-
public class CompositeItemWriterSampleFunctionalTests {
45+
class CompositeItemWriterSampleFunctionalTests {
4646

4747
private static final String GET_TRADES = "SELECT isin, quantity, price, customer FROM TRADE order by isin";
4848

spring-batch-samples/src/test/java/org/springframework/batch/sample/CustomerFilterJobFunctionalTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
@ExtendWith(SpringExtension.class)
4444
@ContextConfiguration(
4545
locations = { "/simple-job-launcher-context.xml", "/jobs/customerFilterJob.xml", "/job-runner-context.xml" })
46-
public class CustomerFilterJobFunctionalTests {
46+
class CustomerFilterJobFunctionalTests {
4747

4848
private static final String GET_CUSTOMERS = "select NAME, CREDIT from CUSTOMER order by NAME";
4949

@@ -64,8 +64,7 @@ public void setDataSource(DataSource dataSource) {
6464
}
6565

6666
@BeforeEach
67-
68-
public void onSetUp() throws Exception {
67+
void onSetUp() {
6968
JdbcTestUtils.deleteFromTables(jdbcTemplate, "TRADE");
7069
JdbcTestUtils.deleteFromTableWhere(jdbcTemplate, "CUSTOMER", "ID > 4");
7170
jdbcTemplate.update("update CUSTOMER set credit=100000");
@@ -78,7 +77,7 @@ public void onSetUp() throws Exception {
7877
}
7978

8079
@AfterEach
81-
public void tearDown() throws Exception {
80+
void tearDown() {
8281
JdbcTestUtils.deleteFromTables(jdbcTemplate, "TRADE");
8382
JdbcTestUtils.deleteFromTableWhere(jdbcTemplate, "CUSTOMER", "ID > 4");
8483
}

spring-batch-samples/src/test/java/org/springframework/batch/sample/DatabaseShutdownFunctionalTests.java

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,20 @@
1616

1717
package org.springframework.batch.sample;
1818

19-
import static org.junit.jupiter.api.Assertions.assertEquals;
20-
import static org.junit.jupiter.api.Assertions.assertFalse;
21-
import static org.junit.jupiter.api.Assertions.assertNotNull;
22-
import static org.junit.jupiter.api.Assertions.assertTrue;
23-
24-
import org.apache.commons.logging.Log;
25-
import org.apache.commons.logging.LogFactory;
26-
import org.junit.jupiter.api.Test;
2719
import org.apache.commons.logging.Log;
2820
import org.apache.commons.logging.LogFactory;
2921
import org.junit.jupiter.api.Test;
3022
import org.junit.jupiter.api.extension.ExtendWith;
31-
3223
import org.springframework.batch.core.BatchStatus;
3324
import org.springframework.batch.core.Job;
3425
import org.springframework.batch.core.JobExecution;
3526
import org.springframework.batch.core.launch.JobOperator;
3627
import org.springframework.batch.test.JobLauncherTestUtils;
3728
import org.springframework.beans.factory.annotation.Autowired;
38-
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
3929
import org.springframework.test.context.ContextConfiguration;
4030
import org.springframework.test.context.junit.jupiter.SpringExtension;
4131

42-
import static org.junit.jupiter.api.Assertions.assertEquals;
43-
import static org.junit.jupiter.api.Assertions.assertNotNull;
44-
import static org.junit.jupiter.api.Assertions.assertTrue;
45-
import static org.springframework.test.util.AssertionErrors.assertFalse;
32+
import static org.junit.jupiter.api.Assertions.*;
4633

4734
/**
4835
* Functional test for graceful shutdown. A batch container is started in a new thread,
@@ -57,7 +44,7 @@
5744
@ExtendWith(SpringExtension.class)
5845
@ContextConfiguration(
5946
locations = { "/simple-job-launcher-context.xml", "/jobs/infiniteLoopJob.xml", "/job-runner-context.xml" })
60-
public class DatabaseShutdownFunctionalTests {
47+
class DatabaseShutdownFunctionalTests {
6148

6249
/** Logger */
6350
protected final Log logger = LogFactory.getLog(getClass());

spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
@ExtendWith(SpringExtension.class)
3232
@ContextConfiguration(
3333
locations = { "/simple-job-launcher-context.xml", "/jobs/delegatingJob.xml", "/job-runner-context.xml" })
34-
public class DelegatingJobFunctionalTests {
34+
class DelegatingJobFunctionalTests {
3535

3636
@Autowired
3737
private JobLauncherTestUtils jobLauncherTestUtils;

0 commit comments

Comments
 (0)