From 72e7c60ea9dfa8fcc8e7d19f92b355a41d960b98 Mon Sep 17 00:00:00 2001 From: Louie Brown Date: Tue, 19 Oct 2021 13:24:28 +0100 Subject: [PATCH 1/9] 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/9] 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/9] 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/9] 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/9] 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()); } } From 4eb89a460d37d25549f7c2534a5fa0929ac22b62 Mon Sep 17 00:00:00 2001 From: Louie Brown Date: Tue, 19 Oct 2021 15:55:48 +0100 Subject: [PATCH 6/9] InitialEmployeeTestNoChange --- 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 cf24e7d..aebfef3 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(10000); - assertEquals(10000, e.getSalary()); + e.setSalary(7000); + assertEquals(7000, e.getSalary()); } } From 54ca39bb46054941f3d2f623ca975abadaf7c63e Mon Sep 17 00:00:00 2001 From: Louie Brown Date: Tue, 19 Oct 2021 16:18:27 +0100 Subject: [PATCH 7/9] restoreEmoployee --- 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 832ca27..ddd49e0 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 = 10000f; + private static final float MIN_SALARY = 7000f; private final float INITIAL_BONUS = 200f; public static int instanceCount; From dbcd0cd0573c012fb3e281c2c6156b6cdab28641 Mon Sep 17 00:00:00 2001 From: Louie Brown Date: Tue, 19 Oct 2021 16:19:10 +0100 Subject: [PATCH 8/9] travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 46691ae..cddd76b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,4 +6,3 @@ notifications: email: recipients: louie.brown@kanios.com on_failure: always - on_success: never \ No newline at end of file From b08846df76b40d7dadbd30d517bd2c6f368e4104 Mon Sep 17 00:00:00 2001 From: Louie Brown Date: Tue, 19 Oct 2021 16:27:38 +0100 Subject: [PATCH 9/9] Restore --- target/classes/employee_stuff/Employee.class | Bin 0 -> 2741 bytes target/classes/test/java/EmployeeTest.class | Bin 0 -> 2554 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 target/classes/employee_stuff/Employee.class create mode 100644 target/classes/test/java/EmployeeTest.class diff --git a/target/classes/employee_stuff/Employee.class b/target/classes/employee_stuff/Employee.class new file mode 100644 index 0000000000000000000000000000000000000000..16b76bd6ceb760c325e8225e242f6ba62998b7e3 GIT binary patch literal 2741 zcmZ`*TUQfj6x~Ax62b&A3JB2}vD73`P`p*~h6ozvq6TB}hC>)aG?~Fl1xlKWieA*qYg|k!XkN6;YDGbKIz6+H8JilrJ+B}#ZkZKZH|?xmtQzXXKYxOo z>6!FgdTeUp^6bo=j5>Y|vRQBpbH=z;HAy10Trl-w;T4Gl63HxCjay4bD=oV;>_$kz zuBn1)%s6!B^u?mX*vjd}tX?k2+S^p^l>%w?Oua<~xzxFWS+FmJ5x@ZrG3=2r2Q}{9eiF7g>=Eec}^lNwzM-;SH4BKVlTHNE7X}qXybtTeo>gd7@NUT1=dSAm3 zh7|+_%Mrgbv6B}q1lqCa-U)cpMLsUbNkKlT;S^50EHhrV)CA33mbI;5z7}|IBKc-y zQQ@41X0*^vOuZstX3}zYNkdRl5*Dp%hmnk}=bldMt6n0+u@;Yxlj1n3p%vjEt|{ni zR9m`OH1c|Jtemfw4AY)?nKM@Hf@OwqUBNyo5O)hNzGxJ!7x5CaSE`o6xQZ#cxCqHQ z$lcV}M1oljil7b^~p)Xz8|KEh^Z{wD}O6BgcP9!!)jhv5b`<^8b6%?p-w$@PuW) zY?Vto-`1HOitD})+HC}*{%G|E&{nCIr9Wh>GLcRu-ukTGdXP+qV6tb#h4HF}XJ9)C zmNkaMmQR!WmiQ&d5H(u@@Rg0yul^h)SoauRHi8*x-29&b=u1@Vl3*)5KFaw*H7t zb?GN`{@}QG^Bd+7&_So&*vFaX8ls1xr0UtyJdlhB(v#Z4{#3MM1MdjjW5PMBcmuSH zw*Vbg>3--WlP-dH`vUa%0`z$St}=j-X=8xHsn{moz1x6ncLeGsWQ>se9jGqX+=HSc z61)fNLt2;zdW$w9ZCfg~g;Z*A6NB4950dR6g7!I}ao79}P=P>s57$9#&m)XB9tbD zd74l4I#YIoPjQM2XMBu%>x_GylqwL$Dw=l5PZ(RT7j=X&C6A%hCT5~H&F!pj`B;ZM zOa-^<#i27#;y)a{9sCV}`2ca|UL%{CS2=r-nQs>0*LakfZ{aK_v)3>hW#m4uETQjW z09jwSVJ}=Oo}%c{{oE7jlz>M|o3Oq_bJO~OZ>6r+&MN9i?SRuwylAA`74SaAd%%wM jkS*sCpZ0=Jz*G3hX++?Ek&ij63)mjv{1aZe37`H4a=YEu literal 0 HcmV?d00001 diff --git a/target/classes/test/java/EmployeeTest.class b/target/classes/test/java/EmployeeTest.class new file mode 100644 index 0000000000000000000000000000000000000000..ac3a583abdd1bed5e5be3495af800f84e720ef5e GIT binary patch literal 2554 zcmb7F%W@k<6g_P#8b=u{S+N~Ewquhxi4+qnJcn^OUY|UGn^64>egM) z-`Z*yn?N7>CHVoWCR5C=$-o&MLl|Z_SruMTj4HU8zzD`Pj517g#+!9r;V4cz&S9KE z=PI)Jz~?6MJdr691Op>shD%3KqUr~ptG?_xhE?ssBxPI@ma{)G$1VCvvX>(i5j*eScp%VAF>5G*uWtwOfI%skkQT_;J4R`1qhB;JA zWrkJhpF(t>no@9{NXlMIZ1%l2B{Kir_QU#SS!jV=E9i)#93I_~3hYPu_$U6kjM ztRdA~m(BiC9-jh57@I5a>@%eL=SM8S}^ zR$uGtkvGV++(g&moNarq=kWTn@V4zuH-TN$G?<4hW>|anuE>=XLt4nUc*V1weH|8T zhEugL#PEBx|IM92@+EF0|$&MVxLmOB3>ms`RzfT5`$M20cy_tEQ zn`W7A+QofP5;($dwzu|WZc0_6IlWeG?5TTmY!F)t*>3ae27tfv4lkY}wErL4QMok5%sf0Ww)aVLH79%@sDw|DFgi%Dh vlHMYmFnvOK;t~