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

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