From 6e25f139f397ebef55352f3e3322a586d9682efd Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Tue, 13 May 2014 13:34:03 -0500
Subject: [PATCH] Only run astrid connectedAndroidTest

---
 .travis.yml                                    |  2 +-
 astrid/build.gradle                            |  3 ---
 .../java/org/tasks/RemoteModelHelpers.java     | 18 +++++++++---------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cf6512b81..ff3fd045f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,4 +11,4 @@ before_install:
   - adb shell input keyevent 82 &
 
 script:
-  - ./gradlew connectedAndroidTest
\ No newline at end of file
+  - ./gradlew :astrid:connectedAndroidTest
\ No newline at end of file
diff --git a/astrid/build.gradle b/astrid/build.gradle
index 50e25b461..fa4bb612a 100644
--- a/astrid/build.gradle
+++ b/astrid/build.gradle
@@ -89,7 +89,4 @@ dependencies {
     compile group: 'com.google.http-client', name: 'google-http-client-extensions-android3', version: '1.6.0-beta', transitive: false
     compile group: 'com.google.oauth-client', name: 'google-oauth-client', version: '1.6.0-beta', transitive: false
     compile group: 'com.google.oauth-client', name: 'google-oauth-client-extensions', version: '1.6.0-beta', transitive: false
-
-    androidTestCompile group: 'junit', name: 'junit', version: '4.10', transitive: false
-    androidTestCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.5', transitive: false
 }
diff --git a/astrid/src/androidTest/java/org/tasks/RemoteModelHelpers.java b/astrid/src/androidTest/java/org/tasks/RemoteModelHelpers.java
index 2448d8908..86dbb62f3 100644
--- a/astrid/src/androidTest/java/org/tasks/RemoteModelHelpers.java
+++ b/astrid/src/androidTest/java/org/tasks/RemoteModelHelpers.java
@@ -9,8 +9,8 @@ import com.todoroo.astrid.data.RemoteModel;
 
 import java.util.Set;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
 
 @SuppressLint("NewApi")
 public class RemoteModelHelpers {
@@ -18,7 +18,7 @@ public class RemoteModelHelpers {
         Set<String> keys = contentValues.keySet();
         Property[] result = new Property[keys.size()];
         int index = 0;
-        for(String key : keys) {
+        for (String key : keys) {
             result[index++] = new Property.StringProperty(table, key);
         }
         return result;
@@ -30,19 +30,19 @@ public class RemoteModelHelpers {
     }
 
     private static void compareContentValues(ContentValues expected, ContentValues actual) {
-        if(expected == null && actual == null) {
+        if (expected == null && actual == null) {
             return;
         }
-        if(expected == null || actual == null) {
+        if (expected == null || actual == null) {
             fail();
         }
-        for(String key : expected.keySet()) {
+        for (String key : expected.keySet()) {
             Object entry = expected.get(key);
-            if(entry instanceof Integer) {
+            if (entry instanceof Integer) {
                 assertEquals(entry, actual.getAsInteger(key));
-            } else if(entry instanceof String) {
+            } else if (entry instanceof String) {
                 assertEquals(entry, actual.getAsString(key));
-            } else if(entry instanceof Long) {
+            } else if (entry instanceof Long) {
                 assertEquals(entry, actual.getAsLong(key));
             } else {
                 fail("Unhandled property type: " + entry.getClass());