From 521354aa57173c28c8acd21deaf1e4d985d4edd0 Mon Sep 17 00:00:00 2001 From: Gillon Paterson Date: Tue, 19 Oct 2021 16:09:11 +0100 Subject: [PATCH 1/3] .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..3e1da5d --- /dev/null +++ b/.travis.yml @@ -0,0 +1,9 @@ +language: java +jdk: openjdk14 +cache: + directories: $HOME/.m2 +notifications: + email: + recipients: gillon.paterson@kainos.com + on_failure: always + on_success: never \ No newline at end of file From fd79d3a7d79c23df747b2b338bee37a0f484e40c Mon Sep 17 00:00:00 2001 From: Gillon Paterson Date: Tue, 19 Oct 2021 16:20:09 +0100 Subject: [PATCH 2/3] Employee.java --- 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 fc3e28db2012217d5ca94dde439c9984670581de Mon Sep 17 00:00:00 2001 From: Gillon Paterson Date: Tue, 19 Oct 2021 16:32:30 +0100 Subject: [PATCH 3/3] test bug fix --- src/test/java/EmployeeTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/EmployeeTest.java b/src/test/java/EmployeeTest.java index aebfef3..b5097cb 100644 --- a/src/test/java/EmployeeTest.java +++ b/src/test/java/EmployeeTest.java @@ -37,13 +37,13 @@ void testSalaryMinFailure() { assertThrows(IllegalArgumentException.class, () -> { e.setSalary(6999); }); - assertNotEquals(6999, e.getSalary()); + assertNotEquals(9999, e.getSalary()); } @Test void testSalaryMinSuccess() { Employee e = new Employee(15, "Henry Banana"); - e.setSalary(7000); - assertEquals(7000, e.getSalary()); + e.setSalary(10000); + assertEquals(10000, e.getSalary()); } }