From 709da6bcd28e55e71e010189847e662f37f963a5 Mon Sep 17 00:00:00 2001 From: Sunil Gulabani Date: Tue, 9 Aug 2016 10:14:59 +0530 Subject: [PATCH] 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)); }