Skip to content

Commit 1472f21

Browse files
committed
Feat: Changes to Lesson15.java files
1 parent 97b4c95 commit 1472f21

File tree

3 files changed

+193
-195
lines changed

3 files changed

+193
-195
lines changed
Lines changed: 52 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,56 @@
11
package com.codedifferently.lesson15;
22

33
public class Employee {
4-
private int id;
5-
private String name;
6-
private String department;
7-
private double salary;
8-
9-
public Employee(int id, String name, String department, double salary) {
10-
this.id = id;
11-
this.name = name;
12-
this.department = department;
13-
this.salary = salary;
14-
}
15-
16-
// Getters and setters
17-
public int getId() {
18-
return id;
19-
}
20-
21-
public void setId(int id) {
22-
this.id = id;
23-
}
24-
25-
public String getName() {
26-
return name;
27-
}
28-
29-
public void setName(String name) {
30-
this.name = name;
31-
}
32-
33-
public String getDepartment() {
34-
return department;
35-
}
36-
37-
public void setDepartment(String department) {
38-
this.department = department;
39-
}
40-
41-
public double getSalary() {
42-
return salary;
43-
}
44-
45-
public void setSalary(double salary) {
46-
this.salary = salary;
47-
}
48-
49-
50-
51-
public boolean isEqualTo(int otherId) {
52-
return this.id == otherId;
53-
}
54-
public String getDetails() {
55-
return "id: " + id + " name: " + name + " department: " + department + " salary: " + salary;
56-
}
4+
private int id;
5+
private String name;
6+
private String department;
7+
private double salary;
8+
9+
public Employee(int id, String name, String department, double salary) {
10+
this.id = id;
11+
this.name = name;
12+
this.department = department;
13+
this.salary = salary;
5714
}
15+
16+
// Getters and setters
17+
public int getId() {
18+
return id;
19+
}
20+
21+
public void setId(int id) {
22+
this.id = id;
23+
}
24+
25+
public String getName() {
26+
return name;
27+
}
28+
29+
public void setName(String name) {
30+
this.name = name;
31+
}
32+
33+
public String getDepartment() {
34+
return department;
35+
}
36+
37+
public void setDepartment(String department) {
38+
this.department = department;
39+
}
40+
41+
public double getSalary() {
42+
return salary;
43+
}
44+
45+
public void setSalary(double salary) {
46+
this.salary = salary;
47+
}
48+
49+
public boolean isEqualTo(int otherId) {
50+
return this.id == otherId;
51+
}
52+
53+
public String getDetails() {
54+
return "id: " + id + " name: " + name + " department: " + department + " salary: " + salary;
55+
}
56+
}
Lines changed: 62 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,80 @@
11
package com.codedifferently.lesson15;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
45
import org.junit.jupiter.api.BeforeEach;
56
import org.junit.jupiter.api.Test;
67

78
class EmployeeTest {
89

9-
Employee employee;
10+
Employee employee;
1011

11-
// Set up
12-
@BeforeEach
13-
void setUp() {
14-
employee = new Employee(7, "Nile", "SWE", 65000.00);
15-
}
12+
// Set up
13+
@BeforeEach
14+
void setUp() {
15+
employee = new Employee(7, "Nile", "SWE", 65000.00);
16+
}
1617

17-
@Test
18-
public void testGetId() {
19-
int actualId = employee.getId();
20-
int expectedId = 7;
21-
assertEquals(expectedId, actualId);
22-
}
18+
@Test
19+
public void testGetId() {
20+
int actualId = employee.getId();
21+
int expectedId = 7;
22+
assertEquals(expectedId, actualId);
23+
}
2324

24-
@Test
25-
public void testSetID() {
26-
int expectedSetId = 0;
27-
employee.setId(expectedSetId);
28-
assertEquals(expectedSetId, employee.getId());
29-
}
25+
@Test
26+
public void testSetID() {
27+
int expectedSetId = 0;
28+
employee.setId(expectedSetId);
29+
assertEquals(expectedSetId, employee.getId());
30+
}
3031

31-
@Test
32-
public void testGetName() {
33-
String expectedName = "Nile";
34-
String actualName = employee.getName();
35-
assertEquals(expectedName, actualName);
36-
}
32+
@Test
33+
public void testGetName() {
34+
String expectedName = "Nile";
35+
String actualName = employee.getName();
36+
assertEquals(expectedName, actualName);
37+
}
3738

38-
@Test
39-
public void testSetName() {
40-
String expectedSetName = "Nile";
41-
employee.setName(expectedSetName);
42-
assertEquals(expectedSetName, employee.getName());
43-
}
39+
@Test
40+
public void testSetName() {
41+
String expectedSetName = "Nile";
42+
employee.setName(expectedSetName);
43+
assertEquals(expectedSetName, employee.getName());
44+
}
4445

45-
@Test
46-
public void testGetDepartment() {
47-
String expectedDepartment = "SWE";
48-
String actualDepartment = employee.getDepartment();
49-
assertEquals(expectedDepartment, actualDepartment);
50-
}
46+
@Test
47+
public void testGetDepartment() {
48+
String expectedDepartment = "SWE";
49+
String actualDepartment = employee.getDepartment();
50+
assertEquals(expectedDepartment, actualDepartment);
51+
}
5152

52-
@Test
53-
public void testSetDepartment() {
54-
String expectedSetDepartment = "Tech";
55-
employee.setDepartment(expectedSetDepartment);
56-
assertEquals(expectedSetDepartment, employee.getDepartment());
57-
}
53+
@Test
54+
public void testSetDepartment() {
55+
String expectedSetDepartment = "Tech";
56+
employee.setDepartment(expectedSetDepartment);
57+
assertEquals(expectedSetDepartment, employee.getDepartment());
58+
}
5859

59-
@Test
60-
public void testGetSalary() {
61-
double expectedSalary = 65000.00;
62-
double actualSalary = employee.getSalary();
63-
assertEquals(expectedSalary, actualSalary);
64-
}
60+
@Test
61+
public void testGetSalary() {
62+
double expectedSalary = 65000.00;
63+
double actualSalary = employee.getSalary();
64+
assertEquals(expectedSalary, actualSalary);
65+
}
6566

66-
@Test
67-
public void testSetSalary() {
68-
double expectedSetSalary = 100000.00;
69-
employee.setSalary(expectedSetSalary);
70-
assertEquals(expectedSetSalary, employee.getSalary());
71-
}
67+
@Test
68+
public void testSetSalary() {
69+
double expectedSetSalary = 100000.00;
70+
employee.setSalary(expectedSetSalary);
71+
assertEquals(expectedSetSalary, employee.getSalary());
72+
}
7273

73-
@Test
74-
public void testGetDetails() {
75-
String actualDetails = employee.getDetails();
76-
String expectedDetails = "id: 7 name: Nile department: SWE salary: 65000.0";
77-
assertEquals(expectedDetails, actualDetails);
78-
}
79-
}
74+
@Test
75+
public void testGetDetails() {
76+
String actualDetails = employee.getDetails();
77+
String expectedDetails = "id: 7 name: Nile department: SWE salary: 65000.0";
78+
assertEquals(expectedDetails, actualDetails);
79+
}
80+
}

0 commit comments

Comments
 (0)