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

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 {