[BAEL-19881] - Rename spring-mvc-simple modules

spring-mvc-basics-4/src/test/java/com/baeldung/controller/ControllerAnnotationIntegrationTest.java

@@ -0,0 +1,79 @@
+package org.baeldung.controller;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.baeldung.controller.config.WebConfig;
+import org.baeldung.controller.student.Student;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.AnnotationConfigWebContextLoader;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.servlet.ModelAndView;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes = { WebConfig.class }, loader = AnnotationConfigWebContextLoader.class)
+public class ControllerAnnotationIntegrationTest {
+
+    private MockMvc mockMvc;
+
+    @Autowired
+    private WebApplicationContext wac;
+
+    private Student selectedStudent;
+
+    @Before
+    public void setUp() {
+        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+
+        selectedStudent = new Student();
+        selectedStudent.setId(1);
+        selectedStudent.setName("Peter");
+    }
+
+    @Test
+    public void testTestController() throws Exception {
+
+        ModelAndView mv = this.mockMvc.perform(MockMvcRequestBuilders.get("/test/")).andReturn().getModelAndView();
+
+        // validate modal data
+        Assert.assertSame(mv.getModelMap().get("data").toString(), "Welcome home man");
+
+        // validate view name
+        Assert.assertSame(mv.getViewName(), "welcome");
+    }
+
+    @Test
+    public void testRestController() throws Exception {
+
+        String responseBody = this.mockMvc.perform(MockMvcRequestBuilders.get("/student/{studentId}", 1)).andReturn().getResponse().getContentAsString();
+
+        ObjectMapper reader = new ObjectMapper();
+
+        Student studentDetails = reader.readValue(responseBody, Student.class);
+
+        Assert.assertEquals(selectedStudent, studentDetails);
+
+    }
+
+    @Test
+    public void testRestAnnotatedController() throws Exception {
+
+        String responseBody = this.mockMvc.perform(MockMvcRequestBuilders.get("/annotated/student/{studentId}", 1)).andReturn().getResponse().getContentAsString();
+
+        ObjectMapper reader = new ObjectMapper();
+
+        Student studentDetails = reader.readValue(responseBody, Student.class);
+
+        Assert.assertEquals(selectedStudent, studentDetails);
+    }
+
+}

spring-mvc-basics-4/src/test/java/com/baeldung/controller/ControllerIntegrationTest.java

@@ -0,0 +1,77 @@
+package org.baeldung.controller;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.servlet.ModelAndView;
+
+import org.baeldung.controller.student.Student;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration({ "classpath:test-mvc.xml" })
+public class ControllerIntegrationTest {
+
+    private MockMvc mockMvc;
+
+    @Autowired
+    private WebApplicationContext wac;
+
+    private Student selectedStudent;
+
+    @Before
+    public void setUp() {
+        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+
+        selectedStudent = new Student();
+        selectedStudent.setId(1);
+        selectedStudent.setName("Peter");
+    }
+
+    @Test
+    public void testTestController() throws Exception {
+
+        ModelAndView mv = this.mockMvc.perform(MockMvcRequestBuilders.get("/test/")).andReturn().getModelAndView();
+
+        // validate modal data
+        Assert.assertSame(mv.getModelMap().get("data").toString(), "Welcome home man");
+
+        // validate view name
+        Assert.assertSame(mv.getViewName(), "welcome");
+    }
+
+    @Test
+    public void testRestController() throws Exception {
+
+        String responseBody = this.mockMvc.perform(MockMvcRequestBuilders.get("/student/{studentId}", 1)).andReturn().getResponse().getContentAsString();
+
+        ObjectMapper reader = new ObjectMapper();
+
+        Student studentDetails = reader.readValue(responseBody, Student.class);
+
+        Assert.assertEquals(selectedStudent, studentDetails);
+
+    }
+
+    @Test
+    public void testRestAnnotatedController() throws Exception {
+
+        String responseBody = this.mockMvc.perform(MockMvcRequestBuilders.get("/annotated/student/{studentId}", 1)).andReturn().getResponse().getContentAsString();
+
+        ObjectMapper reader = new ObjectMapper();
+
+        Student studentDetails = reader.readValue(responseBody, Student.class);
+
+        Assert.assertEquals(selectedStudent, studentDetails);
+    }
+}

spring-mvc-basics-4/src/test/java/com/baeldung/controller/PassParametersControllerIntegrationTest.java

