Skip to content

Commit 131c1f2

Browse files
committed
test: update tests to ensure all pass
- Updated Lesson15TestEmployee.java to fix test logic - Updated Lesson15TestManager.java to ensure correct test behavior - Discarded changes in .vscode/settings.json
1 parent 50084b2 commit 131c1f2

File tree

2 files changed

+61
-33
lines changed

2 files changed

+61
-33
lines changed

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

Lines changed: 45 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@ public class Lesson15TestEmployee {
99

1010
@Test
1111
public void getEmployeeId() {
12-
// Arrange
13-
var employeeId = 4;
14-
15-
// Act
16-
Employee myEmployee = new Employee(employeeId, "", "", 0);
17-
18-
// Assert
19-
assertEquals(4, myEmployee.getId());
12+
// given
13+
Employee employee = new Employee(1, "Ken", "Tech", 80);
14+
// when
15+
int expected = 1;
16+
int actual = employee.getId();
17+
// then
18+
assertEquals(expected, actual);
2019
}
2120

2221
@Test
2322
public void setEmployeeId() {
24-
// Arrange
25-
var expectedId = 5;
26-
27-
// Act
28-
Employee setEmployee = new Employee(5, "", "", 0);
29-
30-
// Assert
31-
assertEquals(expectedId, setEmployee.getId());
23+
// given
24+
Employee employee = new Employee(1, "Kushmir", "Tech", 80);
25+
// when
26+
employee.setId(1);
27+
// then
28+
int expected = 1;
29+
int actual = employee.getId();
30+
31+
assertEquals(expected, actual);
3232
}
3333

3434
@Test
@@ -45,14 +45,15 @@ public void getName() {
4545

4646
@Test
4747
public void setName() {
48-
// Arrange
49-
var getName = "Khai";
50-
51-
// Act
52-
Employee setEmployeeName = new Employee(0, "Khai", "", 0);
53-
54-
// Assert
55-
assertEquals(getName, setEmployeeName.getName());
48+
// given
49+
Employee employee = new Employee(2, "jamie", "2k", 600);
50+
51+
// when
52+
employee.setName("Kody");
53+
String actual = employee.getName();
54+
// then
55+
assertEquals("Kody", actual);
56+
;
5657
}
5758

5859
@Test
@@ -70,13 +71,13 @@ public void getDepartment() {
7071
@Test
7172
public void setDepartment() {
7273
// Arrange
73-
var expectedDepartment = "Software";
74+
Employee employee = new Employee(2, "jamie", "hacker", 600);
7475

75-
// Act
76-
Employee placeDepartment = new Employee(0, "", "Software", 0);
77-
78-
// Assert
79-
assertEquals(expectedDepartment, placeDepartment.getDepartment());
76+
// when
77+
employee.setDepartment("hacker");
78+
String actual = employee.getDepartment();
79+
// then
80+
assertEquals("hacker", actual);
8081
}
8182

8283
@Test
@@ -110,4 +111,18 @@ public void getDetails() {
110111

111112
assertThat(details).isEqualTo("Employee ID: 1, Name: Karsen, Department: Football, Salary: 25");
112113
}
114+
115+
@Test
116+
public void testZeroSalary() {
117+
Employee employee2 = new Employee(1, "Khayla", "Engineering", 50000);
118+
employee2.setSalary(0);
119+
assertThat(employee2.getSalary()).isEqualTo(0);
120+
}
121+
122+
@Test
123+
public void negativeSalary() {
124+
Employee employee3 = new Employee(2, "Sonya", null, 9999);
125+
employee3.setSalary(-800);
126+
assertThat(employee3.getSalary()).isEqualTo(-800);
127+
}
113128
}

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static org.assertj.core.api.Assertions.assertThat;
44
import static org.assertj.core.api.Assertions.assertThatThrownBy;
5+
import static org.junit.jupiter.api.Assertions.assertThrows;
56

67
import org.junit.jupiter.api.BeforeEach;
78
import org.junit.jupiter.api.Test; // got this from chatGpt
@@ -22,6 +23,14 @@ void addsEmployeeToMap() {
2223
assertThat(manager.getEmployee(1)).isEqualTo(newEmployee);
2324
}
2425

26+
@Test
27+
void nullDepartment() {
28+
Employee employeeA = new Employee(1, "Keynon", null, 50000);
29+
manager.addEmployee(employeeA);
30+
Employee fetched = manager.getEmployee(1);
31+
assertThat(fetched.getDepartment()).isNull();
32+
}
33+
2534
@Test
2635
void getEmployeeId() {
2736
Employee employee1 = new Employee(1, "K", "Tech", 0);
@@ -31,16 +40,20 @@ void getEmployeeId() {
3140

3241
@Test
3342
void updateEmployee() {
34-
Employee employee2 = new Employee(1, "K", "Google", 1);
35-
manager.addEmployee(employee2);
36-
assertThat(manager.getEmployee(1)).isEqualTo(employee2);
43+
Employee original = new Employee(1, "John", "Apple", 1);
44+
manager.addEmployee(original);
45+
Employee updated = new Employee(1, "K", "Google", 1);
46+
manager.updateEmployee(updated);
47+
assertThat(manager.getEmployee(1)).isEqualTo(updated);
3748
}
3849

3950
@Test
4051
void removeEmployee() {
4152
Employee employee3 = new Employee(5, "Kaci", "nullhora", 50000);
4253
manager.addEmployee(employee3);
4354
assertThat(manager.getEmployee(5)).isEqualTo(employee3);
55+
manager.removeEmployee(5);
56+
assertThrows(IllegalArgumentException.class, () -> manager.getEmployee(5));
4457
}
4558

4659
@Test

0 commit comments

Comments
 (0)