Skip to content

Commit ea9a0c7

Browse files
committed
Fix @RegisterExtension on CliTester
This reverts commit dfa5480 and rather make the field package private so that the extension can be registered properly Closes gh-17266
1 parent 2d70daf commit ea9a0c7

File tree

6 files changed

+18
-6
lines changed

6 files changed

+18
-6
lines changed

spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/ClassLoaderIntegrationTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import org.junit.jupiter.api.Test;
2020
import org.junit.jupiter.api.extension.ExtendWith;
21+
import org.junit.jupiter.api.extension.RegisterExtension;
2122

2223
import org.springframework.boot.test.system.CapturedOutput;
2324
import org.springframework.boot.test.system.OutputCaptureExtension;
@@ -32,7 +33,8 @@
3233
@ExtendWith(OutputCaptureExtension.class)
3334
class ClassLoaderIntegrationTests {
3435

35-
private final CliTester cli;
36+
@RegisterExtension
37+
CliTester cli;
3638

3739
ClassLoaderIntegrationTests(CapturedOutput capturedOutput) {
3840
this.cli = new CliTester("src/test/resources/", capturedOutput);

spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/DirectorySourcesIntegrationTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import org.junit.jupiter.api.Test;
2020
import org.junit.jupiter.api.extension.ExtendWith;
21+
import org.junit.jupiter.api.extension.RegisterExtension;
2122

2223
import org.springframework.boot.test.system.CapturedOutput;
2324
import org.springframework.boot.test.system.OutputCaptureExtension;
@@ -32,7 +33,8 @@
3233
@ExtendWith(OutputCaptureExtension.class)
3334
class DirectorySourcesIntegrationTests {
3435

35-
private final CliTester cli;
36+
@RegisterExtension
37+
CliTester cli;
3638

3739
DirectorySourcesIntegrationTests(CapturedOutput capturedOutput) {
3840
this.cli = new CliTester("src/test/resources/dir-sample/", capturedOutput);

spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.junit.jupiter.api.BeforeEach;
2323
import org.junit.jupiter.api.Test;
2424
import org.junit.jupiter.api.extension.ExtendWith;
25+
import org.junit.jupiter.api.extension.RegisterExtension;
2526

2627
import org.springframework.boot.cli.command.grab.GrabCommand;
2728
import org.springframework.boot.test.system.CapturedOutput;
@@ -40,7 +41,8 @@
4041
@ExtendWith(OutputCaptureExtension.class)
4142
class GrabCommandIntegrationTests {
4243

43-
private final CliTester cli;
44+
@RegisterExtension
45+
CliTester cli;
4446

4547
GrabCommandIntegrationTests(CapturedOutput capturedOutput) {
4648
this.cli = new CliTester("src/test/resources/grab-samples/", capturedOutput);

spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/ReproIntegrationTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import org.junit.jupiter.api.Test;
2222
import org.junit.jupiter.api.extension.ExtendWith;
23+
import org.junit.jupiter.api.extension.RegisterExtension;
2324

2425
import org.springframework.boot.test.system.CapturedOutput;
2526
import org.springframework.boot.test.system.OutputCaptureExtension;
@@ -37,7 +38,8 @@
3738
@ExtendWith(OutputCaptureExtension.class)
3839
class ReproIntegrationTests {
3940

40-
private final CliTester cli;
41+
@RegisterExtension
42+
CliTester cli;
4143

4244
ReproIntegrationTests(CapturedOutput capturedOutput) {
4345
this.cli = new CliTester("src/test/resources/repro-samples/", capturedOutput);

spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/RunCommandIntegrationTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.junit.jupiter.api.BeforeEach;
2323
import org.junit.jupiter.api.Test;
2424
import org.junit.jupiter.api.extension.ExtendWith;
25+
import org.junit.jupiter.api.extension.RegisterExtension;
2526

2627
import org.springframework.boot.cli.command.run.RunCommand;
2728
import org.springframework.boot.test.system.CapturedOutput;
@@ -37,7 +38,8 @@
3738
@ExtendWith(OutputCaptureExtension.class)
3839
class RunCommandIntegrationTests {
3940

40-
private final CliTester cli;
41+
@RegisterExtension
42+
CliTester cli;
4143

4244
RunCommandIntegrationTests(CapturedOutput capturedOutput) {
4345
this.cli = new CliTester("src/it/resources/run-command/", capturedOutput);

spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.junit.jupiter.api.Disabled;
2323
import org.junit.jupiter.api.Test;
2424
import org.junit.jupiter.api.extension.ExtendWith;
25+
import org.junit.jupiter.api.extension.RegisterExtension;
2526

2627
import org.springframework.boot.test.system.CapturedOutput;
2728
import org.springframework.boot.test.system.OutputCaptureExtension;
@@ -39,7 +40,8 @@
3940
@ExtendWith(OutputCaptureExtension.class)
4041
class SampleIntegrationTests {
4142

42-
private final CliTester cli;
43+
@RegisterExtension
44+
CliTester cli;
4345

4446
SampleIntegrationTests(CapturedOutput capturedOutput) {
4547
this.cli = new CliTester("samples/", capturedOutput);

0 commit comments

Comments
 (0)