Skip to content

Commit c1c218b

Browse files
author
“A1-4U2T1NN”
committed
fix: Ran './gradlew :tdd_app:spotlessApply' to correct formatting;
1 parent 2442d62 commit c1c218b

File tree

4 files changed

+200
-155
lines changed

4 files changed

+200
-155
lines changed

‎lesson_15/tdd/tdd_app/src/main/java/com/codedifferently/lesson15/Employee.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,8 @@ public double getSalary() {
4545
public void setSalary(double salary) {
4646
this.salary = salary;
4747
}
48+
4849
public String getDetails() {
49-
return "id: " + id
50-
+ "name: " + name
51-
+ "department: " + department
52-
+ "salary: " + salary;
50+
return "id: " + id + "name: " + name + "department: " + department + "salary: " + salary;
5351
}
5452
}

‎lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/EmployeeManagerTest.java

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
package com.codedifferently.lesson15;
2+
3+
import org.junit.jupiter.api.Test;
4+
5+
public class EmployeeManagerTest {
6+
7+
EmployeeTest employeeTest;
8+
9+
@Test
10+
public void getIdTest() {
11+
// test if id matches set id
12+
13+
}
14+
15+
@Test
16+
public void setIdTest() {
17+
// tests if changed id matches new id
18+
}
19+
20+
@Test
21+
public void getNameTest() {
22+
// tests if changed name matches name
23+
}
24+
25+
@Test
26+
public void setNameTest() {
27+
// tests if changed id matches new id
28+
}
29+
30+
@Test
31+
public void getDepartmentTest() {}
32+
33+
@Test
34+
public void setDepartmentTest() {}
35+
36+
@Test
37+
public void getSalaryTest() {}
38+
39+
@Test
40+
public void setSalaryTest() {}
41+
}

‎lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeManagerTest.java

Lines changed: 59 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,75 @@
11
package com.codedifferently.lesson15;
22

3-
import java.util.ArrayList;
4-
import java.util.List;
5-
63
import static org.assertj.core.api.Assertions.assertThatThrownBy;
74
import static org.junit.jupiter.api.Assertions.assertEquals;
5+
6+
import java.util.ArrayList;
7+
import java.util.List;
88
import org.junit.jupiter.api.BeforeEach;
99
import org.junit.jupiter.api.Test;
1010

1111
public class EmployeeManagerTest {
1212

13-
EmployeeManager employeeManager;
14-
List<Employee> employees;
13+
EmployeeManager employeeManager;
14+
List<Employee> employees;
1515

16-
//Set up
17-
@BeforeEach
18-
void setUp() {
19-
employeeManager = new EmployeeManager();
20-
Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00);
21-
employeeManager.addEmployee(employee);
22-
employees = new ArrayList();
23-
employees.add(employee);
24-
}
25-
@Test
26-
public void testAddEmployee() {
27-
//Arrange
28-
Employee employee1 = new Employee(1, "Penny", "Sales", 65000.00);
29-
//Act & Assert
30-
employeeManager.addEmployee(employee1);
31-
}
16+
// Set up
17+
@BeforeEach
18+
void setUp() {
19+
employeeManager = new EmployeeManager();
20+
Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00);
21+
employeeManager.addEmployee(employee);
22+
employees = new ArrayList();
23+
employees.add(employee);
24+
}
3225

33-
@Test
34-
public void testGetEmployee() {
35-
//Arrange
36-
Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00);
37-
Employee expectedEmployee = employeeManager.getEmployee(employee.getId());
38-
//Act
39-
Employee actualEmployee = employeeManager.getEmployee(0);
40-
// Assert
41-
assertEquals(expectedEmployee, actualEmployee);
42-
}
26+
@Test
27+
public void testAddEmployee() {
28+
// Arrange
29+
Employee employee1 = new Employee(1, "Penny", "Sales", 65000.00);
30+
// Act & Assert
31+
employeeManager.addEmployee(employee1);
32+
}
4333

