From b7b37d51a86fc897d10b36f702e91a8b85ccb341 Mon Sep 17 00:00:00 2001 From: nilejack Date: Wed, 30 Oct 2024 13:58:21 +0000 Subject: [PATCH 01/13] Feat: Adds for Lesson15 --- .../codedifferently/lesson15/Employee.java | 97 ++++++++++--------- .../lesson15/EmployeeManager.java | 55 ++++++----- .../lesson15/Employee.Test.java | 79 +++++++++++++++ .../lesson15/EmployeeManagerTest.java | 91 +++++++++++++++++ 4 files changed, 253 insertions(+), 69 deletions(-) create mode 100644 lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/Employee.Test.java create mode 100644 lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java diff --git a/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java b/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java index 49aaabbd7..8fd3232cf 100644 --- a/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java +++ b/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java @@ -1,48 +1,57 @@ package com.codedifferently.lesson15; public class Employee { - private int id; - private String name; - private String department; - private double salary; - - public Employee(int id, String name, String department, double salary) { - this.id = id; - this.name = name; - this.department = department; - this.salary = salary; + private int id; + private String name; + private String department; + private double salary; + + public Employee(int id, String name, String department, double salary) { + this.id = id; + this.name = name; + this.department = department; + this.salary = salary; + } + + // Getters and setters + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public double getSalary() { + return salary; + } + + public void setSalary(double salary) { + this.salary = salary; + } + + + + public boolean isEqualTo(int otherId) { + return this.id == otherId; + } + public String getDetails() { + return "id: " + id + " name: " + name + " department: " + department + " salary: " + salary; + } } - - // Getters and setters - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public double getSalary() { - return salary; - } - - public void setSalary(double salary) { - this.salary = salary; - } -} diff --git a/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/EmployeeManager.java b/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/EmployeeManager.java index 663372956..cc55c2633 100644 --- a/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/EmployeeManager.java +++ b/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/EmployeeManager.java @@ -4,29 +4,34 @@ import java.util.Map; public class EmployeeManager { - private Map employees; - - public EmployeeManager() { - employees = new HashMap<>(); - } - - public void addEmployee(Employee employee) { - employees.put(employee.getId(), employee); - } - - public Employee getEmployee(int id) { - return employees.get(id); - } - - public void updateEmployee(Employee employee) { - employees.put(employee.getId(), employee); - } - - public void removeEmployee(int id) { - employees.remove(id); - } - - public int getEmployeeCount() { - return employees.size(); - } + private Map employees = new HashMap<>(); + + public void addEmployee(Employee employee) { + employees.put(employee.getId(), employee); + } + + public void removeEmployee(int id) { + employees.remove(id); + } + + public void updateEmployee(Employee employee) { + employees.put(employee.getId(), employee); + } + + public Employee getEmployee(int id) { + return employees.get(id); + } + + public int getEmployeeCount() { + return employees.size(); + } + + public Map getEmployees() { + return employees; + } + + public void setEmployees(Map employees) { + this.employees = employees; + } } + diff --git a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/Employee.Test.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/Employee.Test.java new file mode 100644 index 000000000..1ac16c69f --- /dev/null +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/Employee.Test.java @@ -0,0 +1,79 @@ +package com.codedifferently.lesson15; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +class EmployeeTest { + + Employee employee; + + // Set up + @BeforeEach + void setUp() { + employee = new Employee(7, "Nile", "SWE", 65000.00); + } + + @Test + public void testGetId() { + int actualId = employee.getId(); + int expectedId = 7; + assertEquals(expectedId, actualId); + } + + @Test + public void testSetID() { + int expectedSetId = 0; + employee.setId(expectedSetId); + assertEquals(expectedSetId, employee.getId()); + } + + @Test + public void testGetName() { + String expectedName = "Nile"; + String actualName = employee.getName(); + assertEquals(expectedName, actualName); + } + + @Test + public void testSetName() { + String expectedSetName = "Nile"; + employee.setName(expectedSetName); + assertEquals(expectedSetName, employee.getName()); + } + + @Test + public void testGetDepartment() { + String expectedDepartment = "SWE"; + String actualDepartment = employee.getDepartment(); + assertEquals(expectedDepartment, actualDepartment); + } + + @Test + public void testSetDepartment() { + String expectedSetDepartment = "Tech"; + employee.setDepartment(expectedSetDepartment); + assertEquals(expectedSetDepartment, employee.getDepartment()); + } + + @Test + public void testGetSalary() { + double expectedSalary = 65000.00; + double actualSalary = employee.getSalary(); + assertEquals(expectedSalary, actualSalary); + } + + @Test + public void testSetSalary() { + double expectedSetSalary = 100000.00; + employee.setSalary(expectedSetSalary); + assertEquals(expectedSetSalary, employee.getSalary()); + } + + @Test + public void testGetDetails() { + String actualDetails = employee.getDetails(); + String expectedDetails = "id: 7 name: Nile department: SWE salary: 65000.0"; + assertEquals(expectedDetails, actualDetails); + } +} \ No newline at end of file diff --git a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java new file mode 100644 index 000000000..5e9efff0c --- /dev/null +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java @@ -0,0 +1,91 @@ +package com.codedifferently.lesson15; + +import java.util.HashMap; +import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +public class EmployeeManagerTest { + private EmployeeManager employeeManager; + Employee employee1; + private int count; + + @BeforeEach + public void setup() { + Employee employee1 = new Employee(1, "Nile", "SWE", 65000.00); + Employee employee2 = new Employee(2, "Chino", "Marketing", 70000.00); + employeeManager = new EmployeeManager(); + } + + @Test + public void testEmployeeManagement() { + } + // Create Employee objects + + @Test + public void addEmployee() { // Use addEmployee to add employees + employeeManager.addEmployee(employee1); + employeeManager.addEmployee(employee2); + } + + @Test// Invoke getEmployeeCount + public void getEmployee() { + int count = employeeManager.getEmployeeCount(); + assertThat(count).isEqualTo(2); + + + + + Employee retrievedEmployee = employeeManager.getEmployee(1); + assertThat(retrievedEmployee.getName()).isEqualTo("Nile"); + } + + @Test + public void updateEmployee() { + employee1.setSalary(70000.00); + employeeManager.updateEmployee(employee1); + + + Employee updatedEmployee = employeeManager.getEmployee(1); + assertThat(updatedEmployee.getSalary()).isEqualTo(70000.00); + } + + @Test + public void getEmployeeCount() { + employeeManager.removeEmployee(2); + count = employeeManager.getEmployeeCount(); + } + + + @Test + public void getEmployees() { + assertThat(count).isEqualTo(1); + + + Map employeeMap = employeeManager.getEmployees(); + assertThat(employeeMap.size()).isEqualTo(1); + } + + @Test + public void setEmployees() { + Map newEmployees = new HashMap<>(); + newEmployees.put(3, new Employee(3, "Charlie", "HR", 75000.00)); + employeeManager.setEmployees(newEmployees); + + + + assertThat(employeeManager.getEmployees().size()).isEqualTo(1); + } + @Test + public void testGetDetails() { + String actualDetails = employee1.getDetails(); + String expectedDetails = "id: 7 name: Nile department: SWE salary: 65000.0"; + assertEquals(expectedDetails, actualDetails); + + } +} + + \ No newline at end of file From 1472f2182d519330c8cfe096aa38bd15ccc60d90 Mon Sep 17 00:00:00 2001 From: nilejack Date: Wed, 30 Oct 2024 16:07:23 +0000 Subject: [PATCH 02/13] Feat: Changes to Lesson15.java files --- .../codedifferently/lesson15/Employee.java | 105 ++++++------ .../lesson15/Employee.Test.java | 123 +++++++------- .../lesson15/EmployeeManagerTest.java | 160 +++++++++--------- 3 files changed, 193 insertions(+), 195 deletions(-) diff --git a/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java b/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java index 8fd3232cf..2d610b49c 100644 --- a/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java +++ b/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java @@ -1,57 +1,56 @@ package com.codedifferently.lesson15; public class Employee { - private int id; - private String name; - private String department; - private double salary; - - public Employee(int id, String name, String department, double salary) { - this.id = id; - this.name = name; - this.department = department; - this.salary = salary; - } - - // Getters and setters - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public double getSalary() { - return salary; - } - - public void setSalary(double salary) { - this.salary = salary; - } - - - - public boolean isEqualTo(int otherId) { - return this.id == otherId; - } - public String getDetails() { - return "id: " + id + " name: " + name + " department: " + department + " salary: " + salary; - } + private int id; + private String name; + private String department; + private double salary; + + public Employee(int id, String name, String department, double salary) { + this.id = id; + this.name = name; + this.department = department; + this.salary = salary; } + + // Getters and setters + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public double getSalary() { + return salary; + } + + public void setSalary(double salary) { + this.salary = salary; + } + + public boolean isEqualTo(int otherId) { + return this.id == otherId; + } + + public String getDetails() { + return "id: " + id + " name: " + name + " department: " + department + " salary: " + salary; + } +} diff --git a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/Employee.Test.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/Employee.Test.java index 1ac16c69f..025d64ce1 100644 --- a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/Employee.Test.java +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/Employee.Test.java @@ -1,79 +1,80 @@ package com.codedifferently.lesson15; import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; class EmployeeTest { - Employee employee; + Employee employee; - // Set up - @BeforeEach - void setUp() { - employee = new Employee(7, "Nile", "SWE", 65000.00); - } + // Set up + @BeforeEach + void setUp() { + employee = new Employee(7, "Nile", "SWE", 65000.00); + } - @Test - public void testGetId() { - int actualId = employee.getId(); - int expectedId = 7; - assertEquals(expectedId, actualId); - } + @Test + public void testGetId() { + int actualId = employee.getId(); + int expectedId = 7; + assertEquals(expectedId, actualId); + } - @Test - public void testSetID() { - int expectedSetId = 0; - employee.setId(expectedSetId); - assertEquals(expectedSetId, employee.getId()); - } + @Test + public void testSetID() { + int expectedSetId = 0; + employee.setId(expectedSetId); + assertEquals(expectedSetId, employee.getId()); + } - @Test - public void testGetName() { - String expectedName = "Nile"; - String actualName = employee.getName(); - assertEquals(expectedName, actualName); - } + @Test + public void testGetName() { + String expectedName = "Nile"; + String actualName = employee.getName(); + assertEquals(expectedName, actualName); + } - @Test - public void testSetName() { - String expectedSetName = "Nile"; - employee.setName(expectedSetName); - assertEquals(expectedSetName, employee.getName()); - } + @Test + public void testSetName() { + String expectedSetName = "Nile"; + employee.setName(expectedSetName); + assertEquals(expectedSetName, employee.getName()); + } - @Test - public void testGetDepartment() { - String expectedDepartment = "SWE"; - String actualDepartment = employee.getDepartment(); - assertEquals(expectedDepartment, actualDepartment); - } + @Test + public void testGetDepartment() { + String expectedDepartment = "SWE"; + String actualDepartment = employee.getDepartment(); + assertEquals(expectedDepartment, actualDepartment); + } - @Test - public void testSetDepartment() { - String expectedSetDepartment = "Tech"; - employee.setDepartment(expectedSetDepartment); - assertEquals(expectedSetDepartment, employee.getDepartment()); - } + @Test + public void testSetDepartment() { + String expectedSetDepartment = "Tech"; + employee.setDepartment(expectedSetDepartment); + assertEquals(expectedSetDepartment, employee.getDepartment()); + } - @Test - public void testGetSalary() { - double expectedSalary = 65000.00; - double actualSalary = employee.getSalary(); - assertEquals(expectedSalary, actualSalary); - } + @Test + public void testGetSalary() { + double expectedSalary = 65000.00; + double actualSalary = employee.getSalary(); + assertEquals(expectedSalary, actualSalary); + } - @Test - public void testSetSalary() { - double expectedSetSalary = 100000.00; - employee.setSalary(expectedSetSalary); - assertEquals(expectedSetSalary, employee.getSalary()); - } + @Test + public void testSetSalary() { + double expectedSetSalary = 100000.00; + employee.setSalary(expectedSetSalary); + assertEquals(expectedSetSalary, employee.getSalary()); + } - @Test - public void testGetDetails() { - String actualDetails = employee.getDetails(); - String expectedDetails = "id: 7 name: Nile department: SWE salary: 65000.0"; - assertEquals(expectedDetails, actualDetails); - } -} \ No newline at end of file + @Test + public void testGetDetails() { + String actualDetails = employee.getDetails(); + String expectedDetails = "id: 7 name: Nile department: SWE salary: 65000.0"; + assertEquals(expectedDetails, actualDetails); + } +} diff --git a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java index 5e9efff0c..9911125b8 100644 --- a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java @@ -1,91 +1,89 @@ package com.codedifferently.lesson15; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.HashMap; import java.util.Map; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; public class EmployeeManagerTest { - private EmployeeManager employeeManager; - Employee employee1; - private int count; - - @BeforeEach - public void setup() { - Employee employee1 = new Employee(1, "Nile", "SWE", 65000.00); - Employee employee2 = new Employee(2, "Chino", "Marketing", 70000.00); - employeeManager = new EmployeeManager(); - } - - @Test - public void testEmployeeManagement() { - } - // Create Employee objects - - @Test - public void addEmployee() { // Use addEmployee to add employees - employeeManager.addEmployee(employee1); - employeeManager.addEmployee(employee2); - } - - @Test// Invoke getEmployeeCount - public void getEmployee() { - int count = employeeManager.getEmployeeCount(); - assertThat(count).isEqualTo(2); - - - - - Employee retrievedEmployee = employeeManager.getEmployee(1); - assertThat(retrievedEmployee.getName()).isEqualTo("Nile"); - } - - @Test - public void updateEmployee() { - employee1.setSalary(70000.00); - employeeManager.updateEmployee(employee1); - - - Employee updatedEmployee = employeeManager.getEmployee(1); - assertThat(updatedEmployee.getSalary()).isEqualTo(70000.00); - } - - @Test - public void getEmployeeCount() { - employeeManager.removeEmployee(2); - count = employeeManager.getEmployeeCount(); - } - - - @Test - public void getEmployees() { - assertThat(count).isEqualTo(1); - - - Map employeeMap = employeeManager.getEmployees(); - assertThat(employeeMap.size()).isEqualTo(1); - } - - @Test - public void setEmployees() { - Map newEmployees = new HashMap<>(); - newEmployees.put(3, new Employee(3, "Charlie", "HR", 75000.00)); - employeeManager.setEmployees(newEmployees); - - - - assertThat(employeeManager.getEmployees().size()).isEqualTo(1); - } - @Test - public void testGetDetails() { - String actualDetails = employee1.getDetails(); - String expectedDetails = "id: 7 name: Nile department: SWE salary: 65000.0"; - assertEquals(expectedDetails, actualDetails); - - } + private EmployeeManager employeeManager; + private Map employees; + Employee employee1; + Employee employee2; + + + @BeforeEach + public void setup() { + employees = new HashMap(); + employees.put(1, new Employee(1, "Nile", "SWE", 65000.00)); + + employeeManager = new EmployeeManager(); + } + + @Test + public void testEmployeeManagement() {} + + // Create Employee objects + + @Test + public void addEmployee() { // Use addEmployee to add employees + assertThat(employees).hasSize(1); + employees.put(2,new Employee(2, "Chino", "Marketing", 70000.00)); + assertThat(employees).hasSize(2); + } + + + @Test // Invoke getEmployeeCount + public void getEmployee() { + int count = employeeManager.getEmployeeCount(); + assertThat(employees).hasSize(2); + + Employee retrievedEmployee = employeeManager.getEmployee(2); + assertThat(retrievedEmployee.getName()).hasSize(2); + } + + @Test + public void updateEmployee() { + employee1.put(new Employee (1, "Nile", "SWE", 65000.00)); + employee1.setSalary(70000.00); + employeeManager.updateEmployee(employee1); + + Employee updatedEmployee = employeeManager.getEmployee(1); + assertThat(updatedEmployee.getSalary()).isEqualTo(70000.00); + } + + @Test + public void getEmployeeCount() { + employeeManager.removeEmployee(2); + count = employeeManager.getEmployeeCount(); + } + + @Test + public void getEmployees() { + employees.put(1, new Employee(1, "Nile", "SWE", 65000.00)); + assertThat(employees).hasSize(1); + Map employeeMap = employeeManager.getEmployees(); + employeeMap.put(count, employee1); + assertThat(employeeMap.size()).isEqualTo(1); + } + + @Test + public void setEmployees() { + Map newEmployees = new HashMap<>(); + newEmployees.put(3, new Employee(3, "Charlie", "HR", 75000.00)); + employeeManager.setEmployees(newEmployees); + + assertThat(employeeManager.getEmployees().size()).isEqualTo(1); + } + + @Test + public void testGetDetails() { + String actualDetails = employee1.getDetails(); + String expectedDetails = "id: 7 name: Nile department: SWE salary: 65000.0"; + assertEquals(expectedDetails, actualDetails); + } } - - \ No newline at end of file From 3f223fcd58b2191ca677942c74471011ec4f341b Mon Sep 17 00:00:00 2001 From: nilejack Date: Wed, 30 Oct 2024 18:03:30 +0000 Subject: [PATCH 03/13] Feat: spotlessApply fix --- .../codedifferently/lesson15/EmployeeManagerTest.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java index 9911125b8..b21232b23 100644 --- a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java @@ -5,7 +5,6 @@ import java.util.HashMap; import java.util.Map; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -14,13 +13,12 @@ public class EmployeeManagerTest { private Map employees; Employee employee1; Employee employee2; - @BeforeEach public void setup() { employees = new HashMap(); employees.put(1, new Employee(1, "Nile", "SWE", 65000.00)); - + employeeManager = new EmployeeManager(); } @@ -31,11 +29,10 @@ public void testEmployeeManagement() {} @Test public void addEmployee() { // Use addEmployee to add employees - assertThat(employees).hasSize(1); - employees.put(2,new Employee(2, "Chino", "Marketing", 70000.00)); + assertThat(employees).hasSize(1); + employees.put(2, new Employee(2, "Chino", "Marketing", 70000.00)); assertThat(employees).hasSize(2); } - @Test // Invoke getEmployeeCount public void getEmployee() { @@ -48,7 +45,7 @@ public void getEmployee() { @Test public void updateEmployee() { - employee1.put(new Employee (1, "Nile", "SWE", 65000.00)); + employee1.put(new Employee(1, "Nile", "SWE", 65000.00)); employee1.setSalary(70000.00); employeeManager.updateEmployee(employee1); From e853c63e04ecb641b064037da769d47cde4f2d2b Mon Sep 17 00:00:00 2001 From: nilejack Date: Wed, 30 Oct 2024 20:01:37 +0000 Subject: [PATCH 04/13] Feat: Fix --- .../lesson15/EmployeeManager.java | 63 +++++-------------- 1 file changed, 15 insertions(+), 48 deletions(-) diff --git a/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/EmployeeManager.java b/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/EmployeeManager.java index 223cb26eb..32c5a2ce0 100644 --- a/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/EmployeeManager.java +++ b/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/EmployeeManager.java @@ -5,70 +5,37 @@ public class EmployeeManager { - private Map employees = new HashMap<>(); + private Map employees = new HashMap<>(); - public void addEmployee(Employee employee) { - employees.put(employee.getId(), employee); - } - - public void removeEmployee(int id) { - employees.remove(id); - } - - public void updateEmployee(Employee employee) { - employees.put(employee.getId(), employee); - } - - public Employee getEmployee(int id) { - return employees.get(id); - } - - public int getEmployeeCount() { - return employees.size(); - } - - public Map getEmployees() { - return employees; - } - - public void setEmployees(Map employees) { - this.employees = employees; - } - - private final Map employees; + public void addEmployee(Employee employee) { + employees.put(employee.getId(), employee); + } - public EmployeeManager() { - employees = new HashMap<>(); + public void removeEmployee(int id) { + employees.remove(id); } - public void addEmployee(Employee employee) { + public void updateEmployee(Employee employee) { employees.put(employee.getId(), employee); } 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 int getEmployeeCount() { + return employees.size(); } - public void removeEmployee(int id) { - assertEmployeeInCollection(id); - employees.remove(id); + public Map getEmployees() { + return employees; } - private void assertEmployeeInCollection(int id) { - if (this.employees.containsKey(id)) { - return; - } - throw new IllegalArgumentException("Employee does not in collection with id " + id); + public void setEmployees(Map employees) { + this.employees = employees; } - public int getEmployeeCount() { - return employees.size(); + public EmployeeManager() { + employees = new HashMap<>(); } } - From fb48cff8afcd3bbf3802792b4748c5bd896ba13e Mon Sep 17 00:00:00 2001 From: nilejack Date: Wed, 30 Oct 2024 23:53:37 +0000 Subject: [PATCH 05/13] Feat: Fix for Nile Jackson's Employee.java file (correction to getDetails) --- .../main/java/com/codedifferently/lesson15/Employee.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java b/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java index 2d610b49c..98ee6855a 100644 --- a/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java +++ b/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java @@ -51,6 +51,13 @@ public boolean isEqualTo(int otherId) { } public String getDetails() { - return "id: " + id + " name: " + name + " department: " + department + " salary: " + salary; + return "id: " + this.getId() + " name: " + this.getName() + " department: " + this.getDepartment() + " salary: " + this.getSalary(); + + } + +public void put(Employee employee) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'put'"); +} } From e66c811e699102418611353b9f9db9850f7f83fb Mon Sep 17 00:00:00 2001 From: nilejack Date: Wed, 30 Oct 2024 23:56:59 +0000 Subject: [PATCH 06/13] Feat: spotlessApply fix --- .../com/codedifferently/lesson15/Employee.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java b/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java index 98ee6855a..368139e7e 100644 --- a/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java +++ b/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java @@ -51,13 +51,18 @@ public boolean isEqualTo(int otherId) { } public String getDetails() { - return "id: " + this.getId() + " name: " + this.getName() + " department: " + this.getDepartment() + " salary: " + this.getSalary(); - - + return "id: " + + this.getId() + + " name: " + + this.getName() + + " department: " + + this.getDepartment() + + " salary: " + + this.getSalary(); } -public void put(Employee employee) { + public void put(Employee employee) { // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'put'"); -} + } } From 34ce2a7c15b3be803e470550faaae78e5e9a258f Mon Sep 17 00:00:00 2001 From: nilejack Date: Wed, 30 Oct 2024 23:59:38 +0000 Subject: [PATCH 07/13] Feat: spotlessApply fix --- .../java/com/codedifferently/lesson15/EmployeeManagerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java index b21232b23..5c082bfb0 100644 --- a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java @@ -56,7 +56,7 @@ public void updateEmployee() { @Test public void getEmployeeCount() { employeeManager.removeEmployee(2); - count = employeeManager.getEmployeeCount(); + int count = employeeManager.getEmployeeCount(); } @Test From 295237a8dc13057425f45b34c7dcd10ba115c261 Mon Sep 17 00:00:00 2001 From: nilejack Date: Thu, 31 Oct 2024 00:00:39 +0000 Subject: [PATCH 08/13] Feat: spotlessApply fix --- .../test/java/com/codedifferently/lesson15/Employee.Test.java | 1 - 1 file changed, 1 deletion(-) diff --git a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/Employee.Test.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/Employee.Test.java index 025d64ce1..9282ae107 100644 --- a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/Employee.Test.java +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/Employee.Test.java @@ -1,7 +1,6 @@ package com.codedifferently.lesson15; import static org.junit.jupiter.api.Assertions.assertEquals; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; From 9a1747a63ae4ab53510ae3e39a939aab8c36a771 Mon Sep 17 00:00:00 2001 From: nilejack Date: Thu, 31 Oct 2024 00:06:55 +0000 Subject: [PATCH 09/13] Fix: spotlessApply Fix --- .../test/java/com/codedifferently/lesson15/Employee.Test.java | 1 + 1 file changed, 1 insertion(+) diff --git a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/Employee.Test.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/Employee.Test.java index 9282ae107..025d64ce1 100644 --- a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/Employee.Test.java +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/Employee.Test.java @@ -1,6 +1,7 @@ package com.codedifferently.lesson15; import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; From 4b88f4a7e186bf205974a6bfa2b880a9d40d6273 Mon Sep 17 00:00:00 2001 From: nilejack Date: Thu, 31 Oct 2024 00:18:57 +0000 Subject: [PATCH 10/13] Fix: spotlessApply fix --- .../java/com/codedifferently/lesson15/EmployeeManagerTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java index 5c082bfb0..0432c7227 100644 --- a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.Map; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -64,7 +65,7 @@ public void getEmployees() { employees.put(1, new Employee(1, "Nile", "SWE", 65000.00)); assertThat(employees).hasSize(1); Map employeeMap = employeeManager.getEmployees(); - employeeMap.put(count, employee1); + employeeMap.putAll(employees); assertThat(employeeMap.size()).isEqualTo(1); } From ed7179a0df5fa55aa5b44014787fc0a74247de3c Mon Sep 17 00:00:00 2001 From: nilejack Date: Thu, 31 Oct 2024 00:21:44 +0000 Subject: [PATCH 11/13] Fix: spotlessApply fix --- .../java/com/codedifferently/lesson15/EmployeeManagerTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java index 0432c7227..d0e24f0e4 100644 --- a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java @@ -5,7 +5,6 @@ import java.util.HashMap; import java.util.Map; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; From cb39e2c044145d0db8c0e0326b0a1b2819fc5128 Mon Sep 17 00:00:00 2001 From: nilejack Date: Thu, 31 Oct 2024 00:45:48 +0000 Subject: [PATCH 12/13] Feat: fixes to EmployeeManagerTest.java --- .../lesson15/EmployeeManagerTest.java | 41 ++++++++----------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java index d0e24f0e4..3709fea64 100644 --- a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java @@ -1,51 +1,47 @@ package com.codedifferently.lesson15; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; - import java.util.HashMap; import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; public class EmployeeManagerTest { private EmployeeManager employeeManager; private Map employees; - Employee employee1; - Employee employee2; + private Employee employee1; + private Employee employee2; @BeforeEach public void setup() { - employees = new HashMap(); - employees.put(1, new Employee(1, "Nile", "SWE", 65000.00)); + employees = new HashMap<>(); + employee1 = new Employee(1, "Nile", "SWE", 65000.00); + employee2 = new Employee(2, "Chino", "Marketing", 70000.00); employeeManager = new EmployeeManager(); + employeeManager.setEmployees(employees); + employeeManager.addEmployee(employee1); + employeeManager.addEmployee(employee2); } @Test public void testEmployeeManagement() {} - // Create Employee objects - @Test - public void addEmployee() { // Use addEmployee to add employees - assertThat(employees).hasSize(1); - employees.put(2, new Employee(2, "Chino", "Marketing", 70000.00)); + public void addEmployee() { assertThat(employees).hasSize(2); } - @Test // Invoke getEmployeeCount + @Test public void getEmployee() { - int count = employeeManager.getEmployeeCount(); - assertThat(employees).hasSize(2); - Employee retrievedEmployee = employeeManager.getEmployee(2); - assertThat(retrievedEmployee.getName()).hasSize(2); + assertThat(retrievedEmployee.getName()).isEqualTo("Chino"); } @Test public void updateEmployee() { - employee1.put(new Employee(1, "Nile", "SWE", 65000.00)); employee1.setSalary(70000.00); employeeManager.updateEmployee(employee1); @@ -55,17 +51,14 @@ public void updateEmployee() { @Test public void getEmployeeCount() { - employeeManager.removeEmployee(2); int count = employeeManager.getEmployeeCount(); + assertEquals(2, count); } @Test public void getEmployees() { - employees.put(1, new Employee(1, "Nile", "SWE", 65000.00)); - assertThat(employees).hasSize(1); Map employeeMap = employeeManager.getEmployees(); - employeeMap.putAll(employees); - assertThat(employeeMap.size()).isEqualTo(1); + assertThat(employeeMap.size()).isEqualTo(2); } @Test @@ -80,7 +73,7 @@ public void setEmployees() { @Test public void testGetDetails() { String actualDetails = employee1.getDetails(); - String expectedDetails = "id: 7 name: Nile department: SWE salary: 65000.0"; + String expectedDetails = "id: 1 name: Nile department: SWE salary: 65000.0"; assertEquals(expectedDetails, actualDetails); } } From 5e56a3fb6447b5105f98b546cb1cf12af2ad3aa3 Mon Sep 17 00:00:00 2001 From: nilejack Date: Thu, 31 Oct 2024 00:50:37 +0000 Subject: [PATCH 13/13] Feat: fix --- .../com/codedifferently/lesson15/EmployeeManagerTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java index 3709fea64..65344fb36 100644 --- a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java @@ -1,10 +1,10 @@ package com.codedifferently.lesson15; -import java.util.HashMap; -import java.util.Map; - import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.HashMap; +import java.util.Map; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;