Updated all Junit tests to 5.x

resolves TASK-675

Author: cppwfs

spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemReaderAutoConfigurationTests.java

@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;

spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemWriterAutoConfigurationTests.java

@@ -23,9 +23,9 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
@@ -62,12 +62,12 @@ public class FlatFileItemWriterAutoConfigurationTests {
 
 	private File outputFile;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		this.outputFile = File.createTempFile("flatfile-config-test-output", ".tmp");
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		this.outputFile.delete();
 	}

spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/RangeConverterTests.java

@@ -16,11 +16,12 @@
 
 package org.springframework.cloud.task.batch.autoconfigure;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.batch.item.file.transform.Range;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
  * @author Michael Minella
@@ -54,18 +55,22 @@ public void testStartAndEndValue() {
 		assertThat(range.getMax()).isEqualTo(25);
 	}
 
-	@Test(expected = NumberFormatException.class)
+	@Test
 	public void testIllegalValue() {
 		RangeConverter converter = new RangeConverter();
 
-		converter.convert("invalid");
+		assertThatExceptionOfType(NumberFormatException.class).isThrownBy(() -> {
+			converter.convert("invalid");
+		});
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void testTooManyValues() {
 		RangeConverter converter = new RangeConverter();
 
-		converter.convert("1-2-3-4");
+		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> {
+			converter.convert("1-2-3-4");
+		});
 	}
 
 }

spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/SingleStepJobAutoConfigurationTests.java

@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;

spring-cloud-task-batch/pom.xml

@@ -55,16 +55,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-test</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
@@ -91,5 +81,15 @@
 			<artifactId>spring-boot-autoconfigure-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>

spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherAutoConfigurationTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.cloud.task.batch.configuration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
 import org.springframework.boot.autoconfigure.batch.JobLauncherApplicationRunner;

spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherCommandLineRunnerCoreTests.java

@@ -16,10 +16,10 @@
 
 package org.springframework.cloud.task.batch.handler;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.function.Executable;
-import org.junit.runner.RunWith;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
@@ -49,7 +49,7 @@
 import org.springframework.core.task.SyncTaskExecutor;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.PlatformTransactionManager;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -58,7 +58,7 @@
 /**
  * @author Glenn Renfro
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(
 		classes = { TaskJobLauncherCommandLineRunnerCoreTests.BatchConfiguration.class })
 public class TaskJobLauncherCommandLineRunnerCoreTests {
@@ -85,7 +85,7 @@ public class TaskJobLauncherCommandLineRunnerCoreTests {
 
 	private Step step;
 
-	@Before
+	@BeforeEach
 	public void init() {
 		this.jobs = new JobBuilderFactory(this.jobRepository);
 		this.steps = new StepBuilderFactory(this.jobRepository, this.transactionManager);

spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherCommandLineRunnerTests.java

@@ -21,8 +21,8 @@
 import javax.sql.DataSource;
 
 import org.assertj.core.api.Condition;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
 
 import org.springframework.batch.core.Job;
@@ -74,7 +74,7 @@ public class TaskJobLauncherCommandLineRunnerTests {
 
 	private ConfigurableApplicationContext applicationContext;
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		if (this.applicationContext != null && this.applicationContext.isActive()) {
 			this.applicationContext.close();

spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/PrefixTests.java

@@ -20,8 +20,8 @@
 
 import javax.sql.DataSource;
 
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
@@ -48,7 +48,7 @@ public class PrefixTests {
 
 	private ConfigurableApplicationContext applicationContext;
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		if (this.applicationContext != null && this.applicationContext.isActive()) {
 			this.applicationContext.close();

spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/TaskBatchExecutionListenerTests.java

@@ -24,8 +24,8 @@
 
 import javax.sql.DataSource;
 
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.StepContribution;
@@ -63,6 +63,7 @@
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
  * @author Michael Minella
@@ -74,7 +75,7 @@ public class TaskBatchExecutionListenerTests {
 
 	private ConfigurableApplicationContext applicationContext;
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		if (this.applicationContext != null && this.applicationContext.isActive()) {
 			this.applicationContext.close();
@@ -87,25 +88,31 @@ public void testAutobuiltDataSource() {
 		validateContext();
 	}
 
-	@Test(expected = AssertionError.class)
+	@Test
 	public void testNoAutoConfigurationEnabled() {
 		this.applicationContext = SpringApplication.run(JobConfiguration.class,
 				"--spring.cloud.task.batch.listener.enabled=false");
-		validateContext();
+		assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> {
+			validateContext();
+		});
 	}
 
-	@Test(expected = AssertionError.class)
+	@Test
 	public void testNoAutoConfigurationEnable() {
 		this.applicationContext = SpringApplication.run(JobConfiguration.class,
 				"--spring.cloud.task.batch.listener.enable=false");
-		validateContext();
+		assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> {
+			validateContext();
+		});
 	}
 
-	@Test(expected = AssertionError.class)
+	@Test
 	public void testNoAutoConfigurationBothDisabled() {
 		this.applicationContext = SpringApplication.run(JobConfiguration.class,
 				"--spring.cloud.task.batch.listener.enable=false --spring.cloud.task.batch.listener.enabled=false");
-		validateContext();
+		assertThatExceptionOfType(AssertionError.class).isThrownBy(() -> {
+			validateContext();
+		});
 	}
 
 	@Test
@@ -245,9 +252,11 @@ public void testBatchExecutionListenerBeanPostProcessorWithEmptyJobNames() {
 		assertThat(bean).isEqualTo(testObject);
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void testBatchExecutionListenerBeanPostProcessorNullJobNames() {
-		beanPostProcessor(null);
+		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> {
+			beanPostProcessor(null);
+		});
 	}
 
 	private TaskBatchExecutionListenerBeanPostProcessor beanPostProcessor(