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

Polishing

Browse Source
This commit is contained in:
Sam Brannen
2024-05-08 11:54:55 +03:00
parent cb48077698
commit 3ce79c3fbf
17 changed files with 108 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-test/src/test/java/org/springframework/test/web/servlet/assertj/DefaultMvcTestResultTests.java
View File

@@ -48,18 +48,17 @@ class DefaultMvcTestResultTests {
@Test
void createWithExceptionDoesNotAllowAccessToRequest() {
assertRequestHasFailed(DefaultMvcTestResult::getRequest);
assertRequestFailed(DefaultMvcTestResult::getRequest);
}
@Test
void createWithExceptionDoesNotAllowAccessToResponse() {
assertRequestHasFailed(DefaultMvcTestResult::getResponse);
assertRequestFailed(DefaultMvcTestResult::getResponse);
}
@Test
void createWithExceptionDoesNotAllowAccessToResolvedException() {
assertRequestHasFailed(DefaultMvcTestResult::getResolvedException);
assertRequestFailed(DefaultMvcTestResult::getResolvedException);
}
@Test
@@ -69,10 +68,11 @@ class DefaultMvcTestResultTests {
assertThat(result.getUnresolvedException()).isSameAs(exception);
}
private void assertRequestHasFailed(Consumer<DefaultMvcTestResult> action) {
private void assertRequestFailed(Consumer<DefaultMvcTestResult> action) {
DefaultMvcTestResult result = new DefaultMvcTestResult(null, new IllegalStateException("Expected"), null);
assertThatIllegalStateException().isThrownBy(() -> action.accept(result))
.withMessageContaining("Request has failed with unresolved exception");
assertThatIllegalStateException()
.isThrownBy(() -> action.accept(result))
.withMessageContaining("Request failed with unresolved exception");
}
}

10
spring-test/src/test/java/org/springframework/test/web/servlet/assertj/MockMvcTesterIntegrationTests.java
View File

@@ -300,14 +300,14 @@ public class MockMvcTesterIntegrationTests {
void doesNotHaveUnresolvedExceptionWithUnresolvedException() {
assertThatExceptionOfType(AssertionError.class)
.isThrownBy(() -> assertThat(perform(get("/error/1"))).doesNotHaveUnresolvedException())
.withMessage("Expecting request to have succeeded but it has failed");
.withMessage("Expected request to succeed, but it failed");
}
@Test
void hasUnresolvedExceptionWithoutUnresolvedException() {
assertThatExceptionOfType(AssertionError.class)
.isThrownBy(() -> assertThat(perform(get("/greet"))).hasUnresolvedException())
.withMessage("Expecting request to have failed but it has succeeded");
.withMessage("Expected request to fail, but it succeeded");
}
@Test
@@ -321,10 +321,10 @@ public class MockMvcTesterIntegrationTests {
void unresolvedExceptionWithSuccessfulRequest() {
assertThatExceptionOfType(AssertionError.class)
.isThrownBy(() -> assertThat(perform(get("/greet"))).unresolvedException())
.withMessage("Expecting request to have failed but it has succeeded");
.withMessage("Expected request to fail, but it succeeded");
}
// Check that assertions fail immediately if request has failed with unresolved exception
// Check that assertions fail immediately if request failed with unresolved exception
@Test
void assertAndApplyWithUnresolvedException() {
@@ -409,7 +409,7 @@ public class MockMvcTesterIntegrationTests {
MvcTestResult result = perform(get("/error/1"));
assertThatExceptionOfType(AssertionError.class)
.isThrownBy(() -> assertions.accept(result))
.withMessageContainingAll("Request has failed unexpectedly:",
.withMessageContainingAll("Request failed unexpectedly:",
ServletException.class.getName(), IllegalStateException.class.getName(),
"Expected");
}