fix: Reverts EmployeeManager changes and modifies EmployeeManagerTest.java. Lesson_15 - Joseph Caballero

Author: Josephcabs

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

@@ -4,7 +4,8 @@
 import java.util.Map;
 
 public class EmployeeManager {
-  private Map<Integer, Employee> employees;
+
+  private final Map<Integer, Employee> employees;
 
   public EmployeeManager() {
     employees = new HashMap<>();
@@ -14,24 +15,28 @@ public void addEmployee(Employee employee) {
     employees.put(employee.getId(), employee);
   }
 
-  public Employee getEmployee(int id) throws RuntimeException {
-    if (employees.get(id) == null) {
-      throw new NullPointerException("Employee with id " + id + " not found");
-    }
+  public Employee getEmployee(int id) {
+    assertEmployeeInCollection(id);
     return employees.get(id);
   }
 
   public void updateEmployee(Employee employee) {
+    assertEmployeeInCollection(employee.getId());
     employees.put(employee.getId(), employee);
   }
 
-  public void removeEmployee(int id) throws RuntimeException {
-    if (employees.get(id) == null) {
-      throw new NullPointerException("Employee with id " + id + " not found");
-    }
+  public void removeEmployee(int id) {
+    assertEmployeeInCollection(id);
     employees.remove(id);
   }
 
+  private void assertEmployeeInCollection(int id) {
+    if (this.employees.containsKey(id)) {
+      return;
+    }
+    throw new IllegalArgumentException("Employee does not in collection with id " + id);
+  }
+
   public int getEmployeeCount() {
     return employees.size();
   }

lesson_15/tdd/tdd_app/src/test/java/JosephCaballero/EmployeeManagerTest.java

@@ -9,60 +9,63 @@
 public class EmployeeManagerTest {
   EmployeeManager employeeManager;
   Employee employee;
+  Employee employee2;
 
   @BeforeEach
   void setUp() {
     employeeManager = new EmployeeManager();
-    employee = new Employee(999, "Joseph", "Boxing", 150000000.5);
-    employeeManager.addEmployee(employee);
   }
 
   @Test
   void testAddEmployee() {
-    assertThat(employeeManager.getEmployee(999)).isEqualTo(employee);
+    employee = new Employee(999, "Joseph", "Boxing", 150000000.5);
+    employeeManager.addEmployee(employee);
+    assertThat(employeeManager.getEmployeeCount()).isEqualTo(1);
   }
 
   @Test
   void testGetEmployee() {
+    employee = new Employee(999, "Joseph", "Boxing", 150000000.5);
+    employeeManager.addEmployee(employee);
     assertThat(employeeManager.getEmployee(999)).isEqualTo(employee);
   }
 
   @Test
   void testGetEmployee_failedDueToNull() throws RuntimeException {
     assertThatThrownBy(() -> employeeManager.getEmployee(9))
-        .isInstanceOf(NullPointerException.class)
-        .hasMessage("Employee with id 9 not found");
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("Employee does not in collection with id 9");
   }
 
   @Test
   void testEmployeeUpdate() {
-    Employee employee2 = new Employee(99, "Angelica", "CodeDifferently", 900.55);
+    employee = new Employee(999, "Joseph", "Boxing", 150000000.5);
+    employeeManager.addEmployee(employee);
+    employee2 = new Employee(99, "Angelica", "CodeDifferently", 900.55);
     employeeManager.addEmployee(employee2);
     employeeManager.updateEmployee(employee2);
     assertThat(employeeManager.getEmployeeCount()).isEqualTo(2);
   }
 
   @Test
   void testRemoveEmployee() throws RuntimeException {
+    employee = new Employee(999, "Joseph", "Boxing", 150000000.5);
+    employeeManager.addEmployee(employee);
     employeeManager.removeEmployee(999);
     assertThat(employeeManager.getEmployeeCount()).isEqualTo(0);
   }
 
   @Test
   void testRemoveEmployee_errorFromNullEmployeeId() throws RuntimeException {
     assertThatThrownBy(() -> employeeManager.removeEmployee(9))
-        .isInstanceOf(NullPointerException.class)
-        .hasMessage("Employee with id 9 not found");
-  }
-
-  @Test
-  void testGetEmployeeCount_whenNoEmployeesAreInMap() {
-    employeeManager.removeEmployee(999);
-    assertThat(employeeManager.getEmployeeCount()).isEqualTo(0);
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("Employee does not in collection with id 9");
   }
 
   @Test
   void testGetEmployeeCount_whenOneEmployeeIsInTheMap() {
+    employee = new Employee(999, "Joseph", "Boxing", 150000000.5);
+    employeeManager.addEmployee(employee);
     assertThat(employeeManager.getEmployeeCount()).isEqualTo(1);
   }
 }