Skip to content

M
mytime
Commit 2d52e26a authored by ssathu-nisum-com's avatar ssathu-nisum-com Committed by tdutta-nisum-com
Browse files
Options

TestCasesForUserControllerAndProjectTeamController (#151)

parent 39b65593
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 45 deletions
src/test/java/com/nisum/mytime/controllertest/ProjectTeamControllerTest.java
View file @ 2d52e26a
package com.nisum.mytime.controllertest;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
......@@ -57,7 +57,7 @@ public class ProjectTeamControllerTest {
"5976ef15874c902c98b8a05d", null, null, null, null, null, null,
null, null, null, null, null, null, "user@nisum.com", null,
null, null, new Date(2017 - 11 - 20), new Date(2107 - 12 - 23),
null, null, null);
null, null, null, null, null, null, null, null, null, null);
when(userService.getEmployeesRole("user@nisum.com"))
.thenReturn(employeesRole);
mockMvc.perform(
......@@ -74,7 +74,7 @@ public class ProjectTeamControllerTest {
list.add("16103");
Project employeeRole1 = new Project(
new ObjectId("9976ef15874c902c98b8a05d"), "102", "OMS", "16101",
"Srikanth", "Gap", "Billable", list);
"Srikanth", list, list, "Gap", "Billable", null, null, list);
String jsonvalue = (new ObjectMapper())
.writeValueAsString(employeeRole1).toString();
when(projectService.addProject(employeeRole1))
......@@ -92,15 +92,15 @@ public class ProjectTeamControllerTest {
"vsingh@nisum.com", "Manager", null, "09:00-06:00", "Java/J2EE",
"Testing", "8755672341", "8800543678", "vsingh@gmail.com", null,
null, null, null, null, new Date(2017 - 11 - 29),
new Date(2017 - 12 - 20), null, null, null);
new Date(2017 - 12 - 20), null, null, null, null, null, null, null, null, null, null);
ObjectMapper mapper = new ObjectMapper();
String jsonString = mapper.writeValueAsString(employeesRoles2);
when(userService.updateEmployeeRole(any())).thenReturn(employeesRoles2);
mockMvc.perform(post("/projectTeam/updateEmployeeRole")
when(userService.updateEmployeeRole(anyObject(),anyObject())).thenReturn(employeesRoles2);
mockMvc.perform(post("/projectTeam/updateEmployeeRole").param("empId", "166999")
.contentType(MediaType.APPLICATION_JSON_VALUE)
.content(jsonString))
.andExpect(MockMvcResultMatchers.status().isOk());
verify(userService).updateEmployeeRole(any());
verify(userService).updateEmployeeRole(anyObject(),anyObject());
}
@Test
......@@ -117,7 +117,7 @@ public class ProjectTeamControllerTest {
"5976ef15874c902c98b8a05d", "16127", null, null, null, null,
null, null, null, null, null, null, null, null, null, null,
null, new Date(2017 - 11 - 20), new Date(2107 - 12 - 23), null,
null, null);
null, null, null, null, null, null, null, null, null);
when(userService.getEmployeesRoleData("16127"))
.thenReturn(employeesRole);
mockMvc.perform(
......@@ -148,12 +148,7 @@ public class ProjectTeamControllerTest {
@Test
public void testaddEmployeeToTeam() throws Exception {
ProjectTeamMate projectTeamMate = new ProjectTeamMate(
new ObjectId("1976ef15874c902c98b8a05d"), "16127",
"Monika Srivastava", "msrivastava@nisum.com", "Employee",
"09:00-06:00", "101", "MOSAIC", "GAP", "16081", "Rajeshekar",
"01", "Software Engineer", "Non-Billable", "8765588388",
new Date(), new Date(), true);
ProjectTeamMate projectTeamMate = new ProjectTeamMate();
String jsonvalue = (new ObjectMapper())
.writeValueAsString(projectTeamMate).toString();
when(projectService.addProjectTeamMate(projectTeamMate))
......@@ -169,9 +164,9 @@ public class ProjectTeamControllerTest {
ProjectTeamMate updatedTeammate = new ProjectTeamMate(
new ObjectId("1976ef15874c902c98b8a05d"), "16127",
"Monika Srivastava", "msrivastava@nisum.com", "Employee",
"09:00-06:00", "101", "MOSAIC", "GAP", "16081", "Rajeshekar",
"09:00-06:00", "101", "MOSAIC", "GAP",
"01", "Software Engineer", "Non-Billable", "8765588388",
new Date(), new Date(), true);
new Date(), new Date(),new Date(), true,"ACC01","DOM1");
String jsonvalue = (new ObjectMapper())
.writeValueAsString(updatedTeammate).toString();
when(projectService.updateTeammate(updatedTeammate))
......@@ -187,9 +182,9 @@ public class ProjectTeamControllerTest {
ProjectTeamMate deleteTeamMate = new ProjectTeamMate(
new ObjectId("1976ef15874c902c98b8a05d"), "16127",
"Monika Srivastava", "msrivastava@nisum.com", "Employee",
"09:00-06:00", "101", "MOSAIC", "GAP", "16081", "Rajeshekar",
"09:00-06:00", "101", "MOSAIC", "GAP",
"01", "Software Engineer", "Non-Billable", "8765588388",
new Date(), new Date(), true);
new Date(), new Date(),new Date(), true,"ACC01","DOM1");
String jsonvalue = (new ObjectMapper())
.writeValueAsString(deleteTeamMate).toString();
mockMvc.perform(post("/projectTeam/deleteTeammate")
......@@ -253,12 +248,12 @@ public class ProjectTeamControllerTest {
@Test
public void testgetProjectDetails() throws Exception {
List<ProjectTeamMate> employeesRoles = createProjectTeamMate();
when(projectService.getProjectDetails("101"))
when(projectService.getProjectDetails("101", null))
.thenReturn(employeesRoles);
mockMvc.perform(
get("/projectTeam/getProjectDetails").param("projectId", "101"))
get("/projectTeam/getProjectDetails").param("projectId", "101").param("status", "Active"))
.andExpect(MockMvcResultMatchers.status().isOk());
verify(projectService).getProjectDetails("101");
verify(projectService).getProjectDetails("101", "Active");
}
@Test
......@@ -321,10 +316,10 @@ public class ProjectTeamControllerTest {
data1.setId(new ObjectId("5976ef15874c902c98b8a05d"));
data1.setProjectId("101");
data1.setProjectName("MOSAIC");
data1.setManagerId("16110");
data1.setManagerName("Rajeshekar");
// data1.setManagerId("16110");
// data1.setManagerName("Rajeshekar");
data1.setStatus("Billable");
data1.setAccount("Gap");
// data1.setAccount("Gap");
List<String> list = new ArrayList<>();
list.add("16101");
list.add("16102");
......@@ -335,10 +330,10 @@ public class ProjectTeamControllerTest {
data2.setId(new ObjectId("9976ef15874c902c98b8a05d"));
data2.setProjectId("102");
data2.setProjectName("OMS");
data2.setManagerId("16111");
data2.setManagerName("Reshma");
// data2.setManagerId("16111");
//data2.setManagerName("Reshma");
data2.setStatus("Billable");
data2.setAccount("Macys");
// data2.setAccount("Macys");
List<String> lists = new ArrayList<>();
lists.add("16104");
lists.add("16105");
......@@ -364,8 +359,8 @@ public class ProjectTeamControllerTest {
record1.setProjectId("101");
record1.setProjectName("Mosaic");
record1.setAccount("Gap");
record1.setManagerId("16081");
record1.setManagerName("Rajeshekar");
// record1.setManagerId("16081");
//record1.setManagerName("Rajeshekar");
record1.setExperience("01 Year");
record1.setDesignation("Software Engineer");
record1.setBillableStatus("Non-Billable");
......@@ -381,8 +376,8 @@ public class ProjectTeamControllerTest {
record2.setProjectId("101");
record2.setProjectName("Mosaic");
record2.setAccount("Gap");
record2.setManagerId("16081");
record2.setManagerName("Rajeshekar");
// record2.setManagerId("16081");
//record2.setManagerName("Rajeshekar");
record2.setExperience("07 Year");
record2.setDesignation("Senoir Software Engineer");
record2.setBillableStatus("Billable");
......
src/test/java/com/nisum/mytime/controllertest/UserControllerTest.java
View file @ 2d52e26a
......@@ -53,10 +53,10 @@ public class UserControllerTest {
@Test
public void testgetEmployeeRole() throws Exception {
EmployeeRoles employeesRole = new EmployeeRoles(
"5976ef15874c902c98b8a05d", null, null, "user@nisum.com", null,
"5976ef15874c902c98b8a05d", null, null, "user@nisum.com", "Admin",
null, null, null, null, null, null, null, null, null, null,
null, null, new Date(2017 - 11 - 20), new Date(2017 - 12 - 23),
null, null, null);
null, null, null, null, null, null, null, null, null, null);
when(userService.getEmployeesRole("user@nisum.com"))
.thenReturn(employeesRole);
mockMvc.perform(
......@@ -73,16 +73,16 @@ public class UserControllerTest {
"Java/J2EE", "Spring", "8767893452", "5687234567",
"user1@gmail.com", null, null, null, null, null,
new Date(2017 - 11 - 20), new Date(2017 - 12 - 23), null, null,
null);
null, null, null, null, null, null, null, null);
ObjectMapper mapper = new ObjectMapper();
String jsonString = mapper.writeValueAsString(employeeRole);
when(userService.assigingEmployeeRole(anyObject()))
when(userService.assigingEmployeeRole(anyObject(),anyObject()))
.thenReturn(employeeRole);
mockMvc.perform(post("/user/assignEmployeeRole")
mockMvc.perform(post("/user/assignEmployeeRole").param("empId", "16999")
.contentType(MediaType.APPLICATION_JSON_VALUE)
.content(jsonString))
.andExpect(MockMvcResultMatchers.status().isOk());
verify(userService).assigingEmployeeRole(anyObject());
verify(userService).assigingEmployeeRole(anyObject(),anyObject());
}
@Test
......@@ -93,16 +93,16 @@ public class UserControllerTest {
"09:00am-06:00am", "php", "Hibernate", "9878678956",
"9989782210", "user2@gmail.com", null, null, null, null, null,
new Date(2017 - 11 - 20), new Date(2017 - 12 - 23), null, null,
null);
null, null, null, null, null, null, null, null);
ObjectMapper mapper = new ObjectMapper();
String jsonString = mapper.writeValueAsString(employeeRole2);
when(userService.updateEmployeeRole(anyObject()))
when(userService.updateEmployeeRole(anyObject(),anyObject()))
.thenReturn(employeeRole2);
mockMvc.perform(post("/user/updateEmployeeRole")
mockMvc.perform(post("/user/updateEmployeeRole").param("empId", "16999")
.contentType(MediaType.APPLICATION_JSON_VALUE)
.content(jsonString))
.andExpect(MockMvcResultMatchers.status().isOk());
verify(userService).updateEmployeeRole(anyObject());
verify(userService).updateEmployeeRole(anyObject(),anyObject());
}
@Test
......@@ -128,7 +128,7 @@ public class UserControllerTest {
"5976ef15874c902c98b8a05d", "16127", null, null, null, null,
null, null, null, null, null, null, null, null, null, null,
null, new Date(2017 - 11 - 13), new Date(2017 - 12 - 20), null,
null, null);
null, null, null, null, null, null, null, null, null);
when(userService.getEmployeesRoleData("16127"))
.thenReturn(employeesRole);
mockMvc.perform(get("/user/getEmployeeRoleData").param("empId", "16127")
......@@ -145,7 +145,7 @@ public class UserControllerTest {
"5976ef15874c902c98b8a05d", "16209", null, null, null, null,
null, null, null, null, null, null, null, null, null, null,
null, new Date(2017 - 11 - 13), new Date(2017 - 12 - 20), null,
null, null);
null, null, null, null, null, null, null, null, null);
when(userService.getEmployeeRoleDataForSearchCriteria("dummy@nisum.com",
"emailId")).thenReturn(employeesRole);
mockMvc.perform(get("/user/getEmployeeRoleDataForSearchCriteria")
......@@ -166,7 +166,7 @@ public class UserControllerTest {
"5976ef15874c902c98b8a05d", "16209", null, null, null, null,
null, null, null, null, null, null, null, null, null, null,
null, new Date(2017 - 11 - 13), new Date(2017 - 12 - 20), null,
null, null);
null, null, null, null, null, null, null, null, null);
when(userService.getEmployeeRoleDataForSearchCriteria(
"Mahesh Kumar Gutam", "employeeName"))
.thenReturn(employeesRole);
......@@ -254,7 +254,7 @@ public class UserControllerTest {
"09:00-06:00", "Java/J2EE", "Spring", "8765588388",
"9978567723", "msrivastava@gmail.com", null, null, null, null,
null, new Date(2017 - 01 - 01), new Date(2017 - 03 - 01), null,
null, null);
null, null, null, null, null, null, null, null, null);
System.out.println(employeeRole);
ObjectMapper mapper = new ObjectMapper();
String jsonString = mapper.writeValueAsString(employeeRole);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment