From aa923627f36fa7af1491325a73814f6d6b15ded5 Mon Sep 17 00:00:00 2001
From: danijoo <danijob88@googlemail.com>
Date: Sat, 7 Nov 2015 13:11:32 +0100
Subject: [PATCH] gradle test task

---
 .../builditbigger/JokeLoaderTaskTest.java     |  1 -
 build.gradle                                  | 19 +++++++++++++++++++
 .../net/headlezz/jokesbackend/MyEndpoint.java |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/com/udacity/gradle/builditbigger/JokeLoaderTaskTest.java b/app/src/androidTest/java/com/udacity/gradle/builditbigger/JokeLoaderTaskTest.java
index 234bea5..d564106 100644
--- a/app/src/androidTest/java/com/udacity/gradle/builditbigger/JokeLoaderTaskTest.java
+++ b/app/src/androidTest/java/com/udacity/gradle/builditbigger/JokeLoaderTaskTest.java
@@ -15,7 +15,6 @@ public class JokeLoaderTaskTest extends AndroidTestCase {
         task.execute();
         talker.doWait();
         MyBus.getInstance().unregister(this);
-
     }
 
     public void onEvent(Joke joke) {
diff --git a/build.gradle b/build.gradle
index 9405f3f..df96389 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,3 +17,22 @@ allprojects {
         jcenter()
     }
 }
+
+
+
+task testAll {
+    evaluationDependsOn ":jokesbackend"
+
+    project(":jokesbackend"){
+        appengine{
+            daemon true
+        }
+    }
+
+    tasks.getByPath(':app:connectedAndroidTest').mustRunAfter ':jokesbackend:appengineRun'
+//    tasks.getByPath('jokesbackend:appengineStop').mustRunAfter ':app:connectedAndroidTest'
+
+    dependsOn ':jokesbackend:appengineRun'
+    dependsOn ':app:connectedAndroidTest'
+    finalizedBy ':jokesbackend:appengineStop'
+}
diff --git a/jokesbackend/src/main/java/net/headlezz/jokesbackend/MyEndpoint.java b/jokesbackend/src/main/java/net/headlezz/jokesbackend/MyEndpoint.java
index 9903e0b..ac2b12c 100644
--- a/jokesbackend/src/main/java/net/headlezz/jokesbackend/MyEndpoint.java
+++ b/jokesbackend/src/main/java/net/headlezz/jokesbackend/MyEndpoint.java
@@ -32,7 +32,7 @@ public class MyEndpoint {
      * A simple endpoint method that takes a name and says Hi back
      */
     @ApiMethod(name = "tellJoke")
-    public Joke tellJoke () {
+    public Joke tellJoke () throws InterruptedException {
         return new Joke(jp.getRandomJoke());
     }