From a9b7947098b253089655f4f81f68ae957e70e0bb Mon Sep 17 00:00:00 2001 From: Stephan Schultz Date: Sun, 4 Sep 2016 13:59:06 +0200 Subject: [PATCH 1/9] yml --- IntelliQ/mobile/mobile.iml | 24 ++++++++++++------- .../steppschuh/intelliq/ExampleUnitTest.java | 2 +- IntelliQ/wear/wear.iml | 10 ++++++++ circle.yml | 18 ++++++++++++++ 4 files changed, 44 insertions(+), 10 deletions(-) create mode 100644 circle.yml diff --git a/IntelliQ/mobile/mobile.iml b/IntelliQ/mobile/mobile.iml index 9bf0689..cb3be39 100755 --- a/IntelliQ/mobile/mobile.iml +++ b/IntelliQ/mobile/mobile.iml @@ -104,14 +104,6 @@ - - - - - - - - @@ -120,9 +112,19 @@ + + + + + + + + + + @@ -188,12 +190,16 @@ + + + + @@ -266,8 +272,8 @@ - + diff --git a/IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleUnitTest.java b/IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleUnitTest.java index de19a2c..017ce65 100755 --- a/IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleUnitTest.java +++ b/IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleUnitTest.java @@ -10,6 +10,6 @@ public class ExampleUnitTest { @Test public void addition_isCorrect() throws Exception { - assertEquals(4, 2 + 2); + assertEquals(5, 2 + 2); } } \ No newline at end of file diff --git a/IntelliQ/wear/wear.iml b/IntelliQ/wear/wear.iml index 4f3ae86..a712f1a 100755 --- a/IntelliQ/wear/wear.iml +++ b/IntelliQ/wear/wear.iml @@ -83,6 +83,8 @@ + + @@ -91,12 +93,20 @@ + + + + + + + + diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..260f75f --- /dev/null +++ b/circle.yml @@ -0,0 +1,18 @@ +# +# Build configuration for Circle CI +# + +machine: + environment: + ANDROID_HOME: /usr/local/android-sdk-linux + +dependencies: + override: + #- echo y | android update sdk --no-ui --all --filter tools,platform-tools,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-support + #- echo y | android update sdk --no-ui --all --filter build-tools-23.0.1 + - ANDROID_HOME=/usr/local/android-sdk-linux ./IntelliQ/gradlew dependencies + +test: + override: + - (cd IntelliQ && ./gradlew mobile:test): + timeout: 600 From c2aa7a665aa57ac791f619253737cae38abc8aa9 Mon Sep 17 00:00:00 2001 From: Stephan Schultz Date: Sun, 4 Sep 2016 14:02:07 +0200 Subject: [PATCH 2/9] yml --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 260f75f..bea5c80 100644 --- a/circle.yml +++ b/circle.yml @@ -1,5 +1,5 @@ # -# Build configuration for Circle CI +# Build configuration for Circle CI # machine: From ec8ea69edeb88194859ef60df6c6d5fd3197f208 Mon Sep 17 00:00:00 2001 From: Stephan Schultz Date: Sun, 4 Sep 2016 14:11:04 +0200 Subject: [PATCH 3/9] yml --- IntelliQ/mobile/build.gradle | 14 ++++----- IntelliQ/mobile/mobile.iml | 60 +++++++++++++++--------------------- IntelliQ/wear/wear.iml | 16 +++++----- circle.yml | 4 +-- 4 files changed, 42 insertions(+), 52 deletions(-) diff --git a/IntelliQ/mobile/build.gradle b/IntelliQ/mobile/build.gradle index b496cfd..c5743f5 100755 --- a/IntelliQ/mobile/build.gradle +++ b/IntelliQ/mobile/build.gradle @@ -7,7 +7,7 @@ android { defaultConfig { applicationId "com.steppschuh.intelliq" minSdkVersion 16 - targetSdkVersion 24 + targetSdkVersion 23 versionCode 1 versionName "1.0" multiDexEnabled true @@ -53,18 +53,18 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) wearApp project(':wear') testCompile 'junit:junit:4.12' - compile 'com.android.support:multidex:1.0.1' - compile 'com.android.support:appcompat-v7:24.2.0' compile 'com.google.android.gms:play-services:9.4.0' - compile 'com.android.support:design:24.2.0' - compile 'com.android.support:support-v4:24.2.0' - compile 'com.android.support:cardview-v7:24.2.0' + compile 'com.android.support:multidex:1.0.1' + compile 'com.android.support:appcompat-v7:23.4.0' + compile 'com.android.support:design:23.4.0' + compile 'com.android.support:support-v4:23.4.0' + compile 'com.android.support:cardview-v7:23.4.0' + compile 'com.android.support:palette-v7:23.4.0' compile 'com.squareup.picasso:picasso:2.5.2' compile 'com.google.code.gson:gson:2.4' compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.13' compile 'com.octo.android.robospice:robospice-spring-android:1.4.14' compile 'com.octo.android.robospice:robospice:1.4.14' - compile 'com.android.support:palette-v7:24.2.0' compile 'com.google.android.gms:play-services-ads:9.4.0' compile 'com.google.android.gms:play-services-analytics:9.4.0' compile 'com.google.android.gms:play-services-auth:9.4.0' diff --git a/IntelliQ/mobile/mobile.iml b/IntelliQ/mobile/mobile.iml index cb3be39..8b3463a 100755 --- a/IntelliQ/mobile/mobile.iml +++ b/IntelliQ/mobile/mobile.iml @@ -64,14 +64,6 @@ - - - - - - - - @@ -80,6 +72,14 @@ + + + + + + + + @@ -125,21 +125,16 @@ - - - - + + + + - - - - - - - - - + + + + @@ -203,18 +198,15 @@ - - + - - - + @@ -222,19 +214,17 @@ - + - - - + @@ -246,6 +236,7 @@ + @@ -253,29 +244,28 @@ - + + + - + - - - diff --git a/IntelliQ/wear/wear.iml b/IntelliQ/wear/wear.iml index a712f1a..e44eb53 100755 --- a/IntelliQ/wear/wear.iml +++ b/IntelliQ/wear/wear.iml @@ -64,14 +64,6 @@ - - - - - - - - @@ -80,6 +72,14 @@ + + + + + + + + diff --git a/circle.yml b/circle.yml index bea5c80..d275e44 100644 --- a/circle.yml +++ b/circle.yml @@ -8,8 +8,8 @@ machine: dependencies: override: - #- echo y | android update sdk --no-ui --all --filter tools,platform-tools,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-support - #- echo y | android update sdk --no-ui --all --filter build-tools-23.0.1 + - echo y | android update sdk --no-ui --all --filter tools,platform-tools,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-support + - echo y | android update sdk --no-ui --all --filter build-tools-23.0.3 - ANDROID_HOME=/usr/local/android-sdk-linux ./IntelliQ/gradlew dependencies test: From 06276fee4f2ebea2a23914faea57768c597b8430 Mon Sep 17 00:00:00 2001 From: Stephan Schultz Date: Sun, 4 Sep 2016 14:26:47 +0200 Subject: [PATCH 4/9] yml --- circle.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/circle.yml b/circle.yml index d275e44..ae19360 100644 --- a/circle.yml +++ b/circle.yml @@ -2,6 +2,10 @@ # Build configuration for Circle CI # +general: + artifacts: + - "IntelliQ/mobile/build/reports/tests/" + machine: environment: ANDROID_HOME: /usr/local/android-sdk-linux @@ -16,3 +20,7 @@ test: override: - (cd IntelliQ && ./gradlew mobile:test): timeout: 600 + +# post: +# - mkdir $CIRCLE_ARTIFACTS/mobile +# - mv IntelliQ/mobile/build/reports/tests/ $CIRCLE_ARTIFACTS/mobile \ No newline at end of file From 152b9c11aa07f23a28af903d13682efa2b722c00 Mon Sep 17 00:00:00 2001 From: Stephan Schultz Date: Sun, 4 Sep 2016 15:23:05 +0200 Subject: [PATCH 5/9] Fixed test --- .../test/java/com/steppschuh/intelliq/ExampleUnitTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleUnitTest.java b/IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleUnitTest.java index 017ce65..dfb32e9 100755 --- a/IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleUnitTest.java +++ b/IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleUnitTest.java @@ -8,8 +8,10 @@ * To work on unit tests, switch the Test Artifact in the Build Variants view. */ public class ExampleUnitTest { + @Test public void addition_isCorrect() throws Exception { - assertEquals(5, 2 + 2); + assertEquals(4, 2 + 2); } + } \ No newline at end of file From bbd15b5ba6615b6db68c76f41f44f5b9168408ec Mon Sep 17 00:00:00 2001 From: Stephan Schultz Date: Sun, 4 Sep 2016 15:33:36 +0200 Subject: [PATCH 6/9] Added backend test --- IntelliQ/backend/build.gradle | 5 ++ .../com/intelliq/appengine/ExampleTest.java | 14 ++++++ IntelliQ/mobile/mobile.iml | 46 +++++++++---------- .../steppschuh/intelliq/ExampleUnitTest.java | 2 +- IntelliQ/wear/wear.iml | 16 +++---- 5 files changed, 51 insertions(+), 32 deletions(-) create mode 100644 IntelliQ/backend/src/test/java/com/intelliq/appengine/ExampleTest.java diff --git a/IntelliQ/backend/build.gradle b/IntelliQ/backend/build.gradle index 7d1bf79..1a55e19 100644 --- a/IntelliQ/backend/build.gradle +++ b/IntelliQ/backend/build.gradle @@ -42,6 +42,11 @@ dependencies { compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.2' compile 'javax.servlet:servlet-api:2.5' + + testCompile 'com.google.appengine:appengine-api-labs:1.9.8' + testCompile 'com.google.appengine:appengine-api-stubs:1.9.8' + testCompile 'com.google.appengine:appengine-testing:1.9.8' + testCompile 'junit:junit:4.12' } diff --git a/IntelliQ/backend/src/test/java/com/intelliq/appengine/ExampleTest.java b/IntelliQ/backend/src/test/java/com/intelliq/appengine/ExampleTest.java new file mode 100644 index 0000000..4ddbb5d --- /dev/null +++ b/IntelliQ/backend/src/test/java/com/intelliq/appengine/ExampleTest.java @@ -0,0 +1,14 @@ +package com.intelliq.appengine; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class ExampleTest { + + @Test + public void testAddition() { + assertEquals(5, 2 + 2); + } + +} \ No newline at end of file diff --git a/IntelliQ/mobile/mobile.iml b/IntelliQ/mobile/mobile.iml index 8b3463a..a444b59 100755 --- a/IntelliQ/mobile/mobile.iml +++ b/IntelliQ/mobile/mobile.iml @@ -42,6 +42,12 @@ + + + + + + @@ -50,12 +56,6 @@ - - - - - - @@ -64,14 +64,6 @@ - - - - - - - - @@ -80,6 +72,14 @@ + + + + + + + + @@ -104,14 +104,6 @@ - - - - - - - - @@ -120,6 +112,14 @@ + + + + + + + + @@ -264,8 +264,8 @@ - + diff --git a/IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleUnitTest.java b/IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleUnitTest.java index dfb32e9..c2e7cb4 100755 --- a/IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleUnitTest.java +++ b/IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleUnitTest.java @@ -13,5 +13,5 @@ public class ExampleUnitTest { public void addition_isCorrect() throws Exception { assertEquals(4, 2 + 2); } - + } \ No newline at end of file diff --git a/IntelliQ/wear/wear.iml b/IntelliQ/wear/wear.iml index e44eb53..a712f1a 100755 --- a/IntelliQ/wear/wear.iml +++ b/IntelliQ/wear/wear.iml @@ -64,14 +64,6 @@ - - - - - - - - @@ -80,6 +72,14 @@ + + + + + + + + From 074b6fdfa09e306ddc5755546b32755e6ad3d9f6 Mon Sep 17 00:00:00 2001 From: Stephan Schultz Date: Sun, 4 Sep 2016 15:42:43 +0200 Subject: [PATCH 7/9] yml --- circle.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index ae19360..7d4075a 100644 --- a/circle.yml +++ b/circle.yml @@ -5,6 +5,7 @@ general: artifacts: - "IntelliQ/mobile/build/reports/tests/" + - "IntelliQ/backend/build/reports/tests/" machine: environment: @@ -20,7 +21,5 @@ test: override: - (cd IntelliQ && ./gradlew mobile:test): timeout: 600 - -# post: -# - mkdir $CIRCLE_ARTIFACTS/mobile -# - mv IntelliQ/mobile/build/reports/tests/ $CIRCLE_ARTIFACTS/mobile \ No newline at end of file + - (cd IntelliQ && ./gradlew backend:test): + timeout: 600 \ No newline at end of file From 00bcb06294073134d4a0a67ef9f15d6168147434 Mon Sep 17 00:00:00 2001 From: Stephan Schultz Date: Sun, 4 Sep 2016 15:53:33 +0200 Subject: [PATCH 8/9] Added Slack integration --- IntelliQ/backend/build.gradle | 2 +- IntelliQ/backend/libs/slackmessagebuilder.jar | Bin 0 -> 11220 bytes .../appengine/MessageBuilderTest.java | 55 ++++++++++++++++++ IntelliQ/mobile/mobile.iml | 14 ++--- ...{ExampleUnitTest.java => ExampleTest.java} | 2 +- IntelliQ/wear/wear.iml | 16 ++--- 6 files changed, 72 insertions(+), 17 deletions(-) create mode 100644 IntelliQ/backend/libs/slackmessagebuilder.jar create mode 100644 IntelliQ/backend/src/test/java/com/intelliq/appengine/MessageBuilderTest.java rename IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/{ExampleUnitTest.java => ExampleTest.java} (90%) mode change 100755 => 100644 diff --git a/IntelliQ/backend/build.gradle b/IntelliQ/backend/build.gradle index 1a55e19..9566718 100644 --- a/IntelliQ/backend/build.gradle +++ b/IntelliQ/backend/build.gradle @@ -24,7 +24,7 @@ sourceCompatibility = JavaVersion.VERSION_1_7 targetCompatibility = JavaVersion.VERSION_1_7 dependencies { - //compile fileTree(dir: 'libs', include: ['*.jar']) + compile fileTree(dir: 'libs', include: ['*.jar']) appengineSdk 'com.google.appengine:appengine-java-sdk:1.9.38' compile group: 'com.google.apis', name: 'google-api-services-oauth2', version: 'v1-rev120-1.22.0' diff --git a/IntelliQ/backend/libs/slackmessagebuilder.jar b/IntelliQ/backend/libs/slackmessagebuilder.jar new file mode 100644 index 0000000000000000000000000000000000000000..dec02a17724f7aff8cbe89482f7d244a54f04699 GIT binary patch literal 11220 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 N!*M%{p}+h0{{Ula_w)b& literal 0 HcmV?d00001 diff --git a/IntelliQ/backend/src/test/java/com/intelliq/appengine/MessageBuilderTest.java b/IntelliQ/backend/src/test/java/com/intelliq/appengine/MessageBuilderTest.java new file mode 100644 index 0000000..34d1a57 --- /dev/null +++ b/IntelliQ/backend/src/test/java/com/intelliq/appengine/MessageBuilderTest.java @@ -0,0 +1,55 @@ +package com.intelliq.appengine; + +import net.steppschuh.slackmessagebuilder.message.attachment.Attachment; +import net.steppschuh.slackmessagebuilder.message.attachment.AttachmentBuilder; +import net.steppschuh.slackmessagebuilder.message.attachment.AttachmentField; +import net.steppschuh.slackmessagebuilder.message.MessageBuilder; +import net.steppschuh.slackmessagebuilder.message.MessageLink; +import net.steppschuh.slackmessagebuilder.request.Webhook; + +public class MessageBuilderTest { + + //@Test + public void builder_exampleMessage() throws Exception { + // create a webhook + String hookUrl = "https://hooks.slack.com/services/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"; + Webhook webhook = new Webhook(hookUrl); + + // create some content + MessageLink gitHubLink = new MessageLink("https://github.com/Steppschuh/SlackMessageBuilder", "GitHub repo"); + + // create a message + MessageBuilder messageBuilder = new MessageBuilder() + .setChannel("#log") + .setUsername("Slack Message Builder") + .setIconEmoji(":+1:") + .setText("I'm the message text with a link to a " + gitHubLink + " :octocat:"); + + // add some attachments + int attachmentCount = 3; + for (int index = 1; index <= attachmentCount; index++) { + messageBuilder.addAttachment(generateMessageAttachment(index)); + } + + // send message + webhook.postMessageSynchronous(messageBuilder.build()); + } + + public static Attachment generateMessageAttachment(int index) { + AttachmentBuilder attachmentBuilder = new AttachmentBuilder() + .setTitle("Attachment #" + index) + .setText("This is the main text in message attachment " + index + ", and can contain standard message markup.") + .setColor(getHexCode(index)) + .addField(new AttachmentField("User", System.getProperty("user.name"))) + .addField(new AttachmentField("Index", String.valueOf(index))) + .setFooter("Created by " + MessageBuilderTest.class.getSimpleName()); + + return attachmentBuilder.build(); + } + + public static String getHexCode(int index) { + String[] colors = {"#00BCD4", "#2196F3", "#673AB7", "#E91E63", "#795548"}; + return colors[Math.abs(index % (colors.length - 1))]; + } + +} \ No newline at end of file diff --git a/IntelliQ/mobile/mobile.iml b/IntelliQ/mobile/mobile.iml index a444b59..6d2240a 100755 --- a/IntelliQ/mobile/mobile.iml +++ b/IntelliQ/mobile/mobile.iml @@ -42,12 +42,6 @@ - - - - - - @@ -56,6 +50,12 @@ + + + + + + @@ -264,8 +264,8 @@ - + diff --git a/IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleUnitTest.java b/IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleTest.java old mode 100755 new mode 100644 similarity index 90% rename from IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleUnitTest.java rename to IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleTest.java index c2e7cb4..1fa9d48 --- a/IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleUnitTest.java +++ b/IntelliQ/mobile/src/test/java/com/steppschuh/intelliq/ExampleTest.java @@ -7,7 +7,7 @@ /** * To work on unit tests, switch the Test Artifact in the Build Variants view. */ -public class ExampleUnitTest { +public class ExampleTest { @Test public void addition_isCorrect() throws Exception { diff --git a/IntelliQ/wear/wear.iml b/IntelliQ/wear/wear.iml index a712f1a..e44eb53 100755 --- a/IntelliQ/wear/wear.iml +++ b/IntelliQ/wear/wear.iml @@ -64,14 +64,6 @@ - - - - - - - - @@ -80,6 +72,14 @@ + + + + + + + + From f92a82a759178b4e1c979ba91012b9f1ab939c70 Mon Sep 17 00:00:00 2001 From: Stephan Schultz Date: Sun, 4 Sep 2016 16:09:39 +0200 Subject: [PATCH 9/9] Fixed test --- .../src/test/java/com/intelliq/appengine/ExampleTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IntelliQ/backend/src/test/java/com/intelliq/appengine/ExampleTest.java b/IntelliQ/backend/src/test/java/com/intelliq/appengine/ExampleTest.java index 4ddbb5d..171e4d6 100644 --- a/IntelliQ/backend/src/test/java/com/intelliq/appengine/ExampleTest.java +++ b/IntelliQ/backend/src/test/java/com/intelliq/appengine/ExampleTest.java @@ -8,7 +8,7 @@ public class ExampleTest { @Test public void testAddition() { - assertEquals(5, 2 + 2); + assertEquals(4, 2 + 2); } } \ No newline at end of file