cleanup and testing work

spring-mvc-java/src/test/java/com/baeldung/web/controller/EmployeeMvcIntegrationTest.java

@@ -23,7 +23,7 @@ import com.baeldung.spring.web.config.WebConfig;
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration(classes = WebConfig.class)
-public class EmployeeTest {
+public class EmployeeMvcIntegrationTest {
 
     @Autowired
     private WebApplicationContext webAppContext;

spring-mvc-java/src/test/java/com/baeldung/web/controller/EmployeeNoMvcIntegrationTest.java

@@ -1,7 +1,7 @@
 package com.baeldung.web.controller;
 
-import org.junit.Before;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +15,7 @@ import com.baeldung.spring.web.config.WebConfig;
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration(classes = WebConfig.class)
-public class EmployeeTestWithoutMockMvc {
+public class EmployeeNoMvcIntegrationTest {
 
     @Autowired
     private EmployeeController employeeController;
@@ -25,9 +25,10 @@ public class EmployeeTestWithoutMockMvc {
         employeeController.initEmployees();
     }
 
+    //
+
     @Test
     public void whenInitEmployees_thenVerifyValuesInitiation() {
-
         Employee employee1 = employeeController.employeeMap.get(1L);
         Employee employee2 = employeeController.employeeMap.get(2L);
         Employee employee3 = employeeController.employeeMap.get(3L);

spring-mvc-java/src/test/java/com/baeldung/web/controller/GreetControllerIntegrationTest.java

@@ -1,6 +1,5 @@
 package com.baeldung.web.controller;
 
-
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 
 import javax.servlet.ServletContext;
@@ -25,7 +24,7 @@ import com.baeldung.spring.web.config.ApplicationConfig;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
-@ContextConfiguration(classes = {ApplicationConfig.class})
+@ContextConfiguration(classes = { ApplicationConfig.class })
 public class GreetControllerIntegrationTest {
 
     @Autowired
@@ -35,7 +34,6 @@ public class GreetControllerIntegrationTest {
 
     private static final String CONTENT_TYPE = "application/json";
 
-
     @Before
     public void setup() throws Exception {
         this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
@@ -74,8 +72,8 @@ public class GreetControllerIntegrationTest {
 
     @Test
     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(CONTENT_TYPE)).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!"));
+        this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithQueryVariable").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType(CONTENT_TYPE))
+                .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!"));
     }
 
     @Test

spring-mvc-java/src/test/java/com/baeldung/web/controller/GreetControllerUnitTest.java

@@ -1,17 +1,19 @@
 package com.baeldung.web.controller;
 
+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.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
+
 import org.junit.Before;
 import org.junit.Test;
 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 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.*;
-
-public class GreetControllerTest {
+public class GreetControllerUnitTest {
 
     private MockMvc mockMvc;
     private static final String CONTENT_TYPE = "application/json";
@@ -43,19 +45,17 @@ public class GreetControllerTest {
 
     @Test
     public void givenGreetURIWithQueryParameter_whenMockMVC_thenVerifyResponse() throws Exception {
-        this.mockMvc.perform(get("/greetWithQueryVariable").param("name", "John Doe")).andDo(print()).andExpect(status().isOk())
-          .andExpect(content().contentType(CONTENT_TYPE)).andExpect(jsonPath("$.message").value("Hello World John Doe!!!"));
+        this.mockMvc.perform(get("/greetWithQueryVariable").param("name", "John Doe")).andDo(print()).andExpect(status().isOk()).andExpect(content().contentType(CONTENT_TYPE)).andExpect(jsonPath("$.message").value("Hello World John Doe!!!"));
     }
 
     @Test
     public void givenGreetURIWithPost_whenMockMVC_thenVerifyResponse() throws Exception {
-        this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPost")).andDo(print()).andExpect(status().isOk()).andExpect(content().contentType(CONTENT_TYPE))
-          .andExpect(jsonPath("$.message").value("Hello World!!!"));
+        this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPost")).andDo(print()).andExpect(status().isOk()).andExpect(content().contentType(CONTENT_TYPE)).andExpect(jsonPath("$.message").value("Hello World!!!"));
     }
 
     @Test
     public void givenGreetURIWithPostAndFormData_whenMockMVC_thenVerifyResponse() throws Exception {
-        this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPostAndFormData").param("id", "1").param("name", "John Doe")).andDo(print()).andExpect(status().isOk())
-          .andExpect(content().contentType(CONTENT_TYPE)).andExpect(jsonPath("$.message").value("Hello World John Doe!!!")).andExpect(jsonPath("$.id").value(1));
+        this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPostAndFormData").param("id", "1").param("name", "John Doe")).andDo(print()).andExpect(status().isOk()).andExpect(content().contentType(CONTENT_TYPE))
+                .andExpect(jsonPath("$.message").value("Hello World John Doe!!!")).andExpect(jsonPath("$.id").value(1));
     }
 }