Skip to content

Commit 2e5d63a

Browse files
Dlafferty251Dlafferty251
committed
feat: Move unit tests for Employee and EmployeeManager into specified classes
1 parent 3536d93 commit 2e5d63a

File tree

3 files changed

+158
-60
lines changed

3 files changed

+158
-60
lines changed

‎lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
package com.codedifferently.lesson15;
2+
3+
import static org.assertj.core.api.Assertions.assertThat;
4+
5+
import org.junit.jupiter.api.Test;
6+
7+
public class EmployeeManagerTest {
8+
9+
@Test
10+
public void testAddEmployee() {
11+
EmployeeManager employeeManager = new EmployeeManager();
12+
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
13+
employeeManager.addEmployee(employee);
14+
assertThat(employeeManager.getEmployeeCount()).isEqualTo(1);
15+
}
16+
17+
@Test
18+
public void testGetEmployee() {
19+
EmployeeManager employeeManager = new EmployeeManager();
20+
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
21+
employeeManager.addEmployee(employee);
22+
Employee result = employeeManager.getEmployee(1);
23+
assertThat(result).isEqualTo(employee);
24+
}
25+
26+
@Test
27+
public void testUpdateEmployee() {
28+
EmployeeManager employeeManager = new EmployeeManager();
29+
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
30+
employeeManager.addEmployee(employee);
31+
employee.setName("Jane Doe");
32+
employeeManager.updateEmployee(employee);
33+
Employee result = employeeManager.getEmployee(1);
34+
assertThat(result.getName()).isEqualTo("Jane Doe");
35+
}
36+
37+
@Test
38+
public void testRemoveEmployee() {
39+
EmployeeManager employeeManager = new EmployeeManager();
40+
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
41+
employeeManager.addEmployee(employee);
42+
employeeManager.removeEmployee(1);
43+
assertThat(employeeManager.getEmployeeCount()).isEqualTo(0);
44+
}
45+
46+
@Test
47+
public void testEmployeeCount() {
48+
EmployeeManager employeeManager = new EmployeeManager();
49+
Employee employee1 = new Employee(1, "John Doe", "Engineering", 50000);
50+
Employee employee2 = new Employee(2, "Jane Doe", "Marketing", 60000);
51+
employeeManager.addEmployee(employee1);
52+
employeeManager.addEmployee(employee2);
53+
int result = employeeManager.getEmployeeCount();
54+
assertThat(result).isEqualTo(2);
55+
}
56+
57+
@Test
58+
public void assertEmployeeInCollection() {
59+
EmployeeManager employeeManager = new EmployeeManager();
60+
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
61+
employeeManager.addEmployee(employee);
62+
try {
63+
employeeManager.getEmployee(1);
64+
} catch (IllegalArgumentException e) {
65+
// This should not happen
66+
assertThat(e.getMessage()).isEqualTo("Employee does not exist in collection with id 1");
67+
}
68+
}
69+
}

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

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
import static org.assertj.core.api.Assertions.assertThat;
2+
3+
import com.codedifferently.lesson15.Employee;
4+
import org.junit.jupiter.api.Test;
5+
6+
public class EmployeeTest {
7+
8+
@Test
9+
public void testGetDetails() {
10+
// Create an instance of Employee by adding in temporary values
11+
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
12+
// This will call the getDetails method and store that in a variable called result
13+
String result = employee.getDetails();
14+
// This will create a string that we expect the getDetails method to return
15+
String expected = "The Employee's ID: 1 Name: John Doe Department: Engineering Salary: 50000.0";
16+
// This will compare the result of the getDetails method to the expected string
17+
assertThat(result).isEqualTo(expected);
18+
}
19+
20+
@Test
21+
public void testSetDetails() {
22+
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
23+
employee.setDetails("Jane Doe", "Marketing", 60000, 1);
24+
25+
String result = employee.getDetails();
26+
String expected = "The Employee's ID: 1 Name: Jane Doe Department: Marketing Salary: 60000.0";
27+
assertThat(result).isEqualTo(expected);
28+
}
29+
30+
@Test
31+
public void testGetId() {
32+
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
33+
int result = employee.getId();
34+
assertThat(result).isEqualTo(1);
35+
}
36+
37+
@Test
38+
public void testSetId() {
39+
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
40+
employee.setId(2);
41+
int result = employee.getId();
42+
assertThat(result).isEqualTo(2);
43+
}
44+
45+
@Test
46+
public void testGetName() {
47+
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
48+
String result = employee.getName();
49+
assertThat(result).isEqualTo("John Doe");
50+
}
51+
52+
@Test
53+
public void testSetName() {
54+
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
55+
employee.setName("Jane Doe");
56+
String result = employee.getName();
57+
assertThat(result).isEqualTo("Jane Doe");
58+
}
59+
60+
@Test
61+
public void testGetDepartment() {
62+
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
63+
String result = employee.getDepartment();
64+
assertThat(result).isEqualTo("Engineering");
65+
}
66+
67+
@Test
68+
public void testSetDepartment() {
69+
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
70+
employee.setDepartment("Marketing");
71+
String result = employee.getDepartment();
72+
assertThat(result).isEqualTo("Marketing");
73+
}
74+
75+
@Test
76+
public void testGetSalary() {
77+
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
78+
double result = employee.getSalary();
79+
assertThat(result).isEqualTo(50000);
80+
}
81+
82+
@Test
83+
public void testSetSalary() {
84+
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
85+
employee.setSalary(60000);
86+
double result = employee.getSalary();
87+
assertThat(result).isEqualTo(60000);
88+
}
89+
}

