Resolve Gradle deprecation warnings in integration tests

Moreover, tests will now fail when new deprecation warnings are emitted.
junit-team · Nov 20, 2024 · 151cd36 · 151cd36
1 parent d9f9122
commit 151cd36
Show file tree

Hide file tree

Showing 18 changed files with 66 additions and 22 deletions.
diff --git a/platform-tooling-support-tests/projects/gradle-kotlin-extensions/build.gradle.kts b/platform-tooling-support-tests/projects/gradle-kotlin-extensions/build.gradle.kts
@@ -11,10 +11,18 @@ repositories {
 
 // grab jupiter version from system environment
 val jupiterVersion = System.getenv("JUNIT_JUPITER_VERSION")
+val platformVersion: String = System.getenv("JUNIT_PLATFORM_VERSION")
 
 dependencies {
 	testImplementation(kotlin("stdlib-jdk8"))
 	testImplementation("org.junit.jupiter:junit-jupiter:$jupiterVersion")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher:$platformVersion")
+}
+
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(8)
+	}
 }
 
 tasks.withType<KotlinCompile>().configureEach {

diff --git a/platform-tooling-support-tests/projects/gradle-kotlin-extensions/gradle.properties b/platform-tooling-support-tests/projects/gradle-kotlin-extensions/gradle.properties
@@ -0,0 +1 @@
+org.gradle.java.installations.fromEnv=JDK8
diff --git a/platform-tooling-support-tests/projects/gradle-missing-engine/build.gradle.kts b/platform-tooling-support-tests/projects/gradle-missing-engine/build.gradle.kts
@@ -31,6 +31,12 @@ dependencies {
 	testImplementation("org.junit.jupiter:junit-jupiter-api:$jupiterVersion") {
 		exclude(group = "org.junit.jupiter", module = "junit-jupiter-engine")
 	}
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher:$platformVersion")}
+
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(8)
+	}
 }
 
 tasks.test {

diff --git a/platform-tooling-support-tests/projects/gradle-missing-engine/gradle.properties b/platform-tooling-support-tests/projects/gradle-missing-engine/gradle.properties
@@ -0,0 +1 @@
+org.gradle.java.installations.fromEnv=JDK8
diff --git a/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts b/platform-tooling-support-tests/projects/gradle-starter/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
 
 // grab jupiter version from system environment
 val jupiterVersion: String = System.getenv("JUNIT_JUPITER_VERSION")
-val vintageVersion: String = System.getenv("JUNIT_VINTAGE_VERSION")
 val platformVersion: String = System.getenv("JUNIT_PLATFORM_VERSION")
 
 repositories {
@@ -17,11 +16,17 @@ dependencies {
 	testRuntimeOnly("org.junit.platform:junit-platform-reporting:$platformVersion")
 }
 
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(8)
+	}
+}
+
 tasks.test {
 	useJUnitPlatform()
 
 	testLogging {
-		events("passed", "skipped", "failed")
+		events("passed", "skipped", "failed", "standardOut")
 	}
 
 	reports {
@@ -35,8 +40,4 @@ tasks.test {
 			"-Djunit.platform.reporting.output.dir=${outputDir.get().asFile.absolutePath}"
 		)
 	}
-
-	doFirst {
-		println("Using Java version: ${JavaVersion.current()}")
-	}
 }
diff --git a/platform-tooling-support-tests/projects/gradle-starter/gradle.properties b/platform-tooling-support-tests/projects/gradle-starter/gradle.properties
@@ -0,0 +1 @@
+org.gradle.java.installations.fromEnv=JDK8
diff --git a/...port-tests/projects/gradle-starter/src/test/java/com/example/project/CalculatorTests.java b/...port-tests/projects/gradle-starter/src/test/java/com/example/project/CalculatorTests.java
@@ -12,13 +12,19 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
 class CalculatorTests {
 
+	@BeforeAll
+	static void printJavaVersion() {
+		System.out.println("Using Java version: " + System.getProperty("java.specification.version"));
+	}
+
 	@Test
 	@DisplayName("1 + 1 = 2")
 	void addsTwoNumbers() {

diff --git a/platform-tooling-support-tests/projects/reflection-tests/build.gradle.kts b/platform-tooling-support-tests/projects/reflection-tests/build.gradle.kts
@@ -18,11 +18,17 @@ dependencies {
 	testRuntimeOnly("org.junit.platform:junit-platform-reporting:$platformVersion")
 }
 
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(8)
+	}
+}
+
 tasks.test {
 	useJUnitPlatform()
 
 	testLogging {
-		events("failed")
+		events("failed", "standardOut")
 	}
 
 	reports {
@@ -36,8 +42,4 @@ tasks.test {
 			"-Djunit.platform.reporting.output.dir=${outputDir.get().asFile.absolutePath}"
 		)
 	}
-
-	doFirst {
-		println("Using Java version: ${JavaVersion.current()}")
-	}
 }
