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

Merge branch 'main' into 4.0.x

Browse Source
This commit is contained in:
Stéphane Nicoll
2025-05-18 09:28:49 +02:00
parent f5ac6d3ea1 921b9fd6ac
commit 00e4ca2201
18 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,8 +184,8 @@ class NestedFileSystemTests {
NestedFileSystem f2 = new NestedFileSystem(this.provider, jp1);
NestedFileSystem f3 = new NestedFileSystem(this.provider, jp2);
NestedFileSystem f4 = new NestedFileSystem(this.provider, jp3);
assertThat(f1.hashCode()).isEqualTo(f2.hashCode());
assertThat(f1).isEqualTo(f1).isEqualTo(f2).isEqualTo(f3).isNotEqualTo(f4);
assertThat(f1).hasSameHashCodeAs(f2);
}
}

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

@@ -208,7 +208,7 @@ class NestedPathTests {
NestedPath p2 = new NestedPath(this.fileSystem, "a.jar");
NestedPath p3 = new NestedPath(this.fileSystem, "c.jar");
NestedPath p4 = new NestedPath(fs2, "c.jar");
assertThat(p1.hashCode()).isEqualTo(p2.hashCode());
assertThat(p1).hasSameHashCodeAs(p2);
assertThat(p1).isEqualTo(p1).isEqualTo(p2).isNotEqualTo(p3).isNotEqualTo(p4);
}