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);
}