浏览代码

Resolve compile errors -> WebTestClient methods removed

Fixes gh-4355
Joe Grandja 8 年之前
父节点
当前提交
68368c87ca

+ 2 - 2
config/src/test/java/org/springframework/security/config/web/server/HttpSecurityTests.java

@@ -88,14 +88,14 @@ public class HttpSecurityTests {
 
 		WebTestClient client = buildClient();
 
-		EntityExchangeResult<byte[]> result = client
+		EntityExchangeResult<String> result = client
 			.filter(basicAuthentication("rob", "rob"))
 			.get()
 			.uri("/")
 			.exchange()
 			.expectStatus().isOk()
 			.expectHeader().valueMatches(HttpHeaders.CACHE_CONTROL, ".+")
-			.expectBody().consumeAsStringWith( b-> assertThat(b).isEqualTo("ok"))
+			.expectBody(String.class).consumeWith(b -> assertThat(b.getResponseBody()).isEqualTo("ok"))
 			.returnResult();
 
 		assertThat(result.getResponseCookies().getFirst("SESSION")).isNotNull();

+ 6 - 6
webflux/src/test/java/org/springframework/security/web/server/authentication/AuthenticationWebFilterTests.java

@@ -78,11 +78,11 @@ public class AuthenticationWebFilterTests {
 			.bindToWebFilters(filter)
 			.build();
 
-		EntityExchangeResult<byte[]> result = client.get()
+		EntityExchangeResult<String> result = client.get()
 			.uri("/")
 			.exchange()
 			.expectStatus().isOk()
-			.expectBody().consumeAsStringWith(b -> assertThat(b).isEqualTo("ok"))
+			.expectBody(String.class).consumeWith(b -> assertThat(b.getResponseBody()).isEqualTo("ok"))
 			.returnResult();
 
 		verifyZeroInteractions(authenticationManager);
@@ -98,13 +98,13 @@ public class AuthenticationWebFilterTests {
 			.bindToWebFilters(filter)
 			.build();
 
-		EntityExchangeResult<byte[]> result = client
+		EntityExchangeResult<String> result = client
 			.filter(basicAuthentication("test","this"))
 			.get()
 			.uri("/")
 			.exchange()
 			.expectStatus().isOk()
-			.expectBody().consumeAsStringWith(b -> assertThat(b).isEqualTo("ok"))
+			.expectBody(String.class).consumeWith(b -> assertThat(b.getResponseBody()).isEqualTo("ok"))
 			.returnResult();
 
 		assertThat(result.getResponseCookies()).isEmpty();
@@ -139,12 +139,12 @@ public class AuthenticationWebFilterTests {
 			.bindToWebFilters(filter)
 			.build();
 
-		EntityExchangeResult<byte[]> result = client
+		EntityExchangeResult<String> result = client
 			.get()
 			.uri("/")
 			.exchange()
 			.expectStatus().isOk()
-			.expectBody().consumeAsStringWith(b -> assertThat(b).isEqualTo("ok"))
+			.expectBody(String.class).consumeWith(b -> assertThat(b.getResponseBody()).isEqualTo("ok"))
 			.returnResult();
 
 		verifyZeroInteractions(authenticationManager, successHandler, entryPoint);