Polish
This commit is contained in:
parent
7d96ad1f6e
commit
d3822c8d19
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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<T extends MockMvcWebCon
|
|||
|
||||
private final MockMvc mockMvc;
|
||||
|
||||
private final List<WebRequestMatcher> mockMvcRequestMatchers = new ArrayList<WebRequestMatcher>();
|
||||
private final List<WebRequestMatcher> requestMatchers = new ArrayList<WebRequestMatcher>();
|
||||
|
||||
private String contextPath = "";
|
||||
|
||||
|
|
@ -58,7 +59,7 @@ public abstract class MockMvcWebConnectionBuilderSupport<T extends MockMvcWebCon
|
|||
protected MockMvcWebConnectionBuilderSupport(MockMvc mockMvc) {
|
||||
Assert.notNull(mockMvc, "MockMvc must not be null");
|
||||
this.mockMvc = mockMvc;
|
||||
this.mockMvcRequestMatchers.add(new HostRequestMatcher("localhost"));
|
||||
this.requestMatchers.add(new HostRequestMatcher("localhost"));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -117,7 +118,7 @@ public abstract class MockMvcWebConnectionBuilderSupport<T extends MockMvcWebCon
|
|||
@SuppressWarnings("unchecked")
|
||||
public T useMockMvc(WebRequestMatcher... matchers) {
|
||||
for (WebRequestMatcher matcher : matchers) {
|
||||
this.mockMvcRequestMatchers.add(matcher);
|
||||
this.requestMatchers.add(matcher);
|
||||
}
|
||||
return (T) this;
|
||||
}
|
||||
|
|
@ -131,7 +132,7 @@ public abstract class MockMvcWebConnectionBuilderSupport<T extends MockMvcWebCon
|
|||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public T useMockMvcForHosts(String... hosts) {
|
||||
this.mockMvcRequestMatchers.add(new HostRequestMatcher(hosts));
|
||||
this.requestMatchers.add(new HostRequestMatcher(hosts));
|
||||
return (T) this;
|
||||
}
|
||||
|
||||
|
|
@ -165,38 +166,23 @@ public abstract class MockMvcWebConnectionBuilderSupport<T extends MockMvcWebCon
|
|||
* @see #alwaysUseMockMvc()
|
||||
* @see #useMockMvc(WebRequestMatcher...)
|
||||
* @see #useMockMvcForHosts(String...)
|
||||
* @since 4.3
|
||||
*/
|
||||
protected final WebConnection createConnection(WebClient webClient) {
|
||||
Assert.notNull(webClient, "WebClient must not be null");
|
||||
return createConnection(webClient, webClient.getWebConnection());
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new {@link WebConnection} that will use a {@link MockMvc}
|
||||
* instance if one of the specified {@link WebRequestMatcher} instances
|
||||
* matches.
|
||||
* @param webClient the WebClient to use if none of
|
||||
* the specified {@code WebRequestMatcher} instances matches; never {@code null}
|
||||
* @param defaultConnection the WebConnection to use
|
||||
* @return a new {@code WebConnection} that will use a {@code MockMvc}
|
||||
* instance if one of the specified {@code WebRequestMatcher} matches
|
||||
* @see #alwaysUseMockMvc()
|
||||
* @see #useMockMvc(WebRequestMatcher...)
|
||||
* @see #useMockMvcForHosts(String...)
|
||||
*/
|
||||
private WebConnection createConnection(WebClient webClient, WebConnection defaultConnection) {
|
||||
MockMvcWebConnection mockMvcWebConnection = new MockMvcWebConnection(this.mockMvc, webClient, this.contextPath);
|
||||
|
||||
WebConnection connection = new MockMvcWebConnection(this.mockMvc, webClient, this.contextPath);
|
||||
if (this.alwaysUseMockMvc) {
|
||||
return mockMvcWebConnection;
|
||||
return connection;
|
||||
}
|
||||
|
||||
List<DelegatingWebConnection.DelegateWebConnection> delegates = new ArrayList<DelegatingWebConnection.DelegateWebConnection>(
|
||||
this.mockMvcRequestMatchers.size());
|
||||
for (WebRequestMatcher matcher : this.mockMvcRequestMatchers) {
|
||||
delegates.add(new DelegatingWebConnection.DelegateWebConnection(matcher, mockMvcWebConnection));
|
||||
List<DelegateWebConnection> delegates = new ArrayList<DelegateWebConnection>(this.requestMatchers.size());
|
||||
for (WebRequestMatcher matcher : this.requestMatchers) {
|
||||
delegates.add(new DelegateWebConnection(matcher, connection));
|
||||
}
|
||||
|
||||
return new DelegatingWebConnection(defaultConnection, delegates);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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,39 +51,30 @@ 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){};
|
||||
|
|
@ -95,123 +85,67 @@ public class MockMvcConnectionBuilderSupportTests {
|
|||
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"));
|
||||
}
|
||||
|
||||
@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
|
||||
|
|
|
|||
|
|
@ -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)));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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)));
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue