diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/GettingStartedDocumentationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/GettingStartedDocumentationTests.java index 288f0fce3a5..1d52c421af3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/GettingStartedDocumentationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/GettingStartedDocumentationTests.java @@ -29,7 +29,7 @@ import org.springframework.boot.gradle.testkit.GradleBuild; * @author Jean-Baptiste Nizet */ @ExtendWith(GradleMultiDslExtension.class) -public class GettingStartedDocumentationTests { +class GettingStartedDocumentationTests { GradleBuild gradleBuild; @@ -37,7 +37,7 @@ public class GettingStartedDocumentationTests { // jar won't be there @TestTemplate - public void typicalPluginsAppliesExceptedPlugins() { + void typicalPluginsAppliesExceptedPlugins() { this.gradleBuild.script("src/main/gradle/getting-started/typical-plugins").build("verify"); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/IntegratingWithActuatorDocumentationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/IntegratingWithActuatorDocumentationTests.java index c877616a0bf..02579592db2 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/IntegratingWithActuatorDocumentationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/IntegratingWithActuatorDocumentationTests.java @@ -36,19 +36,19 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Jean-Baptiste Nizet */ @ExtendWith(GradleMultiDslExtension.class) -public class IntegratingWithActuatorDocumentationTests { +class IntegratingWithActuatorDocumentationTests { GradleBuild gradleBuild; @TestTemplate - public void basicBuildInfo() throws IOException { + void basicBuildInfo() throws IOException { this.gradleBuild.script("src/main/gradle/integrating-with-actuator/build-info-basic").build("bootBuildInfo"); assertThat(new File(this.gradleBuild.getProjectDir(), "build/resources/main/META-INF/build-info.properties")) .isFile(); } @TestTemplate - public void buildInfoCustomValues() throws IOException { + void buildInfoCustomValues() throws IOException { this.gradleBuild.script("src/main/gradle/integrating-with-actuator/build-info-custom-values") .build("bootBuildInfo"); File file = new File(this.gradleBuild.getProjectDir(), "build/resources/main/META-INF/build-info.properties"); @@ -61,7 +61,7 @@ public class IntegratingWithActuatorDocumentationTests { } @TestTemplate - public void buildInfoAdditional() throws IOException { + void buildInfoAdditional() throws IOException { this.gradleBuild.script("src/main/gradle/integrating-with-actuator/build-info-additional") .build("bootBuildInfo"); File file = new File(this.gradleBuild.getProjectDir(), "build/resources/main/META-INF/build-info.properties"); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/ManagingDependenciesDocumentationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/ManagingDependenciesDocumentationTests.java index f2aa45dcb09..91d43545c57 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/ManagingDependenciesDocumentationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/ManagingDependenciesDocumentationTests.java @@ -33,29 +33,29 @@ import static org.junit.jupiter.api.Assumptions.assumingThat; * @author Jean-Baptiste Nizet */ @ExtendWith(GradleMultiDslExtension.class) -public class ManagingDependenciesDocumentationTests { +class ManagingDependenciesDocumentationTests { GradleBuild gradleBuild; @TestTemplate - public void dependenciesExampleEvaluatesSuccessfully() { + void dependenciesExampleEvaluatesSuccessfully() { this.gradleBuild.script("src/main/gradle/managing-dependencies/dependencies").build(); } @TestTemplate - public void customManagedVersions() { + void customManagedVersions() { assertThat(this.gradleBuild.script("src/main/gradle/managing-dependencies/custom-version").build("slf4jVersion") .getOutput()).contains("1.7.20"); } @TestTemplate - public void dependencyManagementInIsolation() { + void dependencyManagementInIsolation() { assertThat(this.gradleBuild.script("src/main/gradle/managing-dependencies/configure-bom") .build("dependencyManagement").getOutput()).contains("org.springframework.boot:spring-boot-starter "); } @TestTemplate - public void dependencyManagementInIsolationWithPluginsBlock() { + void dependencyManagementInIsolationWithPluginsBlock() { assumingThat(this.gradleBuild.getDsl() == Dsl.KOTLIN, () -> assertThat( this.gradleBuild.script("src/main/gradle/managing-dependencies/configure-bom-with-plugins") diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PackagingDocumentationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PackagingDocumentationTests.java index e62426e3c90..badd5127456 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PackagingDocumentationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PackagingDocumentationTests.java @@ -43,17 +43,17 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Jean-Baptiste Nizet */ @ExtendWith(GradleMultiDslExtension.class) -public class PackagingDocumentationTests { +class PackagingDocumentationTests { GradleBuild gradleBuild; @TestTemplate - public void warContainerDependencyEvaluatesSuccessfully() { + void warContainerDependencyEvaluatesSuccessfully() { this.gradleBuild.script("src/main/gradle/packaging/war-container-dependency").build(); } @TestTemplate - public void bootJarMainClass() throws IOException { + void bootJarMainClass() throws IOException { this.gradleBuild.script("src/main/gradle/packaging/boot-jar-main-class").build("bootJar"); File file = new File(this.gradleBuild.getProjectDir(), "build/libs/" + this.gradleBuild.getProjectDir().getName() + ".jar"); @@ -65,7 +65,7 @@ public class PackagingDocumentationTests { } @TestTemplate - public void bootJarManifestMainClass() throws IOException { + void bootJarManifestMainClass() throws IOException { this.gradleBuild.script("src/main/gradle/packaging/boot-jar-manifest-main-class").build("bootJar"); File file = new File(this.gradleBuild.getProjectDir(), "build/libs/" + this.gradleBuild.getProjectDir().getName() + ".jar"); @@ -77,7 +77,7 @@ public class PackagingDocumentationTests { } @TestTemplate - public void applicationPluginMainClass() throws IOException { + void applicationPluginMainClass() throws IOException { this.gradleBuild.script("src/main/gradle/packaging/application-plugin-main-class").build("bootJar"); File file = new File(this.gradleBuild.getProjectDir(), "build/libs/" + this.gradleBuild.getProjectDir().getName() + ".jar"); @@ -89,7 +89,7 @@ public class PackagingDocumentationTests { } @TestTemplate - public void springBootDslMainClass() throws IOException { + void springBootDslMainClass() throws IOException { this.gradleBuild.script("src/main/gradle/packaging/spring-boot-dsl-main-class").build("bootJar"); File file = new File(this.gradleBuild.getProjectDir(), "build/libs/" + this.gradleBuild.getProjectDir().getName() + ".jar"); @@ -101,7 +101,7 @@ public class PackagingDocumentationTests { } @TestTemplate - public void bootWarIncludeDevtools() throws IOException { + void bootWarIncludeDevtools() throws IOException { jarFile(new File(this.gradleBuild.getProjectDir(), "spring-boot-devtools-1.2.3.RELEASE.jar")); this.gradleBuild.script("src/main/gradle/packaging/boot-war-include-devtools").build("bootWar"); File file = new File(this.gradleBuild.getProjectDir(), @@ -113,7 +113,7 @@ public class PackagingDocumentationTests { } @TestTemplate - public void bootJarRequiresUnpack() throws IOException { + void bootJarRequiresUnpack() throws IOException { this.gradleBuild.script("src/main/gradle/packaging/boot-jar-requires-unpack").build("bootJar"); File file = new File(this.gradleBuild.getProjectDir(), "build/libs/" + this.gradleBuild.getProjectDir().getName() + ".jar"); @@ -126,7 +126,7 @@ public class PackagingDocumentationTests { } @TestTemplate - public void bootJarIncludeLaunchScript() throws IOException { + void bootJarIncludeLaunchScript() throws IOException { this.gradleBuild.script("src/main/gradle/packaging/boot-jar-include-launch-script").build("bootJar"); File file = new File(this.gradleBuild.getProjectDir(), "build/libs/" + this.gradleBuild.getProjectDir().getName() + ".jar"); @@ -135,7 +135,7 @@ public class PackagingDocumentationTests { } @TestTemplate - public void bootJarLaunchScriptProperties() throws IOException { + void bootJarLaunchScriptProperties() throws IOException { this.gradleBuild.script("src/main/gradle/packaging/boot-jar-launch-script-properties").build("bootJar"); File file = new File(this.gradleBuild.getProjectDir(), "build/libs/" + this.gradleBuild.getProjectDir().getName() + ".jar"); @@ -144,7 +144,7 @@ public class PackagingDocumentationTests { } @TestTemplate - public void bootJarCustomLaunchScript() throws IOException { + void bootJarCustomLaunchScript() throws IOException { File customScriptFile = new File(this.gradleBuild.getProjectDir(), "src/custom.script"); customScriptFile.getParentFile().mkdirs(); FileCopyUtils.copy("custom", new FileWriter(customScriptFile)); @@ -156,7 +156,7 @@ public class PackagingDocumentationTests { } @TestTemplate - public void bootWarPropertiesLauncher() throws IOException { + void bootWarPropertiesLauncher() throws IOException { this.gradleBuild.script("src/main/gradle/packaging/boot-war-properties-launcher").build("bootWar"); File file = new File(this.gradleBuild.getProjectDir(), "build/libs/" + this.gradleBuild.getProjectDir().getName() + ".war"); @@ -168,7 +168,7 @@ public class PackagingDocumentationTests { } @TestTemplate - public void bootJarAndJar() { + void bootJarAndJar() { this.gradleBuild.script("src/main/gradle/packaging/boot-jar-and-jar").build("assemble"); File jar = new File(this.gradleBuild.getProjectDir(), "build/libs/" + this.gradleBuild.getProjectDir().getName() + ".jar"); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PublishingDocumentationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PublishingDocumentationTests.java index 5d9439a93fb..0e3fd00c291 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PublishingDocumentationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PublishingDocumentationTests.java @@ -33,18 +33,18 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Jean-Baptiste Nizet */ @ExtendWith(GradleMultiDslExtension.class) -public class PublishingDocumentationTests { +class PublishingDocumentationTests { GradleBuild gradleBuild; @TestTemplate - public void mavenUpload() throws IOException { + void mavenUpload() throws IOException { assertThat(this.gradleBuild.script("src/main/gradle/publishing/maven").build("deployerRepository").getOutput()) .contains("https://repo.example.com"); } @TestTemplate - public void mavenPublish() throws IOException { + void mavenPublish() throws IOException { assertThat(this.gradleBuild.script("src/main/gradle/publishing/maven-publish").build("publishingConfiguration") .getOutput()).contains("MavenPublication").contains("https://repo.example.com"); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/RunningDocumentationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/RunningDocumentationTests.java index 20d295f4803..cad05fca05f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/RunningDocumentationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/RunningDocumentationTests.java @@ -34,36 +34,36 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Jean-Baptiste Nizet */ @ExtendWith(GradleMultiDslExtension.class) -public class RunningDocumentationTests { +class RunningDocumentationTests { GradleBuild gradleBuild; @TestTemplate - public void bootRunMain() throws IOException { + void bootRunMain() throws IOException { assertThat(this.gradleBuild.script("src/main/gradle/running/boot-run-main").build("configuredMainClass") .getOutput()).contains("com.example.ExampleApplication"); } @TestTemplate - public void applicationPluginMainClassName() { + void applicationPluginMainClassName() { assertThat(this.gradleBuild.script("src/main/gradle/running/application-plugin-main-class-name") .build("configuredMainClass").getOutput()).contains("com.example.ExampleApplication"); } @TestTemplate - public void springBootDslMainClassName() throws IOException { + void springBootDslMainClassName() throws IOException { assertThat(this.gradleBuild.script("src/main/gradle/running/spring-boot-dsl-main-class-name") .build("configuredMainClass").getOutput()).contains("com.example.ExampleApplication"); } @TestTemplate - public void bootRunSourceResources() throws IOException { + void bootRunSourceResources() throws IOException { assertThat(this.gradleBuild.script("src/main/gradle/running/boot-run-source-resources") .build("configuredClasspath").getOutput()).contains(new File("src/main/resources").getPath()); } @TestTemplate - public void bootRunDisableOptimizedLaunch() throws IOException { + void bootRunDisableOptimizedLaunch() throws IOException { assertThat(this.gradleBuild.script("src/main/gradle/running/boot-run-disable-optimized-launch") .build("optimizedLaunch").getOutput()).contains("false"); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/ApplicationPluginActionIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/ApplicationPluginActionIntegrationTests.java index 430fe735631..b7b3e872ef5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/ApplicationPluginActionIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/ApplicationPluginActionIntegrationTests.java @@ -43,42 +43,42 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Andy Wilkinson */ @ExtendWith(GradleCompatibilityExtension.class) -public class ApplicationPluginActionIntegrationTests { +class ApplicationPluginActionIntegrationTests { GradleBuild gradleBuild; @TestTemplate - public void noBootDistributionWithoutApplicationPluginApplied() { + void noBootDistributionWithoutApplicationPluginApplied() { assertThat(this.gradleBuild.build("distributionExists", "-PdistributionName=boot").getOutput()) .contains("boot exists = false"); } @TestTemplate - public void applyingApplicationPluginCreatesBootDistribution() { + void applyingApplicationPluginCreatesBootDistribution() { assertThat(this.gradleBuild.build("distributionExists", "-PdistributionName=boot", "-PapplyApplicationPlugin") .getOutput()).contains("boot exists = true"); } @TestTemplate - public void noBootStartScriptsTaskWithoutApplicationPluginApplied() { + void noBootStartScriptsTaskWithoutApplicationPluginApplied() { assertThat(this.gradleBuild.build("taskExists", "-PtaskName=bootStartScripts").getOutput()) .contains("bootStartScripts exists = false"); } @TestTemplate - public void applyingApplicationPluginCreatesBootStartScriptsTask() { + void applyingApplicationPluginCreatesBootStartScriptsTask() { assertThat(this.gradleBuild.build("taskExists", "-PtaskName=bootStartScripts", "-PapplyApplicationPlugin") .getOutput()).contains("bootStartScripts exists = true"); } @TestTemplate - public void createsBootStartScriptsTaskUsesApplicationPluginsDefaultJvmOpts() { + void createsBootStartScriptsTaskUsesApplicationPluginsDefaultJvmOpts() { assertThat(this.gradleBuild.build("startScriptsDefaultJvmOpts", "-PapplyApplicationPlugin").getOutput()) .contains("bootStartScripts defaultJvmOpts = [-Dcom.example.a=alpha, -Dcom.example.b=bravo]"); } @TestTemplate - public void zipDistributionForJarCanBeBuilt() throws IOException { + void zipDistributionForJarCanBeBuilt() throws IOException { assertThat(this.gradleBuild.build("bootDistZip").task(":bootDistZip").getOutcome()) .isEqualTo(TaskOutcome.SUCCESS); String name = this.gradleBuild.getProjectDir().getName(); @@ -90,7 +90,7 @@ public class ApplicationPluginActionIntegrationTests { } @TestTemplate - public void tarDistributionForJarCanBeBuilt() throws IOException { + void tarDistributionForJarCanBeBuilt() throws IOException { assertThat(this.gradleBuild.build("bootDistTar").task(":bootDistTar").getOutcome()) .isEqualTo(TaskOutcome.SUCCESS); String name = this.gradleBuild.getProjectDir().getName(); @@ -102,7 +102,7 @@ public class ApplicationPluginActionIntegrationTests { } @TestTemplate - public void zipDistributionForWarCanBeBuilt() throws IOException { + void zipDistributionForWarCanBeBuilt() throws IOException { assertThat(this.gradleBuild.build("bootDistZip").task(":bootDistZip").getOutcome()) .isEqualTo(TaskOutcome.SUCCESS); String name = this.gradleBuild.getProjectDir().getName(); @@ -114,7 +114,7 @@ public class ApplicationPluginActionIntegrationTests { } @TestTemplate - public void tarDistributionForWarCanBeBuilt() throws IOException { + void tarDistributionForWarCanBeBuilt() throws IOException { assertThat(this.gradleBuild.build("bootDistTar").task(":bootDistTar").getOutcome()) .isEqualTo(TaskOutcome.SUCCESS); String name = this.gradleBuild.getProjectDir().getName(); @@ -126,7 +126,7 @@ public class ApplicationPluginActionIntegrationTests { } @TestTemplate - public void applicationNameCanBeUsedToCustomizeDistributionName() throws IOException { + void applicationNameCanBeUsedToCustomizeDistributionName() throws IOException { assertThat(this.gradleBuild.build("bootDistTar").task(":bootDistTar").getOutcome()) .isEqualTo(TaskOutcome.SUCCESS); File distribution = new File(this.gradleBuild.getProjectDir(), "build/distributions/custom-boot.tar"); @@ -138,7 +138,7 @@ public class ApplicationPluginActionIntegrationTests { } @TestTemplate - public void scriptsHaveCorrectPermissions() throws IOException { + void scriptsHaveCorrectPermissions() throws IOException { assertThat(this.gradleBuild.build("bootDistTar").task(":bootDistTar").getOutcome()) .isEqualTo(TaskOutcome.SUCCESS); String name = this.gradleBuild.getProjectDir().getName(); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/DependencyManagementPluginActionIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/DependencyManagementPluginActionIntegrationTests.java index d8533c6459f..ce7638f0bb3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/DependencyManagementPluginActionIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/DependencyManagementPluginActionIntegrationTests.java @@ -37,24 +37,24 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Andy Wilkinson */ @ExtendWith(GradleCompatibilityExtension.class) -public class DependencyManagementPluginActionIntegrationTests { +class DependencyManagementPluginActionIntegrationTests { GradleBuild gradleBuild; @TestTemplate - public void noDependencyManagementIsAppliedByDefault() { + void noDependencyManagementIsAppliedByDefault() { assertThat(this.gradleBuild.build("doesNotHaveDependencyManagement").task(":doesNotHaveDependencyManagement") .getOutcome()).isEqualTo(TaskOutcome.SUCCESS); } @TestTemplate - public void bomIsImportedWhenDependencyManagementPluginIsApplied() { + void bomIsImportedWhenDependencyManagementPluginIsApplied() { assertThat(this.gradleBuild.build("hasDependencyManagement", "-PapplyDependencyManagementPlugin") .task(":hasDependencyManagement").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); } @TestTemplate - public void helpfulErrorWhenVersionlessDependencyFailsToResolve() throws IOException { + void helpfulErrorWhenVersionlessDependencyFailsToResolve() throws IOException { File examplePackage = new File(this.gradleBuild.getProjectDir(), "src/main/java/com/example"); examplePackage.mkdirs(); FileSystemUtils.copyRecursively(new File("src/test/java/com/example"), examplePackage); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests.java index 71ebe701f18..6f32fa800a0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests.java @@ -37,77 +37,77 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Andy Wilkinson */ @ExtendWith(GradleCompatibilityExtension.class) -public class JavaPluginActionIntegrationTests { +class JavaPluginActionIntegrationTests { GradleBuild gradleBuild; @TestTemplate - public void noBootJarTaskWithoutJavaPluginApplied() { + void noBootJarTaskWithoutJavaPluginApplied() { assertThat(this.gradleBuild.build("taskExists", "-PtaskName=bootJar").getOutput()) .contains("bootJar exists = false"); } @TestTemplate - public void applyingJavaPluginCreatesBootJarTask() { + void applyingJavaPluginCreatesBootJarTask() { assertThat(this.gradleBuild.build("taskExists", "-PtaskName=bootJar", "-PapplyJavaPlugin").getOutput()) .contains("bootJar exists = true"); } @TestTemplate - public void noBootRunTaskWithoutJavaPluginApplied() { + void noBootRunTaskWithoutJavaPluginApplied() { assertThat(this.gradleBuild.build("taskExists", "-PtaskName=bootRun").getOutput()) .contains("bootRun exists = false"); } @TestTemplate - public void applyingJavaPluginCreatesBootRunTask() { + void applyingJavaPluginCreatesBootRunTask() { assertThat(this.gradleBuild.build("taskExists", "-PtaskName=bootRun", "-PapplyJavaPlugin").getOutput()) .contains("bootRun exists = true"); } @TestTemplate - public void javaCompileTasksUseUtf8Encoding() { + void javaCompileTasksUseUtf8Encoding() { assertThat(this.gradleBuild.build("javaCompileEncoding", "-PapplyJavaPlugin").getOutput()) .contains("compileJava = UTF-8").contains("compileTestJava = UTF-8"); } @TestTemplate - public void javaCompileTasksUseParametersCompilerFlagByDefault() { + void javaCompileTasksUseParametersCompilerFlagByDefault() { assertThat(this.gradleBuild.build("javaCompileTasksCompilerArgs").getOutput()) .contains("compileJava compiler args: [-parameters]") .contains("compileTestJava compiler args: [-parameters]"); } @TestTemplate - public void javaCompileTasksUseParametersAndAdditionalCompilerFlags() { + void javaCompileTasksUseParametersAndAdditionalCompilerFlags() { assertThat(this.gradleBuild.build("javaCompileTasksCompilerArgs").getOutput()) .contains("compileJava compiler args: [-parameters, -Xlint:all]") .contains("compileTestJava compiler args: [-parameters, -Xlint:all]"); } @TestTemplate - public void javaCompileTasksCanOverrideDefaultParametersCompilerFlag() { + void javaCompileTasksCanOverrideDefaultParametersCompilerFlag() { assertThat(this.gradleBuild.build("javaCompileTasksCompilerArgs").getOutput()) .contains("compileJava compiler args: [-Xlint:all]") .contains("compileTestJava compiler args: [-Xlint:all]"); } @TestTemplate - public void assembleRunsBootJarAndJarIsSkipped() { + void assembleRunsBootJarAndJarIsSkipped() { BuildResult result = this.gradleBuild.build("assemble"); assertThat(result.task(":bootJar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":jar").getOutcome()).isEqualTo(TaskOutcome.SKIPPED); } @TestTemplate - public void errorMessageIsHelpfulWhenMainClassCannotBeResolved() { + void errorMessageIsHelpfulWhenMainClassCannotBeResolved() { BuildResult result = this.gradleBuild.buildAndFail("build", "-PapplyJavaPlugin"); assertThat(result.task(":bootJar").getOutcome()).isEqualTo(TaskOutcome.FAILED); assertThat(result.getOutput()).contains("Main class name has not been configured and it could not be resolved"); } @TestTemplate - public void jarAndBootJarCanBothBeBuilt() { + void jarAndBootJarCanBothBeBuilt() { BuildResult result = this.gradleBuild.build("assemble"); assertThat(result.task(":bootJar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":jar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); @@ -118,7 +118,7 @@ public class JavaPluginActionIntegrationTests { } @TestTemplate - public void additionalMetadataLocationsConfiguredWhenProcessorIsPresent() throws IOException { + void additionalMetadataLocationsConfiguredWhenProcessorIsPresent() throws IOException { createMinimalMainSource(); File libs = new File(this.gradleBuild.getProjectDir(), "libs"); libs.mkdirs(); @@ -132,7 +132,7 @@ public class JavaPluginActionIntegrationTests { } @TestTemplate - public void additionalMetadataLocationsNotConfiguredWhenProcessorIsAbsent() throws IOException { + void additionalMetadataLocationsNotConfiguredWhenProcessorIsAbsent() throws IOException { createMinimalMainSource(); BuildResult result = this.gradleBuild.build("compileJava"); assertThat(result.task(":compileJava").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java index 0c34193164d..58120752656 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java @@ -30,30 +30,30 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Andy Wilkinson */ @ExtendWith(GradleCompatibilityExtension.class) -public class KotlinPluginActionIntegrationTests { +class KotlinPluginActionIntegrationTests { GradleBuild gradleBuild; @TestTemplate - public void noKotlinVersionPropertyWithoutKotlinPlugin() { + void noKotlinVersionPropertyWithoutKotlinPlugin() { assertThat(this.gradleBuild.build("kotlinVersion").getOutput()).contains("Kotlin version: none"); } @TestTemplate - public void kotlinVersionPropertyIsSet() { + void kotlinVersionPropertyIsSet() { String output = this.gradleBuild.build("kotlinVersion", "dependencies", "--configuration", "compileClasspath") .getOutput(); assertThat(output).containsPattern("Kotlin version: [0-9]\\.[0-9]\\.[0-9]+"); } @TestTemplate - public void kotlinCompileTasksUseJavaParametersFlagByDefault() { + void kotlinCompileTasksUseJavaParametersFlagByDefault() { assertThat(this.gradleBuild.build("kotlinCompileTasksJavaParameters").getOutput()) .contains("compileKotlin java parameters: true").contains("compileTestKotlin java parameters: true"); } @TestTemplate - public void kotlinCompileTasksCanOverrideDefaultJavaParametersFlag() { + void kotlinCompileTasksCanOverrideDefaultJavaParametersFlag() { assertThat(this.gradleBuild.build("kotlinCompileTasksJavaParameters").getOutput()) .contains("compileKotlin java parameters: false").contains("compileTestKotlin java parameters: false"); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/MavenPluginActionIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/MavenPluginActionIntegrationTests.java index e8ccfe4f7ed..3272e89a6cd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/MavenPluginActionIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/MavenPluginActionIntegrationTests.java @@ -30,12 +30,12 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Andy Wilkinson */ @ExtendWith(GradleCompatibilityExtension.class) -public class MavenPluginActionIntegrationTests { +class MavenPluginActionIntegrationTests { GradleBuild gradleBuild; @TestTemplate - public void clearsConf2ScopeMappingsOfUploadBootArchivesTask() { + void clearsConf2ScopeMappingsOfUploadBootArchivesTask() { assertThat(this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("6.0.0").build("conf2ScopeMappings") .getOutput()).contains("Conf2ScopeMappings = 0"); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/OnlyDependencyManagementIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/OnlyDependencyManagementIntegrationTests.java index a089067f4e3..3f34cb8f08d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/OnlyDependencyManagementIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/OnlyDependencyManagementIntegrationTests.java @@ -31,12 +31,12 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Andy Wilkinson */ @ExtendWith(GradleCompatibilityExtension.class) -public class OnlyDependencyManagementIntegrationTests { +class OnlyDependencyManagementIntegrationTests { GradleBuild gradleBuild; @TestTemplate - public void dependencyManagementCanBeConfiguredUsingCoordinatesConstant() { + void dependencyManagementCanBeConfiguredUsingCoordinatesConstant() { assertThat(this.gradleBuild.build("dependencyManagement").getOutput()) .contains("org.springframework.boot:spring-boot-starter "); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/WarPluginActionIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/WarPluginActionIntegrationTests.java index 6da554754d6..b03b8743723 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/WarPluginActionIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/WarPluginActionIntegrationTests.java @@ -34,31 +34,31 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Andy Wilkinson */ @ExtendWith(GradleCompatibilityExtension.class) -public class WarPluginActionIntegrationTests { +class WarPluginActionIntegrationTests { GradleBuild gradleBuild; @TestTemplate - public void noBootWarTaskWithoutWarPluginApplied() { + void noBootWarTaskWithoutWarPluginApplied() { assertThat(this.gradleBuild.build("taskExists", "-PtaskName=bootWar").getOutput()) .contains("bootWar exists = false"); } @TestTemplate - public void applyingWarPluginCreatesBootWarTask() { + void applyingWarPluginCreatesBootWarTask() { assertThat(this.gradleBuild.build("taskExists", "-PtaskName=bootWar", "-PapplyWarPlugin").getOutput()) .contains("bootWar exists = true"); } @TestTemplate - public void assembleRunsBootWarAndWarIsSkipped() { + void assembleRunsBootWarAndWarIsSkipped() { BuildResult result = this.gradleBuild.build("assemble"); assertThat(result.task(":bootWar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":war").getOutcome()).isEqualTo(TaskOutcome.SKIPPED); } @TestTemplate - public void warAndBootWarCanBothBeBuilt() { + void warAndBootWarCanBothBeBuilt() { BuildResult result = this.gradleBuild.build("assemble"); assertThat(result.task(":bootWar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":war").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); @@ -69,7 +69,7 @@ public class WarPluginActionIntegrationTests { } @TestTemplate - public void errorMessageIsHelpfulWhenMainClassCannotBeResolved() { + void errorMessageIsHelpfulWhenMainClassCannotBeResolved() { BuildResult result = this.gradleBuild.buildAndFail("build", "-PapplyWarPlugin"); assertThat(result.task(":bootWar").getOutcome()).isEqualTo(TaskOutcome.FAILED); assertThat(result.getOutput()).contains("Main class name has not been configured and it could not be resolved"); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests.java index 2e82719b923..d4ffed03753 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoIntegrationTests.java @@ -40,12 +40,12 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Andy Wilkinson */ @ExtendWith(GradleCompatibilityExtension.class) -public class BuildInfoIntegrationTests { +class BuildInfoIntegrationTests { GradleBuild gradleBuild; @TestTemplate - public void defaultValues() { + void defaultValues() { assertThat(this.gradleBuild.build("buildInfo").task(":buildInfo").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); Properties buildInfoProperties = buildInfoProperties(); assertThat(buildInfoProperties).containsKey("build.time"); @@ -56,7 +56,7 @@ public class BuildInfoIntegrationTests { } @TestTemplate - public void basicExecution() { + void basicExecution() { assertThat(this.gradleBuild.build("buildInfo").task(":buildInfo").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); Properties buildInfoProperties = buildInfoProperties(); assertThat(buildInfoProperties).containsKey("build.time"); @@ -68,13 +68,13 @@ public class BuildInfoIntegrationTests { } @TestTemplate - public void notUpToDateWhenExecutedTwiceAsTimeChanges() { + void notUpToDateWhenExecutedTwiceAsTimeChanges() { assertThat(this.gradleBuild.build("buildInfo").task(":buildInfo").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(this.gradleBuild.build("buildInfo").task(":buildInfo").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); } @TestTemplate - public void upToDateWhenExecutedTwiceWithFixedTime() { + void upToDateWhenExecutedTwiceWithFixedTime() { assertThat(this.gradleBuild.build("buildInfo", "-PnullTime").task(":buildInfo").getOutcome()) .isEqualTo(TaskOutcome.SUCCESS); assertThat(this.gradleBuild.build("buildInfo", "-PnullTime").task(":buildInfo").getOutcome()) @@ -82,7 +82,7 @@ public class BuildInfoIntegrationTests { } @TestTemplate - public void notUpToDateWhenExecutedTwiceWithFixedTimeAndChangedProjectVersion() { + void notUpToDateWhenExecutedTwiceWithFixedTimeAndChangedProjectVersion() { assertThat(this.gradleBuild.build("buildInfo", "-PnullTime").task(":buildInfo").getOutcome()) .isEqualTo(TaskOutcome.SUCCESS); BuildResult result = this.gradleBuild.build("buildInfo", "-PnullTime", "-PprojectVersion=0.2.0"); @@ -90,7 +90,7 @@ public class BuildInfoIntegrationTests { } @TestTemplate - public void reproducibleOutputWithFixedTime() + void reproducibleOutputWithFixedTime() throws InvalidRunnerConfigurationException, UnexpectedBuildFailure, IOException, InterruptedException { assertThat(this.gradleBuild.build("buildInfo", "-PnullTime").task(":buildInfo").getOutcome()) .isEqualTo(TaskOutcome.SUCCESS); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java index 6b99c666223..266f8a15204 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java @@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Andy Wilkinson */ @ExtendWith(GradleCompatibilityExtension.class) -public abstract class AbstractBootArchiveIntegrationTests { +abstract class AbstractBootArchiveIntegrationTests { GradleBuild gradleBuild; @@ -49,13 +49,13 @@ public abstract class AbstractBootArchiveIntegrationTests { } @TestTemplate - public void basicBuild() throws InvalidRunnerConfigurationException, UnexpectedBuildFailure, IOException { + void basicBuild() throws InvalidRunnerConfigurationException, UnexpectedBuildFailure, IOException { assertThat(this.gradleBuild.build(this.taskName).task(":" + this.taskName).getOutcome()) .isEqualTo(TaskOutcome.SUCCESS); } @TestTemplate - public void reproducibleArchive() + void reproducibleArchive() throws InvalidRunnerConfigurationException, UnexpectedBuildFailure, IOException, InterruptedException { assertThat(this.gradleBuild.build(this.taskName).task(":" + this.taskName).getOutcome()) .isEqualTo(TaskOutcome.SUCCESS); @@ -69,8 +69,7 @@ public abstract class AbstractBootArchiveIntegrationTests { } @TestTemplate - public void upToDateWhenBuiltTwice() - throws InvalidRunnerConfigurationException, UnexpectedBuildFailure, IOException { + void upToDateWhenBuiltTwice() throws InvalidRunnerConfigurationException, UnexpectedBuildFailure, IOException { assertThat(this.gradleBuild.build(this.taskName).task(":" + this.taskName).getOutcome()) .isEqualTo(TaskOutcome.SUCCESS); assertThat(this.gradleBuild.build(this.taskName).task(":" + this.taskName).getOutcome()) @@ -78,7 +77,7 @@ public abstract class AbstractBootArchiveIntegrationTests { } @TestTemplate - public void upToDateWhenBuiltTwiceWithLaunchScriptIncluded() + void upToDateWhenBuiltTwiceWithLaunchScriptIncluded() throws InvalidRunnerConfigurationException, UnexpectedBuildFailure, IOException { assertThat(this.gradleBuild.build("-PincludeLaunchScript=true", this.taskName).task(":" + this.taskName) .getOutcome()).isEqualTo(TaskOutcome.SUCCESS); @@ -87,7 +86,7 @@ public abstract class AbstractBootArchiveIntegrationTests { } @TestTemplate - public void notUpToDateWhenLaunchScriptWasNotIncludedAndThenIsIncluded() { + void notUpToDateWhenLaunchScriptWasNotIncludedAndThenIsIncluded() { assertThat(this.gradleBuild.build(this.taskName).task(":" + this.taskName).getOutcome()) .isEqualTo(TaskOutcome.SUCCESS); assertThat(this.gradleBuild.build("-PincludeLaunchScript=true", this.taskName).task(":" + this.taskName) @@ -95,7 +94,7 @@ public abstract class AbstractBootArchiveIntegrationTests { } @TestTemplate - public void notUpToDateWhenLaunchScriptWasIncludedAndThenIsNotIncluded() { + void notUpToDateWhenLaunchScriptWasIncludedAndThenIsNotIncluded() { assertThat(this.gradleBuild.build(this.taskName).task(":" + this.taskName).getOutcome()) .isEqualTo(TaskOutcome.SUCCESS); assertThat(this.gradleBuild.build("-PincludeLaunchScript=true", this.taskName).task(":" + this.taskName) @@ -103,7 +102,7 @@ public abstract class AbstractBootArchiveIntegrationTests { } @TestTemplate - public void notUpToDateWhenLaunchScriptPropertyChanges() { + void notUpToDateWhenLaunchScriptPropertyChanges() { assertThat(this.gradleBuild.build("-PincludeLaunchScript=true", "-PlaunchScriptProperty=foo", this.taskName) .task(":" + this.taskName).getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(this.gradleBuild.build("-PincludeLaunchScript=true", "-PlaunchScriptProperty=bar", this.taskName) @@ -111,7 +110,7 @@ public abstract class AbstractBootArchiveIntegrationTests { } @TestTemplate - public void applicationPluginMainClassNameIsUsed() throws IOException { + void applicationPluginMainClassNameIsUsed() throws IOException { assertThat(this.gradleBuild.build(this.taskName).task(":" + this.taskName).getOutcome()) .isEqualTo(TaskOutcome.SUCCESS); try (JarFile jarFile = new JarFile(new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles()[0])) { @@ -121,7 +120,7 @@ public abstract class AbstractBootArchiveIntegrationTests { } @TestTemplate - public void springBootExtensionMainClassNameIsUsed() throws IOException { + void springBootExtensionMainClassNameIsUsed() throws IOException { assertThat(this.gradleBuild.build(this.taskName).task(":" + this.taskName).getOutcome()) .isEqualTo(TaskOutcome.SUCCESS); try (JarFile jarFile = new JarFile(new File(this.gradleBuild.getProjectDir(), "build/libs").listFiles()[0])) { @@ -131,7 +130,7 @@ public abstract class AbstractBootArchiveIntegrationTests { } @TestTemplate - public void duplicatesAreHandledGracefully() throws IOException { + void duplicatesAreHandledGracefully() throws IOException { assertThat(this.gradleBuild.build(this.taskName).task(":" + this.taskName).getOutcome()) .isEqualTo(TaskOutcome.SUCCESS); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests.java index 98953ecd8f9..99342bd4dae 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests.java @@ -21,9 +21,9 @@ package org.springframework.boot.gradle.tasks.bundling; * * @author Andy Wilkinson */ -public class BootJarIntegrationTests extends AbstractBootArchiveIntegrationTests { +class BootJarIntegrationTests extends AbstractBootArchiveIntegrationTests { - public BootJarIntegrationTests() { + BootJarIntegrationTests() { super("bootJar"); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests.java index 730a6c27b0f..aff076241cd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootWarIntegrationTests.java @@ -21,9 +21,9 @@ package org.springframework.boot.gradle.tasks.bundling; * * @author Andy Wilkinson */ -public class BootWarIntegrationTests extends AbstractBootArchiveIntegrationTests { +class BootWarIntegrationTests extends AbstractBootArchiveIntegrationTests { - public BootWarIntegrationTests() { + BootWarIntegrationTests() { super("bootWar"); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/MavenIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/MavenIntegrationTests.java index 89dc86cb903..3251cb6eced 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/MavenIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/MavenIntegrationTests.java @@ -36,12 +36,12 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Andy Wilkinson */ @ExtendWith(GradleCompatibilityExtension.class) -public class MavenIntegrationTests { +class MavenIntegrationTests { GradleBuild gradleBuild; @TestTemplate - public void bootJarCanBeUploaded() throws FileNotFoundException, IOException { + void bootJarCanBeUploaded() throws FileNotFoundException, IOException { BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("6.0.0") .build("uploadBootArchives"); assertThat(result.task(":uploadBootArchives").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); @@ -51,7 +51,7 @@ public class MavenIntegrationTests { } @TestTemplate - public void bootWarCanBeUploaded() throws IOException { + void bootWarCanBeUploaded() throws IOException { BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("6.0.0") .build("uploadBootArchives"); assertThat(result.task(":uploadBootArchives").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/MavenPublishingIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/MavenPublishingIntegrationTests.java index 0bfbe251304..6e234331813 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/MavenPublishingIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/MavenPublishingIntegrationTests.java @@ -37,12 +37,12 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Andy Wilkinson */ @ExtendWith(GradleCompatibilityExtension.class) -public class MavenPublishingIntegrationTests { +class MavenPublishingIntegrationTests { GradleBuild gradleBuild; @TestTemplate - public void bootJarCanBePublished() throws FileNotFoundException, IOException { + void bootJarCanBePublished() throws FileNotFoundException, IOException { BuildResult result = this.gradleBuild.build("publish"); assertThat(result.task(":publish").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(artifactWithSuffix("jar")).isFile(); @@ -51,7 +51,7 @@ public class MavenPublishingIntegrationTests { } @TestTemplate - public void bootWarCanBePublished() throws IOException { + void bootWarCanBePublished() throws IOException { BuildResult result = this.gradleBuild.build("publish"); assertThat(result.task(":publish").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(artifactWithSuffix("war")).isFile(); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/run/BootRunIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/run/BootRunIntegrationTests.java index 4ba86a6d8ec..b4cccc4276f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/run/BootRunIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/run/BootRunIntegrationTests.java @@ -36,12 +36,12 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Andy Wilkinson */ @ExtendWith(GradleCompatibilityExtension.class) -public class BootRunIntegrationTests { +class BootRunIntegrationTests { GradleBuild gradleBuild; @TestTemplate - public void basicExecution() throws IOException { + void basicExecution() throws IOException { copyClasspathApplication(); new File(this.gradleBuild.getProjectDir(), "src/main/resources").mkdirs(); BuildResult result = this.gradleBuild.build("bootRun"); @@ -52,7 +52,7 @@ public class BootRunIntegrationTests { } @TestTemplate - public void sourceResourcesCanBeUsed() throws IOException { + void sourceResourcesCanBeUsed() throws IOException { copyClasspathApplication(); BuildResult result = this.gradleBuild.build("bootRun"); assertThat(result.task(":bootRun").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); @@ -62,21 +62,21 @@ public class BootRunIntegrationTests { } @TestTemplate - public void springBootExtensionMainClassNameIsUsed() throws IOException { + void springBootExtensionMainClassNameIsUsed() throws IOException { BuildResult result = this.gradleBuild.build("echoMainClassName"); assertThat(result.task(":echoMainClassName").getOutcome()).isEqualTo(TaskOutcome.UP_TO_DATE); assertThat(result.getOutput()).contains("Main class name = com.example.CustomMainClass"); } @TestTemplate - public void applicationPluginMainClassNameIsUsed() throws IOException { + void applicationPluginMainClassNameIsUsed() throws IOException { BuildResult result = this.gradleBuild.build("echoMainClassName"); assertThat(result.task(":echoMainClassName").getOutcome()).isEqualTo(TaskOutcome.UP_TO_DATE); assertThat(result.getOutput()).contains("Main class name = com.example.CustomMainClass"); } @TestTemplate - public void applicationPluginMainClassNameIsNotUsedWhenItIsNull() throws IOException { + void applicationPluginMainClassNameIsNotUsedWhenItIsNull() throws IOException { copyClasspathApplication(); BuildResult result = this.gradleBuild.build("echoMainClassName"); assertThat(result.task(":echoMainClassName").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); @@ -84,7 +84,7 @@ public class BootRunIntegrationTests { } @TestTemplate - public void defaultJvmArgs() throws IOException { + void defaultJvmArgs() throws IOException { copyJvmArgsApplication(); BuildResult result = this.gradleBuild.build("bootRun"); assertThat(result.task(":bootRun").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); @@ -92,7 +92,7 @@ public class BootRunIntegrationTests { } @TestTemplate - public void optimizedLaunchDisabledJvmArgs() throws IOException { + void optimizedLaunchDisabledJvmArgs() throws IOException { copyJvmArgsApplication(); BuildResult result = this.gradleBuild.build("bootRun"); assertThat(result.task(":bootRun").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); @@ -100,7 +100,7 @@ public class BootRunIntegrationTests { } @TestTemplate - public void applicationPluginJvmArgumentsAreUsed() throws IOException { + void applicationPluginJvmArgumentsAreUsed() throws IOException { copyJvmArgsApplication(); BuildResult result = this.gradleBuild.build("bootRun"); assertThat(result.task(":bootRun").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);