iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated formatting.

Browse Source
This commit is contained in:
Sunil Gulabani 2016-08-03 15:04:36 +05:30
parent 6fb230546d
commit c996f8ccd5
8 changed files with 195 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-mvc-test/src/main/java/com/baeldung/spring/bean/Greeting.java
View File

@ -7,12 +7,15 @@ public class Greeting {
public int getId() { public int getId() {
return id; return id;
} }
public void setId(int id) { public void setId(int id) {
this.id = id; this.id = id;
} }
public String getMessage() { public String getMessage() {
return message; return message;
} }
public void setMessage(String message) { public void setMessage(String message) {
this.message = message; this.message = message;
} }

3
spring-mvc-test/src/main/webapp/WEB-INF/web.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1"> version="3.1">

45
spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerIntegrationTest.java
View File

@ -35,9 +35,7 @@ public class GreetControllerIntegrationTest {
@Before @Before
public void setup() throws Exception { public void setup() throws Exception {
this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac) this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
// .alwaysExpect(MockMvcResultMatchers.status().isOk())
.build();
} }
@Test @Test
@ -50,65 +48,42 @@ public class GreetControllerIntegrationTest {
@Test @Test
public void verifyIndexJspViewName() throws Exception { public void verifyIndexJspViewName() throws Exception {
this.mockMvc this.mockMvc.perform(MockMvcRequestBuilders.get("/homePage")).andDo(print()).andExpect(MockMvcResultMatchers.view().name("index"));
.perform(MockMvcRequestBuilders.get("/homePage"))
.andDo(print())
.andExpect(MockMvcResultMatchers.view().name("index"));
} }
@Test @Test
public void verifyGreet() throws Exception { public void verifyGreet() throws Exception {
MvcResult mvcResult = this.mockMvc MvcResult mvcResult = this.mockMvc.perform(MockMvcRequestBuilders.get("/greet")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!")).andReturn();
.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()); Assert.assertEquals("application/json;charset=UTF-8", mvcResult.getResponse().getContentType());
} }
@Test @Test
public void verifyGreetWithPathVariable() throws Exception { public void verifyGreetWithPathVariable() throws Exception {
this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithPathVariable/John")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()) this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithPathVariable/John")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
.andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
.andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John!!!")); .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John!!!"));
} }
@Test @Test
public void verifyGreetWithPathVariable_2() throws Exception { public void verifyGreetWithPathVariable_2() throws Exception {
this.mockMvc this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithPathVariable/{name}", "Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
.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!!!")); .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World Doe!!!"));
} }
@Test @Test
public void verifyGreetWithQueryVariable() throws Exception { public void verifyGreetWithQueryVariable() throws Exception {
this.mockMvc this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithQueryVariable").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk())
.perform(MockMvcRequestBuilders.get("/greetWithQueryVariable").param("name", "John Doe")) .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World 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 @Test
public void verifyGreetWithPost() throws Exception { public void verifyGreetWithPost() throws Exception {
this.mockMvc this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPost")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
.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!!!")); .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!"));
} }
@Test @Test
public void verifyGreetWithPostAndFormData() throws Exception { public void verifyGreetWithPostAndFormData() throws Exception {
this.mockMvc this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPostAndFormData").param("id", "1").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk())
.perform(MockMvcRequestBuilders.post("/greetWithPostAndFormData").param("id", "1").param("name", "John Doe")) .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")).andExpect(MockMvcResultMatchers.jsonPath("$.id").value(1));
.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));
} }
} }

38
spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerTest.java
View File

@ -25,59 +25,39 @@ public class GreetControllerTest {
@Test @Test
public void verifyIndexJspViewName() throws Exception { public void verifyIndexJspViewName() throws Exception {
this.mockMvc.perform(get("/homePage")) this.mockMvc.perform(get("/homePage")).andExpect(view().name("index"));
.andExpect(view().name("index"));
} }
@Test @Test
public void verifyGreet() throws Exception { public void verifyGreet() throws Exception {
this.mockMvc.perform(get("/greet")) this.mockMvc.perform(get("/greet")).andExpect(status().isOk()).andExpect(content().contentType("application/json;charset=UTF-8")).andExpect(jsonPath("$.message").value("Hello World!!!"));
.andExpect(status().isOk())
.andExpect(content().contentType("application/json;charset=UTF-8"))
.andExpect(jsonPath("$.message").value("Hello World!!!"));
} }
@Test @Test
public void verifyGreetWithPathVariable() throws Exception { public void verifyGreetWithPathVariable() throws Exception {
this.mockMvc.perform(get("/greetWithPathVariable/John")) this.mockMvc.perform(get("/greetWithPathVariable/John")).andExpect(status().isOk()).andExpect(content().contentType("application/json;charset=UTF-8")).andExpect(jsonPath("$.message").value("Hello World John!!!"));
.andExpect(status().isOk())
.andExpect(content().contentType("application/json;charset=UTF-8"))
.andExpect(jsonPath("$.message").value("Hello World John!!!"));
} }
@Test @Test
public void verifyGreetWithPathVariable_2() throws Exception { public void verifyGreetWithPathVariable_2() throws Exception {
this.mockMvc.perform(get("/greetWithPathVariable/{name}","Doe")) 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!!!"));
.andExpect(status().isOk())
.andExpect(content().contentType("application/json;charset=UTF-8"))
.andExpect(jsonPath("$.message").value("Hello World Doe!!!"));
} }
@Test @Test
public void verifyGreetWithQueryVariable() throws Exception { public void verifyGreetWithQueryVariable() throws Exception {
this.mockMvc this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithQueryVariable").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk())
.perform(MockMvcRequestBuilders.get("/greetWithQueryVariable").param("name", "John Doe")) .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World 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 @Test
public void verifyGreetWithPost() throws Exception { public void verifyGreetWithPost() throws Exception {
this.mockMvc this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPost")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
.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!!!")); .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!"));
} }
@Test @Test
public void verifyGreetWithPostAndFormData() throws Exception { public void verifyGreetWithPostAndFormData() throws Exception {
this.mockMvc this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPostAndFormData").param("id", "1").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk())
.perform(MockMvcRequestBuilders.post("/greetWithPostAndFormData").param("id", "1").param("name", "John Doe")) .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")).andExpect(MockMvcResultMatchers.jsonPath("$.id").value(1));
.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));
} }
} }