44-
@Test
45-
public void testUpdateEmployee() {
46-
//Arrange
47-
Employee expectedEmployeeUpdate = new Employee(0, "Nitsua", "Tech", 100000.00);
48-
//Act
49-
employeeManager.updateEmployee(expectedEmployeeUpdate);
50-
//Act
51-
assertEquals(expectedEmployeeUpdate, employeeManager.getEmployee(0));
52-
}
34+
@Test
35+
public void testGetEmployee() {
36+
// Arrange
37+
Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00);
38+
Employee expectedEmployee = employeeManager.getEmployee(employee.getId());
39+
// Act
40+
Employee actualEmployee = employeeManager.getEmployee(0);
41+
// Assert
42+
assertEquals(expectedEmployee, actualEmployee);
43+
}
5344

54-
@Test
55-
public void testRemoveEmployee() {
56-
//Arange
57-
Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00);
58-
employeeManager.addEmployee(employee);
59-
//Act
60-
employeeManager.removeEmployee(0);
61-
//Assert
62-
assertThatThrownBy(() -> employeeManager.removeEmployee(0))
45+
@Test
46+
public void testUpdateEmployee() {
47+
// Arrange
48+
Employee expectedEmployeeUpdate = new Employee(0, "Nitsua", "Tech", 100000.00);
49+
// Act
50+
employeeManager.updateEmployee(expectedEmployeeUpdate);
51+
// Act
52+
assertEquals(expectedEmployeeUpdate, employeeManager.getEmployee(0));
53+
}
54+
55+
@Test
56+
public void testRemoveEmployee() {
57+
// Arange
58+
Employee employee = new Employee(0, "Nitsua", "Sales", 65000.00);
59+
employeeManager.addEmployee(employee);
60+
// Act
61+
employeeManager.removeEmployee(0);
62+
// Assert
63+
assertThatThrownBy(() -> employeeManager.removeEmployee(0))
6364
.isInstanceOf(IllegalArgumentException.class)
6465
.hasMessage("Employee does not in collection with id " + employee.getId());
65-
}
66-
@Test
67-
public void testGetEmployeeCount() {
68-
//Act
69-
int actualEmployeeCount = employeeManager.getEmployeeCount();
70-
//Assert(recieved help from Vicente on employees array)
71-
assertEquals(employees.size(), actualEmployeeCount);
72-
}
66+
}
67+
68+
@Test
69+
public void testGetEmployeeCount() {
70+
// Act
71+
int actualEmployeeCount = employeeManager.getEmployeeCount();
72+
// Assert(recieved help from Vicente on employees array)
73+
assertEquals(employees.size(), actualEmployeeCount);
74+
}
7375
}

‎lesson_15/tdd/tdd_app/src/test/java/com/codedifferently/lesson15/EmployeeTest.java

Lines changed: 98 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,116 @@
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

