From d3822c8d19ac02d6274c669e7bff01a44322c873 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 18 Mar 2016 12:00:45 -0400 Subject: [PATCH] Polish --- .../htmlunit/DelegatingWebConnection.java | 3 +- .../MockMvcWebConnectionBuilderSupport.java | 40 ++--- .../MockMvcConnectionBuilderSupportTests.java | 146 +++++------------- .../MockMvcWebClientBuilderTests.java | 64 ++++---- .../MockMvcHtmlUnitDriverBuilderTests.java | 60 +++---- 5 files changed, 115 insertions(+), 198 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnection.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnection.java index 091681a86d1..50f6fa95a79 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnection.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/DelegatingWebConnection.java @@ -37,8 +37,7 @@ import org.springframework.util.Assert; * WebClient webClient = new WebClient(); * * MockMvc mockMvc = ... - * MockMvcWebConnection mockConnection = new MockMvcWebConnection(mockMvc); - * mockConnection.setWebClient(webClient); + * MockMvcWebConnection mockConnection = new MockMvcWebConnection(mockMvc, webClient); * * WebRequestMatcher cdnMatcher = new UrlRegexRequestMatcher(".*?//code.jquery.com/.*"); * WebConnection httpConnection = new HttpWebConnection(webClient); diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionBuilderSupport.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionBuilderSupport.java index d60d2d4d1b2..baef40419bd 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionBuilderSupport.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionBuilderSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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 @@ -23,6 +23,7 @@ import com.gargoylesoftware.htmlunit.WebClient; import com.gargoylesoftware.htmlunit.WebConnection; import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.htmlunit.DelegatingWebConnection.DelegateWebConnection; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.test.web.servlet.setup.MockMvcConfigurer; import org.springframework.util.Assert; @@ -44,7 +45,7 @@ public abstract class MockMvcWebConnectionBuilderSupport mockMvcRequestMatchers = new ArrayList(); + private final List requestMatchers = new ArrayList(); private String contextPath = ""; @@ -58,7 +59,7 @@ public abstract class MockMvcWebConnectionBuilderSupport delegates = new ArrayList( - this.mockMvcRequestMatchers.size()); - for (WebRequestMatcher matcher : this.mockMvcRequestMatchers) { - delegates.add(new DelegatingWebConnection.DelegateWebConnection(matcher, mockMvcWebConnection)); + List delegates = new ArrayList(this.requestMatchers.size()); + for (WebRequestMatcher matcher : this.requestMatchers) { + delegates.add(new DelegateWebConnection(matcher, connection)); } - return new DelegatingWebConnection(defaultConnection, delegates); } + } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java index 9f74285074f..28a16b59192 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcConnectionBuilderSupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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. @@ -20,6 +20,10 @@ import java.io.IOException; import java.net.URL; import javax.servlet.http.HttpServletRequest; +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.WebConnection; +import com.gargoylesoftware.htmlunit.WebRequest; +import com.gargoylesoftware.htmlunit.WebResponse; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -36,11 +40,6 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.WebConnection; -import com.gargoylesoftware.htmlunit.WebRequest; -import com.gargoylesoftware.htmlunit.WebResponse; - import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.notNullValue; @@ -52,166 +51,101 @@ import static org.mockito.Mockito.when; * Integration tests for {@link MockMvcWebConnectionBuilderSupport}. * * @author Rob Winch + * @author Rossen Stoyanchev * @since 4.2 */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration @WebAppConfiguration -@SuppressWarnings({"rawtypes","deprecation"}) public class MockMvcConnectionBuilderSupportTests { - private WebConnection delegateConnection; - - private WebClient webClient; - @Autowired private WebApplicationContext wac; - private MockMvc mockMvc; + private WebClient client; + + private MockMvcWebConnectionBuilderSupport builder; - private WebConnection connection; @Before public void setup() { - delegateConnection = mock(WebConnection.class); - - webClient = mock(WebClient.class); - when(webClient.getWebConnection()).thenReturn(delegateConnection); - - - mockMvc = MockMvcBuilders.webAppContextSetup(wac).build(); - - connection = new MockMvcWebConnectionBuilderSupport(mockMvc){} - .createConnection(webClient); + this.client = mock(WebClient.class); + when(this.client.getWebConnection()).thenReturn(mock(WebConnection.class)); + this.builder = new MockMvcWebConnectionBuilderSupport(this.wac) {}; } + @Test(expected = IllegalArgumentException.class) public void constructorMockMvcNull() { - new MockMvcWebConnectionBuilderSupport((MockMvc)null){}; + new MockMvcWebConnectionBuilderSupport((MockMvc) null){}; } @Test(expected = IllegalArgumentException.class) public void constructorContextNull() { - new MockMvcWebConnectionBuilderSupport((WebApplicationContext)null){}; - } - - @Test - public void contextDeprecated() throws Exception { - connection = new MockMvcWebConnectionBuilderSupport(wac) {} - .createConnection(webClient); - - assertMvcProcessed("http://localhost/"); - assertDelegateProcessed("http://example.com/"); - } - - @Test - public void mockMvcDeprecated() throws Exception { - assertMvcProcessed("http://localhost/"); - assertDelegateProcessed("http://example.com/"); - } - - @Test - public void mockMvcExampleDotComDeprecated() throws Exception { - connection = new MockMvcWebConnectionBuilderSupport(wac) {} - .useMockMvcForHosts("example.com") - .createConnection(delegateConnection); - - assertMvcProcessed("http://localhost/"); - assertMvcProcessed("http://example.com/"); - assertDelegateProcessed("http://other.com/"); - } - - @Test - public void mockMvcAlwaysUseMockMvcDeprecated() throws Exception { - connection = new MockMvcWebConnectionBuilderSupport(wac) {} - .alwaysUseMockMvc() - .createConnection(delegateConnection); - - assertMvcProcessed("http://other.com/"); - } - - @Test - public void defaultContextPathEmptyDeprecated() throws Exception { - connection = new MockMvcWebConnectionBuilderSupport(wac) {} - .createConnection(delegateConnection); - - assertThat(getWebResponse("http://localhost/abc").getContentAsString(), equalTo("")); - } - - @Test - public void defaultContextPathCustomDeprecated() throws Exception { - connection = new MockMvcWebConnectionBuilderSupport(wac) {} - .contextPath("/abc").createConnection(delegateConnection); - - assertThat(getWebResponse("http://localhost/abc/def").getContentAsString(), equalTo("/abc")); + new MockMvcWebConnectionBuilderSupport((WebApplicationContext) null){}; } @Test public void context() throws Exception { - connection = new MockMvcWebConnectionBuilderSupport(wac) {} - .createConnection(webClient); + WebConnection conn = this.builder.createConnection(this.client); - assertMvcProcessed("http://localhost/"); - assertDelegateProcessed("http://example.com/"); + assertMockMvcUsed(conn, "http://localhost/"); + assertMockMvcNotUsed(conn, "http://example.com/"); } @Test public void mockMvc() throws Exception { - assertMvcProcessed("http://localhost/"); - assertDelegateProcessed("http://example.com/"); + MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(wac).build(); + WebConnection conn = new MockMvcWebConnectionBuilderSupport(mockMvc) {}.createConnection(this.client); + + assertMockMvcUsed(conn, "http://localhost/"); + assertMockMvcNotUsed(conn, "http://example.com/"); } @Test public void mockMvcExampleDotCom() throws Exception { - connection = new MockMvcWebConnectionBuilderSupport(wac) {} - .useMockMvcForHosts("example.com") - .createConnection(webClient); + WebConnection conn = this.builder.useMockMvcForHosts("example.com").createConnection(this.client); - assertMvcProcessed("http://localhost/"); - assertMvcProcessed("http://example.com/"); - assertDelegateProcessed("http://other.com/"); + assertMockMvcUsed(conn, "http://localhost/"); + assertMockMvcUsed(conn, "http://example.com/"); + assertMockMvcNotUsed(conn, "http://other.com/"); } @Test public void mockMvcAlwaysUseMockMvc() throws Exception { - connection = new MockMvcWebConnectionBuilderSupport(wac) {} - .alwaysUseMockMvc() - .createConnection(webClient); - - assertMvcProcessed("http://other.com/"); + WebConnection conn = this.builder.alwaysUseMockMvc().createConnection(this.client); + assertMockMvcUsed(conn, "http://other.com/"); } @Test public void defaultContextPathEmpty() throws Exception { - connection = new MockMvcWebConnectionBuilderSupport(wac) {} - .createConnection(webClient); - - assertThat(getWebResponse("http://localhost/abc").getContentAsString(), equalTo("")); + WebConnection conn = this.builder.createConnection(this.client); + assertThat(getResponse(conn, "http://localhost/abc").getContentAsString(), equalTo("")); } @Test public void defaultContextPathCustom() throws Exception { - connection = new MockMvcWebConnectionBuilderSupport(wac) {} - .contextPath("/abc").createConnection(webClient); - - assertThat(getWebResponse("http://localhost/abc/def").getContentAsString(), equalTo("/abc")); + WebConnection conn = this.builder.contextPath("/abc").createConnection(this.client); + assertThat(getResponse(conn, "http://localhost/abc/def").getContentAsString(), equalTo("/abc")); } - private void assertMvcProcessed(String url) throws Exception { - assertThat(getWebResponse(url), notNullValue()); + + private void assertMockMvcUsed(WebConnection connection, String url) throws Exception { + assertThat(getResponse(connection, url), notNullValue()); } - private void assertDelegateProcessed(String url) throws Exception { - assertThat(getWebResponse(url), nullValue()); + private void assertMockMvcNotUsed(WebConnection connection, String url) throws Exception { + assertThat(getResponse(connection, url), nullValue()); } - private WebResponse getWebResponse(String url) throws IOException { + private WebResponse getResponse(WebConnection connection, String url) throws IOException { return connection.getResponse(new WebRequest(new URL(url))); } @Configuration @EnableWebMvc + @SuppressWarnings("unused") static class Config { @RestController diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java index d07c86faffe..c8e4b096009 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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 @@ -18,9 +18,12 @@ package org.springframework.test.web.servlet.htmlunit; import java.io.IOException; import java.net.URL; - import javax.servlet.http.HttpServletRequest; +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.WebRequest; +import com.gargoylesoftware.htmlunit.WebResponse; +import com.gargoylesoftware.htmlunit.util.Cookie; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,20 +43,16 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.WebRequest; -import com.gargoylesoftware.htmlunit.WebResponse; -import com.gargoylesoftware.htmlunit.util.Cookie; - -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; -import static org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuilder.*; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.not; +import static org.junit.Assert.assertThat; /** * Integration tests for {@link MockMvcWebClientBuilder}. * * @author Rob Winch * @author Sam Brannen + * @author Rossen Stoyanchev * @since 4.2 */ @RunWith(SpringJUnit4ClassRunner.class) @@ -61,8 +60,6 @@ import static org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuil @WebAppConfiguration public class MockMvcWebClientBuilderTests { - private WebClient webClient; - @Autowired private WebApplicationContext wac; @@ -74,54 +71,55 @@ public class MockMvcWebClientBuilderTests { this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); } + @Test(expected = IllegalArgumentException.class) public void mockMvcSetupNull() { - mockMvcSetup(null); + MockMvcWebClientBuilder.mockMvcSetup(null); } @Test(expected = IllegalArgumentException.class) public void webAppContextSetupNull() { - webAppContextSetup(null); + MockMvcWebClientBuilder.webAppContextSetup(null); } @Test public void mockMvcSetupWithDefaultWebClientDelegate() throws Exception { - this.webClient = mockMvcSetup(this.mockMvc).build(); + WebClient client = MockMvcWebClientBuilder.mockMvcSetup(this.mockMvc).build(); - assertMvcProcessed("http://localhost/test"); - Assume.group(TestGroup.PERFORMANCE, () -> assertDelegateProcessed("http://example.com/")); + assertMockMvcUsed(client, "http://localhost/test"); + Assume.group(TestGroup.PERFORMANCE, () -> assertMockMvcNotUsed(client, "http://example.com/")); } @Test public void mockMvcSetupWithCustomWebClientDelegate() throws Exception { - WebClient preconfiguredWebClient = new WebClient(); - this.webClient = mockMvcSetup(this.mockMvc).withDelegate(preconfiguredWebClient).build(); + WebClient otherClient = new WebClient(); + WebClient client = MockMvcWebClientBuilder.mockMvcSetup(this.mockMvc).withDelegate(otherClient).build(); - assertMvcProcessed("http://localhost/test"); - Assume.group(TestGroup.PERFORMANCE, () -> assertDelegateProcessed("http://example.com/")); + assertMockMvcUsed(client, "http://localhost/test"); + Assume.group(TestGroup.PERFORMANCE, () -> assertMockMvcNotUsed(client, "http://example.com/")); } - // SPR-14066 - @Test + @Test // SPR-14066 public void cookieManagerShared() throws Exception { this.mockMvc = MockMvcBuilders.standaloneSetup(new CookieController()).build(); - this.webClient = mockMvcSetup(this.mockMvc).build(); + WebClient client = MockMvcWebClientBuilder.mockMvcSetup(this.mockMvc).build(); - assertThat(getWebResponse("http://localhost/").getContentAsString(), equalTo("")); - this.webClient.getCookieManager().addCookie(new Cookie("localhost", "cookie", "cookieManagerShared")); - assertThat(getWebResponse("http://localhost/").getContentAsString(), equalTo("cookieManagerShared")); + assertThat(getResponse(client, "http://localhost/").getContentAsString(), equalTo("")); + client.getCookieManager().addCookie(new Cookie("localhost", "cookie", "cookieManagerShared")); + assertThat(getResponse(client, "http://localhost/").getContentAsString(), equalTo("cookieManagerShared")); } - private void assertMvcProcessed(String url) throws Exception { - assertThat(getWebResponse(url).getContentAsString(), equalTo("mvc")); + + private void assertMockMvcUsed(WebClient client, String url) throws Exception { + assertThat(getResponse(client, url).getContentAsString(), equalTo("mvc")); } - private void assertDelegateProcessed(String url) throws Exception { - assertThat(getWebResponse(url).getContentAsString(), not(equalTo("mvc"))); + private void assertMockMvcNotUsed(WebClient client, String url) throws Exception { + assertThat(getResponse(client, url).getContentAsString(), not(equalTo("mvc"))); } - private WebResponse getWebResponse(String url) throws IOException { - return this.webClient.getWebConnection().getResponse(new WebRequest(new URL(url))); + private WebResponse getResponse(WebClient client, String url) throws IOException { + return client.getWebConnection().getResponse(new WebRequest(new URL(url))); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilderTests.java index 3a1bf27a373..0f2ec38b953 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilderTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/webdriver/MockMvcHtmlUnitDriverBuilderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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 @@ -17,13 +17,12 @@ package org.springframework.test.web.servlet.htmlunit.webdriver; import java.io.IOException; - import javax.servlet.http.HttpServletRequest; +import com.gargoylesoftware.htmlunit.util.Cookie; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; - import org.openqa.selenium.htmlunit.HtmlUnitDriver; import org.springframework.beans.factory.annotation.Autowired; @@ -41,11 +40,12 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import com.gargoylesoftware.htmlunit.util.Cookie; - -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; -import static org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDriverBuilder.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.not; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; /** * Integration tests for {@link MockMvcHtmlUnitDriverBuilder}. @@ -68,71 +68,71 @@ public class MockMvcHtmlUnitDriverBuilderTests { private HtmlUnitDriver driver; + @Before public void setup() { this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); } + @Test(expected = IllegalArgumentException.class) public void webAppContextSetupNull() { - webAppContextSetup(null); + MockMvcHtmlUnitDriverBuilder.webAppContextSetup(null); } @Test(expected = IllegalArgumentException.class) public void mockMvcSetupNull() { - mockMvcSetup(null); + MockMvcHtmlUnitDriverBuilder.mockMvcSetup(null); } @Test public void mockMvcSetupWithCustomDriverDelegate() throws Exception { - WebConnectionHtmlUnitDriver preconfiguredDriver = new WebConnectionHtmlUnitDriver(); - this.driver = mockMvcSetup(this.mockMvc).withDelegate(preconfiguredDriver).build(); + WebConnectionHtmlUnitDriver otherDriver = new WebConnectionHtmlUnitDriver(); + this.driver = MockMvcHtmlUnitDriverBuilder.mockMvcSetup(this.mockMvc).withDelegate(otherDriver).build(); - assertMvcProcessed("http://localhost/test"); - Assume.group(TestGroup.PERFORMANCE, () -> assertDelegateProcessed("http://example.com/")); + assertMockMvcUsed("http://localhost/test"); + Assume.group(TestGroup.PERFORMANCE, () -> assertMockMvcNotUsed("http://example.com/")); } @Test public void mockMvcSetupWithDefaultDriverDelegate() throws Exception { - this.driver = mockMvcSetup(this.mockMvc).build(); + this.driver = MockMvcHtmlUnitDriverBuilder.mockMvcSetup(this.mockMvc).build(); - assertMvcProcessed("http://localhost/test"); - Assume.group(TestGroup.PERFORMANCE, () -> assertDelegateProcessed("http://example.com/")); + assertMockMvcUsed("http://localhost/test"); + Assume.group(TestGroup.PERFORMANCE, () -> assertMockMvcNotUsed("http://example.com/")); } @Test public void javaScriptEnabledByDefault() { - this.driver = mockMvcSetup(this.mockMvc).build(); - + this.driver = MockMvcHtmlUnitDriverBuilder.mockMvcSetup(this.mockMvc).build(); assertTrue(this.driver.isJavascriptEnabled()); } @Test public void javaScriptDisabled() { - this.driver = mockMvcSetup(this.mockMvc).javascriptEnabled(false).build(); - + this.driver = MockMvcHtmlUnitDriverBuilder.mockMvcSetup(this.mockMvc).javascriptEnabled(false).build(); assertFalse(this.driver.isJavascriptEnabled()); } - // SPR-14066 - @Test + @Test // SPR-14066 public void cookieManagerShared() throws Exception { - WebConnectionHtmlUnitDriver delegateDriver = new WebConnectionHtmlUnitDriver(); + WebConnectionHtmlUnitDriver otherDriver = new WebConnectionHtmlUnitDriver(); this.mockMvc = MockMvcBuilders.standaloneSetup(new CookieController()).build(); - this.driver = mockMvcSetup(this.mockMvc) - .withDelegate(delegateDriver) - .build(); + this.driver = MockMvcHtmlUnitDriverBuilder.mockMvcSetup(this.mockMvc) + .withDelegate(otherDriver).build(); assertThat(get("http://localhost/"), equalTo("")); - delegateDriver.getWebClient().getCookieManager().addCookie(new Cookie("localhost", "cookie", "cookieManagerShared")); + Cookie cookie = new Cookie("localhost", "cookie", "cookieManagerShared"); + otherDriver.getWebClient().getCookieManager().addCookie(cookie); assertThat(get("http://localhost/"), equalTo("cookieManagerShared")); } - private void assertMvcProcessed(String url) throws Exception { + + private void assertMockMvcUsed(String url) throws Exception { assertThat(get(url), containsString(EXPECTED_BODY)); } - private void assertDelegateProcessed(String url) throws Exception { + private void assertMockMvcNotUsed(String url) throws Exception { assertThat(get(url), not(containsString(EXPECTED_BODY))); }