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

6
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/ApiVersionTests.java
View File

@@ -53,7 +53,7 @@ class ApiVersionTests {
@Test
void parseReturnsVersion() {
ApiVersion version = ApiVersion.parse("1.2");
assertThat(version.getMajor()).isEqualTo(1);
assertThat(version.getMajor()).isOne();
assertThat(version.getMinor()).isEqualTo(2);
}
@@ -111,7 +111,7 @@ class ApiVersionTests {
@Test
void toStringReturnsString() {
assertThat(ApiVersion.parse("1.2").toString()).isEqualTo("1.2");
assertThat(ApiVersion.parse("1.2")).hasToString("1.2");
}
@Test
@@ -119,7 +119,7 @@ class ApiVersionTests {
ApiVersion v12a = ApiVersion.parse("1.2");
ApiVersion v12b = ApiVersion.parse("1.2");
ApiVersion v13 = ApiVersion.parse("1.3");
assertThat(v12a.hashCode()).isEqualTo(v12b.hashCode());
assertThat(v12a).hasSameHashCodeAs(v12b);
assertThat(v12a).isEqualTo(v12a).isEqualTo(v12b).isNotEqualTo(v13);
}

6
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/ApiVersionsTests.java
View File

@@ -70,12 +70,12 @@ class ApiVersionsTests {
@Test
void createFromRange() {
ApiVersions versions = ApiVersions.of(1, IntStream.rangeClosed(2, 7));
assertThat(versions.toString()).isEqualTo("1.2,1.3,1.4,1.5,1.6,1.7");
assertThat(versions).hasToString("1.2,1.3,1.4,1.5,1.6,1.7");
}
@Test
void toStringReturnsString() {
assertThat(ApiVersions.parse("1.1", "2.2", "3.3").toString()).isEqualTo("1.1,2.2,3.3");
assertThat(ApiVersions.parse("1.1", "2.2", "3.3")).hasToString("1.1,2.2,3.3");
}
@Test
@@ -83,7 +83,7 @@ class ApiVersionsTests {
ApiVersions v12a = ApiVersions.parse("1.2", "2.3");
ApiVersions v12b = ApiVersions.parse("1.2", "2.3");
ApiVersions v13 = ApiVersions.parse("1.3", "2.4");
assertThat(v12a.hashCode()).isEqualTo(v12b.hashCode());
assertThat(v12a).hasSameHashCodeAs(v12b);
assertThat(v12a).isEqualTo(v12a).isEqualTo(v12b).isNotEqualTo(v13);
}

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildOwnerTests.java
View File

@@ -41,7 +41,7 @@ class BuildOwnerTests {
BuildOwner owner = BuildOwner.fromEnv(env);
assertThat(owner.getUid()).isEqualTo(123);
assertThat(owner.getGid()).isEqualTo(456);
assertThat(owner.toString()).isEqualTo("123/456");
assertThat(owner).hasToString("123/456");
}
@Test

18
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildRequestTests.java
View File

@@ -58,8 +58,8 @@ class BuildRequestTests {
File jarFile = new File(this.tempDir, "my-app-0.0.1.jar");
writeTestJarFile(jarFile);
BuildRequest request = BuildRequest.forJarFile(jarFile);
assertThat(request.getName().toString()).isEqualTo("docker.io/library/my-app:0.0.1");
assertThat(request.getBuilder().toString()).isEqualTo("docker.io/" + BuildRequest.DEFAULT_BUILDER_IMAGE_NAME);
assertThat(request.getName()).hasToString("docker.io/library/my-app:0.0.1");
assertThat(request.getBuilder()).hasToString("docker.io/" + BuildRequest.DEFAULT_BUILDER_IMAGE_NAME);
assertThat(request.getApplicationContent(Owner.ROOT)).satisfies(this::hasExpectedJarContent);
assertThat(request.getEnv()).isEmpty();
}
@@ -69,8 +69,8 @@ class BuildRequestTests {
File jarFile = new File(this.tempDir, "my-app-0.0.1.jar");
writeTestJarFile(jarFile);
BuildRequest request = BuildRequest.forJarFile(ImageReference.of("test-app"), jarFile);
assertThat(request.getName().toString()).isEqualTo("docker.io/library/test-app:latest");
assertThat(request.getBuilder().toString()).isEqualTo("docker.io/" + BuildRequest.DEFAULT_BUILDER_IMAGE_NAME);
assertThat(request.getName()).hasToString("docker.io/library/test-app:latest");
assertThat(request.getBuilder()).hasToString("docker.io/" + BuildRequest.DEFAULT_BUILDER_IMAGE_NAME);
assertThat(request.getApplicationContent(Owner.ROOT)).satisfies(this::hasExpectedJarContent);
assertThat(request.getEnv()).isEmpty();
}
@@ -98,14 +98,14 @@ class BuildRequestTests {
void withBuilderUpdatesBuilder() throws IOException {
BuildRequest request = BuildRequest.forJarFile(writeTestJarFile("my-app-0.0.1.jar"))
.withBuilder(ImageReference.of("spring/builder"));
assertThat(request.getBuilder().toString()).isEqualTo("docker.io/spring/builder:latest");
assertThat(request.getBuilder()).hasToString("docker.io/spring/builder:latest");
}
@Test
void withBuilderWhenHasDigestUpdatesBuilder() throws IOException {
BuildRequest request = BuildRequest.forJarFile(writeTestJarFile("my-app-0.0.1.jar")).withBuilder(ImageReference
.of("spring/builder@sha256:6e9f67fa63b0323e9a1e587fd71c561ba48a034504fb804fd26fd8800039835d"));
assertThat(request.getBuilder().toString()).isEqualTo(
assertThat(request.getBuilder()).hasToString(
"docker.io/spring/builder@sha256:6e9f67fa63b0323e9a1e587fd71c561ba48a034504fb804fd26fd8800039835d");
}
@@ -113,14 +113,14 @@ class BuildRequestTests {
void withRunImageUpdatesRunImage() throws IOException {
BuildRequest request = BuildRequest.forJarFile(writeTestJarFile("my-app-0.0.1.jar"))
.withRunImage(ImageReference.of("example.com/custom/run-image:latest"));
assertThat(request.getRunImage().toString()).isEqualTo("example.com/custom/run-image:latest");
assertThat(request.getRunImage()).hasToString("example.com/custom/run-image:latest");
}
@Test
void withRunImageWhenHasDigestUpdatesRunImage() throws IOException {
BuildRequest request = BuildRequest.forJarFile(writeTestJarFile("my-app-0.0.1.jar")).withRunImage(ImageReference
.of("example.com/custom/run-image@sha256:6e9f67fa63b0323e9a1e587fd71c561ba48a034504fb804fd26fd8800039835d"));
assertThat(request.getRunImage().toString()).isEqualTo(
assertThat(request.getRunImage()).hasToString(
"example.com/custom/run-image@sha256:6e9f67fa63b0323e9a1e587fd71c561ba48a034504fb804fd26fd8800039835d");
}
@@ -129,7 +129,7 @@ class BuildRequestTests {
BuildRequest request = BuildRequest.forJarFile(writeTestJarFile("my-app-0.0.1.jar"));
BuildRequest withCreator = request.withCreator(Creator.withVersion("1.0.0"));
assertThat(request.getCreator().getName()).isEqualTo("Spring Boot");
assertThat(request.getCreator().getVersion()).isEqualTo("");
assertThat(request.getCreator().getVersion()).isEmpty();
assertThat(withCreator.getCreator().getName()).isEqualTo("Spring Boot");
assertThat(withCreator.getCreator().getVersion()).isEqualTo("1.0.0");
}

4
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuilderExceptionTests.java
View File

@@ -31,7 +31,7 @@ class BuilderExceptionTests {
void create() {
BuilderException exception = new BuilderException("detector", 1);
assertThat(exception.getOperation()).isEqualTo("detector");
assertThat(exception.getStatusCode()).isEqualTo(1);
assertThat(exception.getStatusCode()).isOne();
assertThat(exception.getMessage()).isEqualTo("Builder lifecycle 'detector' failed with status code 1");
}
@@ -39,7 +39,7 @@ class BuilderExceptionTests {
void createWhenOperationIsNull() {
BuilderException exception = new BuilderException(null, 1);
assertThat(exception.getOperation()).isNull();
assertThat(exception.getStatusCode()).isEqualTo(1);
assertThat(exception.getStatusCode()).isOne();
assertThat(exception.getMessage()).isEqualTo("Builder failed with status code 1");
}

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildpackCoordinatesTests.java
View File

@@ -152,7 +152,7 @@ class BuildpackCoordinatesTests extends AbstractJsonTests {
BuildpackCoordinates c1b = BuildpackCoordinates.of("id", "1");
BuildpackCoordinates c2 = BuildpackCoordinates.of("id", "2");
assertThat(c1a).isEqualTo(c1a).isEqualTo(c1b).isNotEqualTo(c2);
assertThat(c1a.hashCode()).isEqualTo(c1b.hashCode());
assertThat(c1a).hasSameHashCodeAs(c1b);
}
private InputStream createTomlStream(String id, String version, boolean includeStacks, boolean includeOrder) {

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/BuildpackReferenceTests.java
View File

@@ -54,7 +54,7 @@ class BuildpackReferenceTests {
BuildpackReference b = BuildpackReference.of("test1");
BuildpackReference c = BuildpackReference.of("test2");
assertThat(a).isEqualTo(a).isEqualTo(b).isNotEqualTo(c);
assertThat(a.hashCode()).isEqualTo(b.hashCode());
assertThat(a).hasSameHashCodeAs(b);
}
@Test

10
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/EphemeralBuilderTests.java
View File

@@ -122,11 +122,11 @@ class EphemeralBuilderTests extends AbstractJsonTests {
Instant createInstant = builder.getArchive().getCreateDate();
OffsetDateTime createDateTime = OffsetDateTime.ofInstant(createInstant, ZoneId.of("UTC"));
assertThat(createDateTime.getYear()).isEqualTo(1980);
assertThat(createDateTime.getMonthValue()).isEqualTo(1);
assertThat(createDateTime.getDayOfMonth()).isEqualTo(1);
assertThat(createDateTime.getHour()).isEqualTo(0);
assertThat(createDateTime.getMinute()).isEqualTo(0);
assertThat(createDateTime.getSecond()).isEqualTo(1);
assertThat(createDateTime.getMonthValue()).isOne();
assertThat(createDateTime.getDayOfMonth()).isOne();
assertThat(createDateTime.getHour()).isZero();
assertThat(createDateTime.getMinute()).isZero();
assertThat(createDateTime.getSecond()).isOne();
}
@Test

12
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/LifecycleVersionTests.java
View File

@@ -49,9 +49,9 @@ class LifecycleVersionTests {
@Test
void compareTo() {
LifecycleVersion v4 = LifecycleVersion.parse("0.0.4");
assertThat(LifecycleVersion.parse("0.0.3").compareTo(v4)).isNegative();
assertThat(LifecycleVersion.parse("0.0.4").compareTo(v4)).isZero();
assertThat(LifecycleVersion.parse("0.0.5").compareTo(v4)).isPositive();
assertThat(LifecycleVersion.parse("0.0.3")).isLessThan(v4);
assertThat(LifecycleVersion.parse("0.0.4")).isEqualByComparingTo(v4);
assertThat(LifecycleVersion.parse("0.0.5")).isGreaterThan(v4);
}
@Test
@@ -64,9 +64,9 @@ class LifecycleVersionTests {
@Test
void parseReturnsVersion() {
assertThat(LifecycleVersion.parse("1.2.3").toString()).isEqualTo("v1.2.3");
assertThat(LifecycleVersion.parse("1.2").toString()).isEqualTo("v1.2.0");
assertThat(LifecycleVersion.parse("1").toString()).isEqualTo("v1.0.0");
assertThat(LifecycleVersion.parse("1.2.3")).hasToString("v1.2.3");
assertThat(LifecycleVersion.parse("1.2")).hasToString("v1.2.0");
assertThat(LifecycleVersion.parse("1")).hasToString("v1.0.0");
}
}

8
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/build/StackIdTests.java
View File

@@ -58,13 +58,13 @@ class StackIdTests {
given(image.getConfig()).willReturn(imageConfig);
given(imageConfig.getLabels()).willReturn(Collections.singletonMap("io.buildpacks.stack.id", "test"));
StackId stackId = StackId.fromImage(image);
assertThat(stackId.toString()).isEqualTo("test");
assertThat(stackId).hasToString("test");
}
@Test
void ofCreatesStackId() {
StackId stackId = StackId.of("test");
assertThat(stackId.toString()).isEqualTo("test");
assertThat(stackId).hasToString("test");
}
@Test
@@ -72,14 +72,14 @@ class StackIdTests {
StackId s1 = StackId.of("a");
StackId s2 = StackId.of("a");
StackId s3 = StackId.of("b");
assertThat(s1.hashCode()).isEqualTo(s2.hashCode());
assertThat(s1).hasSameHashCodeAs(s2);
assertThat(s1).isEqualTo(s1).isEqualTo(s2).isNotEqualTo(s3);
}
@Test
void toStringReturnsValue() {
StackId stackId = StackId.of("test");
assertThat(stackId.toString()).isEqualTo("test");
assertThat(stackId).hasToString("test");
}
}

10
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/DockerApiTests.java
View File

@@ -403,11 +403,11 @@ class DockerApiTests {
given(http().post(eq(createUri), eq("application/json"), any()))
.willReturn(responseOf("create-container-response.json"));
ContainerReference containerReference = this.api.create(config);
assertThat(containerReference.toString()).isEqualTo("e90e34656806");
assertThat(containerReference).hasToString("e90e34656806");
then(http()).should().post(any(), any(), this.writer.capture());
ByteArrayOutputStream out = new ByteArrayOutputStream();
this.writer.getValue().accept(out);
assertThat(out.toByteArray().length).isEqualTo(config.toString().length());
assertThat(out.toByteArray()).hasSize(config.toString().length());
}
@Test
@@ -425,11 +425,11 @@ class DockerApiTests {
URI uploadUri = new URI(CONTAINERS_URL + "/e90e34656806/archive?path=%2F");
given(http().put(eq(uploadUri), eq("application/x-tar"), any())).willReturn(emptyResponse());
ContainerReference containerReference = this.api.create(config, content);
assertThat(containerReference.toString()).isEqualTo("e90e34656806");
assertThat(containerReference).hasToString("e90e34656806");
then(http()).should().post(any(), any(), this.writer.capture());
ByteArrayOutputStream out = new ByteArrayOutputStream();
this.writer.getValue().accept(out);
assertThat(out.toByteArray().length).isEqualTo(config.toString().length());
assertThat(out.toByteArray()).hasSize(config.toString().length());
then(http()).should().put(any(), any(), this.writer.capture());
this.writer.getValue().accept(out);
assertThat(out.toByteArray()).hasSizeGreaterThan(2000);
@@ -487,7 +487,7 @@ class DockerApiTests {
URI waitUri = new URI(CONTAINERS_URL + "/e90e34656806/wait");
given(http().post(waitUri)).willReturn(responseOf("container-wait-response.json"));
ContainerStatus status = this.api.wait(reference);
assertThat(status.getStatusCode()).isEqualTo(1);
assertThat(status.getStatusCode()).isOne();
}
@Test

20
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/LogUpdateEventTests.java
View File

@@ -36,28 +36,28 @@ class LogUpdateEventTests {
void readAllWhenSimpleStreamReturnsEvents() throws Exception {
List<LogUpdateEvent> events = readAll("log-update-event.stream");
assertThat(events).hasSize(7);
assertThat(events.get(0).toString())
.isEqualTo("Analyzing image '307c032c4ceaa6330b6c02af945a1fe56a8c3c27c28268574b217c1d38b093cf'");
assertThat(events.get(1).toString())
.isEqualTo("Writing metadata for uncached layer 'org.cloudfoundry.openjdk:openjdk-jre'");
assertThat(events.get(2).toString())
.isEqualTo("Using cached launch layer 'org.cloudfoundry.jvmapplication:executable-jar'");
assertThat(events.get(0))
.hasToString("Analyzing image '307c032c4ceaa6330b6c02af945a1fe56a8c3c27c28268574b217c1d38b093cf'");
assertThat(events.get(1))
.hasToString("Writing metadata for uncached layer 'org.cloudfoundry.openjdk:openjdk-jre'");
assertThat(events.get(2))
.hasToString("Using cached launch layer 'org.cloudfoundry.jvmapplication:executable-jar'");
}
@Test
void readAllWhenAnsiStreamReturnsEvents() throws Exception {
List<LogUpdateEvent> events = readAll("log-update-event-ansi.stream");
assertThat(events).hasSize(20);
assertThat(events.get(0).toString()).isEqualTo("");
assertThat(events.get(1).toString()).isEqualTo("Cloud Foundry OpenJDK Buildpack v1.0.64");
assertThat(events.get(2).toString()).isEqualTo(" OpenJDK JRE 11.0.5: Reusing cached layer");
assertThat(events.get(0).toString()).isEmpty();
assertThat(events.get(1)).hasToString("Cloud Foundry OpenJDK Buildpack v1.0.64");
assertThat(events.get(2)).hasToString(" OpenJDK JRE 11.0.5: Reusing cached layer");
}
@Test
void readSucceedsWhenStreamTypeIsInvalid() throws IOException {
List<LogUpdateEvent> events = readAll("log-update-event-invalid-stream-type.stream");
assertThat(events).hasSize(1);
assertThat(events.get(0).toString()).isEqualTo("Stream type is out of bounds. Must be >= 0 and < 3, but was 3");
assertThat(events.get(0)).hasToString("Stream type is out of bounds. Must be >= 0 and < 3, but was 3");
}
private List<LogUpdateEvent> readAll(String name) throws IOException {

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/ProgressUpdateEventTests.java
View File

@@ -40,7 +40,7 @@ abstract class ProgressUpdateEventTests<E extends ProgressUpdateEvent> {
@Test
void getProgressDetailsReturnsProgressDetails() {
ProgressUpdateEvent event = createEvent();
assertThat(event.getProgressDetail().getCurrent()).isEqualTo(1);
assertThat(event.getProgressDetail().getCurrent()).isOne();
assertThat(event.getProgressDetail().getTotal()).isEqualTo(2);
}

19
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/TotalProgressBarTests.java
View File

@@ -36,12 +36,11 @@ class TotalProgressBarTests {
TotalProgressBar bar = new TotalProgressBar("prefix:", '#', true, out);
assertThat(out).hasToString("prefix: [ ");
bar.accept(new TotalProgressEvent(10));
assertThat(out.toString()).isEqualTo("prefix: [ #####");
assertThat(out).hasToString("prefix: [ #####");
bar.accept(new TotalProgressEvent(50));
assertThat(out.toString()).isEqualTo("prefix: [ #########################");
assertThat(out).hasToString("prefix: [ #########################");
bar.accept(new TotalProgressEvent(100));
assertThat(out.toString())
.isEqualTo(String.format("prefix: [ ################################################## ]%n"));
assertThat(out).hasToString(String.format("prefix: [ ################################################## ]%n"));
}
@Test
@@ -50,11 +49,11 @@ class TotalProgressBarTests {
TotalProgressBar bar = new TotalProgressBar(null, '#', true, out);
assertThat(out).hasToString("[ ");
bar.accept(new TotalProgressEvent(10));
assertThat(out.toString()).isEqualTo("[ #####");
assertThat(out).hasToString("[ #####");
bar.accept(new TotalProgressEvent(50));
assertThat(out.toString()).isEqualTo("[ #########################");
assertThat(out).hasToString("[ #########################");
bar.accept(new TotalProgressEvent(100));
assertThat(out.toString()).isEqualTo(String.format("[ ################################################## ]%n"));
assertThat(out).hasToString(String.format("[ ################################################## ]%n"));
}
@Test
@@ -63,11 +62,11 @@ class TotalProgressBarTests {
TotalProgressBar bar = new TotalProgressBar("", '.', false, out);
assertThat(out).hasToString("");
bar.accept(new TotalProgressEvent(10));
assertThat(out.toString()).isEqualTo(".....");
assertThat(out).hasToString(".....");
bar.accept(new TotalProgressEvent(50));
assertThat(out.toString()).isEqualTo(".........................");
assertThat(out).hasToString(".........................");
bar.accept(new TotalProgressEvent(100));
assertThat(out.toString()).isEqualTo(String.format("..................................................%n"));
assertThat(out).hasToString(String.format("..................................................%n"));
}
static class TestPrintStream extends PrintStream {

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/TotalProgressEventTests.java
View File

@@ -30,7 +30,7 @@ class TotalProgressEventTests {
@Test
void create() {
assertThat(new TotalProgressEvent(0).getPercent()).isEqualTo(0);
assertThat(new TotalProgressEvent(0).getPercent()).isZero();
assertThat(new TotalProgressEvent(10).getPercent()).isEqualTo(10);
assertThat(new TotalProgressEvent(100).getPercent()).isEqualTo(100);
}

4
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/ssl/CertificateParserTests.java
View File

@@ -55,7 +55,7 @@ class CertificateParserTests {
Path certPath = this.fileWriter.writeFile("cert.pem", PemFileWriter.CERTIFICATE);
X509Certificate[] certificates = CertificateParser.parse(caPath, certPath);
assertThat(certificates).isNotNull();
assertThat(certificates.length).isEqualTo(2);
assertThat(certificates).hasSize(2);
assertThat(certificates[0].getType()).isEqualTo("X.509");
assertThat(certificates[1].getType()).isEqualTo("X.509");
}
@@ -65,7 +65,7 @@ class CertificateParserTests {
Path path = this.fileWriter.writeFile("ca.pem", PemFileWriter.CA_CERTIFICATE, PemFileWriter.CERTIFICATE);
X509Certificate[] certificates = CertificateParser.parse(path);
assertThat(certificates).isNotNull();
assertThat(certificates.length).isEqualTo(2);
assertThat(certificates).hasSize(2);
assertThat(certificates[0].getType()).isEqualTo("X.509");
assertThat(certificates[1].getType()).isEqualTo("X.509");
}

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/transport/ErrorsTests.java
View File

@@ -48,7 +48,7 @@ class ErrorsTests extends AbstractJsonTests {
@Test
void toStringHasErrorDetails() throws Exception {
Errors errors = getObjectMapper().readValue(getContent("errors.json"), Errors.class);
assertThat(errors.toString()).isEqualTo("[TEST1: Test One, TEST2: Test Two]");
assertThat(errors).hasToString("[TEST1: Test One, TEST2: Test Two]");
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/transport/MessageTests.java
View File

@@ -38,7 +38,7 @@ class MessageTests extends AbstractJsonTests {
@Test
void toStringHasErrorDetails() throws Exception {
Message errors = getObjectMapper().readValue(getContent("message.json"), Message.class);
assertThat(errors.toString()).isEqualTo("test message");
assertThat(errors).hasToString("test message");
}
}

4
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ContainerReferenceTests.java
View File

@@ -32,7 +32,7 @@ class ContainerReferenceTests {
void ofCreatesInstance() {
ContainerReference reference = ContainerReference
.of("92691aec176333f7ae890de9aaeeafef11166efcaa3908edf83eb44a5c943781");
assertThat(reference.toString()).isEqualTo("92691aec176333f7ae890de9aaeeafef11166efcaa3908edf83eb44a5c943781");
assertThat(reference).hasToString("92691aec176333f7ae890de9aaeeafef11166efcaa3908edf83eb44a5c943781");
}
@Test
@@ -55,7 +55,7 @@ class ContainerReferenceTests {
.of("92691aec176333f7ae890de9aaeeafef11166efcaa3908edf83eb44a5c943781");
ContainerReference r3 = ContainerReference
.of("02691aec176333f7ae890de9aaeeafef11166efcaa3908edf83eb44a5c943781");
assertThat(r1.hashCode()).isEqualTo(r2.hashCode());
assertThat(r1).hasSameHashCodeAs(r2);
assertThat(r1).isEqualTo(r1).isEqualTo(r2).isNotEqualTo(r3);
}

4
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ContainerStatusTests.java
View File

@@ -32,14 +32,14 @@ class ContainerStatusTests {
@Test
void ofCreatesFromJson() throws IOException {
ContainerStatus status = ContainerStatus.of(getClass().getResourceAsStream("container-status-error.json"));
assertThat(status.getStatusCode()).isEqualTo(1);
assertThat(status.getStatusCode()).isOne();
assertThat(status.getWaitingErrorMessage()).isEqualTo("error detail");
}
@Test
void ofCreatesFromValues() {
ContainerStatus status = ContainerStatus.of(1, "error detail");
assertThat(status.getStatusCode()).isEqualTo(1);
assertThat(status.getStatusCode()).isOne();
assertThat(status.getWaitingErrorMessage()).isEqualTo("error detail");
}

21
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageNameTests.java
View File

@@ -32,7 +32,7 @@ class ImageNameTests {
@Test
void ofWhenNameOnlyCreatesImageName() {
ImageName imageName = ImageName.of("ubuntu");
assertThat(imageName.toString()).isEqualTo("docker.io/library/ubuntu");
assertThat(imageName).hasToString("docker.io/library/ubuntu");
assertThat(imageName.getDomain()).isEqualTo("docker.io");
assertThat(imageName.getName()).isEqualTo("library/ubuntu");
}
@@ -40,7 +40,7 @@ class ImageNameTests {
@Test
void ofWhenSlashedNameCreatesImageName() {
ImageName imageName = ImageName.of("canonical/ubuntu");
assertThat(imageName.toString()).isEqualTo("docker.io/canonical/ubuntu");
assertThat(imageName).hasToString("docker.io/canonical/ubuntu");
assertThat(imageName.getDomain()).isEqualTo("docker.io");
assertThat(imageName.getName()).isEqualTo("canonical/ubuntu");
}
@@ -48,7 +48,7 @@ class ImageNameTests {
@Test
void ofWhenLocalhostNameCreatesImageName() {
ImageName imageName = ImageName.of("localhost/canonical/ubuntu");
assertThat(imageName.toString()).isEqualTo("localhost/canonical/ubuntu");
assertThat(imageName).hasToString("localhost/canonical/ubuntu");
assertThat(imageName.getDomain()).isEqualTo("localhost");
assertThat(imageName.getName()).isEqualTo("canonical/ubuntu");
}
@@ -56,7 +56,7 @@ class ImageNameTests {
@Test
void ofWhenDomainAndNameCreatesImageName() {
ImageName imageName = ImageName.of("repo.spring.io/canonical/ubuntu");
assertThat(imageName.toString()).isEqualTo("repo.spring.io/canonical/ubuntu");
assertThat(imageName).hasToString("repo.spring.io/canonical/ubuntu");
assertThat(imageName.getDomain()).isEqualTo("repo.spring.io");
assertThat(imageName.getName()).isEqualTo("canonical/ubuntu");
}
@@ -64,7 +64,7 @@ class ImageNameTests {
@Test
void ofWhenDomainNameAndPortCreatesImageName() {
ImageName imageName = ImageName.of("repo.spring.io:8080/canonical/ubuntu");
assertThat(imageName.toString()).isEqualTo("repo.spring.io:8080/canonical/ubuntu");
assertThat(imageName).hasToString("repo.spring.io:8080/canonical/ubuntu");
assertThat(imageName.getDomain()).isEqualTo("repo.spring.io:8080");
assertThat(imageName.getName()).isEqualTo("canonical/ubuntu");
}
@@ -72,7 +72,7 @@ class ImageNameTests {
@Test
void ofWhenSimpleNameAndPortCreatesImageName() {
ImageName imageName = ImageName.of("repo:8080/ubuntu");
assertThat(imageName.toString()).isEqualTo("repo:8080/ubuntu");
assertThat(imageName).hasToString("repo:8080/ubuntu");
assertThat(imageName.getDomain()).isEqualTo("repo:8080");
assertThat(imageName.getName()).isEqualTo("ubuntu");
}
@@ -80,7 +80,7 @@ class ImageNameTests {
@Test
void ofWhenSimplePathAndPortCreatesImageName() {
ImageName imageName = ImageName.of("repo:8080/canonical/ubuntu");
assertThat(imageName.toString()).isEqualTo("repo:8080/canonical/ubuntu");
assertThat(imageName).hasToString("repo:8080/canonical/ubuntu");
assertThat(imageName.getDomain()).isEqualTo("repo:8080");
assertThat(imageName.getName()).isEqualTo("canonical/ubuntu");
}
@@ -88,7 +88,7 @@ class ImageNameTests {
@Test
void ofWhenNameWithLongPathCreatesImageName() {
ImageName imageName = ImageName.of("path1/path2/path3/ubuntu");
assertThat(imageName.toString()).isEqualTo("docker.io/path1/path2/path3/ubuntu");
assertThat(imageName).hasToString("docker.io/path1/path2/path3/ubuntu");
assertThat(imageName.getDomain()).isEqualTo("docker.io");
assertThat(imageName.getName()).isEqualTo("path1/path2/path3/ubuntu");
}
@@ -110,7 +110,7 @@ class ImageNameTests {
@Test
void ofWhenLegacyDomainUsesNewDomain() {
ImageName imageName = ImageName.of("index.docker.io/ubuntu");
assertThat(imageName.toString()).isEqualTo("docker.io/library/ubuntu");
assertThat(imageName).hasToString("docker.io/library/ubuntu");
assertThat(imageName.getDomain()).isEqualTo("docker.io");
assertThat(imageName.getName()).isEqualTo("library/ubuntu");
}
@@ -153,8 +153,7 @@ class ImageNameTests {
ImageName n4 = ImageName.of("docker.io/library/ubuntu");
ImageName n5 = ImageName.of("index.docker.io/library/ubuntu");
ImageName n6 = ImageName.of("alpine");
assertThat(n1.hashCode()).isEqualTo(n2.hashCode()).isEqualTo(n3.hashCode()).isEqualTo(n4.hashCode())
.isEqualTo(n5.hashCode());
assertThat(n1).hasSameHashCodeAs(n2).hasSameHashCodeAs(n3).hasSameHashCodeAs(n4).hasSameHashCodeAs(n5);
assertThat(n1).isEqualTo(n1).isEqualTo(n2).isEqualTo(n3).isEqualTo(n4).isNotEqualTo(n6);
}

40
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageReferenceTests.java
View File

@@ -39,7 +39,7 @@ class ImageReferenceTests {
assertThat(reference.getName()).isEqualTo("library/ubuntu");
assertThat(reference.getTag()).isNull();
assertThat(reference.getDigest()).isNull();
assertThat(reference.toString()).isEqualTo("docker.io/library/ubuntu");
assertThat(reference).hasToString("docker.io/library/ubuntu");
}
@Test
@@ -49,7 +49,7 @@ class ImageReferenceTests {
assertThat(reference.getName()).isEqualTo("library/ubuntu");
assertThat(reference.getTag()).isNull();
assertThat(reference.getDigest()).isNull();
assertThat(reference.toString()).isEqualTo("docker.io/library/ubuntu");
assertThat(reference).hasToString("docker.io/library/ubuntu");
}
@Test
@@ -59,7 +59,7 @@ class ImageReferenceTests {
assertThat(reference.getName()).isEqualTo("adoptopenjdk/openjdk11");
assertThat(reference.getTag()).isNull();
assertThat(reference.getDigest()).isNull();
assertThat(reference.toString()).isEqualTo("docker.io/adoptopenjdk/openjdk11");
assertThat(reference).hasToString("docker.io/adoptopenjdk/openjdk11");
}
@Test
@@ -69,7 +69,7 @@ class ImageReferenceTests {
assertThat(reference.getName()).isEqualTo("java/jdk");
assertThat(reference.getTag()).isNull();
assertThat(reference.getDigest()).isNull();
assertThat(reference.toString()).isEqualTo("repo.example.com/java/jdk");
assertThat(reference).hasToString("repo.example.com/java/jdk");
}
@Test
@@ -79,7 +79,7 @@ class ImageReferenceTests {
assertThat(reference.getName()).isEqualTo("java/jdk");
assertThat(reference.getTag()).isNull();
assertThat(reference.getDigest()).isNull();
assertThat(reference.toString()).isEqualTo("repo.example.com:8080/java/jdk");
assertThat(reference).hasToString("repo.example.com:8080/java/jdk");
}
@Test
@@ -89,7 +89,7 @@ class ImageReferenceTests {
assertThat(reference.getName()).isEqualTo("library/ubuntu");
assertThat(reference.getTag()).isNull();
assertThat(reference.getDigest()).isNull();
assertThat(reference.toString()).isEqualTo("docker.io/library/ubuntu");
assertThat(reference).hasToString("docker.io/library/ubuntu");
}
@Test
@@ -99,7 +99,7 @@ class ImageReferenceTests {
assertThat(reference.getName()).isEqualTo("library/ubuntu");
assertThat(reference.getTag()).isEqualTo("bionic");
assertThat(reference.getDigest()).isNull();
assertThat(reference.toString()).isEqualTo("docker.io/library/ubuntu:bionic");
assertThat(reference).hasToString("docker.io/library/ubuntu:bionic");
}
@Test
@@ -109,7 +109,7 @@ class ImageReferenceTests {
assertThat(reference.getName()).isEqualTo("library/ubuntu");
assertThat(reference.getTag()).isEqualTo("v1");
assertThat(reference.getDigest()).isNull();
assertThat(reference.toString()).isEqualTo("repo.example.com:8080/library/ubuntu:v1");
assertThat(reference).hasToString("repo.example.com:8080/library/ubuntu:v1");
}
@Test
@@ -121,7 +121,7 @@ class ImageReferenceTests {
assertThat(reference.getTag()).isNull();
assertThat(reference.getDigest())
.isEqualTo("sha256:6e9f67fa63b0323e9a1e587fd71c561ba48a034504fb804fd26fd8800039835d");
assertThat(reference.toString()).isEqualTo(
assertThat(reference).hasToString(
"docker.io/library/ubuntu@sha256:6e9f67fa63b0323e9a1e587fd71c561ba48a034504fb804fd26fd8800039835d");
}
@@ -134,7 +134,7 @@ class ImageReferenceTests {
assertThat(reference.getTag()).isEqualTo("bionic");
assertThat(reference.getDigest())
.isEqualTo("sha256:6e9f67fa63b0323e9a1e587fd71c561ba48a034504fb804fd26fd8800039835d");
assertThat(reference.toString()).isEqualTo(
assertThat(reference).hasToString(
"docker.io/library/ubuntu:bionic@sha256:6e9f67fa63b0323e9a1e587fd71c561ba48a034504fb804fd26fd8800039835d");
}
@@ -147,27 +147,27 @@ class ImageReferenceTests {
assertThat(reference.getTag()).isEqualTo("bionic");
assertThat(reference.getDigest())
.isEqualTo("sha256:6e9f67fa63b0323e9a1e587fd71c561ba48a034504fb804fd26fd8800039835d");
assertThat(reference.toString()).isEqualTo(
assertThat(reference).hasToString(
"example.com:8080/canonical/ubuntu:bionic@sha256:6e9f67fa63b0323e9a1e587fd71c561ba48a034504fb804fd26fd8800039835d");
}
@Test
void ofImageName() {
ImageReference reference = ImageReference.of(ImageName.of("ubuntu"));
assertThat(reference.toString()).isEqualTo("docker.io/library/ubuntu");
assertThat(reference).hasToString("docker.io/library/ubuntu");
}
@Test
void ofImageNameAndTag() {
ImageReference reference = ImageReference.of(ImageName.of("ubuntu"), "bionic");
assertThat(reference.toString()).isEqualTo("docker.io/library/ubuntu:bionic");
assertThat(reference).hasToString("docker.io/library/ubuntu:bionic");
}
@Test
void ofImageNameTagAndDigest() {
ImageReference reference = ImageReference.of(ImageName.of("ubuntu"), "bionic",
"sha256:6e9f67fa63b0323e9a1e587fd71c561ba48a034504fb804fd26fd8800039835d");
assertThat(reference.toString()).isEqualTo(
assertThat(reference).hasToString(
"docker.io/library/ubuntu:bionic@sha256:6e9f67fa63b0323e9a1e587fd71c561ba48a034504fb804fd26fd8800039835d");
}
@@ -233,33 +233,33 @@ class ImageReferenceTests {
@Test
void inTaggedFormWhenHasNoTagUsesLatest() {
ImageReference reference = ImageReference.of("ubuntu");
assertThat(reference.inTaggedForm().toString()).isEqualTo("docker.io/library/ubuntu:latest");
assertThat(reference.inTaggedForm()).hasToString("docker.io/library/ubuntu:latest");
}
@Test
void inTaggedFormWhenHasTagUsesTag() {
ImageReference reference = ImageReference.of("ubuntu:bionic");
assertThat(reference.inTaggedForm().toString()).isEqualTo("docker.io/library/ubuntu:bionic");
assertThat(reference.inTaggedForm()).hasToString("docker.io/library/ubuntu:bionic");
}
@Test
void inTaggedOrDigestFormWhenHasDigestUsesDigest() {
ImageReference reference = ImageReference
.of("ubuntu@sha256:6e9f67fa63b0323e9a1e587fd71c561ba48a034504fb804fd26fd8800039835d");
assertThat(reference.inTaggedOrDigestForm().toString()).isEqualTo(
assertThat(reference.inTaggedOrDigestForm()).hasToString(
"docker.io/library/ubuntu@sha256:6e9f67fa63b0323e9a1e587fd71c561ba48a034504fb804fd26fd8800039835d");
}
@Test
void inTaggedOrDigestFormWhenHasTagUsesTag() {
ImageReference reference = ImageReference.of("ubuntu:bionic");
assertThat(reference.inTaggedOrDigestForm().toString()).isEqualTo("docker.io/library/ubuntu:bionic");
assertThat(reference.inTaggedOrDigestForm()).hasToString("docker.io/library/ubuntu:bionic");
}
@Test
void inTaggedOrDigestFormWhenHasNoTagOrDigestUsesLatest() {
ImageReference reference = ImageReference.of("ubuntu");
assertThat(reference.inTaggedOrDigestForm().toString()).isEqualTo("docker.io/library/ubuntu:latest");
assertThat(reference.inTaggedOrDigestForm()).hasToString("docker.io/library/ubuntu:latest");
}
@Test
@@ -267,7 +267,7 @@ class ImageReferenceTests {
ImageReference r1 = ImageReference.of("ubuntu:bionic");
ImageReference r2 = ImageReference.of("docker.io/library/ubuntu:bionic");
ImageReference r3 = ImageReference.of("docker.io/library/ubuntu:latest");
assertThat(r1.hashCode()).isEqualTo(r2.hashCode());
assertThat(r1).hasSameHashCodeAs(r2);
assertThat(r1).isEqualTo(r1).isEqualTo(r2).isNotEqualTo(r3);
}

8
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/ImageTests.java
View File

@@ -55,10 +55,10 @@ class ImageTests extends AbstractJsonTests {
Image image = getImage();
List<LayerId> layers = image.getLayers();
assertThat(layers).hasSize(46);
assertThat(layers.get(0).toString())
.isEqualTo("sha256:733a8e5ce32984099ef675fce04730f6e2a6dcfdf5bd292fea01a8f936265342");
assertThat(layers.get(45).toString())
.isEqualTo("sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef");
assertThat(layers.get(0))
.hasToString("sha256:733a8e5ce32984099ef675fce04730f6e2a6dcfdf5bd292fea01a8f936265342");
assertThat(layers.get(45))
.hasToString("sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef");
}
@Test

8
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/LayerIdTests.java
View File

@@ -37,7 +37,7 @@ class LayerIdTests {
LayerId id = LayerId.of("sha256:9a183e56c86d376b408bdf922746d0a657f62b0e18c7c8f82a496b87710c576f");
assertThat(id.getAlgorithm()).isEqualTo("sha256");
assertThat(id.getHash()).isEqualTo("9a183e56c86d376b408bdf922746d0a657f62b0e18c7c8f82a496b87710c576f");
assertThat(id.toString()).isEqualTo("sha256:9a183e56c86d376b408bdf922746d0a657f62b0e18c7c8f82a496b87710c576f");
assertThat(id).hasToString("sha256:9a183e56c86d376b408bdf922746d0a657f62b0e18c7c8f82a496b87710c576f");
}
@Test
@@ -45,7 +45,7 @@ class LayerIdTests {
LayerId id1 = LayerId.of("sha256:9a183e56c86d376b408bdf922746d0a657f62b0e18c7c8f82a496b87710c576f");
LayerId id2 = LayerId.of("sha256:9a183e56c86d376b408bdf922746d0a657f62b0e18c7c8f82a496b87710c576f");
LayerId id3 = LayerId.of("sha256:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
assertThat(id1.hashCode()).isEqualTo(id2.hashCode());
assertThat(id1).hasSameHashCodeAs(id2);
assertThat(id1).isEqualTo(id1).isEqualTo(id2).isNotEqualTo(id3);
}
@@ -65,7 +65,7 @@ class LayerIdTests {
MessageDigest digest = MessageDigest.getInstance("SHA-256");
digest.update("test".getBytes(StandardCharsets.UTF_8));
LayerId id = LayerId.ofSha256Digest(digest.digest());
assertThat(id.toString()).isEqualTo("sha256:9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08");
assertThat(id).hasToString("sha256:9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08");
}
@Test
@@ -74,7 +74,7 @@ class LayerIdTests {
Arrays.fill(digest, (byte) 127);
digest[0] = 1;
LayerId id = LayerId.ofSha256Digest(digest);
assertThat(id.toString()).isEqualTo("sha256:017f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f");
assertThat(id).hasToString("sha256:017f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f");
}
@Test

4
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/LayerTests.java
View File

@@ -55,8 +55,8 @@ class LayerTests {
layout.directory("/directory", Owner.ROOT);
layout.file("/directory/file", Owner.ROOT, Content.of("test"));
});
assertThat(layer.getId().toString())
.isEqualTo("sha256:d03a34f73804698c875eb56ff694fc2fceccc69b645e4adceb004ed13588613b");
assertThat(layer.getId())
.hasToString("sha256:d03a34f73804698c875eb56ff694fc2fceccc69b645e4adceb004ed13588613b");
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
layer.writeTo(outputStream);
try (TarArchiveInputStream tarStream = new TarArchiveInputStream(

6
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/type/VolumeNameTests.java
View File

@@ -81,7 +81,7 @@ class VolumeNameTests {
@Test
void basedOnGeneratesHashBasedName() {
VolumeName name = VolumeName.basedOn("index.docker.io/library/myapp:latest", "pack-cache-", ".build", 6);
assertThat(name.toString()).isEqualTo("pack-cache-40a311b545d7.build");
assertThat(name).hasToString("pack-cache-40a311b545d7.build");
}
@Test
@@ -99,7 +99,7 @@ class VolumeNameTests {
@Test
void ofGeneratesValue() {
VolumeName name = VolumeName.of("test");
assertThat(name.toString()).isEqualTo("test");
assertThat(name).hasToString("test");
}
@Test
@@ -107,7 +107,7 @@ class VolumeNameTests {
VolumeName n1 = VolumeName.of("test1");
VolumeName n2 = VolumeName.of("test1");
VolumeName n3 = VolumeName.of("test2");
assertThat(n1.hashCode()).isEqualTo(n2.hashCode());
assertThat(n1).hasSameHashCodeAs(n2);
assertThat(n1).isEqualTo(n1).isEqualTo(n2).isNotEqualTo(n3);
}

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/FilePermissionsTests.java
View File

@@ -85,7 +85,7 @@ class FilePermissionsTests {
@Test
void posixPermissionsToUmaskWithEmptyPermissions() {
Set<PosixFilePermission> permissions = Collections.emptySet();
assertThat(FilePermissions.posixPermissionsToUmask(permissions)).isEqualTo(0);
assertThat(FilePermissions.posixPermissionsToUmask(permissions)).isZero();
}
@Test

4
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/TarArchiveTests.java
View File

@@ -68,8 +68,8 @@ class TarArchiveTests {
assertThat(entries.get(0).getLongUserId()).isEqualTo(123);
assertThat(entries.get(0).getLongGroupId()).isEqualTo(456);
assertThat(entries.get(2).getName()).isEqualTo("/cnb/");
assertThat(entries.get(2).getLongUserId()).isEqualTo(0);
assertThat(entries.get(2).getLongGroupId()).isEqualTo(0);
assertThat(entries.get(2).getLongUserId()).isZero();
assertThat(entries.get(2).getLongGroupId()).isZero();
}
}

8
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/io/TarLayoutWriterTests.java
View File

@@ -51,13 +51,13 @@ class TarLayoutWriterTests {
assertThat(tarInputStream.getNextEntry()).isNull();
assertThat(directoryEntry.getName()).isEqualTo("/foo/");
assertThat(directoryEntry.getMode()).isEqualTo(0755);
assertThat(directoryEntry.getLongUserId()).isEqualTo(0);
assertThat(directoryEntry.getLongGroupId()).isEqualTo(0);
assertThat(directoryEntry.getLongUserId()).isZero();
assertThat(directoryEntry.getLongGroupId()).isZero();
assertThat(directoryEntry.getModTime()).isEqualTo(new Date(TarLayoutWriter.NORMALIZED_MOD_TIME));
assertThat(fileEntry.getName()).isEqualTo("/foo/bar.txt");
assertThat(fileEntry.getMode()).isEqualTo(0777);
assertThat(fileEntry.getLongUserId()).isEqualTo(1);
assertThat(fileEntry.getLongGroupId()).isEqualTo(1);
assertThat(fileEntry.getLongUserId()).isOne();
assertThat(fileEntry.getLongGroupId()).isOne();
assertThat(fileEntry.getModTime()).isEqualTo(new Date(TarLayoutWriter.NORMALIZED_MOD_TIME));
assertThat(fileContent).isEqualTo("test".getBytes(StandardCharsets.UTF_8));
}

2
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/socket/FileDescriptorTests.java
View File

@@ -76,7 +76,7 @@ class FileDescriptorTests {
FileDescriptor descriptor = new FileDescriptor(this.sourceHandle, this::close);
try (Handle handle = descriptor.acquire()) {
descriptor.close();
assertThat(this.closedHandle).isEqualTo(0);
assertThat(this.closedHandle).isZero();
}
assertThat(this.closedHandle).isEqualTo(this.sourceHandle);
}

10
spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java
View File

@@ -121,14 +121,14 @@ class CommandRunnerTests {
@Test
void handlesSuccess() {
int status = this.commandRunner.runAndHandleErrors("command");
assertThat(status).isEqualTo(0);
assertThat(status).isZero();
assertThat(this.calls).isEmpty();
}
@Test
void handlesNoSuchCommand() {
int status = this.commandRunner.runAndHandleErrors("missing");
assertThat(status).isEqualTo(1);
assertThat(status).isOne();
assertThat(this.calls).containsOnly(Call.ERROR_MESSAGE);
}
@@ -136,7 +136,7 @@ class CommandRunnerTests {
void handlesRegularExceptionWithMessage() throws Exception {
willThrow(new RuntimeException("With Message")).given(this.regularCommand).run();
int status = this.commandRunner.runAndHandleErrors("command");
assertThat(status).isEqualTo(1);
assertThat(status).isOne();
assertThat(this.calls).containsOnly(Call.ERROR_MESSAGE);
}
@@ -144,7 +144,7 @@ class CommandRunnerTests {
void handlesRegularExceptionWithoutMessage() throws Exception {
willThrow(new RuntimeException()).given(this.regularCommand).run();
int status = this.commandRunner.runAndHandleErrors("command");
assertThat(status).isEqualTo(1);
assertThat(status).isOne();
assertThat(this.calls).containsOnly(Call.ERROR_MESSAGE, Call.PRINT_STACK_TRACE);
}
@@ -153,7 +153,7 @@ class CommandRunnerTests {
willThrow(new RuntimeException()).given(this.regularCommand).run();
int status = this.commandRunner.runAndHandleErrors("command", "--debug");
assertThat(System.getProperty("debug")).isEqualTo("true");
assertThat(status).isEqualTo(1);
assertThat(status).isOne();
assertThat(this.calls).containsOnly(Call.ERROR_MESSAGE, Call.PRINT_STACK_TRACE);
}

34
spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java
View File

@@ -84,12 +84,12 @@ class InitCommandTests extends AbstractHttpClientMockTests {
void generateProject() throws Exception {
String fileName = UUID.randomUUID().toString() + ".zip";
File file = new File(fileName);
assertThat(file.exists()).as("file should not exist").isFalse();
assertThat(file).as("file should not exist").doesNotExist();
MockHttpProjectGenerationRequest request = new MockHttpProjectGenerationRequest("application/zip", fileName);
mockSuccessfulProjectGeneration(request);
try {
assertThat(this.command.run()).isEqualTo(ExitStatus.OK);
assertThat(file.exists()).as("file should have been created").isTrue();
assertThat(file).as("file should have been created").exists();
}
finally {
assertThat(file.delete()).as("failed to delete test file").isTrue();
@@ -139,7 +139,7 @@ class InitCommandTests extends AbstractHttpClientMockTests {
@Test
void generateProjectArchiveExtractedByDefault() throws Exception {
String fileName = UUID.randomUUID().toString();
assertThat(fileName.contains(".")).as("No dot in filename").isFalse();
assertThat(fileName).as("No dot in filename").doesNotContain(".");
byte[] archive = createFakeZipArchive("test.txt", "Fake content");
MockHttpProjectGenerationRequest request = new MockHttpProjectGenerationRequest("application/zip", "demo.zip",
archive);
@@ -167,8 +167,8 @@ class InitCommandTests extends AbstractHttpClientMockTests {
File file = new File(fileName);
try {
assertThat(this.command.run(fileName)).isEqualTo(ExitStatus.OK);
assertThat(file.exists()).as("File not saved properly").isTrue();
assertThat(file.isFile()).as("Should not be a directory").isTrue();
assertThat(file).as("File not saved properly").exists();
assertThat(file).as("Should not be a directory").isFile();
}
finally {
file.delete();
@@ -179,14 +179,14 @@ class InitCommandTests extends AbstractHttpClientMockTests {
void generateProjectAndExtractUnsupportedArchive(@TempDir File tempDir) throws Exception {
String fileName = UUID.randomUUID().toString() + ".zip";
File file = new File(fileName);
assertThat(file.exists()).as("file should not exist").isFalse();
assertThat(file).as("file should not exist").doesNotExist();
try {
byte[] archive = createFakeZipArchive("test.txt", "Fake content");
MockHttpProjectGenerationRequest request = new MockHttpProjectGenerationRequest("application/foobar",
fileName, archive);
mockSuccessfulProjectGeneration(request);
assertThat(this.command.run("--extract", tempDir.getAbsolutePath())).isEqualTo(ExitStatus.OK);
assertThat(file.exists()).as("file should have been saved instead").isTrue();
assertThat(file).as("file should have been saved instead").exists();
}
finally {
assertThat(file.delete()).as("failed to delete test file").isTrue();
@@ -197,13 +197,13 @@ class InitCommandTests extends AbstractHttpClientMockTests {
void generateProjectAndExtractUnknownContentType(@TempDir File tempDir) throws Exception {
String fileName = UUID.randomUUID().toString() + ".zip";
File file = new File(fileName);
assertThat(file.exists()).as("file should not exist").isFalse();
assertThat(file).as("file should not exist").doesNotExist();
try {
byte[] archive = createFakeZipArchive("test.txt", "Fake content");
MockHttpProjectGenerationRequest request = new MockHttpProjectGenerationRequest(null, fileName, archive);
mockSuccessfulProjectGeneration(request);
assertThat(this.command.run("--extract", tempDir.getAbsolutePath())).isEqualTo(ExitStatus.OK);
assertThat(file.exists()).as("file should have been saved instead").isTrue();
assertThat(file).as("file should have been saved instead").exists();
}
finally {
assertThat(file.delete()).as("failed to delete test file").isTrue();
@@ -231,7 +231,7 @@ class InitCommandTests extends AbstractHttpClientMockTests {
file.getAbsolutePath());
mockSuccessfulProjectGeneration(request);
assertThat(this.command.run("--force")).isEqualTo(ExitStatus.OK);
assertThat(fileLength != file.length()).as("File should have changed").isTrue();
assertThat(fileLength).as("File should have changed").isNotEqualTo(file.length());
}
@Test
@@ -269,8 +269,8 @@ class InitCommandTests extends AbstractHttpClientMockTests {
assertThat(this.handler.lastRequest.getBootVersion()).isEqualTo("1.2.0.RELEASE");
List<String> dependencies = this.handler.lastRequest.getDependencies();
assertThat(dependencies).hasSize(2);
assertThat(dependencies.contains("web")).isTrue();
assertThat(dependencies.contains("data-jpa")).isTrue();
assertThat(dependencies).contains("web");
assertThat(dependencies).contains("data-jpa");
}
@Test
@@ -295,8 +295,8 @@ class InitCommandTests extends AbstractHttpClientMockTests {
assertThat(this.handler.lastRequest.getBootVersion()).isEqualTo("1.2.0.RELEASE");
List<String> dependencies = this.handler.lastRequest.getDependencies();
assertThat(dependencies).hasSize(2);
assertThat(dependencies.contains("web")).isTrue();
assertThat(dependencies.contains("data-jpa")).isTrue();
assertThat(dependencies).contains("web");
assertThat(dependencies).contains("data-jpa");
}
@Test
@@ -321,8 +321,8 @@ class InitCommandTests extends AbstractHttpClientMockTests {
assertThat(this.handler.lastRequest.getBootVersion()).isEqualTo("1.2.0.RELEASE");
List<String> dependencies = this.handler.lastRequest.getDependencies();
assertThat(dependencies).hasSize(2);
assertThat(dependencies.contains("web")).isTrue();
assertThat(dependencies.contains("data-jpa")).isTrue();
assertThat(dependencies).contains("web");
assertThat(dependencies).contains("data-jpa");
}
@Test
@@ -336,7 +336,7 @@ class InitCommandTests extends AbstractHttpClientMockTests {
archive);
mockSuccessfulProjectGeneration(request);
assertThat(this.command.run("--force", "--extract", tempDir.getAbsolutePath())).isEqualTo(ExitStatus.OK);
assertThat(fileLength != conflict.length()).as("File should have changed").isTrue();
assertThat(fileLength).as("File should have changed").isNotEqualTo(conflict.length());
}
@Test

26
spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceMetadataTests.java
View File

@@ -40,17 +40,17 @@ class InitializrServiceMetadataTests {
@Test
void parseDefaults() throws Exception {
InitializrServiceMetadata metadata = createInstance("2.0.0");
assertThat(metadata.getDefaults().get("bootVersion")).isEqualTo("1.1.8.RELEASE");
assertThat(metadata.getDefaults().get("javaVersion")).isEqualTo("1.7");
assertThat(metadata.getDefaults().get("groupId")).isEqualTo("org.test");
assertThat(metadata.getDefaults().get("name")).isEqualTo("demo");
assertThat(metadata.getDefaults().get("description")).isEqualTo("Demo project for Spring Boot");
assertThat(metadata.getDefaults().get("packaging")).isEqualTo("jar");
assertThat(metadata.getDefaults().get("language")).isEqualTo("java");
assertThat(metadata.getDefaults().get("artifactId")).isEqualTo("demo");
assertThat(metadata.getDefaults().get("packageName")).isEqualTo("demo");
assertThat(metadata.getDefaults().get("type")).isEqualTo("maven-project");
assertThat(metadata.getDefaults().get("version")).isEqualTo("0.0.1-SNAPSHOT");
assertThat(metadata.getDefaults()).containsEntry("bootVersion", "1.1.8.RELEASE");
assertThat(metadata.getDefaults()).containsEntry("javaVersion", "1.7");
assertThat(metadata.getDefaults()).containsEntry("groupId", "org.test");
assertThat(metadata.getDefaults()).containsEntry("name", "demo");
assertThat(metadata.getDefaults()).containsEntry("description", "Demo project for Spring Boot");
assertThat(metadata.getDefaults()).containsEntry("packaging", "jar");
assertThat(metadata.getDefaults()).containsEntry("language", "java");
assertThat(metadata.getDefaults()).containsEntry("artifactId", "demo");
assertThat(metadata.getDefaults()).containsEntry("packageName", "demo");
assertThat(metadata.getDefaults()).containsEntry("type", "maven-project");
assertThat(metadata.getDefaults()).containsEntry("version", "0.0.1-SNAPSHOT");
assertThat(metadata.getDefaults()).as("Wrong number of defaults").hasSize(11);
}
@@ -73,8 +73,8 @@ class InitializrServiceMetadataTests {
InitializrServiceMetadata metadata = createInstance("2.0.0");
ProjectType projectType = metadata.getProjectTypes().get("maven-project");
assertThat(projectType).isNotNull();
assertThat(projectType.getTags().get("build")).isEqualTo("maven");
assertThat(projectType.getTags().get("format")).isEqualTo("project");
assertThat(projectType.getTags()).containsEntry("build", "maven");
assertThat(projectType.getTags()).containsEntry("format", "project");
}
private static InitializrServiceMetadata createInstance(String version) throws JSONException {

16
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilderTests.java
View File

@@ -221,29 +221,29 @@ class ConfigurationMetadataRepositoryJsonBuilderTests extends AbstractConfigurat
assertThat(source.getProperties()).hasSize(4);
ConfigurationMetadataProperty first = repo.getAllProperties().get("spring.map.first");
assertThat(first.getHints().getKeyHints()).hasSize(2);
assertThat(first.getHints().getValueProviders()).hasSize(0);
assertThat(first.getHints().getValueProviders()).isEmpty();
assertThat(first.getHints().getKeyHints().get(0).getValue()).isEqualTo("one");
assertThat(first.getHints().getKeyHints().get(0).getDescription()).isEqualTo("First.");
assertThat(first.getHints().getKeyHints().get(1).getValue()).isEqualTo("two");
assertThat(first.getHints().getKeyHints().get(1).getDescription()).isEqualTo("Second.");
ConfigurationMetadataProperty second = repo.getAllProperties().get("spring.map.second");
assertThat(second.getHints().getValueHints()).hasSize(2);
assertThat(second.getHints().getValueProviders()).hasSize(0);
assertThat(second.getHints().getValueProviders()).isEmpty();
assertThat(second.getHints().getValueHints().get(0).getValue()).isEqualTo("42");
assertThat(second.getHints().getValueHints().get(0).getDescription()).isEqualTo("Choose me.");
assertThat(second.getHints().getValueHints().get(1).getValue()).isEqualTo("24");
assertThat(second.getHints().getValueHints().get(1).getDescription()).isNull();
ConfigurationMetadataProperty keys = repo.getAllProperties().get("spring.map.keys");
assertThat(keys.getHints().getValueHints()).hasSize(0);
assertThat(keys.getHints().getValueHints()).isEmpty();
assertThat(keys.getHints().getValueProviders()).hasSize(1);
assertThat(keys.getHints().getValueProviders().get(0).getName()).isEqualTo("any");
ConfigurationMetadataProperty values = repo.getAllProperties().get("spring.map.values");
assertThat(values.getHints().getValueHints()).hasSize(0);
assertThat(values.getHints().getValueHints()).isEmpty();
assertThat(values.getHints().getValueProviders()).hasSize(1);
assertThat(values.getHints().getValueProviders().get(0).getName()).isEqualTo("handle-as");
assertThat(values.getHints().getValueProviders().get(0).getParameters()).hasSize(1);
assertThat(values.getHints().getValueProviders().get(0).getParameters().get("target"))
.isEqualTo("java.lang.Integer");
assertThat(values.getHints().getValueProviders().get(0).getParameters()).containsEntry("target",
"java.lang.Integer");
}
private void validateEmptyGroup(ConfigurationMetadataRepository repo) {
@@ -260,8 +260,8 @@ class ConfigurationMetadataRepositoryJsonBuilderTests extends AbstractConfigurat
}
private void validatePropertyHints(ConfigurationMetadataProperty property, int valueHints, int valueProviders) {
assertThat(property.getHints().getValueHints().size()).isEqualTo(valueHints);
assertThat(property.getHints().getValueProviders().size()).isEqualTo(valueProviders);
assertThat(property.getHints().getValueHints()).hasSize(valueHints);
assertThat(property.getHints().getValueProviders()).hasSize(valueProviders);
}
private void contains(Map<String, ?> source, String... keys) {

4
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/JsonReaderTests.java
View File

@@ -100,7 +100,7 @@ class JsonReaderTests extends AbstractConfigurationMetadataTests {
ValueProvider valueProvider = hint.getValueProviders().get(0);
assertThat(valueProvider.getName()).isEqualTo("handle-as");
assertThat(valueProvider.getParameters()).hasSize(1);
assertThat(valueProvider.getParameters().get("target")).isEqualTo(Integer.class.getName());
assertThat(valueProvider.getParameters()).containsEntry("target", Integer.class.getName());
}
@Test
@@ -123,7 +123,7 @@ class JsonReaderTests extends AbstractConfigurationMetadataTests {
ValueProvider valueProvider = hint.getValueProviders().get(0);
assertThat(valueProvider.getName()).isEqualTo("handle-as");
assertThat(valueProvider.getParameters()).hasSize(1);
assertThat(valueProvider.getParameters().get("target")).isEqualTo(String.class.getName());
assertThat(valueProvider.getParameters()).containsEntry("target", String.class.getName());
ValueProvider valueProvider2 = hint.getValueProviders().get(1);
assertThat(valueProvider2.getName()).isEqualTo("any");
assertThat(valueProvider2.getParameters()).isEmpty();

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java
View File

@@ -141,7 +141,7 @@ class ConfigurationMetadataAnnotationProcessorTests extends AbstractMetadataGene
assertThat(metadata).has(Metadata.withProperty("simple.type.my-primitive-double", Double.class));
assertThat(metadata).has(Metadata.withProperty("simple.type.my-float", Float.class));
assertThat(metadata).has(Metadata.withProperty("simple.type.my-primitive-float", Float.class));
assertThat(metadata.getItems().size()).isEqualTo(18);
assertThat(metadata.getItems()).hasSize(18);
}
@Test

1
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/fieldvalues/AbstractFieldValuesProcessorTests.java
View File

@@ -55,7 +55,6 @@ public abstract class AbstractFieldValuesProcessorTests {
compiler.compile((compiled) -> {
});
Map<String, Object> values = processor.getValues();
assertThat(values.get("string")).isEqualTo("1");
assertThat(values.get("stringNone")).isNull();
assertThat(values.get("stringConst")).isEqualTo("c");
assertThat(values.get("bool")).isEqualTo(true);

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageTests.java
View File

@@ -96,7 +96,7 @@ class BootBuildImageTests {
void springBootVersionDefaultValueIsUsed() {
BuildRequest request = this.buildImage.createRequest();
assertThat(request.getCreator().getName()).isEqualTo("Spring Boot");
assertThat(request.getCreator().getVersion()).isEqualTo("");
assertThat(request.getCreator().getVersion()).isEmpty();
}
@Test

14
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootJarTests.java
View File

@@ -19,7 +19,6 @@ package org.springframework.boot.gradle.tasks.bundling;
import java.io.File;
import java.io.IOException;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
import org.gradle.api.Action;
import org.gradle.api.JavaVersion;
@@ -77,14 +76,11 @@ class BootJarTests extends AbstractBootArchiveTests<BootJar> {
@Test
void jarsInLibAreStored() throws IOException {
try (JarFile jarFile = new JarFile(createLayeredJar())) {
assertThat(jarFile.getEntry("BOOT-INF/lib/first-library.jar").getMethod()).isEqualTo(ZipEntry.STORED);
assertThat(jarFile.getEntry("BOOT-INF/lib/second-library.jar").getMethod()).isEqualTo(ZipEntry.STORED);
assertThat(jarFile.getEntry("BOOT-INF/lib/third-library-SNAPSHOT.jar").getMethod())
.isEqualTo(ZipEntry.STORED);
assertThat(jarFile.getEntry("BOOT-INF/lib/first-project-library.jar").getMethod())
.isEqualTo(ZipEntry.STORED);
assertThat(jarFile.getEntry("BOOT-INF/lib/second-project-library-SNAPSHOT.jar").getMethod())
.isEqualTo(ZipEntry.STORED);
assertThat(jarFile.getEntry("BOOT-INF/lib/first-library.jar").getMethod()).isZero();
assertThat(jarFile.getEntry("BOOT-INF/lib/second-library.jar").getMethod()).isZero();
assertThat(jarFile.getEntry("BOOT-INF/lib/third-library-SNAPSHOT.jar").getMethod()).isZero();
assertThat(jarFile.getEntry("BOOT-INF/lib/first-project-library.jar").getMethod()).isZero();
assertThat(jarFile.getEntry("BOOT-INF/lib/second-project-library-SNAPSHOT.jar").getMethod()).isZero();
}
}

6
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/DockerSpecTests.java
View File

@@ -65,7 +65,7 @@ class DockerSpecTests {
DockerConfiguration dockerConfiguration = this.dockerSpec.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(this.dockerSpec.asDockerConfiguration().getBuilderRegistryAuthentication()).isNull();
@@ -80,7 +80,7 @@ class DockerSpecTests {
DockerConfiguration dockerConfiguration = this.dockerSpec.asDockerConfiguration();
DockerHost host = dockerConfiguration.getHost();
assertThat(host.getAddress()).isEqualTo("docker.example.com");
assertThat(host.isSecure()).isEqualTo(false);
assertThat(host.isSecure()).isFalse();
assertThat(host.getCertificatePath()).isNull();
assertThat(dockerConfiguration.isBindHostToBuilder()).isFalse();
assertThat(this.dockerSpec.asDockerConfiguration().getBuilderRegistryAuthentication()).isNull();
@@ -96,7 +96,7 @@ class DockerSpecTests {
DockerConfiguration dockerConfiguration = this.dockerSpec.asDockerConfiguration();
DockerHost host = dockerConfiguration.getHost();
assertThat(host.getAddress()).isEqualTo("docker.example.com");
assertThat(host.isSecure()).isEqualTo(false);
assertThat(host.isSecure()).isFalse();
assertThat(host.getCertificatePath()).isNull();
assertThat(dockerConfiguration.isBindHostToBuilder()).isTrue();
assertThat(this.dockerSpec.asDockerConfiguration().getBuilderRegistryAuthentication()).isNull();

2
spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/src/test/java/org/springframework/boot/jarmode/layertools/TestPrintStream.java
View File

@@ -64,7 +64,7 @@ class TestPrintStream extends PrintStream implements AssertProvider<PrintStreamA
try {
InputStream stream = this.actual.testClass.getResourceAsStream(resource);
String content = FileCopyUtils.copyToString(new InputStreamReader(stream, StandardCharsets.UTF_8));
Assertions.assertThat(this.actual.toString()).isEqualTo(content);
Assertions.assertThat(this.actual).hasToString(content);
}
catch (IOException ex) {
throw new IllegalStateException(ex);

4
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/AbstractPackagerTests.java
View File

@@ -407,8 +407,8 @@ abstract class AbstractPackagerTests<P extends Packager> {
this.testJarFile.addClass("A.class", ClassWithMainMethod.class);
P packager = createPackager();
execute(packager, (callback) -> callback.library(newLibrary(nestedFile, LibraryScope.COMPILE, false)));
assertThat(getPackagedEntry("BOOT-INF/lib/" + nestedFile.getName()).getMethod()).isEqualTo(ZipEntry.STORED);
assertThat(getPackagedEntry("BOOT-INF/classes/test/nested.jar").getMethod()).isEqualTo(ZipEntry.STORED);
assertThat(getPackagedEntry("BOOT-INF/lib/" + nestedFile.getName()).getMethod()).isZero();
assertThat(getPackagedEntry("BOOT-INF/classes/test/nested.jar").getMethod()).isZero();
}
@Test

8
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/FileUtilsTests.java
View File

@@ -56,7 +56,7 @@ class FileUtilsTests {
file.createNewFile();
new File(this.originDirectory, "logback.xml").createNewFile();
FileUtils.removeDuplicatesFromOutputDirectory(this.outputDirectory, this.originDirectory);
assertThat(file.exists()).isFalse();
assertThat(file).doesNotExist();
}
@Test
@@ -67,7 +67,7 @@ class FileUtilsTests {
file.createNewFile();
new File(this.originDirectory, "sub/logback.xml").createNewFile();
FileUtils.removeDuplicatesFromOutputDirectory(this.outputDirectory, this.originDirectory);
assertThat(file.exists()).isFalse();
assertThat(file).doesNotExist();
}
@Test
@@ -78,7 +78,7 @@ class FileUtilsTests {
file.createNewFile();
new File(this.originDirectory, "sub/different.xml").createNewFile();
FileUtils.removeDuplicatesFromOutputDirectory(this.outputDirectory, this.originDirectory);
assertThat(file.exists()).isTrue();
assertThat(file).exists();
}
@Test
@@ -87,7 +87,7 @@ class FileUtilsTests {
file.createNewFile();
new File(this.originDirectory, "different.xml").createNewFile();
FileUtils.removeDuplicatesFromOutputDirectory(this.outputDirectory, this.originDirectory);
assertThat(file.exists()).isTrue();
assertThat(file).exists();
}
@Test

2
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayerTests.java
View File

@@ -50,7 +50,7 @@ class LayerTests {
Layer layer1 = new Layer("testa");
Layer layer2 = new Layer("testa");
Layer layer3 = new Layer("testb");
assertThat(layer1.hashCode()).isEqualTo(layer2.hashCode());
assertThat(layer1).hasSameHashCodeAs(layer2);
assertThat(layer1).isEqualTo(layer1).isEqualTo(layer2).isNotEqualTo(layer3);
}

2
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LibraryCoordinatesTests.java
View File

@@ -35,7 +35,7 @@ class LibraryCoordinatesTests {
assertThat(coordinates.getGroupId()).isEqualTo("g");
assertThat(coordinates.getArtifactId()).isEqualTo("a");
assertThat(coordinates.getVersion()).isEqualTo("v");
assertThat(coordinates.toString()).isEqualTo("g:a:v");
assertThat(coordinates).hasToString("g:a:v");
}
@Test

4
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/MainClassFinderTests.java
View File

@@ -164,7 +164,7 @@ class MainClassFinderTests {
this.testJarFile.addClass("a/b/G.class", ClassWithMainMethod.class);
ClassNameCollector callback = new ClassNameCollector();
MainClassFinder.doWithMainClasses(this.testJarFile.getJarSource(), callback);
assertThat(callback.getClassNames().toString()).isEqualTo("[a.b.G, a.b.c.D]");
assertThat(callback.getClassNames()).hasToString("[a.b.G, a.b.c.D]");
}
@Test
@@ -176,7 +176,7 @@ class MainClassFinderTests {
ClassNameCollector callback = new ClassNameCollector();
try (JarFile jarFile = this.testJarFile.getJarFile()) {
MainClassFinder.doWithMainClasses(jarFile, null, callback);
assertThat(callback.getClassNames().toString()).isEqualTo("[a.b.G, a.b.c.D]");
assertThat(callback.getClassNames()).hasToString("[a.b.G, a.b.c.D]");
}
}

6
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/ZipHeaderPeekInputStreamTests.java
View File

@@ -50,8 +50,8 @@ class ZipHeaderPeekInputStreamTests {
void readIndividualBytes() throws IOException {
try (ZipHeaderPeekInputStream in = new ZipHeaderPeekInputStream(
new ByteArrayInputStream(new byte[] { 0, 1, 2, 3, 4, 5 }))) {
assertThat(in.read()).isEqualTo(0);
assertThat(in.read()).isEqualTo(1);
assertThat(in.read()).isZero();
assertThat(in.read()).isOne();
assertThat(in.read()).isEqualTo(2);
assertThat(in.read()).isEqualTo(3);
assertThat(in.read()).isEqualTo(4);
@@ -99,7 +99,7 @@ class ZipHeaderPeekInputStreamTests {
void readMoreThanEntireStreamWhenStreamLengthIsLessThanZipHeaderLength() throws IOException {
try (ZipHeaderPeekInputStream in = new ZipHeaderPeekInputStream(new ByteArrayInputStream(new byte[] { 10 }))) {
byte[] bytes = new byte[8];
assertThat(in.read(bytes)).isEqualTo(1);
assertThat(in.read(bytes)).isOne();
assertThat(bytes).containsExactly(10, 0, 0, 0, 0, 0, 0, 0);
}
}

4
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/LaunchedURLClassLoaderTests.java
View File

@@ -78,7 +78,7 @@ class LaunchedURLClassLoaderTests {
URL url = jarFile.getUrl();
try (LaunchedURLClassLoader loader = new LaunchedURLClassLoader(new URL[] { url }, null)) {
URL resource = loader.getResource("nested.jar!/3.dat");
assertThat(resource.toString()).isEqualTo(url + "nested.jar!/3.dat");
assertThat(resource).hasToString(url + "nested.jar!/3.dat");
try (InputStream input = resource.openConnection().getInputStream()) {
assertThat(input.read()).isEqualTo(3);
}
@@ -95,7 +95,7 @@ class LaunchedURLClassLoaderTests {
try (LaunchedURLClassLoader loader = new LaunchedURLClassLoader(new URL[] { url }, null)) {
Thread.currentThread().interrupt();
URL resource = loader.getResource("nested.jar!/3.dat");
assertThat(resource.toString()).isEqualTo(url + "nested.jar!/3.dat");
assertThat(resource).hasToString(url + "nested.jar!/3.dat");
URLConnection connection = resource.openConnection();
try (InputStream input = connection.getInputStream()) {
assertThat(input.read()).isEqualTo(3);

30
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java
View File

@@ -142,7 +142,7 @@ class PropertiesLauncherTests {
System.setProperty("loader.config.name", "foo");
this.launcher = new PropertiesLauncher();
assertThat(this.launcher.getMainClass()).isEqualTo("my.Application");
assertThat(ReflectionTestUtils.getField(this.launcher, "paths").toString()).isEqualTo("[etc/]");
assertThat(ReflectionTestUtils.getField(this.launcher, "paths")).hasToString("[etc/]");
}
@Test
@@ -156,14 +156,14 @@ class PropertiesLauncherTests {
void testUserSpecifiedDotPath() {
System.setProperty("loader.path", ".");
this.launcher = new PropertiesLauncher();
assertThat(ReflectionTestUtils.getField(this.launcher, "paths").toString()).isEqualTo("[.]");
assertThat(ReflectionTestUtils.getField(this.launcher, "paths")).hasToString("[.]");
}
@Test
void testUserSpecifiedSlashPath() throws Exception {
System.setProperty("loader.path", "jars/");
this.launcher = new PropertiesLauncher();
assertThat(ReflectionTestUtils.getField(this.launcher, "paths").toString()).isEqualTo("[jars/]");
assertThat(ReflectionTestUtils.getField(this.launcher, "paths")).hasToString("[jars/]");
List<Archive> archives = new ArrayList<>();
this.launcher.getClassPathArchivesIterator().forEachRemaining(archives::add);
assertThat(archives).areExactly(1, endingWith("app.jar"));
@@ -174,7 +174,7 @@ class PropertiesLauncherTests {
System.setProperty("loader.path", "jars/*");
System.setProperty("loader.main", "demo.Application");
this.launcher = new PropertiesLauncher();
assertThat(ReflectionTestUtils.getField(this.launcher, "paths").toString()).isEqualTo("[jars/]");
assertThat(ReflectionTestUtils.getField(this.launcher, "paths")).hasToString("[jars/]");
this.launcher.launch(new String[0]);
waitFor("Hello World");
}
@@ -184,7 +184,7 @@ class PropertiesLauncherTests {
System.setProperty("loader.path", "jars/app.jar");
System.setProperty("loader.main", "demo.Application");
this.launcher = new PropertiesLauncher();
assertThat(ReflectionTestUtils.getField(this.launcher, "paths").toString()).isEqualTo("[jars/app.jar]");
assertThat(ReflectionTestUtils.getField(this.launcher, "paths")).hasToString("[jars/app.jar]");
this.launcher.launch(new String[0]);
waitFor("Hello World");
}
@@ -193,8 +193,8 @@ class PropertiesLauncherTests {
void testUserSpecifiedRootOfJarPath() throws Exception {
System.setProperty("loader.path", "jar:file:./src/test/resources/nested-jars/app.jar!/");
this.launcher = new PropertiesLauncher();
assertThat(ReflectionTestUtils.getField(this.launcher, "paths").toString())
.isEqualTo("[jar:file:./src/test/resources/nested-jars/app.jar!/]");
assertThat(ReflectionTestUtils.getField(this.launcher, "paths"))
.hasToString("[jar:file:./src/test/resources/nested-jars/app.jar!/]");
List<Archive> archives = new ArrayList<>();
this.launcher.getClassPathArchivesIterator().forEachRemaining(archives::add);
assertThat(archives).areExactly(1, endingWith("foo.jar!/"));
@@ -236,8 +236,8 @@ class PropertiesLauncherTests {
System.setProperty("loader.path", "nested-jars/nested-jar-app.jar!/BOOT-INF/classes/");
System.setProperty("loader.main", "demo.Application");
this.launcher = new PropertiesLauncher();
assertThat(ReflectionTestUtils.getField(this.launcher, "paths").toString())
.isEqualTo("[nested-jars/nested-jar-app.jar!/BOOT-INF/classes/]");
assertThat(ReflectionTestUtils.getField(this.launcher, "paths"))
.hasToString("[nested-jars/nested-jar-app.jar!/BOOT-INF/classes/]");
this.launcher.launch(new String[0]);
waitFor("Hello World");
}
@@ -256,7 +256,7 @@ class PropertiesLauncherTests {
System.setProperty("loader.path", "./jars/app.jar");
System.setProperty("loader.main", "demo.Application");
this.launcher = new PropertiesLauncher();
assertThat(ReflectionTestUtils.getField(this.launcher, "paths").toString()).isEqualTo("[jars/app.jar]");
assertThat(ReflectionTestUtils.getField(this.launcher, "paths")).hasToString("[jars/app.jar]");
this.launcher.launch(new String[0]);
waitFor("Hello World");
}
@@ -266,7 +266,7 @@ class PropertiesLauncherTests {
System.setProperty("loader.path", "jars/app.jar");
System.setProperty("loader.classLoader", URLClassLoader.class.getName());
this.launcher = new PropertiesLauncher();
assertThat(ReflectionTestUtils.getField(this.launcher, "paths").toString()).isEqualTo("[jars/app.jar]");
assertThat(ReflectionTestUtils.getField(this.launcher, "paths")).hasToString("[jars/app.jar]");
this.launcher.launch(new String[0]);
waitFor("Hello World");
}
@@ -276,8 +276,8 @@ class PropertiesLauncherTests {
System.setProperty("loader.path", "more-jars/app.jar,jars/app.jar");
System.setProperty("loader.classLoader", URLClassLoader.class.getName());
this.launcher = new PropertiesLauncher();
assertThat(ReflectionTestUtils.getField(this.launcher, "paths").toString())
.isEqualTo("[more-jars/app.jar, jars/app.jar]");
assertThat(ReflectionTestUtils.getField(this.launcher, "paths"))
.hasToString("[more-jars/app.jar, jars/app.jar]");
this.launcher.launch(new String[0]);
waitFor("Hello Other World");
}
@@ -340,7 +340,7 @@ class PropertiesLauncherTests {
void testArgsEnhanced() throws Exception {
System.setProperty("loader.args", "foo");
this.launcher = new PropertiesLauncher();
assertThat(Arrays.asList(this.launcher.getArgs("bar")).toString()).isEqualTo("[foo, bar]");
assertThat(Arrays.asList(this.launcher.getArgs("bar"))).hasToString("[foo, bar]");
}
@SuppressWarnings("unchecked")
@@ -375,7 +375,7 @@ class PropertiesLauncherTests {
this.launcher = new PropertiesLauncher();
List<Archive> archives = new ArrayList<>();
this.launcher.getClassPathArchivesIterator().forEachRemaining(archives::add);
assertThat(archives.size()).isEqualTo(1);
assertThat(archives).hasSize(1);
File archiveRoot = (File) ReflectionTestUtils.getField(archives.get(0), "root");
assertThat(archiveRoot).isEqualTo(loaderPath);
}

12
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/ExplodedArchiveTests.java
View File

@@ -119,7 +119,7 @@ class ExplodedArchiveTests {
void getNestedArchive() throws Exception {
Entry entry = getEntriesMap(this.archive).get("nested.jar");
Archive nested = this.archive.getNestedArchive(entry);
assertThat(nested.getUrl().toString()).isEqualTo(this.rootDirectory.toURI() + "nested.jar");
assertThat(nested.getUrl()).hasToString(this.rootDirectory.toURI() + "nested.jar");
nested.close();
}
@@ -128,15 +128,15 @@ class ExplodedArchiveTests {
Entry entry = getEntriesMap(this.archive).get("d/");
Archive nested = this.archive.getNestedArchive(entry);
Map<String, Entry> nestedEntries = getEntriesMap(nested);
assertThat(nestedEntries.size()).isEqualTo(1);
assertThat(nested.getUrl().toString()).isEqualTo("file:" + this.rootDirectory.toURI().getPath() + "d/");
assertThat(nestedEntries).hasSize(1);
assertThat(nested.getUrl()).hasToString("file:" + this.rootDirectory.toURI().getPath() + "d/");
}
@Test
void getNonRecursiveEntriesForRoot() throws Exception {
try (ExplodedArchive explodedArchive = new ExplodedArchive(new File("/"), false)) {
Map<String, Archive.Entry> entries = getEntriesMap(explodedArchive);
assertThat(entries.size()).isGreaterThan(1);
assertThat(entries).hasSizeGreaterThan(1);
}
}
@@ -145,7 +145,7 @@ class ExplodedArchiveTests {
try (ExplodedArchive explodedArchive = new ExplodedArchive(new File("src/test/resources/root"))) {
assertThat(explodedArchive.getManifest()).isNotNull();
Map<String, Archive.Entry> entries = getEntriesMap(explodedArchive);
assertThat(entries.size()).isEqualTo(4);
assertThat(entries).hasSize(4);
}
}
@@ -154,7 +154,7 @@ class ExplodedArchiveTests {
try (ExplodedArchive explodedArchive = new ExplodedArchive(new File("src/test/resources/root"), false)) {
assertThat(explodedArchive.getManifest()).isNotNull();
Map<String, Archive.Entry> entries = getEntriesMap(explodedArchive);
assertThat(entries.size()).isEqualTo(3);
assertThat(entries).hasSize(3);
}
}

8
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java
View File

@@ -87,20 +87,20 @@ class JarFileArchiveTests {
@Test
void getEntries() {
Map<String, Archive.Entry> entries = getEntriesMap(this.archive);
assertThat(entries.size()).isEqualTo(12);
assertThat(entries).hasSize(12);
}
@Test
void getUrl() throws Exception {
URL url = this.archive.getUrl();
assertThat(url.toString()).isEqualTo(this.rootJarFileUrl);
assertThat(url).hasToString(this.rootJarFileUrl);
}
@Test
void getNestedArchive() throws Exception {
Entry entry = getEntriesMap(this.archive).get("nested.jar");
try (Archive nested = this.archive.getNestedArchive(entry)) {
assertThat(nested.getUrl().toString()).isEqualTo("jar:" + this.rootJarFileUrl + "!/nested.jar!/");
assertThat(nested.getUrl()).hasToString("jar:" + this.rootJarFileUrl + "!/nested.jar!/");
}
}
@@ -139,7 +139,7 @@ class JarFileArchiveTests {
.getNestedArchive(getEntriesMap(this.archive).get("another-nested.jar"))) {
File nested = new File(nestedArchive.getUrl().toURI());
File anotherNested = new File(anotherNestedArchive.getUrl().toURI());
assertThat(nested.getParent()).isEqualTo(anotherNested.getParent());
assertThat(nested).hasParent(anotherNested.getParent());
}
}

14
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java
View File

@@ -174,8 +174,8 @@ class RandomAccessDataFileTests {
byte[] b = new byte[] { 0x0F };
int amountRead = this.inputStream.read(b, 0, 0);
assertThat(b).isEqualTo(new byte[] { 0x0F });
assertThat(amountRead).isEqualTo(0);
assertThat(this.inputStream.read()).isEqualTo(0);
assertThat(amountRead).isZero();
assertThat(this.inputStream.read()).isZero();
}
@Test
@@ -196,7 +196,7 @@ class RandomAccessDataFileTests {
void inputStreamSkipPastEnd() throws Exception {
this.inputStream.skip(256);
long amountSkipped = this.inputStream.skip(1);
assertThat(amountSkipped).isEqualTo(0L);
assertThat(amountSkipped).isZero();
}
@Test
@@ -205,7 +205,7 @@ class RandomAccessDataFileTests {
this.inputStream.skip(56);
assertThat(this.inputStream.available()).isEqualTo(200);
this.inputStream.skip(200);
assertThat(this.inputStream.available()).isEqualTo(0);
assertThat(this.inputStream.available()).isZero();
}
@Test
@@ -239,14 +239,14 @@ class RandomAccessDataFileTests {
@Test
void subsection() throws Exception {
RandomAccessData subsection = this.file.getSubsection(1, 1);
assertThat(subsection.getInputStream().read()).isEqualTo(1);
assertThat(subsection.getInputStream().read()).isOne();
}
@Test
void inputStreamReadPastSubsection() throws Exception {
RandomAccessData subsection = this.file.getSubsection(1, 2);
InputStream inputStream = subsection.getInputStream();
assertThat(inputStream.read()).isEqualTo(1);
assertThat(inputStream.read()).isOne();
assertThat(inputStream.read()).isEqualTo(2);
assertThat(inputStream.read()).isEqualTo(-1);
}
@@ -271,7 +271,7 @@ class RandomAccessDataFileTests {
@Test
void inputStreamSkipNegative() throws Exception {
assertThat(this.inputStream.skip(-1)).isEqualTo(0L);
assertThat(this.inputStream.skip(-1)).isZero();
}
@Test

32
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/AsciiBytesTests.java
View File

@@ -34,19 +34,19 @@ class AsciiBytesTests {
@Test
void createFromBytes() {
AsciiBytes bytes = new AsciiBytes(new byte[] { 65, 66 });
assertThat(bytes.toString()).isEqualTo("AB");
assertThat(bytes).hasToString("AB");
}
@Test
void createFromBytesWithOffset() {
AsciiBytes bytes = new AsciiBytes(new byte[] { 65, 66, 67, 68 }, 1, 2);
assertThat(bytes.toString()).isEqualTo("BC");
assertThat(bytes).hasToString("BC");
}
@Test
void createFromString() {
AsciiBytes bytes = new AsciiBytes("AB");
assertThat(bytes.toString()).isEqualTo("AB");
assertThat(bytes).hasToString("AB");
}
@Test
@@ -84,21 +84,21 @@ class AsciiBytesTests {
@Test
void substringFromBeingIndex() {
AsciiBytes abcd = new AsciiBytes(new byte[] { 65, 66, 67, 68 });
assertThat(abcd.substring(0).toString()).isEqualTo("ABCD");
assertThat(abcd.substring(1).toString()).isEqualTo("BCD");
assertThat(abcd.substring(2).toString()).isEqualTo("CD");
assertThat(abcd.substring(3).toString()).isEqualTo("D");
assertThat(abcd.substring(4).toString()).isEqualTo("");
assertThat(abcd.substring(0)).hasToString("ABCD");
assertThat(abcd.substring(1)).hasToString("BCD");
assertThat(abcd.substring(2)).hasToString("CD");
assertThat(abcd.substring(3)).hasToString("D");
assertThat(abcd.substring(4).toString()).isEmpty();
assertThatExceptionOfType(IndexOutOfBoundsException.class).isThrownBy(() -> abcd.substring(5));
}
@Test
void substring() {
AsciiBytes abcd = new AsciiBytes(new byte[] { 65, 66, 67, 68 });
assertThat(abcd.substring(0, 4).toString()).isEqualTo("ABCD");
assertThat(abcd.substring(1, 3).toString()).isEqualTo("BC");
assertThat(abcd.substring(3, 4).toString()).isEqualTo("D");
assertThat(abcd.substring(3, 3).toString()).isEqualTo("");
assertThat(abcd.substring(0, 4)).hasToString("ABCD");
assertThat(abcd.substring(1, 3)).hasToString("BC");
assertThat(abcd.substring(3, 4)).hasToString("D");
assertThat(abcd.substring(3, 3).toString()).isEmpty();
assertThatExceptionOfType(IndexOutOfBoundsException.class).isThrownBy(() -> abcd.substring(3, 5));
}
@@ -108,9 +108,9 @@ class AsciiBytesTests {
AsciiBytes bc = new AsciiBytes(new byte[] { 66, 67 });
AsciiBytes bc_substring = new AsciiBytes(new byte[] { 65, 66, 67, 68 }).substring(1, 3);
AsciiBytes bc_string = new AsciiBytes("BC");
assertThat(bc.hashCode()).isEqualTo(bc.hashCode());
assertThat(bc.hashCode()).isEqualTo(bc_substring.hashCode());
assertThat(bc.hashCode()).isEqualTo(bc_string.hashCode());
assertThat(bc).hasSameHashCodeAs(bc);
assertThat(bc).hasSameHashCodeAs(bc_substring);
assertThat(bc).hasSameHashCodeAs(bc_string);
assertThat(bc).isEqualTo(bc);
assertThat(bc).isEqualTo(bc_substring);
assertThat(bc).isEqualTo(bc_string);
@@ -139,7 +139,7 @@ class AsciiBytesTests {
}
private void hashCodeSameAsString(String input) {
assertThat(new AsciiBytes(input).hashCode()).isEqualTo(input.hashCode());
assertThat(new AsciiBytes(input)).hasSameHashCodeAs(input);
}
@Test

24
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/CentralDirectoryParserTests.java
View File

@@ -73,18 +73,18 @@ class CentralDirectoryParserTests {
parser.addVisitor(collector);
parser.parse(this.jarData, false);
Iterator<CentralDirectoryFileHeader> headers = collector.getHeaders().iterator();
assertThat(headers.next().getName().toString()).isEqualTo("META-INF/");
assertThat(headers.next().getName().toString()).isEqualTo("META-INF/MANIFEST.MF");
assertThat(headers.next().getName().toString()).isEqualTo("1.dat");
assertThat(headers.next().getName().toString()).isEqualTo("2.dat");
assertThat(headers.next().getName().toString()).isEqualTo("d/");
assertThat(headers.next().getName().toString()).isEqualTo("d/9.dat");
assertThat(headers.next().getName().toString()).isEqualTo("special/");
assertThat(headers.next().getName().toString()).isEqualTo("special/\u00EB.dat");
assertThat(headers.next().getName().toString()).isEqualTo("nested.jar");
assertThat(headers.next().getName().toString()).isEqualTo("another-nested.jar");
assertThat(headers.next().getName().toString()).isEqualTo("space nested.jar");
assertThat(headers.next().getName().toString()).isEqualTo("multi-release.jar");
assertThat(headers.next().getName()).hasToString("META-INF/");
assertThat(headers.next().getName()).hasToString("META-INF/MANIFEST.MF");
assertThat(headers.next().getName()).hasToString("1.dat");
assertThat(headers.next().getName()).hasToString("2.dat");
assertThat(headers.next().getName()).hasToString("d/");
assertThat(headers.next().getName()).hasToString("d/9.dat");
assertThat(headers.next().getName()).hasToString("special/");
assertThat(headers.next().getName()).hasToString("special/\u00EB.dat");
assertThat(headers.next().getName()).hasToString("nested.jar");
assertThat(headers.next().getName()).hasToString("another-nested.jar");
assertThat(headers.next().getName()).hasToString("space nested.jar");
assertThat(headers.next().getName()).hasToString("multi-release.jar");
assertThat(headers.hasNext()).isFalse();
}

2
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/HandlerTests.java
View File

@@ -191,7 +191,7 @@ class HandlerTests {
private void assertStandardAndCustomHandlerUrlsAreEqual(String context, String spec) throws MalformedURLException {
URL standardUrl = new URL(new URL("jar:" + context), spec);
URL customHandlerUrl = new URL(new URL("jar", null, -1, context, this.handler), spec);
assertThat(customHandlerUrl.toString()).isEqualTo(standardUrl.toString());
assertThat(customHandlerUrl).hasToString(standardUrl.toString());
assertThat(customHandlerUrl.getFile()).isEqualTo(standardUrl.getFile());
assertThat(customHandlerUrl.getPath()).isEqualTo(standardUrl.getPath());
assertThat(customHandlerUrl.getQuery()).isEqualTo(standardUrl.getQuery());

41
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java
View File

@@ -188,9 +188,9 @@ class JarFileTests {
@Test
void getInputStream() throws Exception {
InputStream inputStream = this.jarFile.getInputStream(this.jarFile.getEntry("1.dat"));
assertThat(inputStream.available()).isEqualTo(1);
assertThat(inputStream.read()).isEqualTo(1);
assertThat(inputStream.available()).isEqualTo(0);
assertThat(inputStream.available()).isOne();
assertThat(inputStream.read()).isOne();
assertThat(inputStream.available()).isZero();
assertThat(inputStream.read()).isEqualTo(-1);
}
@@ -249,7 +249,7 @@ class JarFileTests {
@Test
void getUrl() throws Exception {
URL url = this.jarFile.getUrl();
assertThat(url.toString()).isEqualTo("jar:" + this.rootJarFile.toURI() + "!/");
assertThat(url).hasToString("jar:" + this.rootJarFile.toURI() + "!/");
JarURLConnection jarURLConnection = (JarURLConnection) url.openConnection();
assertThat(JarFileWrapper.unwrap(jarURLConnection.getJarFile())).isSameAs(this.jarFile);
assertThat(jarURLConnection.getJarEntry()).isNull();
@@ -262,11 +262,11 @@ class JarFileTests {
@Test
void createEntryUrl() throws Exception {
URL url = new URL(this.jarFile.getUrl(), "1.dat");
assertThat(url.toString()).isEqualTo("jar:" + this.rootJarFile.toURI() + "!/1.dat");
assertThat(url).hasToString("jar:" + this.rootJarFile.toURI() + "!/1.dat");
JarURLConnection jarURLConnection = (JarURLConnection) url.openConnection();
assertThat(JarFileWrapper.unwrap(jarURLConnection.getJarFile())).isSameAs(this.jarFile);
assertThat(jarURLConnection.getJarEntry()).isSameAs(this.jarFile.getJarEntry("1.dat"));
assertThat(jarURLConnection.getContentLength()).isEqualTo(1);
assertThat(jarURLConnection.getContentLength()).isOne();
assertThat(jarURLConnection.getContent()).isInstanceOf(InputStream.class);
assertThat(jarURLConnection.getContentType()).isEqualTo("content/unknown");
assertThat(jarURLConnection.getPermission()).isInstanceOf(FilePermission.class);
@@ -278,7 +278,7 @@ class JarFileTests {
@Test
void getMissingEntryUrl() throws Exception {
URL url = new URL(this.jarFile.getUrl(), "missing.dat");
assertThat(url.toString()).isEqualTo("jar:" + this.rootJarFile.toURI() + "!/missing.dat");
assertThat(url).hasToString("jar:" + this.rootJarFile.toURI() + "!/missing.dat");
assertThatExceptionOfType(FileNotFoundException.class)
.isThrownBy(((JarURLConnection) url.openConnection())::getJarEntry);
}
@@ -295,7 +295,7 @@ class JarFileTests {
URL url = new URL(this.jarFile.getUrl(), "1.dat");
url.openConnection();
try (InputStream stream = url.openStream()) {
assertThat(stream.read()).isEqualTo(1);
assertThat(stream.read()).isOne();
assertThat(stream.read()).isEqualTo(-1);
}
}
@@ -317,10 +317,10 @@ class JarFileTests {
assertThat(inputStream.read()).isEqualTo(-1);
URL url = nestedJarFile.getUrl();
assertThat(url.toString()).isEqualTo("jar:" + this.rootJarFile.toURI() + "!/nested.jar!/");
assertThat(url).hasToString("jar:" + this.rootJarFile.toURI() + "!/nested.jar!/");
JarURLConnection conn = (JarURLConnection) url.openConnection();
assertThat(JarFileWrapper.unwrap(conn.getJarFile())).isSameAs(nestedJarFile);
assertThat(conn.getJarFileURL().toString()).isEqualTo("jar:" + this.rootJarFile.toURI() + "!/nested.jar");
assertThat(conn.getJarFileURL()).hasToString("jar:" + this.rootJarFile.toURI() + "!/nested.jar");
assertThat(conn.getInputStream()).isNotNull();
JarInputStream jarInputStream = new JarInputStream(conn.getInputStream());
assertThat(jarInputStream.getNextJarEntry().getName()).isEqualTo("3.dat");
@@ -347,7 +347,7 @@ class JarFileTests {
}
URL url = nestedJarFile.getUrl();
assertThat(url.toString()).isEqualTo("jar:" + this.rootJarFile.toURI() + "!/d!/");
assertThat(url).hasToString("jar:" + this.rootJarFile.toURI() + "!/d!/");
JarURLConnection connection = (JarURLConnection) url.openConnection();
assertThat(JarFileWrapper.unwrap(connection.getJarFile())).isSameAs(nestedJarFile);
}
@@ -357,7 +357,7 @@ class JarFileTests {
void getNestedJarEntryUrl() throws Exception {
try (JarFile nestedJarFile = this.jarFile.getNestedJarFile(this.jarFile.getEntry("nested.jar"))) {
URL url = nestedJarFile.getJarEntry("3.dat").getUrl();
assertThat(url.toString()).isEqualTo("jar:" + this.rootJarFile.toURI() + "!/nested.jar!/3.dat");
assertThat(url).hasToString("jar:" + this.rootJarFile.toURI() + "!/nested.jar!/3.dat");
try (InputStream inputStream = url.openStream()) {
assertThat(inputStream).isNotNull();
assertThat(inputStream.read()).isEqualTo(3);
@@ -369,14 +369,13 @@ class JarFileTests {
void createUrlFromString() throws Exception {
String spec = "jar:" + this.rootJarFile.toURI() + "!/nested.jar!/3.dat";
URL url = new URL(spec);
assertThat(url.toString()).isEqualTo(spec);
assertThat(url).hasToString(spec);
JarURLConnection connection = (JarURLConnection) url.openConnection();
try (InputStream inputStream = connection.getInputStream()) {
assertThat(inputStream).isNotNull();
assertThat(inputStream.read()).isEqualTo(3);
assertThat(connection.getURL().toString()).isEqualTo(spec);
assertThat(connection.getJarFileURL().toString())
.isEqualTo("jar:" + this.rootJarFile.toURI() + "!/nested.jar");
assertThat(connection.getURL()).hasToString(spec);
assertThat(connection.getJarFileURL()).hasToString("jar:" + this.rootJarFile.toURI() + "!/nested.jar");
assertThat(connection.getEntryName()).isEqualTo("3.dat");
connection.getJarFile().close();
}
@@ -395,12 +394,12 @@ class JarFileTests {
private void nonNestedJarFileFromString(String spec) throws Exception {
JarFile.registerUrlProtocolHandler();
URL url = new URL(spec);
assertThat(url.toString()).isEqualTo(spec);
assertThat(url).hasToString(spec);
JarURLConnection connection = (JarURLConnection) url.openConnection();
try (InputStream inputStream = connection.getInputStream()) {
assertThat(inputStream).isNotNull();
assertThat(inputStream.read()).isEqualTo(2);
assertThat(connection.getURL().toString()).isEqualTo(spec);
assertThat(connection.getURL()).hasToString(spec);
assertThat(connection.getJarFileURL().toURI()).isEqualTo(this.rootJarFile.toURI());
assertThat(connection.getEntryName()).isEqualTo("2.dat");
}
@@ -423,9 +422,9 @@ class JarFileTests {
@Test
void sensibleToString() throws Exception {
assertThat(this.jarFile.toString()).isEqualTo(this.rootJarFile.getPath());
assertThat(this.jarFile).hasToString(this.rootJarFile.getPath());
try (JarFile nested = this.jarFile.getNestedJarFile(this.jarFile.getEntry("nested.jar"))) {
assertThat(nested.toString()).isEqualTo(this.rootJarFile.getPath() + "!/nested.jar");
assertThat(nested).hasToString(this.rootJarFile.getPath() + "!/nested.jar");
}
}
@@ -560,7 +559,7 @@ class JarFileTests {
ZipEntry entry = multiRelease.getEntry("multi-release.dat");
assertThat(entry.getName()).isEqualTo("multi-release.dat");
InputStream inputStream = multiRelease.getInputStream(entry);
assertThat(inputStream.available()).isEqualTo(1);
assertThat(inputStream.available()).isOne();
assertThat(inputStream.read()).isEqualTo(Runtime.version().feature());
}
}

13
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarURLConnectionTests.java
View File

@@ -182,7 +182,7 @@ class JarURLConnectionTests {
URL url = new URL("jar:" + this.rootJarFile.toURI().toURL() + "!/nested.jar!/3.dat");
try (JarFile nested = this.jarFile.getNestedJarFile(this.jarFile.getEntry("nested.jar"))) {
JarURLConnection connection = JarURLConnection.get(url, nested);
assertThat(connection.getContentLength()).isEqualTo(1);
assertThat(connection.getContentLength()).isOne();
}
}
@@ -191,7 +191,7 @@ class JarURLConnectionTests {
URL url = new URL("jar:" + this.rootJarFile.toURI().toURL() + "!/nested.jar!/3.dat");
try (JarFile nested = this.jarFile.getNestedJarFile(this.jarFile.getEntry("nested.jar"))) {
JarURLConnection connection = JarURLConnection.get(url, nested);
assertThat(connection.getContentLengthLong()).isEqualTo(1);
assertThat(connection.getContentLengthLong()).isOne();
}
}
@@ -212,23 +212,22 @@ class JarURLConnectionTests {
@Test
void jarEntryBasicName() {
assertThat(new JarEntryName(new StringSequence("a/b/C.class")).toString()).isEqualTo("a/b/C.class");
assertThat(new JarEntryName(new StringSequence("a/b/C.class"))).hasToString("a/b/C.class");
}
@Test
void jarEntryNameWithSingleByteEncodedCharacters() {
assertThat(new JarEntryName(new StringSequence("%61/%62/%43.class")).toString()).isEqualTo("a/b/C.class");
assertThat(new JarEntryName(new StringSequence("%61/%62/%43.class"))).hasToString("a/b/C.class");
}
@Test
void jarEntryNameWithDoubleByteEncodedCharacters() {
assertThat(new JarEntryName(new StringSequence("%c3%a1/b/C.class")).toString()).isEqualTo("\u00e1/b/C.class");
assertThat(new JarEntryName(new StringSequence("%c3%a1/b/C.class"))).hasToString("\u00e1/b/C.class");
}
@Test
void jarEntryNameWithMixtureOfEncodedAndUnencodedDoubleByteCharacters() {
assertThat(new JarEntryName(new StringSequence("%c3%a1/b/\u00c7.class")).toString())
.isEqualTo("\u00e1/b/\u00c7.class");
assertThat(new JarEntryName(new StringSequence("%c3%a1/b/\u00c7.class"))).hasToString("\u00e1/b/\u00c7.class");
}
@Test

30
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/StringSequenceTests.java
View File

@@ -55,38 +55,38 @@ class StringSequenceTests {
@Test
void createFromString() {
assertThat(new StringSequence("test").toString()).isEqualTo("test");
assertThat(new StringSequence("test")).hasToString("test");
}
@Test
void subSequenceWithJustStartShouldReturnSubSequence() {
assertThat(new StringSequence("smiles").subSequence(1).toString()).isEqualTo("miles");
assertThat(new StringSequence("smiles").subSequence(1)).hasToString("miles");
}
@Test
void subSequenceShouldReturnSubSequence() {
assertThat(new StringSequence("hamburger").subSequence(4, 8).toString()).isEqualTo("urge");
assertThat(new StringSequence("smiles").subSequence(1, 5).toString()).isEqualTo("mile");
assertThat(new StringSequence("hamburger").subSequence(4, 8)).hasToString("urge");
assertThat(new StringSequence("smiles").subSequence(1, 5)).hasToString("mile");
}
@Test
void subSequenceWhenCalledMultipleTimesShouldReturnSubSequence() {
assertThat(new StringSequence("hamburger").subSequence(4, 8).subSequence(1, 3).toString()).isEqualTo("rg");
assertThat(new StringSequence("hamburger").subSequence(4, 8).subSequence(1, 3)).hasToString("rg");
}
@Test
void subSequenceWhenEndPastExistingEndShouldThrowException() {
StringSequence sequence = new StringSequence("abcde").subSequence(1, 4);
assertThat(sequence.toString()).isEqualTo("bcd");
assertThat(sequence.subSequence(2, 3).toString()).isEqualTo("d");
assertThat(sequence).hasToString("bcd");
assertThat(sequence.subSequence(2, 3)).hasToString("d");
assertThatExceptionOfType(IndexOutOfBoundsException.class).isThrownBy(() -> sequence.subSequence(3, 4));
}
@Test
void subSequenceWhenStartPastExistingEndShouldThrowException() {
StringSequence sequence = new StringSequence("abcde").subSequence(1, 4);
assertThat(sequence.toString()).isEqualTo("bcd");
assertThat(sequence.subSequence(2, 3).toString()).isEqualTo("d");
assertThat(sequence).hasToString("bcd");
assertThat(sequence.subSequence(2, 3)).hasToString("d");
assertThatExceptionOfType(IndexOutOfBoundsException.class).isThrownBy(() -> sequence.subSequence(4, 3));
}
@@ -103,8 +103,8 @@ class StringSequenceTests {
@Test
void lengthShouldReturnLength() {
StringSequence sequence = new StringSequence("hamburger");
assertThat(sequence.length()).isEqualTo(9);
assertThat(sequence.subSequence(4, 8).length()).isEqualTo(4);
assertThat(sequence).hasSize(9);
assertThat(sequence.subSequence(4, 8)).hasSize(4);
}
@Test
@@ -119,7 +119,7 @@ class StringSequenceTests {
@Test
void indexOfCharShouldReturnIndexOf() {
StringSequence sequence = new StringSequence("aabbaacc");
assertThat(sequence.indexOf('a')).isEqualTo(0);
assertThat(sequence.indexOf('a')).isZero();
assertThat(sequence.indexOf('b')).isEqualTo(2);
assertThat(sequence.subSequence(2).indexOf('a')).isEqualTo(2);
}
@@ -127,7 +127,7 @@ class StringSequenceTests {
@Test
void indexOfStringShouldReturnIndexOf() {
StringSequence sequence = new StringSequence("aabbaacc");
assertThat(sequence.indexOf('a')).isEqualTo(0);
assertThat(sequence.indexOf('a')).isZero();
assertThat(sequence.indexOf('b')).isEqualTo(2);
assertThat(sequence.subSequence(2).indexOf('a')).isEqualTo(2);
}
@@ -142,8 +142,8 @@ class StringSequenceTests {
@Test
void hashCodeShouldBeSameAsString() {
assertThat(new StringSequence("hamburger").hashCode()).isEqualTo("hamburger".hashCode());
assertThat(new StringSequence("hamburger").subSequence(4, 8).hashCode()).isEqualTo("urge".hashCode());
assertThat(new StringSequence("hamburger")).hasSameHashCodeAs("hamburger");
assertThat(new StringSequence("hamburger").subSequence(4, 8)).hasSameHashCodeAs("urge");
}
@Test

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

3
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/web/servlet/MockServletWebServerTests.java
View File

@@ -38,8 +38,7 @@ class MockServletWebServerTests {
@Test
void servletContextHasSessionCookieConfigConfigured() {
MockServletWebServer server = TestMockServletWebServer.create();
assertThat(server.getServletContext().getSessionCookieConfig()).isNotNull()
.isInstanceOf(MockSessionCookieConfig.class);
assertThat(server.getServletContext().getSessionCookieConfig()).isInstanceOf(MockSessionCookieConfig.class);
}
private static final class TestMockServletWebServer extends MockServletWebServer {