Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify AssertJ assertions and also make them more readable

Browse Source 
See gh-33653
This commit is contained in:
Krzysztof Krason
2022-12-29 17:52:45 +01:00
committed by Moritz Halbritter
parent c9a2b2ab66
commit cf6493f65c
345 changed files with 1258 additions and 1292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/CustomLayersProviderTests.java
View File

@@ -59,13 +59,13 @@ class CustomLayersProviderTests {
Library otherDependency = mockLibrary("other-library", "org.foo", null);
Library localSnapshotDependency = mockLibrary("local-library", "org.foo", "1.0-SNAPSHOT");
given(localSnapshotDependency.isLocal()).willReturn(true);
assertThat(layers.getLayer(snapshot).toString()).isEqualTo("snapshot-dependencies");
assertThat(layers.getLayer(groupId).toString()).isEqualTo("my-deps");
assertThat(layers.getLayer(otherDependency).toString()).isEqualTo("my-dependencies-name");
assertThat(layers.getLayer(localSnapshotDependency).toString()).isEqualTo("application");
assertThat(layers.getLayer("META-INF/resources/test.css").toString()).isEqualTo("my-resources");
assertThat(layers.getLayer("application.yml").toString()).isEqualTo("configuration");
assertThat(layers.getLayer("test").toString()).isEqualTo("application");
assertThat(layers.getLayer(snapshot)).hasToString("snapshot-dependencies");
assertThat(layers.getLayer(groupId)).hasToString("my-deps");
assertThat(layers.getLayer(otherDependency)).hasToString("my-dependencies-name");
assertThat(layers.getLayer(localSnapshotDependency)).hasToString("application");
assertThat(layers.getLayer("META-INF/resources/test.css")).hasToString("my-resources");
assertThat(layers.getLayer("application.yml")).hasToString("configuration");
assertThat(layers.getLayer("test")).hasToString("application");
}
private Library mockLibrary(String name, String groupId, String version) {
@@ -79,7 +79,7 @@ class CustomLayersProviderTests {
void getLayerResolverWhenDocumentContainsLibraryLayerWithNoFilters() throws Exception {
CustomLayers layers = this.customLayersProvider.getLayers(getDocument("dependencies-layer-no-filter.xml"));
Library library = mockLibrary("my-library", "com.acme", null);
assertThat(layers.getLayer(library).toString()).isEqualTo("my-deps");
assertThat(layers.getLayer(library)).hasToString("my-deps");
assertThatIllegalStateException().isThrownBy(() -> layers.getLayer("application.yml"))
.withMessageContaining("match any layer");
}
@@ -88,7 +88,7 @@ class CustomLayersProviderTests {
void getLayerResolverWhenDocumentContainsResourceLayerWithNoFilters() throws Exception {
CustomLayers layers = this.customLayersProvider.getLayers(getDocument("application-layer-no-filter.xml"));
Library library = mockLibrary("my-library", "com.acme", null);
assertThat(layers.getLayer("application.yml").toString()).isEqualTo("my-layer");
assertThat(layers.getLayer("application.yml")).hasToString("my-layer");
assertThatIllegalStateException().isThrownBy(() -> layers.getLayer(library))
.withMessageContaining("match any layer");
}

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DockerTests.java
View File

@@ -53,7 +53,7 @@ class DockerTests {
DockerConfiguration dockerConfiguration = docker.asDockerConfiguration();
DockerHost host = dockerConfiguration.getHost();
assertThat(host.getAddress()).isEqualTo("docker.example.com");
assertThat(host.isSecure()).isEqualTo(true);
assertThat(host.isSecure()).isTrue();
assertThat(host.getCertificatePath()).isEqualTo("/tmp/ca-cert");
assertThat(dockerConfiguration.isBindHostToBuilder()).isFalse();
assertThat(docker.asDockerConfiguration().getBuilderRegistryAuthentication()).isNull();
@@ -72,7 +72,7 @@ class DockerTests {
DockerConfiguration dockerConfiguration = docker.asDockerConfiguration();
DockerHost host = dockerConfiguration.getHost();
assertThat(host.getAddress()).isEqualTo("docker.example.com");
assertThat(host.isSecure()).isEqualTo(true);
assertThat(host.isSecure()).isTrue();
assertThat(host.getCertificatePath()).isEqualTo("/tmp/ca-cert");
assertThat(dockerConfiguration.isBindHostToBuilder()).isTrue();
assertThat(docker.asDockerConfiguration().getBuilderRegistryAuthentication()).isNull();

10
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ImageTests.java
View File

@@ -52,7 +52,7 @@ class ImageTests {
@Test
void getBuildRequestWhenNameIsNullDeducesName() {
BuildRequest request = new Image().getBuildRequest(createArtifact(), mockApplicationContent());
assertThat(request.getName().toString()).isEqualTo("docker.io/library/my-app:0.0.1-SNAPSHOT");
assertThat(request.getName()).hasToString("docker.io/library/my-app:0.0.1-SNAPSHOT");
}
@Test
@@ -60,13 +60,13 @@ class ImageTests {
Image image = new Image();
image.name = "demo";
BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent());
assertThat(request.getName().toString()).isEqualTo("docker.io/library/demo:latest");
assertThat(request.getName()).hasToString("docker.io/library/demo:latest");
}
@Test
void getBuildRequestWhenNoCustomizationsUsesDefaults() {
BuildRequest request = new Image().getBuildRequest(createArtifact(), mockApplicationContent());
assertThat(request.getName().toString()).isEqualTo("docker.io/library/my-app:0.0.1-SNAPSHOT");
assertThat(request.getName()).hasToString("docker.io/library/my-app:0.0.1-SNAPSHOT");
assertThat(request.getBuilder().toString()).contains("paketobuildpacks/builder");
assertThat(request.getRunImage()).isNull();
assertThat(request.getEnv()).isEmpty();
@@ -83,7 +83,7 @@ class ImageTests {
Image image = new Image();
image.builder = "springboot/builder:2.2.x";
BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent());
assertThat(request.getBuilder().toString()).isEqualTo("docker.io/springboot/builder:2.2.x");
assertThat(request.getBuilder()).hasToString("docker.io/springboot/builder:2.2.x");
}
@Test
@@ -91,7 +91,7 @@ class ImageTests {
Image image = new Image();
image.runImage = "springboot/run:latest";
BuildRequest request = image.getBuildRequest(createArtifact(), mockApplicationContent());
assertThat(request.getRunImage().toString()).isEqualTo("docker.io/springboot/run:latest");
assertThat(request.getRunImage()).hasToString("docker.io/springboot/run:latest");
}
@Test

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/PropertiesMergingResourceTransformerTests.java
View File

@@ -62,7 +62,7 @@ class PropertiesMergingResourceTransformerTests {
os.flush();
os.close();
byte[] bytes = out.toByteArray();
assertThat(bytes).hasSizeGreaterThan(0);
assertThat(bytes).isNotEmpty();
List<JarEntry> entries = new ArrayList<>();
try (JarInputStream is = new JarInputStream(new ByteArrayInputStream(bytes))) {
JarEntry entry;

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/SystemPropertyFormatterTests.java
View File

@@ -29,7 +29,7 @@ class SystemPropertyFormatterTests {
@Test
void parseEmpty() {
assertThat(SystemPropertyFormatter.format(null, null)).isEqualTo("");
assertThat(SystemPropertyFormatter.format(null, null)).isEmpty();
}
@Test