From ff83a810f5b5fc13532eb79074b68ec6a138fb7a Mon Sep 17 00:00:00 2001 From: angie-3 Date: Wed, 30 Oct 2024 13:36:44 +0000 Subject: [PATCH 1/2] feat: EmployeeManager/Java test files.AngelicaC --- .../ecommerce/EcommerceSystemTest.java | 2 +- .../codedifferently/lesson15/Employee.java | 4 ++ .../lesson15/EmployeeManagertest.java | 49 +++++++++++++++ .../lesson15/EmployeeTest.java | 61 +++++++++++++++++++ 4 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagertest.java create mode 100644 lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeTest.java diff --git a/lesson_14/exceptions/exceptions_app/src/test/java/com/codedifferently/lesson14/ecommerce/EcommerceSystemTest.java b/lesson_14/exceptions/exceptions_app/src/test/java/com/codedifferently/lesson14/ecommerce/EcommerceSystemTest.java index 52194dfa3..77795c3b6 100644 --- a/lesson_14/exceptions/exceptions_app/src/test/java/com/codedifferently/lesson14/ecommerce/EcommerceSystemTest.java +++ b/lesson_14/exceptions/exceptions_app/src/test/java/com/codedifferently/lesson14/ecommerce/EcommerceSystemTest.java @@ -2,7 +2,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -16,6 +15,7 @@ void setUp() { } @Test + void testAddProduct() { // Act ecommerceSystem.addProduct("1", "Laptop"); 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..9b3628e39 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 @@ -45,4 +45,8 @@ public double getSalary() { public void setSalary(double salary) { this.salary = salary; } + + public String getDetails() { + return id + " " + name + " " + department + " " + salary + "."; + } } 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..3d62441cf --- /dev/null +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagertest.java @@ -0,0 +1,49 @@ +package com.codedifferently.lesson15; + +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; + +public class EmployeeManagertest { + private EmployeeManager employeeManager; + private Map employees; + Employee newEmployee; + Employee tomCat; + + @BeforeEach + void set_up() { + employees = new HashMap(); + newEmployee = new Employee(5, "Mike", "Human Resources", 900000.80); + employeeManager = new EmployeeManager(); + } + + @Test + void addEmployee() { + + employees.put(newEmployee.getId(), newEmployee); + employeeManager.addEmployee(newEmployee); + assertEquals(employees.get(5), employeeManager.getEmployee(5)); + } + + @Test + void updateEmployee() { + + tomCat = new Employee(5, "mike", "Human Resources", 900000.80); + employees.put(newEmployee.getId(), newEmployee); + employeeManager.addEmployee(newEmployee); + + employees.put(tomCat.getId(), tomCat); + employeeManager.updateEmployee(tomCat); + assertEquals(employees.get(tomCat.getId()), employeeManager.getEmployee(newEmployee.getId())); + } + + @Test + void RemoveEmployee() { + employeeManager.addEmployee(newEmployee); + employeeManager.removeEmployee(newEmployee.getId()); + assertEquals(0, employeeManager.getEmployeeCount()); + } +} diff --git a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeTest.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeTest.java new file mode 100644 index 000000000..79256cc23 --- /dev/null +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeTest.java @@ -0,0 +1,61 @@ +package com.codedifferently.lesson15; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +public class EmployeeTest { + // private class Employee employee; + Employee testEmployee; + + @BeforeEach + void setUp() { + testEmployee = new Employee(3, "angie", "Software Engineer", 100000.99); + } + + @Test + void getId_successful() { + + Employee employee = new Employee(3, null, "", 0); + int actualId = employee.getId(); + assertEquals(3, actualId); + } + + @Test + void setName() { + testEmployee.setName("angie"); + assertEquals("angie", testEmployee.getName()); + } + + @Test + void getName_successful() { + Employee testemployee = new Employee(0, "angie", "", 0); + + String actualName = testemployee.getName(); + assertEquals("angie", actualName); + } + + @Test + void getDepartment_successful() { + Employee employee = new Employee(0, null, "test", 0); + + String actualDepartment = employee.getDepartment(); + + assertEquals("test", actualDepartment); + } + + @Test + void getSalary_successful() { + Employee employee = new Employee(0, null, "", 100000.99); + + Double actualSalary = employee.getSalary(); + + assertEquals(100000.99, actualSalary); + } + + @Test + public void testGetDetails() { + assertEquals("3 angie Software Engineer 100000.99.", testEmployee.getDetails()); + } +} From a13acf4dd3f385cdd540fe2961178e07f327a4ee Mon Sep 17 00:00:00 2001 From: Angelica Castillo Date: Wed, 30 Oct 2024 10:55:06 -0400 Subject: [PATCH 2/2] Update EcommerceSystemTest.java --- .../codedifferently/lesson14/ecommerce/EcommerceSystemTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lesson_14/exceptions/exceptions_app/src/test/java/com/codedifferently/lesson14/ecommerce/EcommerceSystemTest.java b/lesson_14/exceptions/exceptions_app/src/test/java/com/codedifferently/lesson14/ecommerce/EcommerceSystemTest.java index 77795c3b6..52194dfa3 100644 --- a/lesson_14/exceptions/exceptions_app/src/test/java/com/codedifferently/lesson14/ecommerce/EcommerceSystemTest.java +++ b/lesson_14/exceptions/exceptions_app/src/test/java/com/codedifferently/lesson14/ecommerce/EcommerceSystemTest.java @@ -2,6 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -15,7 +16,6 @@ void setUp() { } @Test - void testAddProduct() { // Act ecommerceSystem.addProduct("1", "Laptop");