diff --git a/platform-tooling-support-tests/projects/reflection-tests/gradle.properties b/platform-tooling-support-tests/projects/reflection-tests/gradle.properties
@@ -0,0 +1 @@
+org.gradle.java.installations.fromEnv=JDK8
diff --git a/...orm-tooling-support-tests/projects/reflection-tests/src/test/java/ReflectionTestCase.java b/...orm-tooling-support-tests/projects/reflection-tests/src/test/java/ReflectionTestCase.java
@@ -17,6 +17,7 @@
 import java.util.Arrays;
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DynamicNode;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor;
@@ -31,6 +32,11 @@
 
 class ReflectionTestCase {
 
+	@BeforeAll
+	static void printJavaVersion() {
+		System.out.println("Using Java version: " + System.getProperty("java.specification.version"));
+	}
+
 	@TestFactory
 	Stream<DynamicNode> canReadParameters() {
 		return Stream.of(JupiterTestDescriptor.class, ClassBasedTestDescriptor.class, ClassTestDescriptor.class,

diff --git a/platform-tooling-support-tests/projects/vintage/build.gradle.kts b/platform-tooling-support-tests/projects/vintage/build.gradle.kts
@@ -18,6 +18,15 @@ dependencies {
 		exclude(group = "junit")
 		because("we want to override it to test against different versions")
 	}
+
+	val platformVersion: String = System.getenv("JUNIT_PLATFORM_VERSION")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher:$platformVersion")
+}
+
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(8)
+	}
 }
 
 tasks.test {

diff --git a/platform-tooling-support-tests/projects/vintage/gradle.properties b/platform-tooling-support-tests/projects/vintage/gradle.properties
@@ -0,0 +1 @@
+org.gradle.java.installations.fromEnv=JDK8
diff --git a/...oling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java b/...oling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java
@@ -43,7 +43,8 @@ void runsTestsInNativeImage() {
 				.setTool(new GradleWrapper(Paths.get(".."))) //
 				.setProject(Projects.GRAALVM_STARTER) //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
-				.addArguments("javaToolchains", "nativeTest", "--no-daemon", "--stacktrace", "--no-build-cache") //
+				.addArguments("javaToolchains", "nativeTest", "--no-daemon", "--stacktrace", "--no-build-cache",
+					"--warning-mode=fail") //
 				.setTimeout(Duration.ofMinutes(10)) //
 				.build();
 

diff --git a/...pport-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java b/...pport-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java
@@ -39,9 +39,9 @@ void gradle_wrapper() {
 				.setTool(new GradleWrapper(Paths.get(".."))) //
 				.setProject(Projects.GRADLE_KOTLIN_EXTENSIONS) //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
-				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache") //
+				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache", "--warning-mode=fail") //
 				.setTimeout(TOOL_TIMEOUT) //
-				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
+				.putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) //
 				.build() //
 				.run();
 

diff --git a/...-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java b/...-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java
@@ -45,8 +45,8 @@ private void test(Tool gradle) {
 				.setProject(Projects.GRADLE_MISSING_ENGINE) //
 				.setTool(gradle) //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
-				.addArguments("build", "--no-daemon", "--debug", "--stacktrace", "--no-build-cache") //
-				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
+				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache", "--warning-mode=fail") //
+				.putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) //
 				.setTimeout(TOOL_TIMEOUT).build() //
 				.run();
 

diff --git a/...ooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java b/...ooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
@@ -41,9 +41,9 @@ void gradle_wrapper() {
 				.setTool(new GradleWrapper(Paths.get(".."))) //
 				.setProject(Projects.GRADLE_STARTER) //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
-				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache") //
+				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache", "--warning-mode=fail") //
 				.setTimeout(TOOL_TIMEOUT) //
-				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
+				.putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) //
 				.build();
 
 		var result = request.run();

diff --git a/...port-tests/src/test/java/platform/tooling/support/tests/ReflectionCompatibilityTests.java b/...port-tests/src/test/java/platform/tooling/support/tests/ReflectionCompatibilityTests.java
@@ -40,9 +40,9 @@ void gradle_wrapper() {
 				.setTool(new GradleWrapper(Paths.get(".."))) //
 				.setProject(Projects.REFLECTION_TESTS) //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
-				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache") //
+				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache", "--warning-mode=fail") //
 				.setTimeout(TOOL_TIMEOUT) //
-				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
+				.putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) //
 				.build();
 
 		var result = request.run();

diff --git a/...ort-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java b/...ort-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java
@@ -57,10 +57,10 @@ void supportedVersions(String version) {
 	private Result run(String version) {
 		var result = Request.builder() //
 				.setTool(new GradleWrapper(Paths.get(".."))) //
-				.setJavaHome(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
+				.putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) //
 				.setProject(Projects.VINTAGE) //
 				.setWorkspace("vintage-gradle-" + version) //
-				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache") //
+				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache", "--warning-mode=fail") //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("-Djunit4Version=" + version) //
 				.setTimeout(TOOL_TIMEOUT) //