‎lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/Lesson15Test.java

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -99,65 +99,5 @@ public void testSetSalary() {
9999
}
100100

101101
// -------
102-
// Tests for EmployeeManager class
103-
@Test
104-
public void testAddEmployee() {
105-
EmployeeManager employeeManager = new EmployeeManager();
106-
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
107-
employeeManager.addEmployee(employee);
108-
assertThat(employeeManager.getEmployeeCount()).isEqualTo(1);
109-
}
110-
111-
@Test
112-
public void testGetEmployee() {
113-
EmployeeManager employeeManager = new EmployeeManager();
114-
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
115-
employeeManager.addEmployee(employee);
116-
Employee result = employeeManager.getEmployee(1);
117-
assertThat(result).isEqualTo(employee);
118-
}
119-
120-
@Test
121-
public void testUpdateEmployee() {
122-
EmployeeManager employeeManager = new EmployeeManager();
123-
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
124-
employeeManager.addEmployee(employee);
125-
employee.setName("Jane Doe");
126-
employeeManager.updateEmployee(employee);
127-
Employee result = employeeManager.getEmployee(1);
128-
assertThat(result.getName()).isEqualTo("Jane Doe");
129-
}
130102

131-
@Test
132-
public void testRemoveEmployee() {
133-
EmployeeManager employeeManager = new EmployeeManager();
134-
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
135-
employeeManager.addEmployee(employee);
136-
employeeManager.removeEmployee(1);
137-
assertThat(employeeManager.getEmployeeCount()).isEqualTo(0);
138-
}
139-
140-
@Test
141-
public void testEmployeeCount() {
142-
EmployeeManager employeeManager = new EmployeeManager();
143-
Employee employee1 = new Employee(1, "John Doe", "Engineering", 50000);
144-
Employee employee2 = new Employee(2, "Jane Doe", "Marketing", 60000);
145-
employeeManager.addEmployee(employee1);
146-
employeeManager.addEmployee(employee2);
147-
int result = employeeManager.getEmployeeCount();
148-
assertThat(result).isEqualTo(2);
149-
}
150-
151-
@Test
152-
public void assertEmployeeInCollection() {
153-
EmployeeManager employeeManager = new EmployeeManager();
154-
Employee employee = new Employee(1, "John Doe", "Engineering", 50000);
155-
employeeManager.addEmployee(employee);
156-
try {
157-
employeeManager.getEmployee(1);
158-
} catch (IllegalArgumentException e) {
159-
// This should not happen
160-
assertThat(e.getMessage()).isEqualTo("Employee does not in collection with id 1");
161-
}
162-
}
163103
}

0 commit comments

Comments
 (0)