@@ -0,0 +1,69 @@
+package org.baeldung.controller;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * This is the test class for {@link org.baeldung.controller.controller.PassParametersController} class.
+ * 09/09/2017
+ *
+ * @author Ahmet Cetin
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration({"classpath:test-mvc.xml"})
+public class PassParametersControllerIntegrationTest {
+    private MockMvc mockMvc;
+
+    @Autowired
+    private WebApplicationContext wac;
+
+    @Before
+    public void setUp() {
+        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+    }
+
+    @Test
+    public void testPassParametersWithModel() throws Exception {
+        ModelAndView mv = this.mockMvc.perform(MockMvcRequestBuilders.get("/showViewPage")).andReturn().getModelAndView();
+
+        //Validate view
+        Assert.assertEquals(mv.getViewName(), "viewPage");
+
+        //Validate attribute
+        Assert.assertEquals(mv.getModelMap().get("message").toString(), "Baeldung");
+    }
+
+    @Test
+    public void testPassParametersWithModelMap() throws Exception {
+        ModelAndView mv = this.mockMvc.perform(MockMvcRequestBuilders.get("/printViewPage")).andReturn().getModelAndView();
+
+        //Validate view
+        Assert.assertEquals(mv.getViewName(), "viewPage");
+
+        //Validate attribute
+        Assert.assertEquals(mv.getModelMap().get("message").toString(), "Baeldung");
+    }
+
+    @Test
+    public void testPassParametersWithModelAndView() throws Exception {
+        ModelAndView mv = this.mockMvc.perform(MockMvcRequestBuilders.get("/goToViewPage")).andReturn().getModelAndView();
+
+        //Validate view
+        Assert.assertEquals(mv.getViewName(), "viewPage");
+
+        //Validate attribute
+        Assert.assertEquals(mv.getModelMap().get("message").toString(), "Baeldung");
+    }
+}

spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerIntegrationTest.java

@@ -0,0 +1,54 @@
+package com.baeldung.controller.optionalpathvars;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+import org.baeldung.controller.config.WebConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes = { WebConfig.class })
+public class ArticleViewerControllerIntegrationTest {
+
+    @Autowired
+    private WebApplicationContext wac;
+
+    private MockMvc mockMvc;
+
+    @Before
+    public void setup() throws Exception {
+        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+    }
+
+    @Test
+    public void whenIdPathVariableIsPassed_thenResponseOK() throws Exception {
+        
+        int articleId = 5;
+        
+        this.mockMvc
+            .perform(MockMvcRequestBuilders.get("/article/{id}", articleId))
+            .andExpect(MockMvcResultMatchers.status().isOk())
+            .andExpect(MockMvcResultMatchers.jsonPath("$.id").value(articleId));
+               
+    }
+
+    @Test
+    public void whenIdPathVariableIsNotPassed_thenResponse500() throws Exception {
+                
+        this.mockMvc
+            .perform(MockMvcRequestBuilders.get("/article"))
+            .andExpect(MockMvcResultMatchers.status().isInternalServerError());
+               
+    }
+
+    
+}

spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithOptionalParamIntegrationTest.java

@@ -0,0 +1,53 @@
+package com.baeldung.controller.optionalpathvars;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+import org.baeldung.controller.config.WebConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes = { WebConfig.class })
+public class ArticleViewerControllerWithOptionalParamIntegrationTest {
+
+    @Autowired
+    private WebApplicationContext wac;
+ 
+    private MockMvc mockMvc;
+
+    @Before
+    public void setup() throws Exception {
+        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+    }
+
+    @Test
+    public void givenOPtionalParam_whenIdPathVariableIsPassed_thenResponseOK() throws Exception {
+    
+        int articleId = 154;
+        
+        this.mockMvc
+            .perform(MockMvcRequestBuilders.get("/optionalParam/article/{id}", articleId))
+            .andExpect(MockMvcResultMatchers.status().isOk())
+            .andExpect(MockMvcResultMatchers.jsonPath("$.id").value(articleId));
+                
+    }
+    
+    @Test
+    public void givenOPtionalParam_whenIdPathVariableIsNotPassed_thenResponseOK() throws Exception {
+            
+        this.mockMvc
+            .perform(MockMvcRequestBuilders.get("/optionalParam/article"))
+            .andExpect(MockMvcResultMatchers.status().isOk())
+            .andExpect(MockMvcResultMatchers.jsonPath("$.id").value(Article.DEFAULT_ARTICLE.getId()));
+                
+    }
+}

spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerControllerWithRequiredAttributeIntegrationTest.java

