From c996f8ccd5d45f5e6e1292ac9b08ba6f7f39eff5 Mon Sep 17 00:00:00 2001 From: Sunil Gulabani Date: Wed, 3 Aug 2016 15:04:36 +0530 Subject: [PATCH 1/2] Updated formatting. --- .../baeldung/spring/ApplicationConfig.java | 14 +- .../com/baeldung/spring/bean/Greeting.java | 33 ++--- .../spring/controller/GreetController.java | 98 +++++++------- .../src/main/webapp/WEB-INF/jsp/index.jsp | 6 +- .../main/webapp/WEB-INF/spring-servlet.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 53 ++++---- .../GreetControllerIntegrationTest.java | 121 +++++++----------- .../controller/GreetControllerTest.java | 106 +++++++-------- 8 files changed, 195 insertions(+), 238 deletions(-) diff --git a/spring-mvc-test/src/main/java/com/baeldung/spring/ApplicationConfig.java b/spring-mvc-test/src/main/java/com/baeldung/spring/ApplicationConfig.java index 1a5b590854..09be5ee113 100644 --- a/spring-mvc-test/src/main/java/com/baeldung/spring/ApplicationConfig.java +++ b/spring-mvc-test/src/main/java/com/baeldung/spring/ApplicationConfig.java @@ -12,14 +12,14 @@ import org.springframework.web.servlet.view.JstlView; @EnableWebMvc @Configuration -@ComponentScan(basePackages = {"com.baeldung.spring.controller"}) +@ComponentScan(basePackages = { "com.baeldung.spring.controller" }) public class ApplicationConfig extends WebMvcConfigurerAdapter { - public ApplicationConfig() { - super(); - } - - @Override + public ApplicationConfig() { + super(); + } + + @Override public void addViewControllers(final ViewControllerRegistry registry) { super.addViewControllers(registry); registry.addViewController("/").setViewName("index"); @@ -27,7 +27,7 @@ public class ApplicationConfig extends WebMvcConfigurerAdapter { @Bean public ViewResolver viewResolver() { - final InternalResourceViewResolver bean = new InternalResourceViewResolver(); + final InternalResourceViewResolver bean = new InternalResourceViewResolver(); bean.setViewClass(JstlView.class); bean.setPrefix("/WEB-INF/jsp/"); bean.setSuffix(".jsp"); diff --git a/spring-mvc-test/src/main/java/com/baeldung/spring/bean/Greeting.java b/spring-mvc-test/src/main/java/com/baeldung/spring/bean/Greeting.java index d7ddaf2fd1..11c0a79b0e 100644 --- a/spring-mvc-test/src/main/java/com/baeldung/spring/bean/Greeting.java +++ b/spring-mvc-test/src/main/java/com/baeldung/spring/bean/Greeting.java @@ -1,19 +1,22 @@ package com.baeldung.spring.bean; public class Greeting { - private int id; - private String message; - - public int getId() { - return id; - } - public void setId(int id) { - this.id = id; - } - public String getMessage() { - return message; - } - public void setMessage(String message) { - this.message = message; - } + private int id; + private String message; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } } diff --git a/spring-mvc-test/src/main/java/com/baeldung/spring/controller/GreetController.java b/spring-mvc-test/src/main/java/com/baeldung/spring/controller/GreetController.java index 0f62df2a71..d563f80918 100644 --- a/spring-mvc-test/src/main/java/com/baeldung/spring/controller/GreetController.java +++ b/spring-mvc-test/src/main/java/com/baeldung/spring/controller/GreetController.java @@ -11,54 +11,54 @@ import com.baeldung.spring.bean.Greeting; @Controller public class GreetController { - - @RequestMapping(value = "/homePage", method = RequestMethod.GET) - public String index() { - return "index"; - } - - @RequestMapping(value = "/greet", method = RequestMethod.GET, produces = "application/json") - @ResponseBody - public Greeting greet() { - Greeting greeting = new Greeting(); - greeting.setId(1); - greeting.setMessage("Hello World!!!"); - return greeting; - } - - @RequestMapping(value = "/greetWithPathVariable/{name}", method = RequestMethod.GET, produces = "application/json") - @ResponseBody - public Greeting greetWithPathVariable(@PathVariable("name") String name) { - Greeting greeting = new Greeting(); - greeting.setId(1); - greeting.setMessage("Hello World " + name + "!!!"); - return greeting; - } - - @RequestMapping(value = "/greetWithQueryVariable", method = RequestMethod.GET, produces = "application/json") - @ResponseBody - public Greeting greetWithQueryVariable(@RequestParam("name") String name) { - Greeting greeting = new Greeting(); - greeting.setId(1); - greeting.setMessage("Hello World " + name + "!!!"); - return greeting; - } - - @RequestMapping(value = "/greetWithPost", method = RequestMethod.POST, produces = "application/json") - @ResponseBody - public Greeting greetWithPost() { - Greeting greeting = new Greeting(); - greeting.setId(1); - greeting.setMessage("Hello World!!!"); - return greeting; - } - @RequestMapping(value = "/greetWithPostAndFormData", method = RequestMethod.POST, produces = "application/json") - @ResponseBody - public Greeting greetWithPostAndFormData(@RequestParam("id") int id, @RequestParam("name") String name) { - Greeting greeting = new Greeting(); - greeting.setId(id); - greeting.setMessage("Hello World " + name + "!!!"); - return greeting; - } + @RequestMapping(value = "/homePage", method = RequestMethod.GET) + public String index() { + return "index"; + } + + @RequestMapping(value = "/greet", method = RequestMethod.GET, produces = "application/json") + @ResponseBody + public Greeting greet() { + Greeting greeting = new Greeting(); + greeting.setId(1); + greeting.setMessage("Hello World!!!"); + return greeting; + } + + @RequestMapping(value = "/greetWithPathVariable/{name}", method = RequestMethod.GET, produces = "application/json") + @ResponseBody + public Greeting greetWithPathVariable(@PathVariable("name") String name) { + Greeting greeting = new Greeting(); + greeting.setId(1); + greeting.setMessage("Hello World " + name + "!!!"); + return greeting; + } + + @RequestMapping(value = "/greetWithQueryVariable", method = RequestMethod.GET, produces = "application/json") + @ResponseBody + public Greeting greetWithQueryVariable(@RequestParam("name") String name) { + Greeting greeting = new Greeting(); + greeting.setId(1); + greeting.setMessage("Hello World " + name + "!!!"); + return greeting; + } + + @RequestMapping(value = "/greetWithPost", method = RequestMethod.POST, produces = "application/json") + @ResponseBody + public Greeting greetWithPost() { + Greeting greeting = new Greeting(); + greeting.setId(1); + greeting.setMessage("Hello World!!!"); + return greeting; + } + + @RequestMapping(value = "/greetWithPostAndFormData", method = RequestMethod.POST, produces = "application/json") + @ResponseBody + public Greeting greetWithPostAndFormData(@RequestParam("id") int id, @RequestParam("name") String name) { + Greeting greeting = new Greeting(); + greeting.setId(id); + greeting.setMessage("Hello World " + name + "!!!"); + return greeting; + } } \ No newline at end of file diff --git a/spring-mvc-test/src/main/webapp/WEB-INF/jsp/index.jsp b/spring-mvc-test/src/main/webapp/WEB-INF/jsp/index.jsp index 89c7ca6c81..2cf02bc2d8 100644 --- a/spring-mvc-test/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/spring-mvc-test/src/main/webapp/WEB-INF/jsp/index.jsp @@ -1,5 +1,5 @@ - -

Spring MVC - Integration Testing

- + +

Spring MVC - Integration Testing

+ \ No newline at end of file diff --git a/spring-mvc-test/src/main/webapp/WEB-INF/spring-servlet.xml b/spring-mvc-test/src/main/webapp/WEB-INF/spring-servlet.xml index 40718ab3a4..2b8192e742 100644 --- a/spring-mvc-test/src/main/webapp/WEB-INF/spring-servlet.xml +++ b/spring-mvc-test/src/main/webapp/WEB-INF/spring-servlet.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"> \ No newline at end of file diff --git a/spring-mvc-test/src/main/webapp/WEB-INF/web.xml b/spring-mvc-test/src/main/webapp/WEB-INF/web.xml index 8cf7a9a37b..dc0233a7fc 100644 --- a/spring-mvc-test/src/main/webapp/WEB-INF/web.xml +++ b/spring-mvc-test/src/main/webapp/WEB-INF/web.xml @@ -1,34 +1,33 @@ - + - Spring MVC - Integration Testing + Spring MVC - Integration Testing - - contextClass - + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - com.baeldung.spring - - - - org.springframework.web.context.ContextLoaderListener - + + + contextConfigLocation + com.baeldung.spring + - - spring - org.springframework.web.servlet.DispatcherServlet - 1 - - - - spring - / - + + org.springframework.web.context.ContextLoaderListener + + + + spring + org.springframework.web.servlet.DispatcherServlet + 1 + + + + spring + / + \ No newline at end of file diff --git a/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerIntegrationTest.java b/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerIntegrationTest.java index d7d697dda9..368ef6ec91 100644 --- a/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerIntegrationTest.java +++ b/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerIntegrationTest.java @@ -28,87 +28,62 @@ import javax.servlet.ServletContext; @ContextConfiguration(classes = { ApplicationConfig.class }) public class GreetControllerIntegrationTest { - @Autowired - private WebApplicationContext wac; + @Autowired + private WebApplicationContext wac; - private MockMvc mockMvc; + private MockMvc mockMvc; - @Before - public void setup() throws Exception { - this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac) -// .alwaysExpect(MockMvcResultMatchers.status().isOk()) - .build(); - } + @Before + public void setup() throws Exception { + this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); + } - @Test - public void verifyWac() { - ServletContext servletContext = wac.getServletContext(); - Assert.assertNotNull(servletContext); - Assert.assertTrue(servletContext instanceof MockServletContext); - Assert.assertNotNull(wac.getBean("greetController")); - } + @Test + public void verifyWac() { + ServletContext servletContext = wac.getServletContext(); + Assert.assertNotNull(servletContext); + Assert.assertTrue(servletContext instanceof MockServletContext); + Assert.assertNotNull(wac.getBean("greetController")); + } - @Test - public void verifyIndexJspViewName() throws Exception { - this.mockMvc - .perform(MockMvcRequestBuilders.get("/homePage")) - .andDo(print()) - .andExpect(MockMvcResultMatchers.view().name("index")); - } + @Test + public void verifyIndexJspViewName() throws Exception { + this.mockMvc.perform(MockMvcRequestBuilders.get("/homePage")).andDo(print()).andExpect(MockMvcResultMatchers.view().name("index")); + } - @Test - public void verifyGreet() throws Exception { - MvcResult mvcResult = this.mockMvc - .perform(MockMvcRequestBuilders.get("/greet")) - .andDo(print()) - .andExpect(MockMvcResultMatchers.status().isOk()) - .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!")) - .andReturn(); - Assert.assertEquals("application/json;charset=UTF-8", mvcResult.getResponse().getContentType()); - } + @Test + public void verifyGreet() throws Exception { + MvcResult mvcResult = this.mockMvc.perform(MockMvcRequestBuilders.get("/greet")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!")).andReturn(); + Assert.assertEquals("application/json;charset=UTF-8", mvcResult.getResponse().getContentType()); + } - @Test - public void verifyGreetWithPathVariable() throws Exception { - this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithPathVariable/John")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()) - .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")) - .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John!!!")); - } + @Test + public void verifyGreetWithPathVariable() throws Exception { + this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithPathVariable/John")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")) + .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John!!!")); + } - @Test - public void verifyGreetWithPathVariable_2() throws Exception { - this.mockMvc - .perform(MockMvcRequestBuilders.get("/greetWithPathVariable/{name}", "Doe")) - .andDo(print()) - .andExpect(MockMvcResultMatchers.status().isOk()) - .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")) - .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World Doe!!!")); - } + @Test + public void verifyGreetWithPathVariable_2() throws Exception { + this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithPathVariable/{name}", "Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")) + .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World Doe!!!")); + } - @Test - public void verifyGreetWithQueryVariable() throws Exception { - this.mockMvc - .perform(MockMvcRequestBuilders.get("/greetWithQueryVariable").param("name", "John Doe")) - .andDo(print()) - .andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")) - .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")); - } + @Test + public void verifyGreetWithQueryVariable() throws Exception { + this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithQueryVariable").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")); + } - @Test - public void verifyGreetWithPost() throws Exception { - this.mockMvc - .perform(MockMvcRequestBuilders.post("/greetWithPost")) - .andDo(print()) - .andExpect(MockMvcResultMatchers.status().isOk()) - .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")) - .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!")); - } + @Test + public void verifyGreetWithPost() throws Exception { + this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPost")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")) + .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!")); + } - @Test - public void verifyGreetWithPostAndFormData() throws Exception { - this.mockMvc - .perform(MockMvcRequestBuilders.post("/greetWithPostAndFormData").param("id", "1").param("name", "John Doe")) - .andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()) - .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")) - .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")).andExpect(MockMvcResultMatchers.jsonPath("$.id").value(1)); - } + @Test + public void verifyGreetWithPostAndFormData() throws Exception { + this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPostAndFormData").param("id", "1").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")).andExpect(MockMvcResultMatchers.jsonPath("$.id").value(1)); + } } \ No newline at end of file diff --git a/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerTest.java b/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerTest.java index 155b6b4a50..1631118981 100644 --- a/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerTest.java +++ b/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerTest.java @@ -15,69 +15,49 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; public class GreetControllerTest { - - private MockMvc mockMvc; - - @Before - public void setup() { - this.mockMvc = MockMvcBuilders.standaloneSetup(new GreetController()).build(); - } - - @Test - public void verifyIndexJspViewName() throws Exception { - this.mockMvc.perform(get("/homePage")) - .andExpect(view().name("index")); - } - - @Test - public void verifyGreet() throws Exception { - this.mockMvc.perform(get("/greet")) - .andExpect(status().isOk()) - .andExpect(content().contentType("application/json;charset=UTF-8")) - .andExpect(jsonPath("$.message").value("Hello World!!!")); - } - - @Test - public void verifyGreetWithPathVariable() throws Exception { - this.mockMvc.perform(get("/greetWithPathVariable/John")) - .andExpect(status().isOk()) - .andExpect(content().contentType("application/json;charset=UTF-8")) - .andExpect(jsonPath("$.message").value("Hello World John!!!")); - } - - @Test - public void verifyGreetWithPathVariable_2() throws Exception { - this.mockMvc.perform(get("/greetWithPathVariable/{name}","Doe")) - .andExpect(status().isOk()) - .andExpect(content().contentType("application/json;charset=UTF-8")) - .andExpect(jsonPath("$.message").value("Hello World Doe!!!")); - } - - @Test - public void verifyGreetWithQueryVariable() throws Exception { - this.mockMvc - .perform(MockMvcRequestBuilders.get("/greetWithQueryVariable").param("name", "John Doe")) - .andDo(print()) - .andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")) - .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")); - } - @Test - public void verifyGreetWithPost() throws Exception { - this.mockMvc - .perform(MockMvcRequestBuilders.post("/greetWithPost")) - .andDo(print()) - .andExpect(MockMvcResultMatchers.status().isOk()) - .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")) - .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!")); - } + private MockMvc mockMvc; - @Test - public void verifyGreetWithPostAndFormData() throws Exception { - this.mockMvc - .perform(MockMvcRequestBuilders.post("/greetWithPostAndFormData").param("id", "1").param("name", "John Doe")) - .andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()) - .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")) - .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")).andExpect(MockMvcResultMatchers.jsonPath("$.id").value(1)); - } + @Before + public void setup() { + this.mockMvc = MockMvcBuilders.standaloneSetup(new GreetController()).build(); + } + + @Test + public void verifyIndexJspViewName() throws Exception { + this.mockMvc.perform(get("/homePage")).andExpect(view().name("index")); + } + + @Test + public void verifyGreet() throws Exception { + this.mockMvc.perform(get("/greet")).andExpect(status().isOk()).andExpect(content().contentType("application/json;charset=UTF-8")).andExpect(jsonPath("$.message").value("Hello World!!!")); + } + + @Test + public void verifyGreetWithPathVariable() throws Exception { + this.mockMvc.perform(get("/greetWithPathVariable/John")).andExpect(status().isOk()).andExpect(content().contentType("application/json;charset=UTF-8")).andExpect(jsonPath("$.message").value("Hello World John!!!")); + } + + @Test + public void verifyGreetWithPathVariable_2() throws Exception { + this.mockMvc.perform(get("/greetWithPathVariable/{name}", "Doe")).andExpect(status().isOk()).andExpect(content().contentType("application/json;charset=UTF-8")).andExpect(jsonPath("$.message").value("Hello World Doe!!!")); + } + + @Test + public void verifyGreetWithQueryVariable() throws Exception { + this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithQueryVariable").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")); + } + + @Test + public void verifyGreetWithPost() throws Exception { + this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPost")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")) + .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!")); + } + + @Test + public void verifyGreetWithPostAndFormData() throws Exception { + this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPostAndFormData").param("id", "1").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")).andExpect(MockMvcResultMatchers.jsonPath("$.id").value(1)); + } } From 709da6bcd28e55e71e010189847e662f37f963a5 Mon Sep 17 00:00:00 2001 From: Sunil Gulabani Date: Tue, 9 Aug 2016 10:14:59 +0530 Subject: [PATCH 2/2] Updated the test names and added Annotation Based Web Config. --- .../com/baeldung/web/WebAppInitializer.java | 33 +++++++++++++++++++ ...ing-servlet.xml => spring-servlet-old.xml} | 0 .../webapp/WEB-INF/{web.xml => web-old.xml} | 0 .../GreetControllerIntegrationTest.java | 16 ++++----- .../controller/GreetControllerTest.java | 14 ++++---- 5 files changed, 48 insertions(+), 15 deletions(-) create mode 100644 spring-mvc-test/src/main/java/com/baeldung/web/WebAppInitializer.java rename spring-mvc-test/src/main/webapp/WEB-INF/{spring-servlet.xml => spring-servlet-old.xml} (100%) rename spring-mvc-test/src/main/webapp/WEB-INF/{web.xml => web-old.xml} (100%) diff --git a/spring-mvc-test/src/main/java/com/baeldung/web/WebAppInitializer.java b/spring-mvc-test/src/main/java/com/baeldung/web/WebAppInitializer.java new file mode 100644 index 0000000000..23fad058d0 --- /dev/null +++ b/spring-mvc-test/src/main/java/com/baeldung/web/WebAppInitializer.java @@ -0,0 +1,33 @@ +package com.baeldung.web; + +import java.util.Set; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRegistration; + +import org.springframework.web.WebApplicationInitializer; +import org.springframework.web.context.ContextLoaderListener; +import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; +import org.springframework.web.context.support.GenericWebApplicationContext; +import org.springframework.web.servlet.DispatcherServlet; + +public class WebAppInitializer implements WebApplicationInitializer { + + @Override + public void onStartup(final ServletContext sc) throws ServletException { + + final AnnotationConfigWebApplicationContext root = new AnnotationConfigWebApplicationContext(); + root.scan("com.baeldung.spring"); + + sc.addListener(new ContextLoaderListener(root)); + + final ServletRegistration.Dynamic appServlet = sc.addServlet("spring", new DispatcherServlet(new GenericWebApplicationContext())); + appServlet.setLoadOnStartup(1); + + final Set mappingConflicts = appServlet.addMapping("/"); + if (!mappingConflicts.isEmpty()) { + throw new IllegalStateException("'appServlet' could not be mapped to '/' due " + "to an existing mapping. This is a known issue under Tomcat versions " + "<= 7.0.14; see https://issues.apache.org/bugzilla/show_bug.cgi?id=51278"); + } + } +} diff --git a/spring-mvc-test/src/main/webapp/WEB-INF/spring-servlet.xml b/spring-mvc-test/src/main/webapp/WEB-INF/spring-servlet-old.xml similarity index 100% rename from spring-mvc-test/src/main/webapp/WEB-INF/spring-servlet.xml rename to spring-mvc-test/src/main/webapp/WEB-INF/spring-servlet-old.xml diff --git a/spring-mvc-test/src/main/webapp/WEB-INF/web.xml b/spring-mvc-test/src/main/webapp/WEB-INF/web-old.xml similarity index 100% rename from spring-mvc-test/src/main/webapp/WEB-INF/web.xml rename to spring-mvc-test/src/main/webapp/WEB-INF/web-old.xml diff --git a/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerIntegrationTest.java b/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerIntegrationTest.java index 368ef6ec91..abed0a977e 100644 --- a/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerIntegrationTest.java +++ b/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerIntegrationTest.java @@ -39,7 +39,7 @@ public class GreetControllerIntegrationTest { } @Test - public void verifyWac() { + public void givenWAC_whenServletContext_thenItProvidesGreetController() { ServletContext servletContext = wac.getServletContext(); Assert.assertNotNull(servletContext); Assert.assertTrue(servletContext instanceof MockServletContext); @@ -47,42 +47,42 @@ public class GreetControllerIntegrationTest { } @Test - public void verifyIndexJspViewName() throws Exception { + public void givenHomePageURI_whenMockMVC_thenReturnsIndexJSPViewName() throws Exception { this.mockMvc.perform(MockMvcRequestBuilders.get("/homePage")).andDo(print()).andExpect(MockMvcResultMatchers.view().name("index")); } @Test - public void verifyGreet() throws Exception { + public void givenGreetURI_whenMockMVC_thenVerifyResponse() throws Exception { MvcResult mvcResult = this.mockMvc.perform(MockMvcRequestBuilders.get("/greet")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!")).andReturn(); Assert.assertEquals("application/json;charset=UTF-8", mvcResult.getResponse().getContentType()); } @Test - public void verifyGreetWithPathVariable() throws Exception { + public void givenGreetURIWithPathVariable_whenMockMVC_thenVerifyResponse() throws Exception { this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithPathVariable/John")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")) .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John!!!")); } @Test - public void verifyGreetWithPathVariable_2() throws Exception { + public void givenGreetURIWithPathVariable_2_whenMockMVC_thenVerifyResponse() throws Exception { this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithPathVariable/{name}", "Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")) .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World Doe!!!")); } @Test - public void verifyGreetWithQueryVariable() throws Exception { + public void givenGreetURIWithQueryParameter_whenMockMVC_thenVerifyResponse() throws Exception { this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithQueryVariable").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")); } @Test - public void verifyGreetWithPost() throws Exception { + public void givenGreetURIWithPost_whenMockMVC_thenVerifyResponse() throws Exception { this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPost")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")) .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!")); } @Test - public void verifyGreetWithPostAndFormData() throws Exception { + public void givenGreetURIWithPostAndFormData_whenMockMVC_thenVerifyResponse() throws Exception { this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPostAndFormData").param("id", "1").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")).andExpect(MockMvcResultMatchers.jsonPath("$.id").value(1)); } diff --git a/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerTest.java b/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerTest.java index 1631118981..8e624544cd 100644 --- a/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerTest.java +++ b/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerTest.java @@ -24,39 +24,39 @@ public class GreetControllerTest { } @Test - public void verifyIndexJspViewName() throws Exception { + public void givenHomePageURI_whenMockMVC_thenReturnsIndexJSPViewName() throws Exception { this.mockMvc.perform(get("/homePage")).andExpect(view().name("index")); } @Test - public void verifyGreet() throws Exception { + public void givenGreetURI_whenMockMVC_thenVerifyResponse() throws Exception { this.mockMvc.perform(get("/greet")).andExpect(status().isOk()).andExpect(content().contentType("application/json;charset=UTF-8")).andExpect(jsonPath("$.message").value("Hello World!!!")); } @Test - public void verifyGreetWithPathVariable() throws Exception { + public void givenGreetURIWithPathVariable_whenMockMVC_thenVerifyResponse() throws Exception { this.mockMvc.perform(get("/greetWithPathVariable/John")).andExpect(status().isOk()).andExpect(content().contentType("application/json;charset=UTF-8")).andExpect(jsonPath("$.message").value("Hello World John!!!")); } @Test - public void verifyGreetWithPathVariable_2() throws Exception { + public void givenGreetURIWithPathVariable_2_whenMockMVC_thenVerifyResponse() throws Exception { this.mockMvc.perform(get("/greetWithPathVariable/{name}", "Doe")).andExpect(status().isOk()).andExpect(content().contentType("application/json;charset=UTF-8")).andExpect(jsonPath("$.message").value("Hello World Doe!!!")); } @Test - public void verifyGreetWithQueryVariable() throws Exception { + public void givenGreetURIWithQueryParameter_whenMockMVC_thenVerifyResponse() throws Exception { this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithQueryVariable").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")); } @Test - public void verifyGreetWithPost() throws Exception { + public void givenGreetURIWithPost_whenMockMVC_thenVerifyResponse() throws Exception { this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPost")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")) .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!")); } @Test - public void verifyGreetWithPostAndFormData() throws Exception { + public void givenGreetURIWithPostAndFormData_whenMockMVC_thenVerifyResponse() throws Exception { this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPostAndFormData").param("id", "1").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")).andExpect(MockMvcResultMatchers.jsonPath("$.id").value(1)); }