From 955f77bf5d30d74e28fa7c3f61fddc45aff771c4 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 27 May 2020 18:53:29 +0100 Subject: [PATCH] Add error message to MockServerHttpRequest Closes gh-25109 --- .../mock/http/server/reactive/MockServerHttpRequest.java | 2 ++ .../testfixture/http/server/reactive/MockServerHttpRequest.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java b/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java index 356367c55d6..90eeb86054d 100644 --- a/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java +++ b/spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java @@ -232,6 +232,8 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest { * @return the created builder */ public static BodyBuilder method(HttpMethod method, String urlTemplate, Object... vars) { + Assert.notNull(method, "HttpMethod is required. If testing a custom HTTP method, " + + "please use the variant that accepts a String based HTTP method."); URI url = UriComponentsBuilder.fromUriString(urlTemplate).buildAndExpand(vars).encode().toUri(); return new DefaultBodyBuilder(method, url); } diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/MockServerHttpRequest.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/MockServerHttpRequest.java index 96708ef2fb5..9a468cb9937 100644 --- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/MockServerHttpRequest.java +++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/MockServerHttpRequest.java @@ -232,6 +232,8 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest { * @return the created builder */ public static BodyBuilder method(HttpMethod method, String urlTemplate, Object... vars) { + Assert.notNull(method, "HttpMethod is required. If testing a custom HTTP method, " + + "please use the variant that accepts a String based HTTP method."); URI url = UriComponentsBuilder.fromUriString(urlTemplate).buildAndExpand(vars).encode().toUri(); return new DefaultBodyBuilder(method, url); }