Updated the Spring Samples Code to JUnit 5.

Since I had to add the dependency to the tests to have them pass because of the change made in the previous commit, I decided to migrate all tests to JUnit 5.

2 things to note:
* I used Spring's AssertionErrors on some AssertTrue or AssertFalse methods so that we could maintain the message.
* In a couple of cases the use of assertNotSame that was used had a message, but is no longer supported, so I removed those messages.

Author: cppwfs

.vscode/launch.json

@@ -0,0 +1,84 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "java",
+            "name": "Launch Current File",
+            "request": "launch",
+            "mainClass": "${file}"
+        },
+        {
+            "type": "java",
+            "name": "Launch CommandLineJobRunner",
+            "request": "launch",
+            "mainClass": "org.springframework.batch.core.launch.support.CommandLineJobRunner",
+            "projectName": "spring-batch-core"
+        },
+        {
+            "type": "java",
+            "name": "Launch JobRegistryBackgroundJobRunner",
+            "request": "launch",
+            "mainClass": "org.springframework.batch.core.launch.support.JobRegistryBackgroundJobRunner",
+            "projectName": "spring-batch-core"
+        },
+        {
+            "type": "java",
+            "name": "Launch DataSourceInitializer",
+            "request": "launch",
+            "mainClass": "test.jdbc.datasource.DataSourceInitializer",
+            "projectName": "spring-batch-core"
+        },
+        {
+            "type": "java",
+            "name": "Launch AvroTestUtils",
+            "request": "launch",
+            "mainClass": "org.springframework.batch.item.avro.example.AvroTestUtils",
+            "projectName": "spring-batch-infrastructure"
+        },
+        {
+            "type": "java",
+            "name": "Launch DataSourceInitializer(1)",
+            "request": "launch",
+            "mainClass": "test.jdbc.datasource.DataSourceInitializer",
+            "projectName": "spring-batch-infrastructure"
+        },
+        {
+            "type": "java",
+            "name": "Launch BatchMetricsApplication",
+            "request": "launch",
+            "mainClass": "org.springframework.batch.sample.metrics.BatchMetricsApplication",
+            "projectName": "spring-batch-samples"
+        },
+        {
+            "type": "java",
+            "name": "Launch MongoDBSampleApp",
+            "request": "launch",
+            "mainClass": "org.springframework.batch.sample.mongodb.MongoDBSampleApp",
+            "projectName": "spring-batch-samples"
+        },
+        {
+            "type": "java",
+            "name": "Launch AmqpMessageProducer",
+            "request": "launch",
+            "mainClass": "org.springframework.batch.sample.rabbitmq.amqp.AmqpMessageProducer",
+            "projectName": "spring-batch-samples"
+        },
+        {
+            "type": "java",
+            "name": "Launch DataSourceInitializer(2)",
+            "request": "launch",
+            "mainClass": "org.springframework.batch.test.DataSourceInitializer",
+            "projectName": "spring-batch-test"
+        },
+        {
+            "type": "java",
+            "name": "Launch Task Sample app",
+            "request": "launch",
+            "mainClass": "org.springframework.batch.test.DataSourceInitializer",
+            "projectName": "spring-batch-sample-apps"
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "automatic"
+}

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

@@ -0,0 +1,29 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "java",
+            "name": "Launch Current File",
+            "request": "launch",
+            "mainClass": "${file}"
+        },
+        {
+            "type": "java",
+            "name": "Launch TaskletSampleApp",
+            "request": "launch",
+            "mainClass": "io.spring.taskletsampleapp.TaskletSampleApp",
+            "projectName": "tasklet-sample-app"
+        },
+        {
+            "type": "java",
+            "name": "Launch TaskletSampleApp For XML",
+            "request": "launch",
+            "mainClass": "io.spring.taskletsampleapp.TaskletSampleApp",
+            "projectName": "tasklet-sample-app",
+            "vmArgs": "-Dspring.profiles.active=xml -Dspring.batch.initializer.enabled=true"
+        }
+    ]
+}

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

@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "automatic"
+}

spring-batch-samples/pom.xml

@@ -158,18 +158,6 @@
 			<artifactId>spring-batch-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.hamcrest</groupId>
-					<artifactId>hamcrest-core</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
@@ -179,7 +167,7 @@
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
 			<version>${junit-jupiter.version}</version>
-			<optional>true</optional>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>

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

@@ -19,11 +19,13 @@
 
 import org.junit.jupiter.api.Test;
 
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.explore.JobExplorer;
 import org.springframework.batch.test.JobLauncherTestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * <p>
