Skip to content

Polish unit tests from buildSrc #38086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Polish unit tests from buildSrc #38086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions ...Src/src/test/java/org/springframework/boot/build/architecture/ArchitectureCheckTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ 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();
});
}

@Test
void whenPackagesAreNotTangledTaskSucceedsAndWritesAnEmptyReport() throws Exception {
prepareTask("untangled", (architectureCheck) -> {
architectureCheck.checkArchitecture();
assertThat(failureReport(architectureCheck).length()).isZero();
assertThat(failureReport(architectureCheck)).isEmpty();
});
}

Expand All @@ -66,15 +66,15 @@ File failureReport(ArchitectureCheck architectureCheck) {
void whenBeanPostProcessorBeanMethodIsNotStaticTaskFailsAndWritesAReport() throws Exception {
prepareTask("bpp/nonstatic", (architectureCheck) -> {
assertThatExceptionOfType(GradleException.class).isThrownBy(architectureCheck::checkArchitecture);
assertThat(failureReport(architectureCheck).length()).isGreaterThan(0);
assertThat(failureReport(architectureCheck)).isNotEmpty();
});
}

@Test
void whenBeanPostProcessorBeanMethodIsStaticAndHasUnsafeParametersTaskFailsAndWritesAReport() throws Exception {
prepareTask("bpp/unsafeparameters", (architectureCheck) -> {
assertThatExceptionOfType(GradleException.class).isThrownBy(architectureCheck::checkArchitecture);
assertThat(failureReport(architectureCheck).length()).isGreaterThan(0);
assertThat(failureReport(architectureCheck)).isNotEmpty();
});
}

Expand All @@ -83,7 +83,7 @@ void whenBeanPostProcessorBeanMethodIsStaticAndHasSafeParametersTaskSucceedsAndW
throws Exception {
prepareTask("bpp/safeparameters", (architectureCheck) -> {
architectureCheck.checkArchitecture();
assertThat(failureReport(architectureCheck).length()).isZero();
assertThat(failureReport(architectureCheck)).isEmpty();
});
}

Expand All @@ -92,23 +92,23 @@ void whenBeanPostProcessorBeanMethodIsStaticAndHasNoParametersTaskSucceedsAndWri
throws Exception {
prepareTask("bpp/noparameters", (architectureCheck) -> {
architectureCheck.checkArchitecture();
assertThat(failureReport(architectureCheck).length()).isZero();
assertThat(failureReport(architectureCheck)).isEmpty();
});
}

@Test
void whenBeanFactoryPostProcessorBeanMethodIsNotStaticTaskFailsAndWritesAReport() throws Exception {
prepareTask("bfpp/nonstatic", (architectureCheck) -> {
assertThatExceptionOfType(GradleException.class).isThrownBy(architectureCheck::checkArchitecture);
assertThat(failureReport(architectureCheck).length()).isGreaterThan(0);
assertThat(failureReport(architectureCheck)).isNotEmpty();
});
}

@Test
void whenBeanFactoryPostProcessorBeanMethodIsStaticAndHasParametersTaskFailsAndWritesAReport() throws Exception {
prepareTask("bfpp/parameters", (architectureCheck) -> {
assertThatExceptionOfType(GradleException.class).isThrownBy(architectureCheck::checkArchitecture);
assertThat(failureReport(architectureCheck).length()).isGreaterThan(0);
assertThat(failureReport(architectureCheck)).isNotEmpty();
});
}

Expand All @@ -117,7 +117,7 @@ void whenBeanFactoryPostProcessorBeanMethodIsStaticAndHasNoParametersTaskSucceed
throws Exception {
prepareTask("bfpp/noparameters", (architectureCheck) -> {
architectureCheck.checkArchitecture();
assertThat(failureReport(architectureCheck).length()).isZero();
assertThat(failureReport(architectureCheck)).isEmpty();
});
}

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/test/java/org/springframework/boot/build/bom/bomr/ReleaseScheduleTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
*
* @author Andy Wilkinson
*/
public class ReleaseScheduleTests {
class ReleaseScheduleTests {

private final RestTemplate rest = new RestTemplate();

Expand Down
4 changes: 2 additions & 2 deletions ...t/java/org/springframework/boot/build/bom/bomr/version/DependencyVersionUpgradeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
*
* @author Andy Wilkinson
*/
public class DependencyVersionUpgradeTests {
class DependencyVersionUpgradeTests {

@ParameterizedTest
@ArtifactVersion(current = "1.2.3", candidate = "1.2.3")
Expand Down Expand Up @@ -244,7 +244,7 @@ void isUpgradeWhenReleaseTrainToSnapshotAndMovingToSnapshotsShouldReturnTrue(Dep
static class InputProvider implements ArgumentsProvider {

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