From 72e7c60ea9dfa8fcc8e7d19f92b355a41d960b98 Mon Sep 17 00:00:00 2001 From: Louie Brown Date: Tue, 19 Oct 2021 13:24:28 +0100 Subject: [PATCH 1/5] add newfile --- newfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newfile diff --git a/newfile b/newfile new file mode 100644 index 0000000..e69de29 From 26b038a71af985be2a73ee0b25c37e175a89a5c0 Mon Sep 17 00:00:00 2001 From: Louie Brown Date: Tue, 19 Oct 2021 13:25:23 +0100 Subject: [PATCH 2/5] remove newfile --- newfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 newfile diff --git a/newfile b/newfile deleted file mode 100644 index e69de29..0000000 From b983eab120ef2978252b4299c9f769332df05c4d Mon Sep 17 00:00:00 2001 From: Louie Brown Date: Tue, 19 Oct 2021 14:35:41 +0100 Subject: [PATCH 3/5] Travis yml --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..46691ae --- /dev/null +++ b/.travis.yml @@ -0,0 +1,9 @@ +language: java +jdk: openjdk14 +cache: + directories: $HOME/.m2 +notifications: + email: + recipients: louie.brown@kanios.com + on_failure: always + on_success: never \ No newline at end of file From 3ec2d85167c6581f20bcc5cc6a8ec200d02461b1 Mon Sep 17 00:00:00 2001 From: Louie Brown Date: Tue, 19 Oct 2021 14:45:49 +0100 Subject: [PATCH 4/5] Update min salary --- src/employee_stuff/Employee.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/employee_stuff/Employee.java b/src/employee_stuff/Employee.java index ddd49e0..832ca27 100644 --- a/src/employee_stuff/Employee.java +++ b/src/employee_stuff/Employee.java @@ -7,7 +7,7 @@ public class Employee { private int number; private float salary; private float bonus; - private static final float MIN_SALARY = 7000f; + private static final float MIN_SALARY = 10000f; private final float INITIAL_BONUS = 200f; public static int instanceCount; From 7d826c72cf5a58f384593dcbd356999ec35892f6 Mon Sep 17 00:00:00 2001 From: Louie Brown Date: Tue, 19 Oct 2021 14:49:49 +0100 Subject: [PATCH 5/5] update assert equals test --- src/test/java/EmployeeTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/EmployeeTest.java b/src/test/java/EmployeeTest.java index aebfef3..cf24e7d 100644 --- a/src/test/java/EmployeeTest.java +++ b/src/test/java/EmployeeTest.java @@ -43,7 +43,7 @@ void testSalaryMinFailure() { @Test void testSalaryMinSuccess() { Employee e = new Employee(15, "Henry Banana"); - e.setSalary(7000); - assertEquals(7000, e.getSalary()); + e.setSalary(10000); + assertEquals(10000, e.getSalary()); } }