Skip to content

Commit 2442d62

Browse files
author
“A1-4U2T1NN”
committed
feat: added getDetails method to Employee.java; created corresponding test for getDetails; added appropriate import statements to EmployeeManagerTest; added @beforeeach set up for EmployeeManagerTest; added test for each EmployeeManager method; added throw assert to testRemoveEmployee checking for an IllegalArgumentException and corresponding message; fix: corrected naming convention for EmployeeTest tests;
1 parent 863a8da commit 2442d62

File tree

3 files changed

+82
-41
lines changed

3 files changed

+82
-41
lines changed

lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,10 @@ public double getSalary() {
4545
public void setSalary(double salary) {
4646
this.salary = salary;
4747
}
48+
public String getDetails() {
49+
return "id: " + id
50+
+ "name: " + name
51+
+ "department: " + department
52+
+ "salary: " + salary;
53+
}
4854
}
Lines changed: 52 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,73 @@
11
package com.codedifferently.lesson15;
22

3+
import java.util.ArrayList;
4+
import java.util.List;
5+
6+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
7+
import static org.junit.jupiter.api.Assertions.assertEquals;
8+
import org.junit.jupiter.api.BeforeEach;
39
import org.junit.jupiter.api.Test;
410

511
public class EmployeeManagerTest {
612

7-
EmployeeTest employeeTest;
8-
9-
@Test
10-
public void testaddEmployee() {
11-
// Arrange
12-
13-
//Act
14-
15-
//Assert
16-
17-
}
13+
EmployeeManager employeeManager;
14+
List<Employee> employees;
1815

19-
@Test
20-
public void test() {
21-
// tests if changed id matches new id
16+
//Set up
17+
@BeforeEach
18+
void setUp() {
19+
employeeManager = new EmployeeManager();
20+
Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00);
21+
employeeManager.addEmployee(employee);
22+
employees = new ArrayList();
23+
employees.add(employee);
2224
}
23-
2425
@Test
25-
public void getNameTest() {
26-
// tests if changed name matches name
27-
}
26+
public void testAddEmployee() {
27+
//Arrange
28+
Employee employee1 = new Employee(1, "Penny", "Sales", 65000.00);
29+
//Act & Assert
30+
employeeManager.addEmployee(employee1);
31+
}
2832

2933
@Test
30-
public void setNameTest() {
31-
// tests if changed id matches new id
32-
}
33-
@Test
34-
public void getDepartmentTest() {
35-
34+
public void testGetEmployee() {
35+
//Arrange
36+
Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00);
37+
Employee expectedEmployee = employeeManager.getEmployee(employee.getId());
38+
//Act
39+
Employee actualEmployee = employeeManager.getEmployee(0);
40+
// Assert
41+
assertEquals(expectedEmployee, actualEmployee);
3642
}
3743

3844
@Test
39-
public void setDepartmentTest() {
40-
45+
public void testUpdateEmployee() {
46+
//Arrange
47+
Employee expectedEmployeeUpdate = new Employee(0, "Nitsua", "Tech", 100000.00);
48+
//Act
49+
employeeManager.updateEmployee(expectedEmployeeUpdate);
50+
//Act
51+
assertEquals(expectedEmployeeUpdate, employeeManager.getEmployee(0));
4152
}
4253

4354
@Test
44-
public void getSalaryTest() {
45-
55+
public void testRemoveEmployee() {
56+
//Arange
57+
Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00);
58+
employeeManager.addEmployee(employee);
59+
//Act
60+
employeeManager.removeEmployee(0);
61+
//Assert
62+
assertThatThrownBy(() -> employeeManager.removeEmployee(0))
63+
.isInstanceOf(IllegalArgumentException.class)
64+
.hasMessage("Employee does not in collection with id " + employee.getId());
4665
}
47-
4866
@Test
49-
public void setSalaryTest() {
50-
67+
public void testGetEmployeeCount() {
68+
//Act
69+
int actualEmployeeCount = employeeManager.getEmployeeCount();
70+
//Assert(recieved help from Vicente on employees array)
71+
assertEquals(employees.size(), actualEmployeeCount);
5172
}
5273
}

lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeTest.java

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void setUp() {
1515
}
1616

1717
@Test
18-
//Method beign tested
18+
//Method being tested
1919
public void testGetId() {
2020
//Execersise
2121
int actualId = employee.getId();
@@ -37,10 +37,10 @@ public void testSetID() {
3737

3838
@Test
3939
public void testGetName() {
40-
//Act
41-
String actualName = employee.getName();
4240
//Arrange
4341
String expectedName = "Chigazo";
42+
//Act
43+
String actualName = employee.getName();
4444
//Assert
4545
assertEquals(expectedName, actualName);
4646
}
@@ -56,18 +56,18 @@ public void testSetName() {
5656
}
5757

5858
@Test
59-
public void getDepartmentTest() {
60-
//Act
61-
String expectedDepartment = employee.getDepartment();
59+
public void testGetDepartment() {
6260
//Arrange
6361
String actualDepartment = "Finance";
62+
//Act
63+
String expectedDepartment = employee.getDepartment();
6464
//Assert
6565
assertEquals(expectedDepartment, actualDepartment);
6666
}
6767

6868
@Test
69-
public void setDepartmentTest() {
70-
//Arrange
69+
public void testSetDepartment() {
70+
//Arrange
7171
String expectedSetDepartment = "Tech";
7272
//Act
7373
employee.setDepartment(expectedSetDepartment);
@@ -76,7 +76,7 @@ public void setDepartmentTest() {
7676
}
7777

7878
@Test
79-
public void getSalaryTest() {
79+
public void testGetSalary() {
8080
//Arrange
8181
double actualSalary = 50000.00;
8282
//Act
@@ -86,13 +86,27 @@ public void getSalaryTest() {
8686
}
8787

8888
@Test
89-
public void setSalaryTest() {
89+
public void testSetSalary() {
9090
//Arrange
9191
double expectedSetSalary = 100000.00;
9292
//Act
9393
employee.setSalary(expectedSetSalary);
9494
//Assert
9595
assertEquals(expectedSetSalary, employee.getSalary());
9696
}
97+
98+
@Test
99+
public void testGetDetails() {
100+
//Arrange
101+
String actualDetails =
102+
"id: " + employee.getId()
103+
+ "name: " + employee.getName()
104+
+ "department: " + employee.getDepartment()
105+
+ "salary: " + employee.getSalary();
106+
//Act
107+
String expectedDetails = employee.getDetails();
108+
//Assert
109+
assertEquals(expectedDetails, actualDetails);
110+
}
97111
}
98112

0 commit comments

Comments
 (0)