@@ -0,0 +1,53 @@
+package com.baeldung.controller.optionalpathvars;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+import org.baeldung.controller.config.WebConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes = { WebConfig.class })
+public class ArticleViewerControllerWithRequiredAttributeIntegrationTest {
+
+    @Autowired
+    private WebApplicationContext wac;
+ 
+    private MockMvc mockMvc;
+
+    @Before
+    public void setup() throws Exception {
+        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+    }
+
+    @Test
+    public void givenRequiredAttributeIsFalse_whenIdPathVariableIsPassed_thenResponseOK() throws Exception {
+    
+        int articleId = 154;
+        
+        this.mockMvc
+            .perform(MockMvcRequestBuilders.get("/requiredAttribute/article/{id}", articleId))
+            .andExpect(MockMvcResultMatchers.status().isOk())
+            .andExpect(MockMvcResultMatchers.jsonPath("$.id").value(articleId));
+                
+    }
+    
+    @Test
+    public void givenRequiredAttributeIsFalse_whenIdPathVariableIsNotPassed_thenResponseOK() throws Exception {
+            
+        this.mockMvc
+            .perform(MockMvcRequestBuilders.get("/requiredAttribute/article"))
+            .andExpect(MockMvcResultMatchers.status().isOk())
+            .andExpect(MockMvcResultMatchers.jsonPath("$.id").value(Article.DEFAULT_ARTICLE.getId()));
+                
+    }
+}

spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerWithMapParamIntegrationTest.java

@@ -0,0 +1,55 @@
+package com.baeldung.controller.optionalpathvars;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+import org.baeldung.controller.config.WebConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes = { WebConfig.class })
+public class ArticleViewerWithMapParamIntegrationTest {
+
+    @Autowired
+    private WebApplicationContext wac;
+
+    private MockMvc mockMvc;
+
+    @Before
+    public void setup() throws Exception {
+        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+    }
+
+    @Test
+    public void givenPathVarsMapParam_whenIdPathVariableIsPassed_thenResponseOK() throws Exception {
+        
+        int articleId = 5;
+        
+        this.mockMvc
+            .perform(MockMvcRequestBuilders.get("/mapParam/article/{id}", articleId))
+            .andExpect(MockMvcResultMatchers.status().isOk())
+            .andExpect(MockMvcResultMatchers.jsonPath("$.id").value(articleId));
+               
+    }
+
+    @Test
+    public void givenPathVarsMapParam_whenIdPathVariableIsNotPassed_thenResponseOK() throws Exception {
+                
+        this.mockMvc
+            .perform(MockMvcRequestBuilders.get("/mapParam/article"))
+            .andExpect(MockMvcResultMatchers.status().isOk())
+            .andExpect(MockMvcResultMatchers.jsonPath("$.id").value(Article.DEFAULT_ARTICLE.getId()));
+               
+    }
+
+    
+}

spring-mvc-basics-4/src/test/java/com/baeldung/optionalpathvars/ArticleViewerWithTwoSeparateMethodsIntegrationTest.java

@@ -0,0 +1,54 @@
+package com.baeldung.controller.optionalpathvars;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+import org.baeldung.controller.config.WebConfig;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(classes = { WebConfig.class })
+public class ArticleViewerWithTwoSeparateMethodsIntegrationTest {
+
+    @Autowired
+    private WebApplicationContext wac;
+
+    private MockMvc mockMvc;
+
+    @Before
+    public void setup() throws Exception {
+        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+    }
+
+    @Test
+    public void givenTwoSeparateMethods_whenIdPathVariableIsPassed_thenResponseOK() throws Exception {
+        
+        int articleId = 5;
+        
+        this.mockMvc
+            .perform(MockMvcRequestBuilders.get("/seperateMethods/article/{id}", articleId))
+            .andExpect(MockMvcResultMatchers.status().isOk())
+            .andExpect(MockMvcResultMatchers.jsonPath("$.id").value(articleId));
+               
+    }
+
+    @Test
+    public void givenTwoSeparateMethods_whenIdPathVariableIsNotPassed_thenResponseOK() throws Exception {
+                
+        this.mockMvc
+            .perform(MockMvcRequestBuilders.get("/seperateMethods/article"))
+            .andExpect(MockMvcResultMatchers.status().isOk())
+            .andExpect(MockMvcResultMatchers.jsonPath("$.id").value(Article.DEFAULT_ARTICLE.getId()));
+               
+    }
+        
+}

spring-mvc-basics-4/src/test/resources/test-mvc.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xsi:schemaLocation="
+        http://www.springframework.org/schema/beans     
+        http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+        http://www.springframework.org/schema/context
+        http://www.springframework.org/schema/context/spring-context-4.0.xsd
+        http://www.springframework.org/schema/mvc
+        http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd">
+ <context:component-scan base-package="org.baeldung.controller.controller" />
+ <mvc:annotation-driven />
+ 
+  	 <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+	        <property name="prefix">
+	            <value>/WEB-INF/</value>
+	        </property>
+	        <property name="suffix">
+	            <value>.jsp</value>
+	        </property>
+	  </bean>
+  </beans>