Polishing in [Rest|Web]TestClient Assertions

See gh-34428

Author: rstoyanchev

spring-test/src/main/java/org/springframework/test/web/reactive/server/CookieAssertions.java

@@ -36,12 +36,13 @@ public class CookieAssertions extends AbstractCookieAssertions<ExchangeResult, W
 
 
 	@Override
-	protected void assertWithDiagnostics(Runnable assertion) {
-		exchangeResult.assertWithDiagnostics(assertion);
+	protected MultiValueMap<String, ResponseCookie> getResponseCookies() {
+		return getExchangeResult().getResponseCookies();
 	}
 
 	@Override
-	protected MultiValueMap<String, ResponseCookie> getResponseCookies() {
-		return exchangeResult.getResponseCookies();
+	protected void assertWithDiagnostics(Runnable assertion) {
+		getExchangeResult().assertWithDiagnostics(assertion);
 	}
+
 }

spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java

@@ -38,12 +38,13 @@ public class HeaderAssertions extends AbstractHeaderAssertions<ExchangeResult, W
 
 
 	@Override
-	protected void assertWithDiagnostics(Runnable assertion) {
-		exchangeResult.assertWithDiagnostics(assertion);
+	protected HttpHeaders getResponseHeaders() {
+		return getExchangeResult().getResponseHeaders();
 	}
 
 	@Override
-	protected HttpHeaders getResponseHeaders() {
-		return exchangeResult.getResponseHeaders();
+	protected void assertWithDiagnostics(Runnable assertion) {
+		getExchangeResult().assertWithDiagnostics(assertion);
 	}
+
 }

spring-test/src/main/java/org/springframework/test/web/reactive/server/StatusAssertions.java

@@ -36,12 +36,13 @@ public class StatusAssertions extends AbstractStatusAssertions<ExchangeResult, W
 
 
 	@Override
-	protected void assertWithDiagnostics(Runnable assertion) {
-		exchangeResult.assertWithDiagnostics(assertion);
+	protected HttpStatusCode getStatus() {
+		return getExchangeResult().getStatus();
 	}
 
 	@Override
-	protected HttpStatusCode getStatus() {
-		return exchangeResult.getStatus();
+	protected void assertWithDiagnostics(Runnable assertion) {
+		getExchangeResult().assertWithDiagnostics(assertion);
 	}
+
 }

spring-test/src/main/java/org/springframework/test/web/reactive/server/XpathAssertions.java

@@ -35,20 +35,23 @@
  */
 public class XpathAssertions extends AbstractXpathAssertions<WebTestClient.BodyContentSpec> {
 
-	XpathAssertions(WebTestClient.BodyContentSpec spec,
-					String expression, @Nullable Map<String, String> namespaces, Object... args) {
+
+	XpathAssertions(
+			WebTestClient.BodyContentSpec spec,
+			String expression, @Nullable Map<String, String> namespaces, Object... args) {
+
 		super(spec, expression, namespaces, args);
 	}
 
+
 	@Override
 	protected Optional<HttpHeaders> getResponseHeaders() {
-		return Optional.of(bodySpec.returnResult())
-				.map(ExchangeResult::getResponseHeaders);
+		return Optional.of(getBodySpec().returnResult()).map(ExchangeResult::getResponseHeaders);
 	}
 
 	@Override
 	protected byte[] getContent() {
-		byte[] body = this.bodySpec.returnResult().getResponseBody();
+		byte[] body = getBodySpec().returnResult().getResponseBody();
 		Assert.notNull(body, "Expected body content");
 		return body;
 	}

spring-test/src/main/java/org/springframework/test/web/servlet/client/CookieAssertions.java

@@ -35,12 +35,13 @@ public class CookieAssertions extends AbstractCookieAssertions<ExchangeResult, R
 
 
 	@Override
-	protected void assertWithDiagnostics(Runnable assertion) {
-		exchangeResult.assertWithDiagnostics(assertion);
+	protected MultiValueMap<String, ResponseCookie> getResponseCookies() {
+		return getExchangeResult().getResponseCookies();
 	}
 
 	@Override
-	protected MultiValueMap<String, ResponseCookie> getResponseCookies() {
-		return exchangeResult.getResponseCookies();
+	protected void assertWithDiagnostics(Runnable assertion) {
+		getExchangeResult().assertWithDiagnostics(assertion);
 	}
+
 }

spring-test/src/main/java/org/springframework/test/web/servlet/client/EntityExchangeResult.java

@@ -23,6 +23,7 @@
  * extracted to a representation of type {@code <T>}.
  *
  * @author Rob Worsnop
+ * @since 7.0
  * @param <T> the response body type
  */
 public class EntityExchangeResult<T> extends ExchangeResult {

spring-test/src/main/java/org/springframework/test/web/servlet/client/HeaderAssertions.java

@@ -33,13 +33,15 @@ public class HeaderAssertions extends AbstractHeaderAssertions<ExchangeResult, R
 		super(exchangeResult, responseSpec);
 	}
 
+
 	@Override
-	protected void assertWithDiagnostics(Runnable assertion) {
-		exchangeResult.assertWithDiagnostics(assertion);
+	protected HttpHeaders getResponseHeaders() {
+		return getExchangeResult().getResponseHeaders();
 	}
 
 	@Override
-	protected HttpHeaders getResponseHeaders() {
-		return exchangeResult.getResponseHeaders();
+	protected void assertWithDiagnostics(Runnable assertion) {
+		getExchangeResult().assertWithDiagnostics(assertion);
 	}
+
 }

spring-test/src/main/java/org/springframework/test/web/servlet/client/StatusAssertions.java

@@ -36,12 +36,13 @@ public class StatusAssertions extends AbstractStatusAssertions<ExchangeResult, R
 
 
 	@Override
-	protected void assertWithDiagnostics(Runnable assertion) {
-		exchangeResult.assertWithDiagnostics(assertion);
+	protected HttpStatusCode getStatus() {
+		return getExchangeResult().getStatus();
 	}
 
 	@Override
-	protected HttpStatusCode getStatus() {
-		return exchangeResult.getStatus();
+	protected void assertWithDiagnostics(Runnable assertion) {
+		getExchangeResult().assertWithDiagnostics(assertion);
 	}
+
 }

spring-test/src/main/java/org/springframework/test/web/servlet/client/XpathAssertions.java

@@ -44,13 +44,12 @@ public class XpathAssertions extends AbstractXpathAssertions<RestTestClient.Body
 
 	@Override
 	protected Optional<HttpHeaders> getResponseHeaders() {
-		return Optional.of(bodySpec.returnResult())
-				.map(ExchangeResult::getResponseHeaders);
+		return Optional.of(getBodySpec().returnResult()).map(ExchangeResult::getResponseHeaders);
 	}
 
 	@Override
 	protected byte[] getContent() {
-		byte[] body = this.bodySpec.returnResult().getResponseBody();
+		byte[] body = getBodySpec().returnResult().getResponseBody();
 		Assert.notNull(body, "Expected body content");
 		return body;
 	}

spring-test/src/main/java/org/springframework/test/web/servlet/client/package-info.java

@@ -1,8 +1,7 @@
 /**
  * Support for testing Spring MVC applications via
- * {@link org.springframework.test.web.reactive.server.WebTestClient}
- * with {@link org.springframework.test.web.servlet.MockMvc} for server request
- * handling.
+ * {@link org.springframework.test.web.servlet.client.RestTestClient} with
+ * {@link org.springframework.test.web.servlet.MockMvc} for server request handling.
  */
 
 @NullMarked