Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix package imports for Spring MVC Test classes

  • Loading branch information...
commit 63bbfe96ae76bc071653653ae1464a37a941912a 1 parent c789b7f
@rstoyanchev rstoyanchev authored
Showing with 93 additions and 96 deletions.
  1. +5 −5 src/test/java/org/springframework/samples/mvc/async/CallableControllerTests.java
  2. +5 −5 src/test/java/org/springframework/samples/mvc/convert/ConvertControllerTests.java
  3. +4 −4 src/test/java/org/springframework/samples/mvc/data/CustomArgumentControllerTests.java
  4. +6 −6 src/test/java/org/springframework/samples/mvc/data/DataControllerTests.java
  5. +7 −7 src/test/java/org/springframework/samples/mvc/data/StandardArgumentsControllerTests.java
  6. +5 −5 src/test/java/org/springframework/samples/mvc/exceptions/ExceptionControllerTests.java
  7. +3 −3 src/test/java/org/springframework/samples/mvc/fileupload/FileUploadControllerTests.java
  8. +13 −13 src/test/java/org/springframework/samples/mvc/form/FormControllerTests.java
  9. +8 −8 src/test/java/org/springframework/samples/mvc/mapping/MappingControllerTests.java
  10. +7 −7 src/test/java/org/springframework/samples/mvc/messageconverters/MessageConvertersControllerTests.java
  11. +5 −5 src/test/java/org/springframework/samples/mvc/redirect/RedirectControllerTests.java
  12. +6 −7 src/test/java/org/springframework/samples/mvc/response/ResponseControllerTests.java
  13. +4 −4 src/test/java/org/springframework/samples/mvc/simple/SimpleControllerRevisitedTests.java
  14. +4 −4 src/test/java/org/springframework/samples/mvc/simple/SimpleControllerTests.java
  15. +5 −7 src/test/java/org/springframework/samples/mvc/validation/ValidationControllerTests.java
  16. +6 −6 src/test/java/org/springframework/samples/mvc/views/ViewsControllerTests.java
