From b643a4c488a249f5da91b7765195f404c78c6f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Wed, 16 Oct 2024 15:19:05 +0000 Subject: [PATCH 1/8] feat: created chigazograham.json file --- .../main/resources/data/chigazograham.json | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 lesson_09/types/types_app/src/main/resources/data/chigazograham.json diff --git a/lesson_09/types/types_app/src/main/resources/data/chigazograham.json b/lesson_09/types/types_app/src/main/resources/data/chigazograham.json new file mode 100644 index 000000000..292620c54 --- /dev/null +++ b/lesson_09/types/types_app/src/main/resources/data/chigazograham.json @@ -0,0 +1,92 @@ +[ + { + "column1": "ms1wuglcnp", + "column2": "true", + "column3": "6463003749233522688", + "column4": "2.7921879E38", + "column5": "8.442422875678673E307", + "column6": "4743", + "column7": "1270272283" + }, + { + "column1": "7awo0gh", + "column2": "false", + "column3": "7752118028902647808", + "column4": "2.6698281E38", + "column5": "5.605056226818231E307", + "column6": "23516", + "column7": "1704066280" + }, + { + "column1": "cserf78x02", + "column2": "false", + "column3": "2540472457630355968", + "column4": "1.5396288E38", + "column5": "1.50417665803363E308", + "column6": "14580", + "column7": "2114160244" + }, + { + "column1": "zgqnjh5", + "column2": "false", + "column3": "953741867660372224", + "column4": "2.2381432E38", + "column5": "2.493477176095576E307", + "column6": "26539", + "column7": "996751379" + }, + { + "column1": "s5iqo80h3c", + "column2": "false", + "column3": "5714943984670955520", + "column4": "1.932927E38", + "column5": "1.705202914715676E308", + "column6": "7442", + "column7": "1112427416" + }, + { + "column1": "wcuo0zxejh", + "column2": "false", + "column3": "2704740152448495104", + "column4": "1.0179288E38", + "column5": "1.393686380125556E308", + "column6": "32762", + "column7": "1881329776" + }, + { + "column1": "cnq9kjd6hiu", + "column2": "true", + "column3": "6206221245541992448", + "column4": "1.3631897E38", + "column5": "1.2956738103127734E308", + "column6": "30578", + "column7": "1147532001" + }, + { + "column1": "8z0bnd", + "column2": "false", + "column3": "4562348053081931776", + "column4": "1.4620677E38", + "column5": "2.044622864892074E307", + "column6": "17197", + "column7": "1094615070" + }, + { + "column1": "0vl9htqrw", + "column2": "false", + "column3": "6077936030977995776", + "column4": "1.7550462E38", + "column5": "4.752956293100593E307", + "column6": "12867", + "column7": "724629435" + }, + { + "column1": "6ur49", + "column2": "true", + "column3": "1339556241029906688", + "column4": "1.944709E38", + "column5": "9.16514287771922E307", + "column6": "20363", + "column7": "562533284" + } +] \ No newline at end of file From 68ccb5fae54e5e7c969f4a4ace4c2947e82813e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Wed, 16 Oct 2024 19:01:53 +0000 Subject: [PATCH 2/8] fix: deleted lesson_09 content from main; --- .../main/resources/data/chigazograham.json | 92 ------------------- 1 file changed, 92 deletions(-) delete mode 100644 lesson_09/types/types_app/src/main/resources/data/chigazograham.json diff --git a/lesson_09/types/types_app/src/main/resources/data/chigazograham.json b/lesson_09/types/types_app/src/main/resources/data/chigazograham.json deleted file mode 100644 index 292620c54..000000000 --- a/lesson_09/types/types_app/src/main/resources/data/chigazograham.json +++ /dev/null @@ -1,92 +0,0 @@ -[ - { - "column1": "ms1wuglcnp", - "column2": "true", - "column3": "6463003749233522688", - "column4": "2.7921879E38", - "column5": "8.442422875678673E307", - "column6": "4743", - "column7": "1270272283" - }, - { - "column1": "7awo0gh", - "column2": "false", - "column3": "7752118028902647808", - "column4": "2.6698281E38", - "column5": "5.605056226818231E307", - "column6": "23516", - "column7": "1704066280" - }, - { - "column1": "cserf78x02", - "column2": "false", - "column3": "2540472457630355968", - "column4": "1.5396288E38", - "column5": "1.50417665803363E308", - "column6": "14580", - "column7": "2114160244" - }, - { - "column1": "zgqnjh5", - "column2": "false", - "column3": "953741867660372224", - "column4": "2.2381432E38", - "column5": "2.493477176095576E307", - "column6": "26539", - "column7": "996751379" - }, - { - "column1": "s5iqo80h3c", - "column2": "false", - "column3": "5714943984670955520", - "column4": "1.932927E38", - "column5": "1.705202914715676E308", - "column6": "7442", - "column7": "1112427416" - }, - { - "column1": "wcuo0zxejh", - "column2": "false", - "column3": "2704740152448495104", - "column4": "1.0179288E38", - "column5": "1.393686380125556E308", - "column6": "32762", - "column7": "1881329776" - }, - { - "column1": "cnq9kjd6hiu", - "column2": "true", - "column3": "6206221245541992448", - "column4": "1.3631897E38", - "column5": "1.2956738103127734E308", - "column6": "30578", - "column7": "1147532001" - }, - { - "column1": "8z0bnd", - "column2": "false", - "column3": "4562348053081931776", - "column4": "1.4620677E38", - "column5": "2.044622864892074E307", - "column6": "17197", - "column7": "1094615070" - }, - { - "column1": "0vl9htqrw", - "column2": "false", - "column3": "6077936030977995776", - "column4": "1.7550462E38", - "column5": "4.752956293100593E307", - "column6": "12867", - "column7": "724629435" - }, - { - "column1": "6ur49", - "column2": "true", - "column3": "1339556241029906688", - "column4": "1.944709E38", - "column5": "9.16514287771922E307", - "column6": "20363", - "column7": "562533284" - } -] \ No newline at end of file From 28ebc46afc789384265efdd077fd278d8414b1f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Tue, 29 Oct 2024 13:12:43 +0000 Subject: [PATCH 3/8] feat: added test framework for EmployeeTest and EmployeeManagerTest --- .../lesson15/EmployeeManagerTest.java | 48 +++++++++++++ .../lesson15/EmployeeTest.java | 72 +++++++++++++++++++ 2 files changed, 120 insertions(+) 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_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..1cb9e92de --- /dev/null +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java @@ -0,0 +1,48 @@ +package com.codedifferently.lesson15; + +import org.junit.jupiter.api.Test; + +public class EmployeeManagerTest { + + EmployeeTest employeeTest; + + @Test + public void getIdTest() { + // test if id matches set id + + } + + @Test + public void setIdTest() { + // tests if changed id matches new id + } + + @Test + public void getNameTest() { + // tests if changed name matches name + } + + @Test + public void setNameTest() { + // tests if changed id matches new id + } + @Test + public void getDepartmentTest() { + + } + + @Test + public void setDepartmentTest() { + + } + + @Test + public void getSalaryTest() { + + } + + @Test + public void setSalaryTest() { + + } +} 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..af6d24329 --- /dev/null +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeTest.java @@ -0,0 +1,72 @@ +package com.codedifferently.lesson15; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.BeforeEach; + +import com.codedifferently.lesson14.ecommerce.EcommerceSystem; + +public class EmployeeTest { + + EmployeeTest employeeTest; + + @BeforeEach + void setUp() { + employeeTest = new EmployeeTest(); + } + + @Test + public void getIdTest() { + // test if id matches set id + + Id idObject = new Id(57); + + int expectedId = idObject.getId(); + + assertThat(expectedId).isEqualTo(57); + } + + @Test + public void setIdTest() { + // tests if changed id matches new id + employeeTest.setId(); + } + + @Test + public void getNameTest() { + // tests if changed name matches name + employeeTest.getName(); + } + + @Test + public void setNameTest() { + // tests if changed id matches new id + employeeTest.setName(); + } + + @Test + public void getDepartmentTest() { + employeeTest.getDepartment(); + } + + @Test + public void setDepartmentTest() { + employeeTest.setDepartment(); + } + + @Test + public void getSalaryTest() { + employeeTest.getSalary(); + } + + @Test + public void setSalaryTest() { + employeeTest.setSalary(); + } + + private void getId() { + throw new UnsupportedOperationException("Not supported yet."); + } +} + From 9b45e845ef36599e0f93066e67ac7875037d63c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Tue, 29 Oct 2024 14:30:37 +0000 Subject: [PATCH 4/8] feat: added Arrange, Act, and Assert methods for all 'textGet...' functions; added Arrange, Act, and Assert methods for 'testSetName' and 'testSetID' functions; --- .../codedifferently/lesson15/Employee.java | 4 + .../lesson15/EmployeeTest.java | 88 +++++++++++-------- 2 files changed, 57 insertions(+), 35 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 49aaabbd7..aa51bc38b 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; } + + int setId() { + throw new UnsupportedOperationException("Not supported yet."); + } } 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 af6d24329..7f8feb814 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,70 +1,88 @@ package com.codedifferently.lesson15; -import static org.assertj.core.api.Assertions.assertThat; - -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import com.codedifferently.lesson14.ecommerce.EcommerceSystem; public class EmployeeTest { - EmployeeTest employeeTest; - + Employee employee; + //Set up @BeforeEach - void setUp() { - employeeTest = new EmployeeTest(); - } + void setUp() { + employee = new Employee(19, "Chigazo", "Finance", 200000.00); + } @Test - public void getIdTest() { - // test if id matches set id - - Id idObject = new Id(57); + //Method beign tested + public void testGetId() { + //Execersise + int actualId = employee.getId(); - int expectedId = idObject.getId(); - - assertThat(expectedId).isEqualTo(57); + int expectedId = 19; + //Assert(Checking the value) + assertEquals(expectedId, actualId); } @Test - public void setIdTest() { - // tests if changed id matches new id - employeeTest.setId(); + public void testSetID() { + //Arrange + int expectedSetId = 91; + //Act + employee.setId(expectedSetId); + //Assert + assertEquals(expectedSetId, employee.getId()); } @Test - public void getNameTest() { - // tests if changed name matches name - employeeTest.getName(); + public void testGetName() { + + String actualName = employee.getName(); + + String expectedName = "Chigazo"; + + assertEquals(expectedName, actualName); } @Test - public void setNameTest() { - // tests if changed id matches new id - employeeTest.setName(); + public void testSetName() { + //Arrange + String expectedSetName = "Austin"; + //Act + employee.setName(expectedSetName); + //Assert + assertEquals(expectedSetName, employee.getName()); } @Test public void getDepartmentTest() { - employeeTest.getDepartment(); - } + String expectedDepartment = employee.getDepartment(); - @Test - public void setDepartmentTest() { - employeeTest.setDepartment(); + String actualDepartment = "Finance"; + + assertEquals(expectedDepartment, actualDepartment); } + // @Test + // public void setDepartmentTest() { + // employee.setDepartment(); + // } + @Test public void getSalaryTest() { - employeeTest.getSalary(); - } + double expectedSalary = employee.getSalary(); - @Test - public void setSalaryTest() { - employeeTest.setSalary(); + double actualSalary = 200000.00; + + assertEquals(expectedSalary, actualSalary); } + // @Test + // public void setSalaryTest() { + // employee.setSalary(); + // } + private void getId() { throw new UnsupportedOperationException("Not supported yet."); } From 863a8da443f51c821dfd19379353dea6ebaf7ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Tue, 29 Oct 2024 15:10:22 +0000 Subject: [PATCH 5/8] feat: added Arrange, Act, and Assert methods for testSetDepartment and testSetSalary; --- .../codedifferently/lesson15/Employee.java | 4 -- .../lesson15/EmployeeManagerTest.java | 10 ++-- .../lesson15/EmployeeTest.java | 50 +++++++++++-------- 3 files changed, 36 insertions(+), 28 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 aa51bc38b..49aaabbd7 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,8 +45,4 @@ public double getSalary() { public void setSalary(double salary) { this.salary = salary; } - - int setId() { - throw new UnsupportedOperationException("Not supported yet."); - } } 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 1cb9e92de..06e1aede7 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 @@ -7,13 +7,17 @@ public class EmployeeManagerTest { EmployeeTest employeeTest; @Test - public void getIdTest() { - // test if id matches set id + public void testaddEmployee() { + // Arrange + + //Act + + //Assert } @Test - public void setIdTest() { + public void test() { // tests if changed id matches new 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 index 7f8feb814..d1a3dc6b0 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 @@ -11,7 +11,7 @@ public class EmployeeTest { //Set up @BeforeEach void setUp() { - employee = new Employee(19, "Chigazo", "Finance", 200000.00); + employee = new Employee(19, "Chigazo", "Finance", 50000.00); } @Test @@ -37,17 +37,17 @@ public void testSetID() { @Test public void testGetName() { - + //Act String actualName = employee.getName(); - + //Arrange String expectedName = "Chigazo"; - + //Assert assertEquals(expectedName, actualName); } @Test public void testSetName() { - //Arrange + //Arrange String expectedSetName = "Austin"; //Act employee.setName(expectedSetName); @@ -57,34 +57,42 @@ public void testSetName() { @Test public void getDepartmentTest() { + //Act String expectedDepartment = employee.getDepartment(); - + //Arrange String actualDepartment = "Finance"; - + //Assert assertEquals(expectedDepartment, actualDepartment); } - // @Test - // public void setDepartmentTest() { - // employee.setDepartment(); - // } + @Test + public void setDepartmentTest() { + //Arrange + String expectedSetDepartment = "Tech"; + //Act + employee.setDepartment(expectedSetDepartment); + //Assert + assertEquals(expectedSetDepartment, employee.getDepartment()); + } @Test public void getSalaryTest() { + //Arrange + double actualSalary = 50000.00; + //Act double expectedSalary = employee.getSalary(); - - double actualSalary = 200000.00; - + //Assert assertEquals(expectedSalary, actualSalary); } - // @Test - // public void setSalaryTest() { - // employee.setSalary(); - // } - - private void getId() { - throw new UnsupportedOperationException("Not supported yet."); + @Test + public void setSalaryTest() { + //Arrange + double expectedSetSalary = 100000.00; + //Act + employee.setSalary(expectedSetSalary); + //Assert + assertEquals(expectedSetSalary, employee.getSalary()); } } From 2442d622c99aa8d27592b4e18fb87857e8f0c72b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Tue, 29 Oct 2024 20:53:07 +0000 Subject: [PATCH 6/8] feat: added getDetails method to Employee.java; created corresponding test for getDetails; added appropriate import statements to EmployeeManagerTest; added @BeforeEach set up for EmployeeManagerTest; added test for each EmployeeManager method; added throw assert to testRemoveEmployee checking for an IllegalArgumentException and corresponding message; fix: corrected naming convention for EmployeeTest tests; --- .../codedifferently/lesson15/Employee.java | 6 ++ .../lesson15/EmployeeManagerTest.java | 83 ++++++++++++------- .../lesson15/EmployeeTest.java | 34 +++++--- 3 files changed, 82 insertions(+), 41 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 49aaabbd7..17f7406fb 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,10 @@ 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/com/codedifferently/lesson15/EmployeeManagerTest.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java index 06e1aede7..a58742baa 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,52 +1,73 @@ package com.codedifferently.lesson15; +import java.util.ArrayList; +import java.util.List; + +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; public class EmployeeManagerTest { - EmployeeTest employeeTest; - - @Test - public void testaddEmployee() { - // Arrange - - //Act - - //Assert - - } + EmployeeManager employeeManager; + List employees; - @Test - public void test() { - // tests if changed id matches new id + //Set up + @BeforeEach + void setUp() { + employeeManager = new EmployeeManager(); + Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00); + employeeManager.addEmployee(employee); + employees = new ArrayList(); + employees.add(employee); } - @Test - public void getNameTest() { - // tests if changed name matches name - } + public void testAddEmployee() { + //Arrange + Employee employee1 = new Employee(1, "Penny", "Sales", 65000.00); + //Act & Assert + employeeManager.addEmployee(employee1); + } @Test - public void setNameTest() { - // tests if changed id matches new id - } - @Test - public void getDepartmentTest() { - + public void testGetEmployee() { + //Arrange + Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00); + Employee expectedEmployee = employeeManager.getEmployee(employee.getId()); + //Act + Employee actualEmployee = employeeManager.getEmployee(0); + // Assert + assertEquals(expectedEmployee, actualEmployee); } @Test - public void setDepartmentTest() { - + public void testUpdateEmployee() { + //Arrange + Employee expectedEmployeeUpdate = new Employee(0, "Nitsua", "Tech", 100000.00); + //Act + employeeManager.updateEmployee(expectedEmployeeUpdate); + //Act + assertEquals(expectedEmployeeUpdate, employeeManager.getEmployee(0)); } @Test - public void getSalaryTest() { - + public void testRemoveEmployee() { + //Arange + Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00); + employeeManager.addEmployee(employee); + //Act + employeeManager.removeEmployee(0); + //Assert + assertThatThrownBy(() -> employeeManager.removeEmployee(0)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("Employee does not in collection with id " + employee.getId()); } - @Test - public void setSalaryTest() { - + public void testGetEmployeeCount() { + //Act + int actualEmployeeCount = employeeManager.getEmployeeCount(); + //Assert(recieved help from Vicente on employees array) + assertEquals(employees.size(), actualEmployeeCount); } } 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 d1a3dc6b0..9bf9a5fa8 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 @@ -15,7 +15,7 @@ void setUp() { } @Test - //Method beign tested + //Method being tested public void testGetId() { //Execersise int actualId = employee.getId(); @@ -37,10 +37,10 @@ public void testSetID() { @Test public void testGetName() { - //Act - String actualName = employee.getName(); //Arrange String expectedName = "Chigazo"; + //Act + String actualName = employee.getName(); //Assert assertEquals(expectedName, actualName); } @@ -56,18 +56,18 @@ public void testSetName() { } @Test - public void getDepartmentTest() { - //Act - String expectedDepartment = employee.getDepartment(); + public void testGetDepartment() { //Arrange String actualDepartment = "Finance"; + //Act + String expectedDepartment = employee.getDepartment(); //Assert assertEquals(expectedDepartment, actualDepartment); } @Test - public void setDepartmentTest() { - //Arrange + public void testSetDepartment() { + //Arrange String expectedSetDepartment = "Tech"; //Act employee.setDepartment(expectedSetDepartment); @@ -76,7 +76,7 @@ public void setDepartmentTest() { } @Test - public void getSalaryTest() { + public void testGetSalary() { //Arrange double actualSalary = 50000.00; //Act @@ -86,7 +86,7 @@ public void getSalaryTest() { } @Test - public void setSalaryTest() { + public void testSetSalary() { //Arrange double expectedSetSalary = 100000.00; //Act @@ -94,5 +94,19 @@ public void setSalaryTest() { //Assert assertEquals(expectedSetSalary, employee.getSalary()); } + + @Test + public void testGetDetails() { + //Arrange + String actualDetails = + "id: " + employee.getId() + + "name: " + employee.getName() + + "department: " + employee.getDepartment() + + "salary: " + employee.getSalary(); + //Act + String expectedDetails = employee.getDetails(); + //Assert + assertEquals(expectedDetails, actualDetails); + } } From c1c218bddfc352886cc77e09a8f6c37561be3038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Tue, 29 Oct 2024 20:59:59 +0000 Subject: [PATCH 7/8] fix: Ran './gradlew :tdd_app:spotlessApply' to correct formatting; --- .../codedifferently/lesson15/Employee.java | 6 +- .../codedifferently/EmployeeManagerTest.java | 41 ++++ .../lesson15/EmployeeManagerTest.java | 116 +++++------ .../lesson15/EmployeeTest.java | 192 +++++++++--------- 4 files changed, 200 insertions(+), 155 deletions(-) create mode 100644 lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/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 17f7406fb..e5282c675 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,10 +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; + return "id: " + id + "name: " + name + "department: " + department + "salary: " + salary; } } diff --git a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/EmployeeManagerTest.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/EmployeeManagerTest.java new file mode 100644 index 000000000..2aba2ef56 --- /dev/null +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/EmployeeManagerTest.java @@ -0,0 +1,41 @@ +package com.codedifferently.lesson15; + +import org.junit.jupiter.api.Test; + +public class EmployeeManagerTest { + + EmployeeTest employeeTest; + + @Test + public void getIdTest() { + // test if id matches set id + + } + + @Test + public void setIdTest() { + // tests if changed id matches new id + } + + @Test + public void getNameTest() { + // tests if changed name matches name + } + + @Test + public void setNameTest() { + // tests if changed id matches new id + } + + @Test + public void getDepartmentTest() {} + + @Test + public void setDepartmentTest() {} + + @Test + public void getSalaryTest() {} + + @Test + public void setSalaryTest() {} +} 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 a58742baa..0004c9fdb 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,73 +1,75 @@ package com.codedifferently.lesson15; -import java.util.ArrayList; -import java.util.List; - import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.ArrayList; +import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; public class EmployeeManagerTest { - EmployeeManager employeeManager; - List employees; + EmployeeManager employeeManager; + List employees; - //Set up - @BeforeEach - void setUp() { - employeeManager = new EmployeeManager(); - Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00); - employeeManager.addEmployee(employee); - employees = new ArrayList(); - employees.add(employee); - } - @Test - public void testAddEmployee() { - //Arrange - Employee employee1 = new Employee(1, "Penny", "Sales", 65000.00); - //Act & Assert - employeeManager.addEmployee(employee1); - } + // Set up + @BeforeEach + void setUp() { + employeeManager = new EmployeeManager(); + Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00); + employeeManager.addEmployee(employee); + employees = new ArrayList(); + employees.add(employee); + } - @Test - public void testGetEmployee() { - //Arrange - Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00); - Employee expectedEmployee = employeeManager.getEmployee(employee.getId()); - //Act - Employee actualEmployee = employeeManager.getEmployee(0); - // Assert - assertEquals(expectedEmployee, actualEmployee); - } + @Test + public void testAddEmployee() { + // Arrange + Employee employee1 = new Employee(1, "Penny", "Sales", 65000.00); + // Act & Assert + employeeManager.addEmployee(employee1); + } - @Test - public void testUpdateEmployee() { - //Arrange - Employee expectedEmployeeUpdate = new Employee(0, "Nitsua", "Tech", 100000.00); - //Act - employeeManager.updateEmployee(expectedEmployeeUpdate); - //Act - assertEquals(expectedEmployeeUpdate, employeeManager.getEmployee(0)); - } + @Test + public void testGetEmployee() { + // Arrange + Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00); + Employee expectedEmployee = employeeManager.getEmployee(employee.getId()); + // Act + Employee actualEmployee = employeeManager.getEmployee(0); + // Assert + assertEquals(expectedEmployee, actualEmployee); + } - @Test - public void testRemoveEmployee() { - //Arange - Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00); - employeeManager.addEmployee(employee); - //Act - employeeManager.removeEmployee(0); - //Assert - assertThatThrownBy(() -> employeeManager.removeEmployee(0)) + @Test + public void testUpdateEmployee() { + // Arrange + Employee expectedEmployeeUpdate = new Employee(0, "Nitsua", "Tech", 100000.00); + // Act + employeeManager.updateEmployee(expectedEmployeeUpdate); + // Act + assertEquals(expectedEmployeeUpdate, employeeManager.getEmployee(0)); + } + + @Test + public void testRemoveEmployee() { + // Arange + Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00); + employeeManager.addEmployee(employee); + // Act + employeeManager.removeEmployee(0); + // Assert + assertThatThrownBy(() -> employeeManager.removeEmployee(0)) .isInstanceOf(IllegalArgumentException.class) .hasMessage("Employee does not in collection with id " + employee.getId()); - } - @Test - public void testGetEmployeeCount() { - //Act - int actualEmployeeCount = employeeManager.getEmployeeCount(); - //Assert(recieved help from Vicente on employees array) - assertEquals(employees.size(), actualEmployeeCount); - } + } + + @Test + public void testGetEmployeeCount() { + // Act + int actualEmployeeCount = employeeManager.getEmployeeCount(); + // Assert(recieved help from Vicente on employees array) + assertEquals(employees.size(), actualEmployeeCount); + } } 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 9bf9a5fa8..3361a5f57 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,112 +1,116 @@ 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 { - Employee employee; - //Set up - @BeforeEach - void setUp() { - employee = new Employee(19, "Chigazo", "Finance", 50000.00); - } + Employee employee; - @Test - //Method being tested - public void testGetId() { - //Execersise - int actualId = employee.getId(); - - int expectedId = 19; - //Assert(Checking the value) - assertEquals(expectedId, actualId); - } + // Set up + @BeforeEach + void setUp() { + employee = new Employee(19, "Chigazo", "Finance", 50000.00); + } - @Test - public void testSetID() { - //Arrange - int expectedSetId = 91; - //Act - employee.setId(expectedSetId); - //Assert - assertEquals(expectedSetId, employee.getId()); - } + @Test + // Method being tested + public void testGetId() { + // Execersise + int actualId = employee.getId(); - @Test - public void testGetName() { - //Arrange - String expectedName = "Chigazo"; - //Act - String actualName = employee.getName(); - //Assert - assertEquals(expectedName, actualName); - } + int expectedId = 19; + // Assert(Checking the value) + assertEquals(expectedId, actualId); + } - @Test - public void testSetName() { - //Arrange - String expectedSetName = "Austin"; - //Act - employee.setName(expectedSetName); - //Assert - assertEquals(expectedSetName, employee.getName()); - } + @Test + public void testSetID() { + // Arrange + int expectedSetId = 91; + // Act + employee.setId(expectedSetId); + // Assert + assertEquals(expectedSetId, employee.getId()); + } - @Test - public void testGetDepartment() { - //Arrange - String actualDepartment = "Finance"; - //Act - String expectedDepartment = employee.getDepartment(); - //Assert - assertEquals(expectedDepartment, actualDepartment); - } + @Test + public void testGetName() { + // Arrange + String expectedName = "Chigazo"; + // Act + String actualName = employee.getName(); + // Assert + assertEquals(expectedName, actualName); + } - @Test - public void testSetDepartment() { - //Arrange - String expectedSetDepartment = "Tech"; - //Act - employee.setDepartment(expectedSetDepartment); - //Assert - assertEquals(expectedSetDepartment, employee.getDepartment()); - } + @Test + public void testSetName() { + // Arrange + String expectedSetName = "Austin"; + // Act + employee.setName(expectedSetName); + // Assert + assertEquals(expectedSetName, employee.getName()); + } - @Test - public void testGetSalary() { - //Arrange - double actualSalary = 50000.00; - //Act - double expectedSalary = employee.getSalary(); - //Assert - assertEquals(expectedSalary, actualSalary); - } + @Test + public void testGetDepartment() { + // Arrange + String actualDepartment = "Finance"; + // Act + String expectedDepartment = employee.getDepartment(); + // Assert + assertEquals(expectedDepartment, actualDepartment); + } - @Test - public void testSetSalary() { - //Arrange - double expectedSetSalary = 100000.00; - //Act - employee.setSalary(expectedSetSalary); - //Assert - assertEquals(expectedSetSalary, employee.getSalary()); - } + @Test + public void testSetDepartment() { + // Arrange + String expectedSetDepartment = "Tech"; + // Act + employee.setDepartment(expectedSetDepartment); + // Assert + assertEquals(expectedSetDepartment, employee.getDepartment()); + } - @Test - public void testGetDetails() { - //Arrange - String actualDetails = - "id: " + employee.getId() - + "name: " + employee.getName() - + "department: " + employee.getDepartment() - + "salary: " + employee.getSalary(); - //Act - String expectedDetails = employee.getDetails(); - //Assert - assertEquals(expectedDetails, actualDetails); - } -} + @Test + public void testGetSalary() { + // Arrange + double actualSalary = 50000.00; + // Act + double expectedSalary = employee.getSalary(); + // Assert + assertEquals(expectedSalary, actualSalary); + } + @Test + public void testSetSalary() { + // Arrange + double expectedSetSalary = 100000.00; + // Act + employee.setSalary(expectedSetSalary); + // Assert + assertEquals(expectedSetSalary, employee.getSalary()); + } + + @Test + public void testGetDetails() { + // Arrange + String actualDetails = + "id: " + + employee.getId() + + "name: " + + employee.getName() + + "department: " + + employee.getDepartment() + + "salary: " + + employee.getSalary(); + // Act + String expectedDetails = employee.getDetails(); + // Assert + assertEquals(expectedDetails, actualDetails); + } +} From 3cfbfff0c5a539aef43080a0baef9924b10deba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Tue, 29 Oct 2024 21:05:37 +0000 Subject: [PATCH 8/8] fix: removed duplicate EmployeeManagerTest; --- .../codedifferently/EmployeeManagerTest.java | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/EmployeeManagerTest.java diff --git a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/EmployeeManagerTest.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/EmployeeManagerTest.java deleted file mode 100644 index 2aba2ef56..000000000 --- a/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/EmployeeManagerTest.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.codedifferently.lesson15; - -import org.junit.jupiter.api.Test; - -public class EmployeeManagerTest { - - EmployeeTest employeeTest; - - @Test - public void getIdTest() { - // test if id matches set id - - } - - @Test - public void setIdTest() { - // tests if changed id matches new id - } - - @Test - public void getNameTest() { - // tests if changed name matches name - } - - @Test - public void setNameTest() { - // tests if changed id matches new id - } - - @Test - public void getDepartmentTest() {} - - @Test - public void setDepartmentTest() {} - - @Test - public void getSalaryTest() {} - - @Test - public void setSalaryTest() {} -}