Skip to content

Modernize exception assertions in BaseTaskExecutionDaoTestCases #1041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
siddiqueirshad wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Modernize exception assertions in BaseTaskExecutionDaoTestCases #1041

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 16 additions & 42 deletions ...est/java/org/springframework/cloud/task/repository/dao/BaseTaskExecutionDaoTestCases.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.springframework.test.annotation.DirtiesContext;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

/**
* Defines test cases that shall be between {@link TaskExecutionDao} tests.
Expand All @@ -39,41 +39,25 @@ public abstract class BaseTaskExecutionDaoTestCases {
@Test
@DirtiesContext
public void getLatestTaskExecutionsByTaskNamesWithNullParameter() {
try {
this.dao.getLatestTaskExecutionsByTaskNames(null);
}
catch (IllegalArgumentException e) {
assertThat(e.getMessage()).isEqualTo("At least 1 task name must be provided.");
return;
}
fail("Expected an IllegalArgumentException to be thrown.");
assertThatThrownBy(() -> this.dao.getLatestTaskExecutionsByTaskNames(null))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("At least 1 task name must be provided.");
}

@Test
@DirtiesContext
public void getLatestTaskExecutionsByTaskNamesWithEmptyArrayParameter() {
try {
this.dao.getLatestTaskExecutionsByTaskNames(new String[0]);
}
catch (IllegalArgumentException e) {
assertThat(e.getMessage()).isEqualTo("At least 1 task name must be provided.");
return;
}
fail("Expected an IllegalArgumentException to be thrown.");
assertThatThrownBy(() -> this.dao.getLatestTaskExecutionsByTaskNames(new String[0]))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("At least 1 task name must be provided.");
}

@Test
@DirtiesContext
public void getLatestTaskExecutionsByTaskNamesWithArrayParametersContainingNullAndEmptyValues() {
try {
this.dao.getLatestTaskExecutionsByTaskNames("foo", null, "bar", " ");
}
catch (IllegalArgumentException e) {
assertThat(e.getMessage())
.isEqualTo("Task names must not contain any empty elements but 2 of 4 were empty or null.");
return;
}
fail("Expected an IllegalArgumentException to be thrown.");
assertThatThrownBy(() -> this.dao.getLatestTaskExecutionsByTaskNames("foo", null, "bar", " "))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("Task names must not contain any empty elements but 2 of 4 were empty or null.");
}

@Test
Expand Down Expand Up @@ -161,27 +145,17 @@ public void getLatestTaskExecutionsByTaskNamesWithIdenticalTaskExecutions() {
@Test
@DirtiesContext
public void getLatestTaskExecutionForTaskNameWithNullParameter() {
try {
this.dao.getLatestTaskExecutionForTaskName(null);
}
catch (IllegalArgumentException e) {
assertThat(e.getMessage()).isEqualTo("The task name must not be empty.");
return;
}
fail("Expected an IllegalArgumentException to be thrown.");
assertThatThrownBy(() -> this.dao.getLatestTaskExecutionForTaskName(null))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("The task name must not be empty.");
}

@Test
@DirtiesContext
public void getLatestTaskExecutionForTaskNameWithEmptyStringParameter() {
try {
this.dao.getLatestTaskExecutionForTaskName("");
}
catch (IllegalArgumentException e) {
assertThat(e.getMessage()).isEqualTo("The task name must not be empty.");
return;
}
fail("Expected an IllegalArgumentException to be thrown.");
assertThatThrownBy(() -> this.dao.getLatestTaskExecutionForTaskName(""))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("The task name must not be empty.");
}

@Test
Expand Down