Skip to content

Commit e21fda2

Browse files
committed
Merge pull request #38086 from GVictorG7
* gh-38086: Polish unit tests from buildSrc Closes gh-38086
2 parents e1203b7 + b9c2c6b commit e21fda2

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

buildSrc/src/test/java/org/springframework/boot/build/architecture/ArchitectureCheckTests.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ class ArchitectureCheckTests {
4646
void whenPackagesAreTangledTaskFailsAndWritesAReport() throws Exception {
4747
prepareTask("tangled", (architectureCheck) -> {
4848
assertThatExceptionOfType(GradleException.class).isThrownBy(() -> architectureCheck.checkArchitecture());
49-
assertThat(failureReport(architectureCheck).length()).isGreaterThan(0);
49+
assertThat(failureReport(architectureCheck)).isNotEmpty();
5050
});
5151
}
5252

5353
@Test
5454
void whenPackagesAreNotTangledTaskSucceedsAndWritesAnEmptyReport() throws Exception {
5555
prepareTask("untangled", (architectureCheck) -> {
5656
architectureCheck.checkArchitecture();
57-
assertThat(failureReport(architectureCheck).length()).isZero();
57+
assertThat(failureReport(architectureCheck)).isEmpty();
5858
});
5959
}
6060

@@ -66,15 +66,15 @@ File failureReport(ArchitectureCheck architectureCheck) {
6666
void whenBeanPostProcessorBeanMethodIsNotStaticTaskFailsAndWritesAReport() throws Exception {
6767
prepareTask("bpp/nonstatic", (architectureCheck) -> {
6868
assertThatExceptionOfType(GradleException.class).isThrownBy(() -> architectureCheck.checkArchitecture());
69-
assertThat(failureReport(architectureCheck).length()).isGreaterThan(0);
69+
assertThat(failureReport(architectureCheck)).isNotEmpty();
7070
});
7171
}
7272

7373
@Test
7474
void whenBeanPostProcessorBeanMethodIsStaticAndHasUnsafeParametersTaskFailsAndWritesAReport() throws Exception {
7575
prepareTask("bpp/unsafeparameters", (architectureCheck) -> {
7676
assertThatExceptionOfType(GradleException.class).isThrownBy(() -> architectureCheck.checkArchitecture());
77-
assertThat(failureReport(architectureCheck).length()).isGreaterThan(0);
77+
assertThat(failureReport(architectureCheck)).isNotEmpty();
7878
});
7979
}
8080

@@ -83,7 +83,7 @@ void whenBeanPostProcessorBeanMethodIsStaticAndHasSafeParametersTaskSucceedsAndW
8383
throws Exception {
8484
prepareTask("bpp/safeparameters", (architectureCheck) -> {
8585
architectureCheck.checkArchitecture();
86-
assertThat(failureReport(architectureCheck).length()).isZero();
86+
assertThat(failureReport(architectureCheck)).isEmpty();
8787
});
8888
}
8989

@@ -92,23 +92,23 @@ void whenBeanPostProcessorBeanMethodIsStaticAndHasNoParametersTaskSucceedsAndWri
9292
throws Exception {
9393
prepareTask("bpp/noparameters", (architectureCheck) -> {
9494
architectureCheck.checkArchitecture();
95-
assertThat(failureReport(architectureCheck).length()).isZero();
95+
assertThat(failureReport(architectureCheck)).isEmpty();
9696
});
9797
}
9898

9999
@Test
100100
void whenBeanFactoryPostProcessorBeanMethodIsNotStaticTaskFailsAndWritesAReport() throws Exception {
101101
prepareTask("bfpp/nonstatic", (architectureCheck) -> {
102102
assertThatExceptionOfType(GradleException.class).isThrownBy(() -> architectureCheck.checkArchitecture());
103-
assertThat(failureReport(architectureCheck).length()).isGreaterThan(0);
103+
assertThat(failureReport(architectureCheck)).isNotEmpty();
104104
});
105105
}
106106

107107
@Test
108108
void whenBeanFactoryPostProcessorBeanMethodIsStaticAndHasParametersTaskFailsAndWritesAReport() throws Exception {
109109
prepareTask("bfpp/parameters", (architectureCheck) -> {
110110
assertThatExceptionOfType(GradleException.class).isThrownBy(() -> architectureCheck.checkArchitecture());
111-
assertThat(failureReport(architectureCheck).length()).isGreaterThan(0);
111+
assertThat(failureReport(architectureCheck)).isNotEmpty();
112112
});
113113
}
114114

@@ -117,7 +117,7 @@ void whenBeanFactoryPostProcessorBeanMethodIsStaticAndHasNoParametersTaskSucceed
117117
throws Exception {
118118
prepareTask("bfpp/noparameters", (architectureCheck) -> {
119119
architectureCheck.checkArchitecture();
120-
assertThat(failureReport(architectureCheck).length()).isZero();
120+
assertThat(failureReport(architectureCheck)).isEmpty();
121121
});
122122
}
123123

buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/ReleaseScheduleTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
* @author Andy Wilkinson
3939
*/
40-
public class ReleaseScheduleTests {
40+
class ReleaseScheduleTests {
4141

4242
private final RestTemplate rest = new RestTemplate();
4343

buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/version/DependencyVersionUpgradeTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
*
4141
* @author Andy Wilkinson
4242
*/
43-
public class DependencyVersionUpgradeTests {
43+
class DependencyVersionUpgradeTests {
4444

4545
@ParameterizedTest
4646
@ArtifactVersion(current = "1.2.3", candidate = "1.2.3")
@@ -244,7 +244,7 @@ void isUpgradeWhenReleaseTrainToSnapshotAndMovingToSnapshotsShouldReturnTrue(Dep
244244
static class InputProvider implements ArgumentsProvider {
245245

246246
@Override
247-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
247+
public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
248248
Method testMethod = context.getRequiredTestMethod();
249249
Stream<Arguments> artifactVersions = artifactVersions(testMethod)
250250
.map((artifactVersion) -> Arguments.of(VersionType.ARTIFACT_VERSION.parse(artifactVersion.current()),

0 commit comments

Comments
 (0)