From b9c2c6b820ebfee858c07c3870141c3b02b7a38f Mon Sep 17 00:00:00 2001 From: Victor Georgescu Date: Fri, 27 Oct 2023 18:05:35 +0300 Subject: [PATCH] Polish unit tests from buildSrc * remove redundant "public" access modifiers * remove a never thrown defined Exception * assert the emptiness instead of length of files See gh-38086 --- .../architecture/ArchitectureCheckTests.java | 18 +++++++++--------- .../build/bom/bomr/ReleaseScheduleTests.java | 2 +- .../version/DependencyVersionUpgradeTests.java | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/buildSrc/src/test/java/org/springframework/boot/build/architecture/ArchitectureCheckTests.java b/buildSrc/src/test/java/org/springframework/boot/build/architecture/ArchitectureCheckTests.java index 61001c78433..28875f7948c 100644 --- a/buildSrc/src/test/java/org/springframework/boot/build/architecture/ArchitectureCheckTests.java +++ b/buildSrc/src/test/java/org/springframework/boot/build/architecture/ArchitectureCheckTests.java @@ -46,7 +46,7 @@ class ArchitectureCheckTests { void whenPackagesAreTangledTaskFailsAndWritesAReport() throws Exception { prepareTask("tangled", (architectureCheck) -> { assertThatExceptionOfType(GradleException.class).isThrownBy(() -> architectureCheck.checkArchitecture()); - assertThat(failureReport(architectureCheck).length()).isGreaterThan(0); + assertThat(failureReport(architectureCheck)).isNotEmpty(); }); } @@ -54,7 +54,7 @@ class ArchitectureCheckTests { void whenPackagesAreNotTangledTaskSucceedsAndWritesAnEmptyReport() throws Exception { prepareTask("untangled", (architectureCheck) -> { architectureCheck.checkArchitecture(); - assertThat(failureReport(architectureCheck).length()).isZero(); + assertThat(failureReport(architectureCheck)).isEmpty(); }); } @@ -66,7 +66,7 @@ class ArchitectureCheckTests { void whenBeanPostProcessorBeanMethodIsNotStaticTaskFailsAndWritesAReport() throws Exception { prepareTask("bpp/nonstatic", (architectureCheck) -> { assertThatExceptionOfType(GradleException.class).isThrownBy(() -> architectureCheck.checkArchitecture()); - assertThat(failureReport(architectureCheck).length()).isGreaterThan(0); + assertThat(failureReport(architectureCheck)).isNotEmpty(); }); } @@ -74,7 +74,7 @@ class ArchitectureCheckTests { void whenBeanPostProcessorBeanMethodIsStaticAndHasUnsafeParametersTaskFailsAndWritesAReport() throws Exception { prepareTask("bpp/unsafeparameters", (architectureCheck) -> { assertThatExceptionOfType(GradleException.class).isThrownBy(() -> architectureCheck.checkArchitecture()); - assertThat(failureReport(architectureCheck).length()).isGreaterThan(0); + assertThat(failureReport(architectureCheck)).isNotEmpty(); }); } @@ -83,7 +83,7 @@ class ArchitectureCheckTests { throws Exception { prepareTask("bpp/safeparameters", (architectureCheck) -> { architectureCheck.checkArchitecture(); - assertThat(failureReport(architectureCheck).length()).isZero(); + assertThat(failureReport(architectureCheck)).isEmpty(); }); } @@ -92,7 +92,7 @@ class ArchitectureCheckTests { throws Exception { prepareTask("bpp/noparameters", (architectureCheck) -> { architectureCheck.checkArchitecture(); - assertThat(failureReport(architectureCheck).length()).isZero(); + assertThat(failureReport(architectureCheck)).isEmpty(); }); } @@ -100,7 +100,7 @@ class ArchitectureCheckTests { void whenBeanFactoryPostProcessorBeanMethodIsNotStaticTaskFailsAndWritesAReport() throws Exception { prepareTask("bfpp/nonstatic", (architectureCheck) -> { assertThatExceptionOfType(GradleException.class).isThrownBy(() -> architectureCheck.checkArchitecture()); - assertThat(failureReport(architectureCheck).length()).isGreaterThan(0); + assertThat(failureReport(architectureCheck)).isNotEmpty(); }); } @@ -108,7 +108,7 @@ class ArchitectureCheckTests { void whenBeanFactoryPostProcessorBeanMethodIsStaticAndHasParametersTaskFailsAndWritesAReport() throws Exception { prepareTask("bfpp/parameters", (architectureCheck) -> { assertThatExceptionOfType(GradleException.class).isThrownBy(() -> architectureCheck.checkArchitecture()); - assertThat(failureReport(architectureCheck).length()).isGreaterThan(0); + assertThat(failureReport(architectureCheck)).isNotEmpty(); }); } @@ -117,7 +117,7 @@ class ArchitectureCheckTests { throws Exception { prepareTask("bfpp/noparameters", (architectureCheck) -> { architectureCheck.checkArchitecture(); - assertThat(failureReport(architectureCheck).length()).isZero(); + assertThat(failureReport(architectureCheck)).isEmpty(); }); } diff --git a/buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/ReleaseScheduleTests.java b/buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/ReleaseScheduleTests.java index f4718e62f07..bbf78521403 100644 --- a/buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/ReleaseScheduleTests.java +++ b/buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/ReleaseScheduleTests.java @@ -37,7 +37,7 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat * * @author Andy Wilkinson */ -public class ReleaseScheduleTests { +class ReleaseScheduleTests { private final RestTemplate rest = new RestTemplate(); diff --git a/buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/DependencyVersionUpgradeTests.java b/buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/DependencyVersionUpgradeTests.java index 7220de730d0..404ae42fe89 100644 --- a/buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/DependencyVersionUpgradeTests.java +++ b/buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/DependencyVersionUpgradeTests.java @@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Andy Wilkinson */ -public class DependencyVersionUpgradeTests { +class DependencyVersionUpgradeTests { @ParameterizedTest @ArtifactVersion(current = "1.2.3", candidate = "1.2.3") @@ -244,7 +244,7 @@ public class DependencyVersionUpgradeTests { static class InputProvider implements ArgumentsProvider { @Override - public Stream provideArguments(ExtensionContext context) throws Exception { + public Stream provideArguments(ExtensionContext context) { Method testMethod = context.getRequiredTestMethod(); Stream artifactVersions = artifactVersions(testMethod) .map((artifactVersion) -> Arguments.of(VersionType.ARTIFACT_VERSION.parse(artifactVersion.current()),