From 12fa16b76c343ac005255619bf343ed3730adb54 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Wed, 30 Mar 2016 10:56:50 +0530 Subject: [PATCH 01/17] Update shippable.yml --- shippable.yml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/shippable.yml b/shippable.yml index c58602b..7a252f4 100644 --- a/shippable.yml +++ b/shippable.yml @@ -10,22 +10,10 @@ env: # - FOO=test - TEST=foo -before_script: +ci: - mkdir -p shippable/testresults - mkdir -p shippable/codecovarage -after_success: - - mvn clean cobertura:cobertura - - mvn test - -notifications: - email: - varsha@shippable.com - irc: - pull_requests: true - channels: - - "chat.freenode.net#test-irc" - -archive: true - -#cache: true + after_success: + - mvn clean cobertura:cobertura + - mvn test From aef319328c2e1f2cdf32d6a00d42d7767e4a0854 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Wed, 30 Mar 2016 11:05:02 +0530 Subject: [PATCH 02/17] Update shippable.yml --- shippable.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/shippable.yml b/shippable.yml index 7a252f4..64230ac 100644 --- a/shippable.yml +++ b/shippable.yml @@ -10,10 +10,9 @@ env: # - FOO=test - TEST=foo -ci: - - mkdir -p shippable/testresults - - mkdir -p shippable/codecovarage - - after_success: +build: + ci: + - mkdir -p shippable/testresults + - mkdir -p shippable/codecovarage - mvn clean cobertura:cobertura - mvn test From 86afe621304c75ae07f549b3a6cc22bfafbc220b Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Wed, 30 Mar 2016 11:18:45 +0530 Subject: [PATCH 03/17] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 64230ac..5bebc14 100644 --- a/shippable.yml +++ b/shippable.yml @@ -4,7 +4,7 @@ jdk: - openjdk7 # - oraclejdk7 # - openjdk6 - - oraclejdk8 + # - oraclejdk8 env: # - FOO=test From 21b1cc2c84828bd8111704967655230010d21f7a Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Wed, 30 Mar 2016 11:22:45 +0530 Subject: [PATCH 04/17] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 5bebc14..4ae0fb0 100644 --- a/shippable.yml +++ b/shippable.yml @@ -15,4 +15,4 @@ build: - mkdir -p shippable/testresults - mkdir -p shippable/codecovarage - mvn clean cobertura:cobertura - - mvn test + - mvn test From 60080ad702e0f98163aa55f786618e04f14be2b1 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Wed, 30 Mar 2016 11:48:48 +0530 Subject: [PATCH 05/17] Update shippable.yml --- shippable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/shippable.yml b/shippable.yml index 4ae0fb0..2a833df 100644 --- a/shippable.yml +++ b/shippable.yml @@ -16,3 +16,4 @@ build: - mkdir -p shippable/codecovarage - mvn clean cobertura:cobertura - mvn test + - timeout 5 From cae031754a829fd0cb1fd7621b2df852c0400b14 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Wed, 30 Mar 2016 12:36:09 +0530 Subject: [PATCH 06/17] Create test.java --- test.java | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 test.java diff --git a/test.java b/test.java new file mode 100644 index 0000000..6b03384 --- /dev/null +++ b/test.java @@ -0,0 +1,24 @@ +import java.io.BufferedReader; +import java.io.InputStreamReader; + +class addtwonumbers_function +{ + // private = local to this class + private static int addIntegers(int a, int b) + { + int sum= a+b; + } + + public static void main(String[] args) + { + // output the answer of adding both of the values together + System.out.println("Answer = " + addIntegers(4, 4)); + } + if(sum==8) + { + return true; + } + else { + return false + } +} From 0c2ec6ff1246caaa9ec1a3db6bde59d4eb6017c6 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Wed, 30 Mar 2016 12:47:04 +0530 Subject: [PATCH 07/17] Update shippable.yml --- shippable.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 2a833df..28d22cd 100644 --- a/shippable.yml +++ b/shippable.yml @@ -15,5 +15,4 @@ build: - mkdir -p shippable/testresults - mkdir -p shippable/codecovarage - mvn clean cobertura:cobertura - - mvn test - - timeout 5 + - mvn test From 932006311ee76d813ce41c749abecabaf286a4f6 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Wed, 30 Mar 2016 13:09:54 +0530 Subject: [PATCH 08/17] Update test.java --- test.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test.java b/test.java index 6b03384..4cc2c96 100644 --- a/test.java +++ b/test.java @@ -8,11 +8,16 @@ private static int addIntegers(int a, int b) { int sum= a+b; } + private static int subIntegers(int a, int b) + { + int sub= a-b; + } public static void main(String[] args) { // output the answer of adding both of the values together System.out.println("Answer = " + addIntegers(4, 4)); + System.out.println("Answer2 = " + subIntegers(7, 4)); } if(sum==8) { @@ -21,4 +26,11 @@ public static void main(String[] args) else { return false } + if(sub==3) + { + return true; + } + else { + return false + } } From e0305efc2d45e3724a5de8dd59a077834934d6ef Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Wed, 30 Mar 2016 13:42:34 +0530 Subject: [PATCH 09/17] Delete test.java --- test.java | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 test.java diff --git a/test.java b/test.java deleted file mode 100644 index 4cc2c96..0000000 --- a/test.java +++ /dev/null @@ -1,36 +0,0 @@ -import java.io.BufferedReader; -import java.io.InputStreamReader; - -class addtwonumbers_function -{ - // private = local to this class - private static int addIntegers(int a, int b) - { - int sum= a+b; - } - private static int subIntegers(int a, int b) - { - int sub= a-b; - } - - public static void main(String[] args) - { - // output the answer of adding both of the values together - System.out.println("Answer = " + addIntegers(4, 4)); - System.out.println("Answer2 = " + subIntegers(7, 4)); - } - if(sum==8) - { - return true; - } - else { - return false - } - if(sub==3) - { - return true; - } - else { - return false - } -} From 08746a8c37bb6817f10334e33a021d38a1e3af8a Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Wed, 30 Mar 2016 14:47:18 +0530 Subject: [PATCH 10/17] Update TestApp.java --- src/test/java/TestApp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/TestApp.java b/src/test/java/TestApp.java index 4688630..840c807 100644 --- a/src/test/java/TestApp.java +++ b/src/test/java/TestApp.java @@ -8,7 +8,7 @@ public void testInsertAndGetData() { App app = new App(); result = app.getData(); } finally { - assertEquals("Hope this works!", result); + assertEquals("Hope this works!123", result); } } } From de9ff441607d25a063eb281f3ff9d13b057f1f06 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Thu, 31 Mar 2016 17:59:30 +0530 Subject: [PATCH 11/17] Update shippable.yml --- shippable.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shippable.yml b/shippable.yml index 28d22cd..a483fa8 100644 --- a/shippable.yml +++ b/shippable.yml @@ -2,9 +2,9 @@ language: java jdk: - openjdk7 - # - oraclejdk7 -# - openjdk6 - # - oraclejdk8 + - oraclejdk7 + - openjdk6 + - oraclejdk8 env: # - FOO=test From 542268eecf1a287bd5cdac69ef9841714ecd1b06 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Thu, 31 Mar 2016 18:06:01 +0530 Subject: [PATCH 12/17] Update TestApp.java --- src/test/java/TestApp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/TestApp.java b/src/test/java/TestApp.java index 840c807..4688630 100644 --- a/src/test/java/TestApp.java +++ b/src/test/java/TestApp.java @@ -8,7 +8,7 @@ public void testInsertAndGetData() { App app = new App(); result = app.getData(); } finally { - assertEquals("Hope this works!123", result); + assertEquals("Hope this works!", result); } } } From 0ac1fca5f1b986a8f02f4e1175ca7ffc144ea1dc Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 18 Apr 2016 11:41:19 +0530 Subject: [PATCH 13/17] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index a483fa8..097b2de 100644 --- a/shippable.yml +++ b/shippable.yml @@ -15,4 +15,4 @@ build: - mkdir -p shippable/testresults - mkdir -p shippable/codecovarage - mvn clean cobertura:cobertura - - mvn test + - mvn test From 62168c8566e62bd47b60511c72fab7e092124e30 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Mon, 18 Apr 2016 12:17:47 +0530 Subject: [PATCH 14/17] Update shippable.yml --- shippable.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 097b2de..86334b2 100644 --- a/shippable.yml +++ b/shippable.yml @@ -15,4 +15,16 @@ build: - mkdir -p shippable/testresults - mkdir -p shippable/codecovarage - mvn clean cobertura:cobertura - - mvn test + - mvn test + +integrations: + notifications: + - integrationName: email + type: email + recipients: + - shiphitchcock1@gmail.com + # - varsha@shippable.com + on_start: ALWAYS + on_success: always + on_failure: always + on_pull_request: always From a247538aea2e22d10d1a4e35340c2666e63b3a58 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Fri, 13 May 2016 16:44:19 +0530 Subject: [PATCH 15/17] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 86334b2..6c3bcf1 100644 --- a/shippable.yml +++ b/shippable.yml @@ -4,7 +4,7 @@ jdk: - openjdk7 - oraclejdk7 - openjdk6 - - oraclejdk8 + # - oraclejdk8 env: # - FOO=test From de80e1bf99f56077b699d1561ddb79cf70cb2081 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Fri, 13 May 2016 16:59:13 +0530 Subject: [PATCH 16/17] Update shippable.yml --- shippable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 6c3bcf1..0f5affc 100644 --- a/shippable.yml +++ b/shippable.yml @@ -3,7 +3,7 @@ language: java jdk: - openjdk7 - oraclejdk7 - - openjdk6 + # - openjdk6 # - oraclejdk8 env: From 8618edaf4679d06ffdba17cb2d04d5337cd46f91 Mon Sep 17 00:00:00 2001 From: shiphitchcock1 Date: Fri, 13 May 2016 17:22:02 +0530 Subject: [PATCH 17/17] Update shippable.yml --- shippable.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shippable.yml b/shippable.yml index 0f5affc..86334b2 100644 --- a/shippable.yml +++ b/shippable.yml @@ -3,8 +3,8 @@ language: java jdk: - openjdk7 - oraclejdk7 - # - openjdk6 - # - oraclejdk8 + - openjdk6 + - oraclejdk8 env: # - FOO=test