From 8610f7f815e201e3db37377bf363864d5594d53a Mon Sep 17 00:00:00 2001 From: mblack23 <92953970+mblack23@users.noreply.github.com> Date: Sun, 19 Dec 2021 19:26:28 -0500 Subject: [PATCH 1/8] Add .circleci/config.yml --- .circleci/config.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000..8ea8ffe4 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,36 @@ +# Use the latest 2.1 version of CircleCI pipeline process engine. +# See: https://circleci.com/docs/2.0/configuration-reference +version: 2.1 + +# Define a job to be invoked later in a workflow. +# See: https://circleci.com/docs/2.0/configuration-reference/#jobs +jobs: + # Below is the definition of your job to build and test your app, you can rename and customize it as you want. + build-and-test: + # These next lines define a Docker executor: https://circleci.com/docs/2.0/executor-types/ + # You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub. + # Be sure to update the Docker image tag below to openjdk version of your application. + # A list of available CircleCI Docker Convenience Images are available here: https://circleci.com/developer/images/image/cimg/openjdk + docker: + - image: cimg/openjdk:11.0 + # Add steps to the job + # See: https://circleci.com/docs/2.0/configuration-reference/#steps + steps: + # Checkout the code as the first step. + - checkout + # Use mvn clean and package as the standard maven build phase + - run: + name: Build + command: mvn -B -DskipTests clean package + # Then run your tests! + - run: + name: Test + command: mvn test + +# Invoke jobs via workflows +# See: https://circleci.com/docs/2.0/configuration-reference/#workflows +workflows: + sample: # This is the name of the workflow, feel free to change it to better match your workflow. + # Inside the workflow, you define the jobs you want to run. + jobs: + - build-and-test From a92a5487e9ec41a0ca12f7cae415e55b4b8c95fc Mon Sep 17 00:00:00 2001 From: mblack23 Date: Sun, 19 Dec 2021 19:28:43 -0500 Subject: [PATCH 2/8] Update SimpleCalculatorTest.class --- .../SimpleCalculatorTest.class | Bin 689 -> 689 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/target/test-classes/travis_ci_tutorial_java/SimpleCalculatorTest.class b/target/test-classes/travis_ci_tutorial_java/SimpleCalculatorTest.class index f6880b5706073f05e021fb7bf54f469445d1be6b..0b9b3a186f04cd9f3e3e425cfb7304ac856b2ba0 100644 GIT binary patch delta 367 zcmYL@%}T>S6otV(u0UjB6wQJ{#mY-5HE>KfSm1IcnO_y7O^ delta 350 zcmYLD%Syvg5IvLRHZi@aQJc0tYt==fNEW&j9|%Igl?%b8kRr8UA+1}x>IYo1@H?`x zqTpWt!Cw*Qrh<1dXXeg%Od$$!@%8ie0pI{TF6Pj(vFyS?OP3YF3;hfit5~zKZexQ` zIqE(1M#ls*jIIgR`5^78te-#Aq59s>KPhq~TvQ36@I4!hYXf1>6X9XNbZnGe#2TqTb&BQc8IDX8GafXB5`embae zFJ}bI!{>>xz+$5mU%}!IXuQL?nZmr>v#b|blRCsJ?0>h~DNLqS`38xA1GH^pCjGP3 UQHxk&`#SG*e85P|(kC^40Z-K^nE(I) From 13e26241a85b4195ffe8adcf0957ea61a5d5540f Mon Sep 17 00:00:00 2001 From: mblack23 Date: Sun, 19 Dec 2021 19:31:13 -0500 Subject: [PATCH 3/8] subtraction added subtraction --- .../SimpleCalculator.java | 3 +++ .../SimpleCalculator.class | Bin 427 -> 513 bytes 2 files changed, 3 insertions(+) diff --git a/src/main/java/travis_ci_tutorial_java/SimpleCalculator.java b/src/main/java/travis_ci_tutorial_java/SimpleCalculator.java index a768b9a2..70fde218 100755 --- a/src/main/java/travis_ci_tutorial_java/SimpleCalculator.java +++ b/src/main/java/travis_ci_tutorial_java/SimpleCalculator.java @@ -4,4 +4,7 @@ public class SimpleCalculator { public int add(int a, int b) { return a + b; } + public int sub(int a, int b){ + return a - b; + } } diff --git a/target/classes/travis_ci_tutorial_java/SimpleCalculator.class b/target/classes/travis_ci_tutorial_java/SimpleCalculator.class index aadae118abd0ac4909fb2a2feb7ba07c94920fb6..e5605f9b0c857c261abffddeda33c9d260930775 100644 GIT binary patch literal 513 zcma)2u}%U(6r2ZlfQW)9Hd<&06jE4fEF>`@AzEN)aqn)UOBT)?cYKwNm5GHP;71u} z4+=vpC~oGxoq6+i@B8QT3&16g%P0uiX`+^9F$v8i&C)nA%1)+gsd^(bd$qc+Y?xU^ zp$t#Z$R(@h&%K9Ws>4)Jx;Ar@-Uy2A&RF2}<49Lg#7+%9N`m^(%=LXX3v}|R0;>hh zVH_$uR@}vYedwhxW+CVfx4q95H>xNS`0c@YGj3~Z^FbHx zEjS0={2w4P3ngNiU5_kezx#p8JBtFUL?=7zF0r;UkoVXL_E9Ig;aj?0sCRPu^hW+W k>*up)D}6mnCmJ}&^E@@~ delta 211 zcmZoff$?3=9m$45C~N%nU;848rUTA`|_@Cgzn-e67sN!@$D8I+0g9jgdhh zE3qt5KPNFSUEe<`D>b= Date: Sun, 19 Dec 2021 19:33:24 -0500 Subject: [PATCH 4/8] multiply --- .../SimpleCalculatorTest.java | 2 ++ .../SimpleCalculatorTest.class | Bin 689 -> 633 bytes 2 files changed, 2 insertions(+) diff --git a/src/test/java/travis_ci_tutorial_java/SimpleCalculatorTest.java b/src/test/java/travis_ci_tutorial_java/SimpleCalculatorTest.java index 9c578eb9..23c57f10 100755 --- a/src/test/java/travis_ci_tutorial_java/SimpleCalculatorTest.java +++ b/src/test/java/travis_ci_tutorial_java/SimpleCalculatorTest.java @@ -10,5 +10,7 @@ public class SimpleCalculatorTest { public void testAdd() { SimpleCalculator calc = new SimpleCalculator(); assertEquals(calc.add(1, 1), 2); + assertEquals(calc.sub(1, 1), 0); + assertEquals(calc.multi(1, 1), 0); } } diff --git a/target/test-classes/travis_ci_tutorial_java/SimpleCalculatorTest.class b/target/test-classes/travis_ci_tutorial_java/SimpleCalculatorTest.class index 0b9b3a186f04cd9f3e3e425cfb7304ac856b2ba0..5459ada56913a425c77b2f598d6e3b4860505537 100644 GIT binary patch delta 249 zcmdnU`jdt0)W2Q(7#J9g8KgFHu`<^4XC;;;>gOcprR%#E73CLkFo-ZRWQ67wr55Ms zl%=L9B=9FY=WagFVC;$mf zh0J1w(!7+^w9Gu9_O$#Wg%Y6JlFEWqh2YHGf}B+6#GK?(po#fKTwIC_f(&9j46F>| zj0~b0J_yGImlS2@rCV!;O+LxkZEwQB%)khAHP>zi!AK$D?F^#(fjlM#E+EMUmf>UI U2C{h|s(>^vkjKa%0ahgm05A?fDgXcg delta 232 zcmey#vXPbR)W2Q(7#J9g8B{iMu`)7hOcc<_;9?MD-~MlK-D0?#Kj=ZAj{4m!^j|zUzDz&RhpMsqVHH-oLW@E!yv~X&&a@&2iI From 6953f49eb85e324e525f42899d6c8c0a790d3742 Mon Sep 17 00:00:00 2001 From: mblack23 Date: Sun, 19 Dec 2021 19:34:26 -0500 Subject: [PATCH 5/8] fixed multi --- src/test/java/travis_ci_tutorial_java/SimpleCalculatorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/travis_ci_tutorial_java/SimpleCalculatorTest.java b/src/test/java/travis_ci_tutorial_java/SimpleCalculatorTest.java index 23c57f10..00dd7412 100755 --- a/src/test/java/travis_ci_tutorial_java/SimpleCalculatorTest.java +++ b/src/test/java/travis_ci_tutorial_java/SimpleCalculatorTest.java @@ -11,6 +11,6 @@ public void testAdd() { SimpleCalculator calc = new SimpleCalculator(); assertEquals(calc.add(1, 1), 2); assertEquals(calc.sub(1, 1), 0); - assertEquals(calc.multi(1, 1), 0); + assertEquals(calc.multi(1, 1), 1); } } From 674c1b2ec334c2b5e10952346a5d7f04782ad536 Mon Sep 17 00:00:00 2001 From: mblack23 Date: Sun, 19 Dec 2021 19:35:41 -0500 Subject: [PATCH 6/8] fixed multiply again --- .../SimpleCalculator.java | 3 +++ .../SimpleCalculator.class | Bin 513 -> 601 bytes .../SimpleCalculatorTest.class | Bin 633 -> 753 bytes 3 files changed, 3 insertions(+) diff --git a/src/main/java/travis_ci_tutorial_java/SimpleCalculator.java b/src/main/java/travis_ci_tutorial_java/SimpleCalculator.java index 70fde218..5044095e 100755 --- a/src/main/java/travis_ci_tutorial_java/SimpleCalculator.java +++ b/src/main/java/travis_ci_tutorial_java/SimpleCalculator.java @@ -7,4 +7,7 @@ public int add(int a, int b) { public int sub(int a, int b){ return a - b; } + public int multi(int a, int b){ + return a * b; + } } diff --git a/target/classes/travis_ci_tutorial_java/SimpleCalculator.class b/target/classes/travis_ci_tutorial_java/SimpleCalculator.class index e5605f9b0c857c261abffddeda33c9d260930775..0df0addf656d027fd6fefab14b4efa9f451b7d45 100644 GIT binary patch delta 84 zcmZoff$?3=9m$4B`{H9ff$?3=9m$3}O?x9!~tM$H+WciSZFD0|OI-C;-Th3EThx diff --git a/target/test-classes/travis_ci_tutorial_java/SimpleCalculatorTest.class b/target/test-classes/travis_ci_tutorial_java/SimpleCalculatorTest.class index 5459ada56913a425c77b2f598d6e3b4860505537..1e4b7582d92deb0fed42c4f734c09bbf2ba9f64e 100644 GIT binary patch delta 297 zcmXwzy-ve06oo&BShTJSt!NA4w?KiUMe4xF#K4fMGZJHH5h@B4nq*>N%EW|t5Yz<_ zNIU>6x-ZnS8cT01=g`cG u|8hH1Mow)`l&KAD?h*wwb;>lEqr<#;vAx{abjpSbwAf`2VXkM`!T$pi3ohjV delta 249 zcmey!`jdt0)W2Q(7#J9g8KgFHu`<^4XC;;;>gOcprR%#E73CLkFo-ZRWQ67wr55Ms zl%=L9B=9FY=WagFVC;$mf zh0J1w(!7+^w9Gu9_O$#Wg%Y6JlFEWqh2YHGf}B+6#GK?(po#fKTwIC_f(&9j46F>| zj0~b0J_yGImlS2@rCV!;O@7VTZEwQB%)khAHP>zi!AK$D?F^#(fjlM#E+EMUmf>UI U2C{h|s(>^vkjKa%0ahgm0CzM%i~s-t From 351b5ef387e68979eceb68d2652f644594e41e36 Mon Sep 17 00:00:00 2001 From: mblack23 Date: Sun, 19 Dec 2021 19:37:49 -0500 Subject: [PATCH 7/8] divide --- .../SimpleCalculator.java | 4 ++++ .../SimpleCalculatorTest.java | 3 +-- .../SimpleCalculator.class | Bin 601 -> 690 bytes .../SimpleCalculatorTest.class | Bin 753 -> 689 bytes 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/travis_ci_tutorial_java/SimpleCalculator.java b/src/main/java/travis_ci_tutorial_java/SimpleCalculator.java index 5044095e..5c76a652 100755 --- a/src/main/java/travis_ci_tutorial_java/SimpleCalculator.java +++ b/src/main/java/travis_ci_tutorial_java/SimpleCalculator.java @@ -9,5 +9,9 @@ public int sub(int a, int b){ } public int multi(int a, int b){ return a * b; + } + public int divide(int a, int b){ + return a / b; } } + diff --git a/src/test/java/travis_ci_tutorial_java/SimpleCalculatorTest.java b/src/test/java/travis_ci_tutorial_java/SimpleCalculatorTest.java index 00dd7412..e527ade2 100755 --- a/src/test/java/travis_ci_tutorial_java/SimpleCalculatorTest.java +++ b/src/test/java/travis_ci_tutorial_java/SimpleCalculatorTest.java @@ -10,7 +10,6 @@ public class SimpleCalculatorTest { public void testAdd() { SimpleCalculator calc = new SimpleCalculator(); assertEquals(calc.add(1, 1), 2); - assertEquals(calc.sub(1, 1), 0); - assertEquals(calc.multi(1, 1), 1); + } } diff --git a/target/classes/travis_ci_tutorial_java/SimpleCalculator.class b/target/classes/travis_ci_tutorial_java/SimpleCalculator.class index 0df0addf656d027fd6fefab14b4efa9f451b7d45..df19cddecd9ca3a8a334b7c2f4d471d3883c8ac9 100644 GIT binary patch delta 86 zcmcb~vWb=J)W2Q(7#J9g86+lhy<}%g$t=rENuBu7fRS~x5~C5LDnA1w13OTG69W?i hGmvJHmdRNIq?s7FfFv7GmVtq9awnrEyBJth8~~W|4`cuU delta 34 qcmdnQdXt6g)W2Q(7#J9g8N?@Yy`1<*kCA1wHlqYXej|{@#J~k4`52gi nBsT*G0}q2JkjD*D15pVS;RW(IfT9WviVTcEs08FQF(?B7+c*q> delta 182 zcmdnU`jM6E)W2Q(7#J9g8MHQXbu%h)F$gj!@-Qedh%+)U7ndf1_$oXMsvtgVZfQP8WSQwaq+H`g^2u5ya5cbh#VcEtY(kj9rv4cSh%u#6NgfW#{xq!@#K=n)v zTtHHcffYz{GjK5QFo-hnGAJoyg(iYg9?KhgE|8v5NZJVObnU; Dc3T>e From 1ef7da5ebdef9acf27009dc6809160e0f24e7878 Mon Sep 17 00:00:00 2001 From: mblack23 Date: Sun, 19 Dec 2021 19:41:23 -0500 Subject: [PATCH 8/8] test2 --- .../SimpleCalculatorTest.java | 5 ++++- .../SimpleCalculatorTest.class | Bin 689 -> 809 bytes 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/java/travis_ci_tutorial_java/SimpleCalculatorTest.java b/src/test/java/travis_ci_tutorial_java/SimpleCalculatorTest.java index e527ade2..adb17a62 100755 --- a/src/test/java/travis_ci_tutorial_java/SimpleCalculatorTest.java +++ b/src/test/java/travis_ci_tutorial_java/SimpleCalculatorTest.java @@ -10,6 +10,9 @@ public class SimpleCalculatorTest { public void testAdd() { SimpleCalculator calc = new SimpleCalculator(); assertEquals(calc.add(1, 1), 2); - + } + public void testsub() { + SimpleCalculator calc = new SimpleCalculator(); + assertEquals(calc.sub(1, 1), 0); } } diff --git a/target/test-classes/travis_ci_tutorial_java/SimpleCalculatorTest.class b/target/test-classes/travis_ci_tutorial_java/SimpleCalculatorTest.class index 614725c90bcdaf589e5fbafbf2f50ba655222224..9534b6b4711930ccf1e38b1c33ec38fda7483fe8 100644 GIT binary patch delta 160 zcmXAhy$-=(7=@qrYiWI2G!?|8@tYXA41?85TtVv+Ol-XhV;6)(V&tM4Z(=!5o|BwY zR4!HfEgvsn!K|=v>3P{c&C0$c<|mWvstBGA*SHvE`$@F9 s5wGU1du4d6-RT$F8?0snN3)4fi&(GgYMuX%fKbg>4oLJ>n5Y}3KZcnY82|tP delta 41 xcmZ3