Support JUnit5 in tests

Author: garyrussell

build.gradle

@@ -74,7 +74,10 @@ subprojects { subproject ->
 		hamcrestVersion = '1.3'
 		jacksonVersion = '2.9.4'
 		jaywayJsonPathVersion = '2.4.0'
-		junitVersion = '4.12'
+		junit4Version = '4.12'
+		junitJupiterVersion = '5.1.0'
+		junitPlatformVersion = '1.1.0'
+		junitVintageVersion = '5.1.0'
 		kafkaVersion = '1.0.0'
 		mockitoVersion = '2.15.0'
 		scalaVersion = '2.11'
@@ -93,6 +96,19 @@ subprojects { subproject ->
 		toolVersion = '0.7.9'
 	}
 
+	// dependencies that are common across all java projects
+	dependencies {
+		testCompile "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
+		testRuntime "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
+		testRuntime "org.junit.platform:junit-platform-launcher:$junitPlatformVersion"
+
+		// To support JUnit 4 tests
+		testRuntime "org.junit.vintage:junit-vintage-engine:$junitVintageVersion"
+
+		// To avoid compiler warnings about @API annotations in JUnit code
+		testCompileOnly 'org.apiguardian:apiguardian-api:1.0.0'
+	}
+
 	// enable all compiler warnings; individual projects may customize further
 	[compileJava, compileTestJava]*.options*.compilerArgs = ['-Xlint:all,-options']
 
@@ -104,6 +120,7 @@ subprojects { subproject ->
 			append = false
 			destinationFile = file("$buildDir/jacoco.exec")
 		}
+		useJUnitPlatform()
 	}
 
 	checkstyle {
@@ -202,7 +219,7 @@ project ('spring-kafka-test') {
 			exclude group: 'org.slf4j', module: 'slf4j-log4j12'
 		}
 
-		compile ("junit:junit:$junitVersion") {
+		compile ("junit:junit:$junit4Version") {
 			exclude group: 'org.hamcrest', module: 'hamcrest-core'
 		}
 		compile ("org.mockito:mockito-core:$mockitoVersion") {

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -26,9 +26,8 @@
 import java.util.Map;
 
 import org.apache.kafka.streams.StreamsConfig;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -40,13 +39,14 @@
 import org.springframework.kafka.test.context.EmbeddedKafka;
 import org.springframework.kafka.test.rule.KafkaEmbedded;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
 /**
  * @author Pawel Szymczyk
- * @author Artme Bilan
+ * @author Artem Bilan
+ * @author Gary Russell
  */
-@RunWith(SpringRunner.class)
+@SpringJUnitConfig
 @DirtiesContext
 @EmbeddedKafka
 public class StreamsBuilderFactoryBeanTests {
@@ -55,7 +55,7 @@ public class StreamsBuilderFactoryBeanTests {
 
 	private static Path stateStoreDir;
 
-	@BeforeClass
+	@BeforeAll
 	public static void setup() throws IOException {
 		stateStoreDir = Files.createTempDirectory("test-state-dir");
 	}