From c5e116c1008f08d1bbada9f9a236fb8ea0addbeb Mon Sep 17 00:00:00 2001 From: htanweer244 Date: Wed, 30 Oct 2024 15:56:41 +0000 Subject: [PATCH 1/2] feat: practiced unit testing Lesson 15 Hw by Hummad Tanweer --- .../codedifferently/lesson15/Employee.java | 8 ++ .../lesson15/EmployeeManagerTest.java | 86 +++++++++++++++++++ .../lesson15/EmployeeTest.java | 79 +++++++++++++++++ 3 files changed, 173 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/main/java/com/codedifferently/lesson15/Employee.java b/lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java index 49aaabbd7..39113e30f 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,12 @@ 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 new file mode 100644 index 000000000..8b8a1dcfc --- /dev/null +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java @@ -0,0 +1,86 @@ +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 EmployeeManagerTest { + + EmployeeManager employeeManager; + + Employee employee; + + @BeforeEach + public void setUp() { + employeeManager = new EmployeeManager(); + employee = new Employee (2,"Hummad","Finance",2000); + } + @Test + public void testAddEmployee() { + + employeeManager.addEmployee(employee); + Employee employee1 = new Employee (3,"Hummad","Finance",2000); + employeeManager.addEmployee(employee1); + + assertEquals(2, employeeManager.getEmployeeCount()); + } + + @Test + public void testGetEmployee(){ + + + employeeManager.addEmployee(employee); + + assertEquals(employee, employeeManager.getEmployee(employee.getId())); + + } + + @Test + public void testGetEmployeeCount() { + + employee = new Employee(2, "Hummad", "Finance", 2000); + Employee employee1 = new Employee (3,"Hummad","Finance",2000); + + employeeManager.addEmployee(employee1); + + employeeManager.addEmployee(employee); + + assertEquals(2, employeeManager.getEmployeeCount()); + + } + + @Test + public void testRemoveEmployee() + { + + employeeManager.addEmployee(employee); + + employeeManager.removeEmployee(employee.getId()); + + assertEquals(0, employeeManager.getEmployeeCount()); + + } + + @Test + public void testUpdateEmployee() + { + + employee = new Employee(2, "Hummad", "Finance", 2000); + + employeeManager.addEmployee(employee); + + employeeManager.updateEmployee(employee); + + assertEquals(employeeManager.getEmployee(employee.getId()), employee); + + } + +} + + + + + + + + + \ No newline at end of file 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..e628c72e2 --- /dev/null +++ b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeTest.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; + + +public class EmployeeTest { + + Employee employee; + + @BeforeEach + void setUp() { + employee = new Employee(2,"Hummad","Finance",2000); + } + + @Test + public void testGetId() { + + int actualId =2; + int expectedId = employee.getId(); + assertEquals(expectedId, actualId); + + } +@Test + public void testGetSalary() + { + assertEquals(employee.getSalary(),2000); + + } + @Test + public void testSetSalary(){ + employee.setSalary(2000); + assertEquals(employee.getSalary(),2000); + + } + + @Test + public void testSetId() { + + employee.setId(10); + assertEquals(employee.getId(),10); + + } + + @Test + public void testGetName() { + employee.getName(); + assertEquals(employee.getName(),"Hummad"); + + } + + @Test + public void testSetName(){ + employee.setName("Hummad"); + assertEquals(employee.getName(),"Hummad"); + + } + + @Test + public void testGetDepartment() { + + assertEquals(employee.getDepartment(),"Finance"); + } + @Test + public void testSetDepartment() { + + employee.setDepartment("Finance"); + assertEquals(employee.getDepartment(),"Finance"); + } + + @Test + public void testGetDetails() { + + // String expectedDetails = "2 Hummad Finance 2000"; + assertEquals("ID:2Name: HummadDepartment: Financesalary: 2000.0",employee.getDetails()); + } + +} From d7cf60a60221f6588315bbab6be125c4bb421980 Mon Sep 17 00:00:00 2001 From: htanweer244 Date: Wed, 30 Oct 2024 16:03:59 +0000 Subject: [PATCH 2/2] fix: format issues --- .../codedifferently/lesson15/Employee.java | 6 +-- .../lesson15/EmployeeManagerTest.java | 42 ++++++---------- .../lesson15/EmployeeTest.java | 49 +++++++++---------- 3 files changed, 37 insertions(+), 60 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 39113e30f..a3b32a29f 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 @@ -47,10 +47,6 @@ public void setSalary(double 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/lesson15/EmployeeManagerTest.java b/lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java index 8b8a1dcfc..95f62dd43 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,86 +1,72 @@ 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 EmployeeManagerTest { - EmployeeManager employeeManager; + EmployeeManager employeeManager; Employee employee; @BeforeEach public void setUp() { - employeeManager = new EmployeeManager(); - employee = new Employee (2,"Hummad","Finance",2000); + employeeManager = new EmployeeManager(); + employee = new Employee(2, "Hummad", "Finance", 2000); } + @Test public void testAddEmployee() { - + employeeManager.addEmployee(employee); - Employee employee1 = new Employee (3,"Hummad","Finance",2000); + Employee employee1 = new Employee(3, "Hummad", "Finance", 2000); employeeManager.addEmployee(employee1); assertEquals(2, employeeManager.getEmployeeCount()); } @Test - public void testGetEmployee(){ + public void testGetEmployee() { - employeeManager.addEmployee(employee); assertEquals(employee, employeeManager.getEmployee(employee.getId())); - } @Test public void testGetEmployeeCount() { employee = new Employee(2, "Hummad", "Finance", 2000); - Employee employee1 = new Employee (3,"Hummad","Finance",2000); + Employee employee1 = new Employee(3, "Hummad", "Finance", 2000); employeeManager.addEmployee(employee1); employeeManager.addEmployee(employee); assertEquals(2, employeeManager.getEmployeeCount()); - } - @Test - public void testRemoveEmployee() - { + @Test + public void testRemoveEmployee() { employeeManager.addEmployee(employee); employeeManager.removeEmployee(employee.getId()); assertEquals(0, employeeManager.getEmployeeCount()); - } @Test - public void testUpdateEmployee() - { + public void testUpdateEmployee() { - employee = new Employee(2, "Hummad", "Finance", 2000); + employee = new Employee(2, "Hummad", "Finance", 2000); employeeManager.addEmployee(employee); employeeManager.updateEmployee(employee); assertEquals(employeeManager.getEmployee(employee.getId()), employee); - } - } - - - - - - - - - \ No newline at end of file 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 e628c72e2..507466488 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,79 +1,74 @@ 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; @BeforeEach void setUp() { - employee = new Employee(2,"Hummad","Finance",2000); + employee = new Employee(2, "Hummad", "Finance", 2000); } - + @Test public void testGetId() { - - int actualId =2; + + int actualId = 2; int expectedId = employee.getId(); assertEquals(expectedId, actualId); - } -@Test - public void testGetSalary() - { - assertEquals(employee.getSalary(),2000); + @Test + public void testGetSalary() { + assertEquals(employee.getSalary(), 2000); } + @Test - public void testSetSalary(){ + public void testSetSalary() { employee.setSalary(2000); - assertEquals(employee.getSalary(),2000); - + assertEquals(employee.getSalary(), 2000); } @Test public void testSetId() { employee.setId(10); - assertEquals(employee.getId(),10); - + assertEquals(employee.getId(), 10); } @Test public void testGetName() { employee.getName(); - assertEquals(employee.getName(),"Hummad"); - + assertEquals(employee.getName(), "Hummad"); } @Test - public void testSetName(){ + public void testSetName() { employee.setName("Hummad"); - assertEquals(employee.getName(),"Hummad"); - + assertEquals(employee.getName(), "Hummad"); } - @Test + @Test public void testGetDepartment() { - assertEquals(employee.getDepartment(),"Finance"); + assertEquals(employee.getDepartment(), "Finance"); } - @Test + + @Test public void testSetDepartment() { employee.setDepartment("Finance"); - assertEquals(employee.getDepartment(),"Finance"); + assertEquals(employee.getDepartment(), "Finance"); } - @Test + @Test public void testGetDetails() { // String expectedDetails = "2 Hummad Finance 2000"; - assertEquals("ID:2Name: HummadDepartment: Financesalary: 2000.0",employee.getDetails()); + assertEquals("ID:2Name: HummadDepartment: Financesalary: 2000.0", employee.getDetails()); } - }