7-
88
public class EmployeeTest {
99

10-
Employee employee;
11-
//Set up
12-
@BeforeEach
13-
void setUp() {
14-
employee = new Employee(19, "Chigazo", "Finance", 50000.00);
15-
}
10+
Employee employee;
1611

17-
@Test
18-
//Method being tested
19-
public void testGetId() {
20-
//Execersise
21-
int actualId = employee.getId();
22-
23-
int expectedId = 19;
24-
//Assert(Checking the value)
25-
assertEquals(expectedId, actualId);
26-
}
12+
// Set up
13+
@BeforeEach
14+
void setUp() {
15+
employee = new Employee(19, "Chigazo", "Finance", 50000.00);
16+
}
2717

28-
@Test
29-
public void testSetID() {
30-
//Arrange
31-
int expectedSetId = 91;
32-
//Act
33-
employee.setId(expectedSetId);
34-
//Assert
35-
assertEquals(expectedSetId, employee.getId());
36-
}
18+
@Test
19+
// Method being tested
20+
public void testGetId() {
21+
// Execersise
22+
int actualId = employee.getId();
3723

38-
@Test
39-
public void testGetName() {
40-
//Arrange
41-
String expectedName = "Chigazo";
42-
//Act
43-
String actualName = employee.getName();
44-
//Assert
45-
assertEquals(expectedName, actualName);
46-
}
24+
int expectedId = 19;
25+
// Assert(Checking the value)
26+
assertEquals(expectedId, actualId);
27+
}
4728

48-
@Test
49-
public void testSetName() {
50-
//Arrange
51-
String expectedSetName = "Austin";
52-
//Act
53-
employee.setName(expectedSetName);
54-
//Assert
55-
assertEquals(expectedSetName, employee.getName());
56-
}
29+
@Test
30+
public void testSetID() {
31+
// Arrange
32+
int expectedSetId = 91;
33+
// Act
34+
employee.setId(expectedSetId);
35+
// Assert
36+
assertEquals(expectedSetId, employee.getId());
37+
}
5738

58-
@Test
59-
public void testGetDepartment() {
60-
//Arrange
61-
String actualDepartment = "Finance";
62-
//Act
63-
String expectedDepartment = employee.getDepartment();
64-
//Assert
65-
assertEquals(expectedDepartment, actualDepartment);
66-
}
39+
@Test
40+
public void testGetName() {
41+
// Arrange
42+
String expectedName = "Chigazo";
43+
// Act
44+
String actualName = employee.getName();
45+
// Assert
46+
assertEquals(expectedName, actualName);
47+
}
6748

68-
@Test
69-
public void testSetDepartment() {
70-
//Arrange
71-
String expectedSetDepartment = "Tech";
72-
//Act
73-
employee.setDepartment(expectedSetDepartment);
74-
//Assert
75-
assertEquals(expectedSetDepartment, employee.getDepartment());
76-
}
49+
@Test
50+
public void testSetName() {
51+
// Arrange
52+
String expectedSetName = "Austin";
53+
// Act
54+
employee.setName(expectedSetName);
55+
// Assert
56+
assertEquals(expectedSetName, employee.getName());
57+
}
7758

78-
@Test
79-
public void testGetSalary() {
80-
//Arrange
81-
double actualSalary = 50000.00;
82-
//Act
83-
double expectedSalary = employee.getSalary();
84-
//Assert
85-
assertEquals(expectedSalary, actualSalary);
86-
}
59+
@Test
60+
public void testGetDepartment() {
61+
// Arrange
62+
String actualDepartment = "Finance";
63+
// Act
64+
String expectedDepartment = employee.getDepartment();
65+
// Assert
66+
assertEquals(expectedDepartment, actualDepartment);
67+
}
8768

88-
@Test
89-
public void testSetSalary() {
90-
//Arrange
91-
double expectedSetSalary = 100000.00;
92-
//Act
93-
employee.setSalary(expectedSetSalary);
94-
//Assert
95-
assertEquals(expectedSetSalary, employee.getSalary());
96-
}
69+
@Test
70+
public void testSetDepartment() {
71+
// Arrange
72+
String expectedSetDepartment = "Tech";
73+
// Act
74+
employee.setDepartment(expectedSetDepartment);
75+
// Assert
76+
assertEquals(expectedSetDepartment, employee.getDepartment());
77+
}
9778

98-
@Test
99-
public void testGetDetails() {
100-
//Arrange
101-
String actualDetails =
102-
"id: " + employee.getId()
103-
+ "name: " + employee.getName()
104-
+ "department: " + employee.getDepartment()
105-
+ "salary: " + employee.getSalary();
106-
//Act
107-
String expectedDetails = employee.getDetails();
108-
//Assert
109-
assertEquals(expectedDetails, actualDetails);
110-
}
111-
}
79+
@Test
80+
public void testGetSalary() {
81+
// Arrange
82+
double actualSalary = 50000.00;
83+
// Act
84+
double expectedSalary = employee.getSalary();
85+
// Assert
86+
assertEquals(expectedSalary, actualSalary);
87+
}
11288

89+
@Test
90+
public void testSetSalary() {
91+
// Arrange
92+
double expectedSetSalary = 100000.00;
93+
// Act
94+
employee.setSalary(expectedSetSalary);
95+
// Assert
96+
assertEquals(expectedSetSalary, employee.getSalary());
97+
}
98+
99+
@Test
100+
public void testGetDetails() {
101+
// Arrange
102+
String actualDetails =
103+
"id: "
104+
+ employee.getId()
105+
+ "name: "
106+
+ employee.getName()
107+
+ "department: "
108+
+ employee.getDepartment()
109+
+ "salary: "
110+
+ employee.getSalary();
111+
// Act
112+
String expectedDetails = employee.getDetails();
113+
// Assert
114+
assertEquals(expectedDetails, actualDetails);
115+
}
116+
}

0 commit comments

Comments
 (0)