Add MockMvcTestClient

See gh-19647

Author: rstoyanchev

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

@@ -0,0 +1,105 @@
+/*
+ * Copyright 2002-2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.test.web.servlet.client;
+
+import javax.servlet.Filter;
+
+import org.springframework.http.client.reactive.ClientHttpConnector;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import org.springframework.test.web.servlet.DispatcherServletCustomizer;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.RequestBuilder;
+import org.springframework.test.web.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.setup.ConfigurableMockMvcBuilder;
+import org.springframework.test.web.servlet.setup.MockMvcConfigurer;
+
+/**
+ * Base class for implementations of {@link MockMvcTestClient.MockMvcServerSpec}
+ * that simply delegates to a {@link ConfigurableMockMvcBuilder} supplied by
+ * the concrete sub-classes.
+ *
+ * @author Rossen Stoyanchev
+ * @since 5.3
+ * @param <B> the type of the concrete sub-class spec
+ */
+abstract class AbstractMockMvcServerSpec<B extends MockMvcTestClient.MockMvcServerSpec<B>>
+		implements MockMvcTestClient.MockMvcServerSpec<B> {
+
+	@Override
+	public <T extends B> T filters(Filter... filters) {
+		getMockMvcBuilder().addFilters(filters);
+		return self();
+	}
+
+	public final <T extends B> T filter(Filter filter, String... urlPatterns) {
+		getMockMvcBuilder().addFilter(filter, urlPatterns);
+		return self();
+	}
+
+	@Override
+	public <T extends B> T defaultRequest(RequestBuilder requestBuilder) {
+		getMockMvcBuilder().defaultRequest(requestBuilder);
+		return self();
+	}
+
+	@Override
+	public <T extends B> T alwaysExpect(ResultMatcher resultMatcher) {
+		getMockMvcBuilder().alwaysExpect(resultMatcher);
+		return self();
+	}
+
+	@Override
+	public <T extends B> T dispatchOptions(boolean dispatchOptions) {
+		getMockMvcBuilder().dispatchOptions(dispatchOptions);
+		return self();
+	}
+
+	@Override
+	public <T extends B> T dispatcherServletCustomizer(DispatcherServletCustomizer customizer) {
+		getMockMvcBuilder().addDispatcherServletCustomizer(customizer);
+		return self();
+	}
+
+	@Override
+	public <T extends B> T apply(MockMvcConfigurer configurer) {
+		getMockMvcBuilder().apply(configurer);
+		return self();
+	}
+
+	@SuppressWarnings("unchecked")
+	private <T extends B> T self() {
+		return (T) this;
+	}
+
+	/**
+	 * Return the concrete {@link ConfigurableMockMvcBuilder} to delegate
+	 * configuration methods and to use to create the {@link MockMvc}.
+	 */
+	protected abstract ConfigurableMockMvcBuilder<?> getMockMvcBuilder();
+
+	@Override
+	public WebTestClient.Builder configureClient() {
+		MockMvc mockMvc = getMockMvcBuilder().build();
+		ClientHttpConnector connector = new MockMvcHttpConnector(mockMvc);
+		return WebTestClient.bindToServer(connector);
+	}
+
+	@Override
+	public WebTestClient build() {
+		return configureClient().build();
+	}
+
+}

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

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2002-2020 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.test.web.servlet.client;
+
+import org.springframework.test.web.servlet.setup.ConfigurableMockMvcBuilder;
+import org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+/**
+ * Simple wrapper around a {@link DefaultMockMvcBuilder}.
+ *
+ * @author Rossen Stoyanchev
+ * @since 5.3
+ */
+class ApplicationContextMockMvcSpec extends AbstractMockMvcServerSpec<ApplicationContextMockMvcSpec> {
+
+	private final DefaultMockMvcBuilder mockMvcBuilder;
+
+
+	public ApplicationContextMockMvcSpec(WebApplicationContext context) {
+		this.mockMvcBuilder = MockMvcBuilders.webAppContextSetup(context);
+	}
+
+	@Override
+	protected ConfigurableMockMvcBuilder<?> getMockMvcBuilder() {
+		return this.mockMvcBuilder;
+	}
+
+}