Skip to content

feat: adds amiyah jones' lesson 15 emplyeeManager and Employee test files #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 77 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
8cc92d0
Create README.md
AmiyahJo Sep 24, 2024
50b1861
Delete lesson_00/amiyahjones/README.md
AmiyahJo Sep 24, 2024
27d57c0
Merge branch 'code-differently:main' into main
AmiyahJo Sep 25, 2024
fa3c700
Merge branch 'code-differently:main' into main
AmiyahJo Sep 26, 2024
7c2d053
Merge branch 'code-differently:main' into main
AmiyahJo Sep 26, 2024
faedd1b
Merge branch 'code-differently:main' into main
AmiyahJo Sep 26, 2024
19a4187
Merge branch 'code-differently:main' into main
AmiyahJo Sep 26, 2024
7711266
Merge branch 'code-differently:main' into main
AmiyahJo Sep 27, 2024
9a10c4c
Merge branch 'code-differently:main' into main
AmiyahJo Sep 27, 2024
3ea50c4
Merge branch 'code-differently:main' into main
AmiyahJo Sep 27, 2024
d7b772d
Merge branch 'code-differently:main' into main
AmiyahJo Sep 27, 2024
de46b67
Merge branch 'code-differently:main' into main
AmiyahJo Sep 27, 2024
b891561
Merge branch 'code-differently:main' into main
AmiyahJo Sep 28, 2024
7c9f2db
Merge branch 'code-differently:main' into main
AmiyahJo Sep 30, 2024
ff3ba35
Merge branch 'code-differently:main' into main
AmiyahJo Sep 30, 2024
457feea
Merge branch 'code-differently:main' into main
AmiyahJo Sep 30, 2024
5868f9d
Merge branch 'code-differently:main' into main
AmiyahJo Oct 1, 2024
28eacd4
Merge branch 'code-differently:main' into main
AmiyahJo Oct 1, 2024
bca4933
Merge branch 'code-differently:main' into main
AmiyahJo Oct 1, 2024
9ff0f9e
Merge branch 'code-differently:main' into main
AmiyahJo Oct 1, 2024
8d02849
Merge branch 'code-differently:main' into main
AmiyahJo Oct 2, 2024
6dd3a43
Merge branch 'code-differently:main' into main
AmiyahJo Oct 2, 2024
95f56a5
Merge branch 'code-differently:main' into main
AmiyahJo Oct 3, 2024
0f4dbac
Merge branch 'code-differently:main' into main
AmiyahJo Oct 4, 2024
a3b9984
Merge branch 'code-differently:main' into main
AmiyahJo Oct 4, 2024
54cd199
Merge branch 'code-differently:main' into main
AmiyahJo Oct 4, 2024
edbe7c0
Merge branch 'code-differently:main' into main
AmiyahJo Oct 4, 2024
7f0a084
Merge branch 'code-differently:main' into main
AmiyahJo Oct 7, 2024
a905b74
Merge branch 'code-differently:main' into main
AmiyahJo Oct 8, 2024
2d69531
Merge branch 'code-differently:main' into main
AmiyahJo Oct 8, 2024
df48fbd
Merge branch 'code-differently:main' into main
AmiyahJo Oct 8, 2024
c972d14
Merge branch 'code-differently:main' into main
AmiyahJo Oct 9, 2024
bc3907c
Merge branch 'code-differently:main' into main
AmiyahJo Oct 9, 2024
c3eabbb
Merge branch 'code-differently:main' into main
AmiyahJo Oct 9, 2024
9fff7d0
Merge branch 'code-differently:main' into main
AmiyahJo Oct 11, 2024
4c57926
Merge branch 'code-differently:main' into main
AmiyahJo Oct 11, 2024
8dd5d42
Merge branch 'code-differently:main' into main
AmiyahJo Oct 14, 2024
18f65ee
Merge branch 'code-differently:main' into main
AmiyahJo Oct 14, 2024
2dd1645
Merge branch 'code-differently:main' into main
AmiyahJo Oct 14, 2024
0de8601
Merge branch 'code-differently:main' into main
AmiyahJo Oct 14, 2024
85dd364
Merge branch 'code-differently:main' into main
AmiyahJo Oct 16, 2024
0afda26
Merge branch 'code-differently:main' into main
AmiyahJo Oct 16, 2024
f31e8d9
Merge branch 'code-differently:main' into main
AmiyahJo Oct 16, 2024
3e24069
Merge branch 'code-differently:main' into main
AmiyahJo Oct 17, 2024
8600f6c
Merge branch 'code-differently:main' into main
AmiyahJo Oct 17, 2024
563b076
Merge branch 'code-differently:main' into main
AmiyahJo Oct 18, 2024
b01a324
Merge branch 'code-differently:main' into main
AmiyahJo Oct 18, 2024
697a72d
Merge branch 'code-differently:main' into main
AmiyahJo Oct 21, 2024
92891f6
Merge branch 'code-differently:main' into main
AmiyahJo Oct 21, 2024
17fdee5
Merge branch 'code-differently:main' into main
AmiyahJo Oct 22, 2024
cf7e6f2
Merge branch 'code-differently:main' into main
AmiyahJo Oct 23, 2024
a131bdc
Merge branch 'code-differently:main' into main
AmiyahJo Oct 23, 2024
c46d32f
Merge branch 'code-differently:main' into main
AmiyahJo Oct 24, 2024
651fa01
Merge branch 'code-differently:main' into main
AmiyahJo Oct 26, 2024
e075fb7
Merge branch 'code-differently:main' into main
AmiyahJo Oct 27, 2024
ec7c3d1
Merge branch 'code-differently:main' into main
AmiyahJo Oct 28, 2024
5abb36a
feat: adds employee manager test page
Oct 29, 2024
e7b8f6a
Merge branch 'code-differently:main' into feature/lesson_15
AmiyahJo Oct 29, 2024
0b9908f
feat: adds employee feature , work in progress
Oct 29, 2024
6a59629
feat: new getDetails added
Oct 29, 2024
f96daa2
chore: spelling change 'id' to 'ID'
Oct 29, 2024
f281ac0
rm: removes method 'details'
Oct 29, 2024
2ef91ac
feat: adds test
Oct 29, 2024
ad5881a
chore: whitespacce adjustment for testGetDetails()
Oct 29, 2024
f609dba
feat: adds AAA comments for reference in both .java tests
Oct 29, 2024
1bea0f7
chore: whitespace adjustment in tests
Oct 29, 2024
e35a659
feat: testGetID test added
Oct 29, 2024
07ada74
feat: adds testGetName()
Oct 29, 2024
bde73a9
feat: adds testGetSalary
Oct 29, 2024
35d6387
feat: adds variables to store expected and actual department name
Oct 29, 2024
fc49eb5
feat: adds all set tests
Oct 29, 2024
efbbe3b
feat: testAddEmployee test is added.
Oct 29, 2024
6a5424e
feat: adds testAddEmployee code
Oct 29, 2024
51304ea
feat: adds employee manager (to settle tasks) , testUpdateEmployee test
Oct 29, 2024
5831a17
feat: adds add and remove employee , employee count , and assertion(s…
Oct 29, 2024
d388be2
rm: throw exception extra(s)
Oct 29, 2024
a7c20d1
fix: gradlew spotless apply
Oct 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,15 @@ public double getSalary() {
public void setSalary(double salary) {
this.salary = salary;
}

public String getDetails() {
return "Employee: "
+ name
+ ", Department: "
+ department
+ " , ID: "
+ id
+ " , Salary: "
+ (int) salary;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
package com.codedifferently.lesson15;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

public class EmployeeManagerTest {
private EmployeeManager employeeManager;

@BeforeEach
public void setUp() {
employeeManager = new EmployeeManager();
}

@Test
void testAddEmployee() {
// Arrange
Employee employee = new Employee(1, "John Doe", null, 0);

// Act
employeeManager.addEmployee(employee);

// Assert
assertEquals(1, employeeManager.getEmployeeCount());
}

@Test
void testUpdateEmployee() {
// Arrange
Employee employee = new Employee(1, "John Doe", null, 0);
Employee updatedEmployee = new Employee(1, "Jane Doe", null, 0);

// Act
employeeManager.addEmployee(employee);
employeeManager.updateEmployee(updatedEmployee);

// Assert
Employee retrievedEmployee = employeeManager.getEmployee(1);
assertEquals(updatedEmployee.getName(), retrievedEmployee.getName());
}

@Test
void testGetEmployee() {
// Arrange
Employee employee = new Employee(1, "John Doe", null, 0);

// Act
employeeManager.addEmployee(employee);
Employee retrievedEmployee = employeeManager.getEmployee(1);

// Assert
assertEquals(employee.getId(), retrievedEmployee.getId());
assertEquals(employee.getName(), retrievedEmployee.getName());
}

@Test
void testRemoveEmployee() {

Employee employee = new Employee(1, "John Doe", null, 0);

employeeManager.addEmployee(employee);
assertEquals(1, employeeManager.getEmployeeCount());

employeeManager.removeEmployee(1);
assertEquals(0, employeeManager.getEmployeeCount());
}

@Test
void testGetEmployeeCount() {

assertEquals(0, employeeManager.getEmployeeCount());

employeeManager.addEmployee(new Employee(1, "John Doe", null, 0));
employeeManager.addEmployee(new Employee(2, "Jane Doe", null, 0));

assertEquals(2, employeeManager.getEmployeeCount());
}

@Test
void testGetEmployeeThrowsExceptionForNonExistentId() {
assertThrows(
IllegalArgumentException.class,
() -> {
employeeManager.getEmployee(999);
});
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
package com.codedifferently.lesson15;

import static org.junit.jupiter.api.Assertions.assertEquals;

import org.junit.jupiter.api.Test;

public class EmployeeTest {
@Test
void testGetDepartment() {
// Arrange
Employee employee = new Employee(12345, "John Doe", "Engineering", 75000);

// Act
String actualDepartment = employee.getDepartment();

// Assert
String expectedDepartment = "Engineering";
assertEquals(expectedDepartment, actualDepartment);
}

@Test
void testGetDetails() {
// Arrange
Employee employee = new Employee(12345, "John Doe", "Engineering", 75000);

// Act
String actualDetails = employee.getDetails();

// Assert
String expectedDetails =
"Employee: John Doe, Department: Engineering , ID: 12345 , Salary: 75000";
assertEquals(expectedDetails, actualDetails);
}

@Test
void testGetId() {
// Arrange
Employee employee = new Employee(12345, "John Doe", "Engineering", 75000);

// Act
int actualEmployeeID = employee.getId();

// Assert
int expectedEmployeeID = 12345;
assertEquals(expectedEmployeeID, actualEmployeeID);
}

@Test
void testGetName() {
// Arrange
Employee employee = new Employee(12345, "John Doe", "Engineering", 75000);

// Act
employee.getName();

// Assert
assertEquals("John Doe", employee.getName());
}

@Test
void testGetSalary() {
// Arrange
Employee employee = new Employee(12345, "John Doe", "Engineering", 75000);

// Act
double expectedSalary = employee.getSalary();

// Assert
double actualSalary = 75000;
assertEquals(expectedSalary, actualSalary);
}

@Test
void testSetDepartment() {
// Arrange
Employee employee = new Employee(12345, "John Doe", "", 75000);

// Act
employee.setDepartment("Engineering");

// Assert
assertEquals("Engineering", employee.getDepartment());
}

@Test
void testSetId() {
// Arrange
Employee employee = new Employee(0, "John Doe", "", 75000);

// Act
employee.setId(12345);

// Assert
assertEquals(12345, employee.getId());
}

@Test
void testSetName() {
// Arrange
Employee employee = new Employee(12345, "", "Engineering", 75000);

// Act
employee.setName("Alice Johnson");

// Assert
assertEquals("Alice Johnson", employee.getName());
}

@Test
void testSetSalary() {
// Arrange
Employee employee = new Employee(12345, "", "Engineering", 0);

// Act
employee.setSalary(75000);

// Assert
assertEquals(75000, employee.getSalary());
}
}
Loading