@@ -39,9 +41,10 @@
  * </p>
  */
 
-@SpringJUnitConfig(
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(
 		locations = { "/simple-job-launcher-context.xml", "/jobs/amqp-example-job.xml", "/job-runner-context.xml" })
-class AMQPJobFunctionalTests {
+public class AMQPJobFunctionalTests {
 
 	@Autowired
 	private JobLauncherTestUtils jobLauncherTestUtils;

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

@@ -17,13 +17,15 @@
 package org.springframework.batch.sample;
 
 import org.junit.jupiter.api.Test;
-
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.test.JobLauncherTestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml", "/jobs/beanWrapperMapperSampleJob.xml",
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/beanWrapperMapperSampleJob.xml",
 		"/job-runner-context.xml" })
 class BeanWrapperMapperSampleJobFunctionalTests {
 

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

@@ -15,32 +15,34 @@
  */
 package org.springframework.batch.sample;
 
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.sql.DataSource;
-
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Test;
-
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.sample.domain.trade.Trade;
 import org.springframework.batch.test.JobLauncherTestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowCallbackHandler;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.jdbc.JdbcTestUtils;
 
+import javax.sql.DataSource;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml", "/jobs/compositeItemWriterSampleJob.xml",
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/compositeItemWriterSampleJob.xml",
 		"/job-runner-context.xml" })
-class CompositeItemWriterSampleFunctionalTests {
+public class CompositeItemWriterSampleFunctionalTests {
 
 	private static final String GET_TRADES = "SELECT isin, quantity, price, customer FROM TRADE order by isin";
 

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

@@ -16,33 +16,34 @@
 
 package org.springframework.batch.sample;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.test.JobLauncherTestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowCallbackHandler;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.jdbc.JdbcTestUtils;
 
-@SpringJUnitConfig(
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(
 		locations = { "/simple-job-launcher-context.xml", "/jobs/customerFilterJob.xml", "/job-runner-context.xml" })
-class CustomerFilterJobFunctionalTests {
+public class CustomerFilterJobFunctionalTests {
 
 	private static final String GET_CUSTOMERS = "select NAME, CREDIT from CUSTOMER order by NAME";
 
@@ -63,7 +64,8 @@ public void setDataSource(DataSource dataSource) {
 	}
 
 	@BeforeEach
-	void onSetUp() {
+
+	public void onSetUp() throws Exception {
 		JdbcTestUtils.deleteFromTables(jdbcTemplate, "TRADE");
 		JdbcTestUtils.deleteFromTableWhere(jdbcTemplate, "CUSTOMER", "ID > 4");
 		jdbcTemplate.update("update CUSTOMER set credit=100000");
@@ -76,7 +78,7 @@ void onSetUp() {
 	}
 
 	@AfterEach
-	void tearDown() {
+	public void tearDown() throws Exception {
 		JdbcTestUtils.deleteFromTables(jdbcTemplate, "TRADE");
 		JdbcTestUtils.deleteFromTableWhere(jdbcTemplate, "CUSTOMER", "ID > 4");
 	}
@@ -95,7 +97,7 @@ void testFilterJob(@Autowired Job job) throws Exception {
 		jdbcTemplate.query(GET_CUSTOMERS, new RowCallbackHandler() {
 			@Override
 			public void processRow(ResultSet rs) throws SQLException {
-				Customer customer = customers.get(activeRow++);
+				CustomerFilterJobFunctionalTests.Customer customer = customers.get(activeRow++);
 				assertEquals(customer.getName(), rs.getString(1));
 				assertEquals(customer.getCredit(), rs.getDouble(2), .01);
 			}

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

@@ -24,25 +24,40 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.jupiter.api.Test;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.launch.JobOperator;
 import org.springframework.batch.test.JobLauncherTestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.springframework.test.util.AssertionErrors.assertFalse;
 
 /**
  * Functional test for graceful shutdown. A batch container is started in a new thread,
  * then it's stopped using {@link JobOperator#stop(long)}}.
  *
  * @author Lucas Ward
  * @author Mahmoud Ben Hassine
+ * @author Glenn Renfro
  *
  */
-@SpringJUnitConfig(
+
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(
 		locations = { "/simple-job-launcher-context.xml", "/jobs/infiniteLoopJob.xml", "/job-runner-context.xml" })
-class DatabaseShutdownFunctionalTests {
+public class DatabaseShutdownFunctionalTests {
 
 	/** Logger */
 	protected final Log logger = LogFactory.getLog(getClass());