Fix Gradle plugin's tests following JUnit 5 upgrade

Closes gh-322
spring-io · Mar 1, 2022 · 728fa19 · 728fa19
1 parent 4c3d7b1
commit 728fa19
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/spring-javaformat-gradle/spring-javaformat-gradle-plugin/build.gradle b/spring-javaformat-gradle/spring-javaformat-gradle-plugin/build.gradle
@@ -20,6 +20,7 @@ jar {
 }
 
 test {
+	useJUnitPlatform()
 	testLogging {
 		events "passed", "skipped", "failed"
 	}

diff --git a/...ng-javaformat-gradle-plugin/src/test/java/io/spring/javaformat/gradle/CheckTaskTests.java b/...ng-javaformat-gradle-plugin/src/test/java/io/spring/javaformat/gradle/CheckTaskTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 the original author or authors.
+ * Copyright 2017-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,11 +45,11 @@
 @ExtendWith(GradleBuildExtension.class)
 public class CheckTaskTests {
 
+	private final GradleBuild gradleBuild = new GradleBuild();
+
 	@TempDir
 	public File temp;
 
-	public GradleBuild gradleBuild;
-
 	@Test
 	public void checkOk() throws IOException {
 		BuildResult result = this.gradleBuild.source("src/test/resources/check-ok").build("check");

diff --git a/...g-javaformat-gradle-plugin/src/test/java/io/spring/javaformat/gradle/FormatTaskTests.java b/...g-javaformat-gradle-plugin/src/test/java/io/spring/javaformat/gradle/FormatTaskTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 the original author or authors.
+ * Copyright 2017-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@
 @ExtendWith(GradleBuildExtension.class)
 public class FormatTaskTests {
 
-	public GradleBuild gradleBuild;
+	private final GradleBuild gradleBuild = new GradleBuild();
 
 	@Test
 	public void checkOk() throws IOException {
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ jar { @@
     }
     test {
+    	useJUnitPlatform()
     	testLogging {
     		events "passed", "skipped", "failed"
     	}
@@ Expand Down @@