From 0d35a8aa6fb5c038a4e296600749bee7e257ae5d Mon Sep 17 00:00:00 2001 From: zionbuch Date: Wed, 30 Oct 2024 15:57:32 +0000 Subject: [PATCH 1/6] feat: added Zion's Lesson_15 Test for Employee and EmployeeManager --- .../codedifferently/lesson15/Employee.java | 4 + .../src/test/java/EmployeeManagerTest.java | 78 +++++++++++++++++++ .../lesson15/EmployeeTest.java | 65 ++++++++++++++++ 3 files changed, 147 insertions(+) create mode 100644 lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java create mode 100644 lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeTest.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..74c0e0167 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 " + id + " Name: " + name + " department " + department + salary + " salary"; + } } diff --git a/lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java b/lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java new file mode 100644 index 000000000..0a297ec31 --- /dev/null +++ b/lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java @@ -0,0 +1,78 @@ +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import com.codedifferently.lesson15.Employee; +import com.codedifferently.lesson15.EmployeeManager; + +public class EmployeeManagerTest { + + EmployeeManager employeeManager; + Employee employee; + Employee employee2; + + @BeforeEach + public void setUp() { + employeeManager = new EmployeeManager(); + employee = new Employee(0, "Zion", "Code Differently", 0); + } + + @Test + public void testAddEmployee() { + employeeManager.addEmployee(employee); + assertEquals(1, employeeManager.getEmployeeCount()); + } + + @Test + public void testGetEmployee() { + employeeManager.addEmployee(employee); + assertEquals(employeeManager.getEmployee(employee.getId()), employee); + } + + @Test + public void testupdateEmployee() { + employeeManager.addEmployee(employee); + employee2 = new Employee(0, "Andre", "JP Morgan", 0); + employeeManager.updateEmployee(employee2); + assertEquals(employeeManager.getEmployee(employee2.getId()), employee2); + } + + @Test + public void testSetName() { + employee.setName("Zion"); + assertEquals(employee.getName(), "Zion"); + } + + @Test + public void testGetDepartment() { + employee.getDepartment(); + assertEquals(employee.getDepartment(), "Code Differently"); + } + + @Test + public void testSetDepartment() { + employee.setDepartment("Code Differently"); + assertEquals(employee.getDepartment(), "Code Differently"); + } + + @Test + public void testGetDetails() { + assertEquals(employee.getDetails(), "Id 0 Name: Zion department Code Differently0.0 salary"); + } + + @Test + public void testRemoveEmployee(){ + // Setup + var id=0; + + // Execute + employeeManager.addEmployee(employee); + employeeManager.removeEmployee(id); + + // Assert + assertThatThrownBy(() -> employeeManager.getEmployee(id)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("Employee does not in collection with id " + id); + } +} 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..d602207f7 --- /dev/null +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeTest.java @@ -0,0 +1,65 @@ +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; + + @BeforeEach + public void setUp() { + employee = new Employee(0, "Zion", "Code Differently", 0); + } + + @Test + public void testGetId() { + employee.getId(); + assertEquals(employee.getId(), 0); + } + + @Test + public void testSetId() { + employee.setId(1); + assertEquals(employee.getId(), 1); + } + + @Test + public void testGetName() { + assertEquals(employee.getName(), "Zion"); + } + + @Test + public void testSetName() { + employee.setName("Zion"); + assertEquals(employee.getName(), "Zion"); + } + + @Test + public void testGetDepartment() { + employee.getDepartment(); + assertEquals(employee.getDepartment(), "Code Differently"); + } + + @Test + public void testSetDepartment() { + employee.setDepartment("Code Differently"); + assertEquals(employee.getDepartment(), "Code Differently"); + } + + @Test + public void testGetDetails() { + assertEquals(employee.getDetails(), "Id 0 Name: Zion department Code Differently0.0 salary"); + } + @Test + public void testGetSalary() { + employee.getSalary(); + assertEquals(employee.getSalary(), 0); + } + + @Test + public void testSetSalary() { + assertEquals(employee.getSalary(), 0); + } + +} From 668d7d2bbe98dd0c129deae3b9a942d783eade9b Mon Sep 17 00:00:00 2001 From: zionbuch Date: Thu, 31 Oct 2024 14:38:30 +0000 Subject: [PATCH 2/6] fix: build failed --- .../tdd_app/src/test/java/EmployeeManagerTest.java | 10 +++++----- .../com/codedifferently/lesson15/EmployeeTest.java | 11 ++++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java b/lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java index 0a297ec31..2baece610 100644 --- a/lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java +++ b/lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java @@ -1,10 +1,10 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; import com.codedifferently.lesson15.Employee; import com.codedifferently.lesson15.EmployeeManager; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class EmployeeManagerTest { @@ -61,10 +61,10 @@ public void testGetDetails() { assertEquals(employee.getDetails(), "Id 0 Name: Zion department Code Differently0.0 salary"); } - @Test - public void testRemoveEmployee(){ + @Test + public void testRemoveEmployee() { // Setup - var id=0; + var id = 0; // Execute employeeManager.addEmployee(employee); 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 index d602207f7..56ae75201 100644 --- 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 @@ -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; @@ -51,15 +52,15 @@ public void testSetDepartment() { public void testGetDetails() { assertEquals(employee.getDetails(), "Id 0 Name: Zion department Code Differently0.0 salary"); } + @Test - public void testGetSalary() { + public void testGetSalary() { employee.getSalary(); assertEquals(employee.getSalary(), 0); - } + } - @Test - public void testSetSalary() { + @Test + public void testSetSalary() { assertEquals(employee.getSalary(), 0); } - } From 86754baed6f7b69be8def4b22e382db458956e9a Mon Sep 17 00:00:00 2001 From: zionbuch Date: Thu, 31 Oct 2024 14:50:30 +0000 Subject: [PATCH 3/6] feat: recommit for spotless --- lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java b/lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java index 2baece610..0d6998843 100644 --- a/lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java +++ b/lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java @@ -1,10 +1,10 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.codedifferently.lesson15.Employee; import com.codedifferently.lesson15.EmployeeManager; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; public class EmployeeManagerTest { @@ -75,4 +75,5 @@ public void testRemoveEmployee() { .isInstanceOf(IllegalArgumentException.class) .hasMessage("Employee does not in collection with id " + id); } + } From bda3feecbd9827a22d31764e45db8da7fefe0ef6 Mon Sep 17 00:00:00 2001 From: zionbuch Date: Thu, 31 Oct 2024 14:52:07 +0000 Subject: [PATCH 4/6] chore: spotlessApply --- lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java b/lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java index 0d6998843..44618154b 100644 --- a/lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java +++ b/lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java @@ -75,5 +75,4 @@ public void testRemoveEmployee() { .isInstanceOf(IllegalArgumentException.class) .hasMessage("Employee does not in collection with id " + id); } - } From fc224d900f9399229c401de31d6b04e47886bcb8 Mon Sep 17 00:00:00 2001 From: zionbuch Date: Thu, 31 Oct 2024 14:56:49 +0000 Subject: [PATCH 5/6] feat: refactor --- .../codedifferently/lesson15}/EmployeeManagerTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename lesson_15/tdd/tdd_app/src/test/java/{ => com/codedifferently/lesson15}/EmployeeManagerTest.java (95%) diff --git a/lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java similarity index 95% rename from lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java rename to lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java index 44618154b..53305790a 100644 --- a/lesson_15/tdd/tdd_app/src/test/java/EmployeeManagerTest.java +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java @@ -1,11 +1,9 @@ +package com.codedifferently.lesson15; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.codedifferently.lesson15.Employee; -import com.codedifferently.lesson15.EmployeeManager; - public class EmployeeManagerTest { EmployeeManager employeeManager; From 5ca3e1db49d2cf41c18027cad4f0a210373b29a2 Mon Sep 17 00:00:00 2001 From: zionbuch Date: Thu, 31 Oct 2024 15:15:59 +0000 Subject: [PATCH 6/6] fix: applies spotlessApply --- .../java/com/codedifferently/lesson15/EmployeeManagerTest.java | 2 ++ 1 file changed, 2 insertions(+) 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 53305790a..dc59d8fae 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,6 +1,8 @@ package com.codedifferently.lesson15; + import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;