View
10 src/test/java/org/springframework/samples/mvc/async/CallableControllerTests.java
@@ -1,17 +1,17 @@
package org.springframework.samples.mvc.async;
import static org.hamcrest.Matchers.instanceOf;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.request;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.webAppContextSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.samples.mvc.AbstractContextControllerTests;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
@RunWith(SpringJUnit4ClassRunner.class)
public class CallableControllerTests extends AbstractContextControllerTests {
View
10 src/test/java/org/springframework/samples/mvc/convert/ConvertControllerTests.java
@@ -1,16 +1,16 @@
package org.springframework.samples.mvc.convert;
import static org.hamcrest.Matchers.startsWith;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
import org.junit.Before;
import org.junit.Test;
import org.springframework.format.support.DefaultFormattingConversionService;
import org.springframework.format.support.FormattingConversionService;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
public class ConvertControllerTests {
View
8 src/test/java/org/springframework/samples/mvc/data/CustomArgumentControllerTests.java
@@ -1,14 +1,14 @@
package org.springframework.samples.mvc.data;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
import org.junit.Before;
import org.junit.Test;
import org.springframework.samples.mvc.data.custom.CustomArgumentController;
import org.springframework.samples.mvc.data.custom.CustomArgumentResolver;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
public class CustomArgumentControllerTests {
private MockMvc mockMvc;
View
12 src/test/java/org/springframework/samples/mvc/data/DataControllerTests.java
@@ -1,16 +1,16 @@
package org.springframework.samples.mvc.data;
import static org.hamcrest.Matchers.startsWith;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
import org.junit.Before;
import org.junit.Test;
import org.springframework.http.MediaType;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
public class DataControllerTests {
View
14 src/test/java/org/springframework/samples/mvc/data/StandardArgumentsControllerTests.java
@@ -1,17 +1,17 @@
package org.springframework.samples.mvc.data;
import static org.hamcrest.Matchers.startsWith;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
import org.junit.Before;
import org.junit.Test;
import org.springframework.http.MediaType;
import org.springframework.samples.mvc.data.standard.StandardArgumentsController;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
public class StandardArgumentsControllerTests {
private MockMvc mockMvc;
@@ -25,7 +25,7 @@ public void setup() throws Exception {
public void request() throws Exception {
this.mockMvc.perform(get("/data/standard/request"))
.andExpect(content().string(startsWith(
- "request = org.springframework.test.web.mock.servlet.request.Servlet3MockHttpServletRequest@")));
+ "request = org.springframework.test.web.servlet.request.Servlet3MockHttpServletRequest@")));
}
@Test
View
10 src/test/java/org/springframework/samples/mvc/exceptions/ExceptionControllerTests.java
@@ -1,16 +1,16 @@
package org.springframework.samples.mvc.exceptions;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.webAppContextSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.samples.mvc.AbstractContextControllerTests;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
@RunWith(SpringJUnit4ClassRunner.class)
public class ExceptionControllerTests extends AbstractContextControllerTests {
View
6 src/test/java/org/springframework/samples/mvc/fileupload/FileUploadControllerTests.java
@@ -1,8 +1,8 @@
package org.springframework.samples.mvc.fileupload;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.fileUpload;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.model;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.webAppContextSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.fileUpload;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
import org.junit.Test;
import org.junit.runner.RunWith;
View
26 src/test/java/org/springframework/samples/mvc/form/FormControllerTests.java
@@ -1,17 +1,18 @@
package org.springframework.samples.mvc.form;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.flash;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.model;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.redirectedUrl;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.view;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.flash;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
import org.junit.Before;
import org.junit.Test;
import org.springframework.http.MediaType;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
import org.springframework.web.servlet.view.InternalResourceViewResolver;
public class FormControllerTests {
@@ -32,10 +33,9 @@ public void setup() throws Exception {
public void submitSuccess() throws Exception {
this.mockMvc.perform(
post("/form")
- .contentType(MediaType.APPLICATION_FORM_URLENCODED)
.param("name", "Joe")
.param("age", "56")
- .param("birthDate", "1941/12/16")
+ .param("birthDate", "1941-12-16")
.param("phone", "(347) 888-1234")
.param("currency", "$123.33")
.param("percent", "89%")
@@ -46,6 +46,7 @@ public void submitSuccess() throws Exception {
.param("additionalInfo[java]", "true")
.param("_additionalInfo[java]", "on")
.param("subscribeNewsletter", "false"))
+ .andDo(print())
.andExpect(status().isMovedTemporarily())
.andExpect(redirectedUrl("/form"))
.andExpect(flash().attribute("message",
@@ -59,11 +60,10 @@ public void submitSuccess() throws Exception {
public void submitSuccessAjax() throws Exception {
this.mockMvc.perform(
post("/form")
- .contentType(MediaType.APPLICATION_FORM_URLENCODED)
.header("X-Requested-With", "XMLHttpRequest")
.param("name", "Joe")
.param("age", "56")
- .param("birthDate", "1941/12/16")
+ .param("birthDate", "1941-12-16")
.param("phone", "(347) 888-1234")
.param("currency", "$123.33")
.param("percent", "89%")
@@ -87,7 +87,7 @@ public void submitSuccessAjax() throws Exception {
@Test
public void submitError() throws Exception {
this.mockMvc.perform(
- post("/form").contentType(MediaType.APPLICATION_FORM_URLENCODED))
+ post("/form"))
.andExpect(status().isOk())
.andExpect(view().name("form"))
.andExpect(model().errorCount(2))
View
16 src/test/java/org/springframework/samples/mvc/mapping/MappingControllerTests.java
@@ -1,13 +1,13 @@
package org.springframework.samples.mvc.mapping;
import static org.hamcrest.Matchers.startsWith;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.xpath;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.webAppContextSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.xpath;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
import org.junit.Before;
import org.junit.Test;
@@ -15,7 +15,7 @@
import org.springframework.http.MediaType;
import org.springframework.samples.mvc.AbstractContextControllerTests;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
@RunWith(SpringJUnit4ClassRunner.class)
public class MappingControllerTests extends AbstractContextControllerTests {
View
14 ...a/org/springframework/samples/mvc/messageconverters/MessageConvertersControllerTests.java
@@ -1,11 +1,11 @@
package org.springframework.samples.mvc.messageconverters;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.webAppContextSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
import org.junit.Before;
import org.junit.Test;
@@ -13,7 +13,7 @@
import org.springframework.http.MediaType;
import org.springframework.samples.mvc.AbstractContextControllerTests;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
@RunWith(SpringJUnit4ClassRunner.class)
public class MessageConvertersControllerTests extends AbstractContextControllerTests {
View
10 src/test/java/org/springframework/samples/mvc/redirect/RedirectControllerTests.java
@@ -1,14 +1,14 @@
package org.springframework.samples.mvc.redirect;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.redirectedUrl;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
import org.junit.Before;
import org.junit.Test;
import org.springframework.format.support.DefaultFormattingConversionService;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
public class RedirectControllerTests {
View
13 src/test/java/org/springframework/samples/mvc/response/ResponseControllerTests.java
@@ -1,17 +1,17 @@
package org.springframework.samples.mvc.response;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
import java.nio.charset.Charset;
import org.junit.Before;
import org.junit.Test;
import org.springframework.http.MediaType;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
public class ResponseControllerTests {
@@ -34,7 +34,6 @@ public void responseCharsetAccept() throws Exception {
this.mockMvc.perform(
get("/response/charset/accept")
.accept(new MediaType("text", "plain", Charset.forName("UTF-8"))))
- .andDo(print())
.andExpect(status().isOk())
.andExpect(content().string(
"\u3053\u3093\u306b\u3061\u306f\u4e16\u754c\uff01 (\"Hello world!\" in Japanese)"));
View
8 src/test/java/org/springframework/samples/mvc/simple/SimpleControllerRevisitedTests.java
@@ -1,9 +1,9 @@
package org.springframework.samples.mvc.simple;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
import org.junit.Test;
import org.springframework.http.MediaType;
View
8 src/test/java/org/springframework/samples/mvc/simple/SimpleControllerTests.java
@@ -1,9 +1,9 @@
package org.springframework.samples.mvc.simple;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
import org.junit.Test;
View
12 src/test/java/org/springframework/samples/mvc/validation/ValidationControllerTests.java
@@ -1,14 +1,13 @@
package org.springframework.samples.mvc.validation;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
import org.junit.Before;
import org.junit.Test;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
public class ValidationControllerTests {
@@ -28,7 +27,6 @@ public void validateSuccess() throws Exception {
@Test
public void validateErrors() throws Exception {
this.mockMvc.perform(get("/validate?number=3&date=2010-07-01"))
- .andDo(print())
.andExpect(content().string("Object has validation errors"));
}
View
12 src/test/java/org/springframework/samples/mvc/views/ViewsControllerTests.java
@@ -1,18 +1,18 @@
package org.springframework.samples.mvc.views;
import static org.hamcrest.Matchers.containsString;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.model;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.view;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.webAppContextSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.samples.mvc.AbstractContextControllerTests;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
@RunWith(SpringJUnit4ClassRunner.class)
public class ViewsControllerTests extends AbstractContextControllerTests {
Please sign in to comment.
Something went wrong with that request. Please try again.