From 37c77f32859af542c28d80ef614344a409589655 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Wed, 12 Oct 2022 10:50:40 +0100
Subject: [PATCH] Tolerate responses with non-standard status codes with
 WebTestClient

Closes gh-847
---
 config/checkstyle/checkstyle-suppressions.xml |  1 +
 .../WebTestClientResponseConverter.java       | 13 +++++-
 .../WebTestClientResponseConverterTests.java  | 44 ++++++++++++++++++-
 3 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/config/checkstyle/checkstyle-suppressions.xml b/config/checkstyle/checkstyle-suppressions.xml
index 85f240e2..6898a954 100644
--- a/config/checkstyle/checkstyle-suppressions.xml
+++ b/config/checkstyle/checkstyle-suppressions.xml
@@ -5,4 +5,5 @@
 <suppressions>
 	<suppress files="com[\\/]example[\\/]restassured" checks="IllegalImport" />
 	<suppress files="src[\\/]testFixtures" checks="JavadocPackage" />
+	<suppress files="WebTestClientResponseConverterTests\.java" checks="IllegalImport" />
 </suppressions>
diff --git a/spring-restdocs-webtestclient/src/main/java/org/springframework/restdocs/webtestclient/WebTestClientResponseConverter.java b/spring-restdocs-webtestclient/src/main/java/org/springframework/restdocs/webtestclient/WebTestClientResponseConverter.java
index df0a6084..c5eae390 100644
--- a/spring-restdocs-webtestclient/src/main/java/org/springframework/restdocs/webtestclient/WebTestClientResponseConverter.java
+++ b/spring-restdocs-webtestclient/src/main/java/org/springframework/restdocs/webtestclient/WebTestClientResponseConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,10 +36,19 @@ class WebTestClientResponseConverter implements ResponseConverter<ExchangeResult
 
 	@Override
 	public OperationResponse convert(ExchangeResult result) {
-		return new OperationResponseFactory().create(result.getStatus().value(), extractHeaders(result),
+		return new OperationResponseFactory().create(extractStatus(result), extractHeaders(result),
 				result.getResponseBodyContent());
 	}
 
+	private int extractStatus(ExchangeResult result) {
+		try {
+			return (int) result.getClass().getMethod("getRawStatusCode").invoke(result);
+		}
+		catch (Throwable ex) {
+			return result.getStatus().value();
+		}
+	}
+
 	private HttpHeaders extractHeaders(ExchangeResult result) {
 		HttpHeaders headers = result.getResponseHeaders();
 		if (result.getResponseCookies().isEmpty() || headers.containsKey(HttpHeaders.SET_COOKIE)) {
diff --git a/spring-restdocs-webtestclient/src/test/java/org/springframework/restdocs/webtestclient/WebTestClientResponseConverterTests.java b/spring-restdocs-webtestclient/src/test/java/org/springframework/restdocs/webtestclient/WebTestClientResponseConverterTests.java
index 18e04004..6f809979 100644
--- a/spring-restdocs-webtestclient/src/test/java/org/springframework/restdocs/webtestclient/WebTestClientResponseConverterTests.java
+++ b/spring-restdocs-webtestclient/src/test/java/org/springframework/restdocs/webtestclient/WebTestClientResponseConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@ package org.springframework.restdocs.webtestclient;
 
 import java.util.Collections;
 
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
 import org.junit.Test;
 
 import org.springframework.http.HttpHeaders;
@@ -27,10 +29,12 @@ import org.springframework.http.ResponseCookie;
 import org.springframework.restdocs.operation.OperationResponse;
 import org.springframework.test.web.reactive.server.ExchangeResult;
 import org.springframework.test.web.reactive.server.WebTestClient;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.web.reactive.function.server.RouterFunctions;
 import org.springframework.web.reactive.function.server.ServerResponse;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assume.assumeThat;
 import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
 
 /**
@@ -72,4 +76,42 @@ public class WebTestClientResponseConverterTests {
 				Collections.singletonList("name=value; Domain=localhost; HttpOnly"));
 	}
 
+	@Test
+	public void responseWithNonStandardStatusCode() {
+		assumeThat(ExchangeResult.class, hasMethod("getRawStatusCode"));
+		ExchangeResult result = WebTestClient
+				.bindToRouterFunction(RouterFunctions.route(GET("/foo"), (req) -> ServerResponse.status(210).build()))
+				.configureClient().baseUrl("http://localhost").build().get().uri("/foo").exchange().expectBody()
+				.returnResult();
+		OperationResponse response = this.converter.convert(result);
+		assertThat(response.getStatusCode()).isEqualTo(210);
+	}
+
+	private HasMethodMatcher hasMethod(String name) {
+		return new HasMethodMatcher(name);
+	}
+
+	private static final class HasMethodMatcher extends BaseMatcher<Class<?>> {
+
+		private final String methodName;
+
+		private HasMethodMatcher(String methodName) {
+			this.methodName = methodName;
+		}
+
+		@Override
+		public boolean matches(Object item) {
+			if (!(item instanceof Class)) {
+				return false;
+			}
+			return ReflectionUtils.findMethod((Class<?>) item, this.methodName) != null;
+		}
+
+		@Override
+		public void describeTo(Description description) {
+			description.appendText("method '" + this.methodName + "' to exist on class");
+		}
+
+	}
+
 }