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

Polishing

Browse Source
This commit is contained in:
Sam Brannen
2023-02-22 11:21:00 +01:00
parent ce66b251ab
commit 3a9c7524f0
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-test/src/test/java/org/springframework/test/web/client/match/MockRestRequestMatchersTests.java
View File

@@ -20,14 +20,13 @@ import java.io.IOException;
import java.net.URI;
import java.util.List;
import org.assertj.core.api.AssertionsForClassTypes;
import org.assertj.core.api.ThrowableTypeAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
import org.springframework.http.HttpMethod;
import org.springframework.mock.http.client.MockClientHttpRequest;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.any;
import static org.hamcrest.Matchers.anything;
@@ -149,7 +148,7 @@ class MockRestRequestMatchersTests {
void headerContainsWithMissingHeader() {
assertThatAssertionError()
.isThrownBy(() -> MockRestRequestMatchers.header("foo", containsString("baz")).match(this.request))
.withMessageContaining("but was null");
.withMessage("Expected header <foo> to exist but was null");
}
@Test
@@ -174,7 +173,7 @@ class MockRestRequestMatchersTests {
MockRestRequestMatchers.header("foo", containsInAnyOrder(endsWith("baz"), endsWith("bar"))).match(this.request);
MockRestRequestMatchers.header("foo", contains(is("bar"), is("baz"))).match(this.request);
MockRestRequestMatchers.header("foo", contains(is("bar"), Matchers.anything())).match(this.request);
MockRestRequestMatchers.header("foo", contains(is("bar"), anything())).match(this.request);
MockRestRequestMatchers.header("foo", hasItem(endsWith("baz"))).match(this.request);
MockRestRequestMatchers.header("foo", everyItem(startsWith("ba"))).match(this.request);
MockRestRequestMatchers.header("foo", hasSize(2)).match(this.request);
@@ -234,7 +233,7 @@ class MockRestRequestMatchersTests {
void headersWithMissingHeader() {
assertThatAssertionError()
.isThrownBy(() -> MockRestRequestMatchers.header("foo", "bar").match(this.request))
.withMessageContaining("but was null");
.withMessage("Expected header <foo> to exist but was null");
}
@Test
@@ -259,7 +258,7 @@ class MockRestRequestMatchersTests {
assertThatAssertionError()
.isThrownBy(() -> MockRestRequestMatchers.queryParam("foo", "bar").match(this.request))
.withMessageContaining("but was null");
.withMessage("Expected query param <foo> to exist but was null");
}
@Test
@@ -301,7 +300,7 @@ class MockRestRequestMatchersTests {
MockRestRequestMatchers.queryParam("foo", containsInAnyOrder(endsWith("baz"), endsWith("bar"))).match(this.request);
MockRestRequestMatchers.queryParam("foo", contains(is("bar"), is("baz"))).match(this.request);
MockRestRequestMatchers.queryParam("foo", contains(is("bar"), Matchers.anything())).match(this.request);
MockRestRequestMatchers.queryParam("foo", contains(is("bar"), anything())).match(this.request);
MockRestRequestMatchers.queryParam("foo", hasItem(endsWith("baz"))).match(this.request);
MockRestRequestMatchers.queryParam("foo", everyItem(startsWith("ba"))).match(this.request);
MockRestRequestMatchers.queryParam("foo", hasSize(2)).match(this.request);
@@ -351,7 +350,7 @@ class MockRestRequestMatchersTests {
}
private static ThrowableTypeAssert<AssertionError> assertThatAssertionError() {
return AssertionsForClassTypes.assertThatExceptionOfType(AssertionError.class);
return assertThatExceptionOfType(AssertionError.class);
}
}