diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/ClassLoaderIntegrationTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/ClassLoaderIntegrationTests.java index 41be85a4114..b19061dd53f 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/ClassLoaderIntegrationTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/ClassLoaderIntegrationTests.java @@ -18,7 +18,6 @@ package org.springframework.boot.cli; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.boot.test.system.CapturedOutput; import org.springframework.boot.test.system.OutputCaptureExtension; @@ -33,8 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(OutputCaptureExtension.class) class ClassLoaderIntegrationTests { - @RegisterExtension - private CliTester cli; + private final CliTester cli; ClassLoaderIntegrationTests(CapturedOutput capturedOutput) { this.cli = new CliTester("src/test/resources/", capturedOutput); diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/DirectorySourcesIntegrationTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/DirectorySourcesIntegrationTests.java index 2a4252cfb38..b8bce24e224 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/DirectorySourcesIntegrationTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/DirectorySourcesIntegrationTests.java @@ -18,7 +18,6 @@ package org.springframework.boot.cli; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.boot.test.system.CapturedOutput; import org.springframework.boot.test.system.OutputCaptureExtension; @@ -33,8 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(OutputCaptureExtension.class) class DirectorySourcesIntegrationTests { - @RegisterExtension - private CliTester cli; + private final CliTester cli; DirectorySourcesIntegrationTests(CapturedOutput capturedOutput) { this.cli = new CliTester("src/test/resources/dir-sample/", capturedOutput); diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java index 6fc83e47552..226db0ab51e 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java @@ -22,7 +22,6 @@ 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.junit.jupiter.api.extension.RegisterExtension; import org.springframework.boot.cli.command.grab.GrabCommand; import org.springframework.boot.test.system.CapturedOutput; @@ -41,8 +40,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @ExtendWith(OutputCaptureExtension.class) class GrabCommandIntegrationTests { - @RegisterExtension - private CliTester cli; + private final CliTester cli; GrabCommandIntegrationTests(CapturedOutput capturedOutput) { this.cli = new CliTester("src/test/resources/grab-samples/", capturedOutput); diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/ReproIntegrationTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/ReproIntegrationTests.java index a202bb8c259..5e3c2a2ab6c 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/ReproIntegrationTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/ReproIntegrationTests.java @@ -20,7 +20,6 @@ import java.util.concurrent.ExecutionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.boot.test.system.CapturedOutput; import org.springframework.boot.test.system.OutputCaptureExtension; @@ -38,8 +37,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @ExtendWith(OutputCaptureExtension.class) class ReproIntegrationTests { - @RegisterExtension - private CliTester cli; + private final CliTester cli; ReproIntegrationTests(CapturedOutput capturedOutput) { this.cli = new CliTester("src/test/resources/repro-samples/", capturedOutput); diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/RunCommandIntegrationTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/RunCommandIntegrationTests.java index 951368553db..1b58c85a95f 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/RunCommandIntegrationTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/RunCommandIntegrationTests.java @@ -22,7 +22,6 @@ 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.junit.jupiter.api.extension.RegisterExtension; import org.springframework.boot.cli.command.run.RunCommand; import org.springframework.boot.test.system.CapturedOutput; @@ -38,8 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(OutputCaptureExtension.class) class RunCommandIntegrationTests { - @RegisterExtension - private CliTester cli; + private final CliTester cli; RunCommandIntegrationTests(CapturedOutput capturedOutput) { this.cli = new CliTester("src/it/resources/run-command/", capturedOutput); diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java index 920e150e6e6..a94d36721a6 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java @@ -22,7 +22,6 @@ import java.net.URI; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.jupiter.api.extension.RegisterExtension; import org.springframework.boot.test.system.CapturedOutput; import org.springframework.boot.test.system.OutputCaptureExtension; @@ -40,8 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(OutputCaptureExtension.class) class SampleIntegrationTests { - @RegisterExtension - private CliTester cli; + private final CliTester cli; SampleIntegrationTests(CapturedOutput capturedOutput) { this.cli = new CliTester("samples/", capturedOutput);