Hacking

philwebb · Apr 25, 2024 · 0ceeb45 · 0ceeb45
1 parent aaf3310
commit 0ceeb45
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/MvcResultAssert.java b/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/MvcResultAssert.java
@@ -27,6 +27,7 @@
 import org.assertj.core.api.Assertions;
 import org.assertj.core.api.MapAssert;
 import org.assertj.core.api.ObjectAssert;
+import org.assertj.core.api.ThrowingConsumer;
 import org.assertj.core.error.BasicErrorMessageFactory;
 import org.assertj.core.internal.Failures;
 
@@ -55,6 +56,10 @@ public class MvcResultAssert extends AbstractMockHttpServletResponseAssert<MvcRe
 		super(jsonMessageConverter, mvcResult, MvcResultAssert.class);
 	}
 
+	public void and(ThrowingConsumer<MvcResultAssert> result) {
+		result.accept(this);
+	}
+
 	@Override
 	protected MockHttpServletResponse getResponse() {
 		checkHasNotFailedUnexpectedly();
@@ -89,6 +94,12 @@ public CookieMapAssert cookies() {
 		return new CookieMapAssert(this.actual.getResponse().getCookies());
 	}
 
+	public MvcResultAssert cookies(ThrowingConsumer<CookieMapAssert> cookies) {
+		cookies.accept(cookies());
+		return this.myself;
+	}
+
+
 	/**
 	 * Return a new {@linkplain MediaTypeAssert assertion} object that uses the
 	 * response's {@linkplain MediaType content type} as the object to test.

diff --git a/.../java/org/springframework/test/web/servlet/assertj/AssertableMockMvcIntegrationTests.java b/.../java/org/springframework/test/web/servlet/assertj/AssertableMockMvcIntegrationTests.java
@@ -84,6 +84,30 @@ public class AssertableMockMvcIntegrationTests {
 		this.mockMvc = AssertableMockMvc.from(wac);
 	}
 
+	@Test
+	void hacking() {
+		assertThat(perform(get("/foo").accept(MediaType.APPLICATION_JSON)))
+				.satisfies((result) -> {
+					assertThat(result).hasStatusOk();
+					assertThat(result).cookies().containsCookie("foo");
+					assertThat(result).cookies().containsCookie("bar");
+				});
+
+		assertThat(perform(get("/foo").accept(MediaType.APPLICATION_JSON)))
+				.hasStatusOk()
+				.cookies((cookies) -> {
+					cookies.containsCookie("foo");
+					cookies.containsCookie("bar");
+				});
+
+		assertThat(perform(get("/foo").accept(MediaType.APPLICATION_JSON)))
+				.and(result -> {
+					result.hasStatusOk();
+					result.cookies().containsCookie("foo");
+					result.cookies().containsCookie("bar");
+				});
+	}
+
 	@Nested
 	class RequestTests {