Fix for unit tests running on travis.

Author: jkasten2

OneSignalSDK/app/src/test/java/com/onesignal/ShadowOneSignalRestClient.java

@@ -37,7 +37,7 @@ public class ShadowOneSignalRestClient {
    public static String lastUrl;
    public static Thread testThread;
    public static boolean failNext, failAll;
-   public static String failResponse = "{}", nextSuccessResponse;
+   public static String failResponse = "{}", nextSuccessResponse, nextSuccessfulGETResponse;
    public static int networkCallCount;
 
    public static final String testUserId = "a2f7f967-e8cc-11e4-bed1-118f05be4511";
@@ -158,9 +158,9 @@ static void getSync(final String url, final OneSignalRestClient.ResponseHandler
       doInterruptibleDelay();
       if (doFail(responseHandler)) return;
 
-      if (nextSuccessResponse != null) {
-         responseHandler.onSuccess(nextSuccessResponse);
-         nextSuccessResponse = null;
+      if (nextSuccessfulGETResponse != null) {
+         responseHandler.onSuccess(nextSuccessfulGETResponse);
+         nextSuccessfulGETResponse = null;
       }
       else
          responseHandler.onSuccess("{}");

OneSignalSDK/app/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java

@@ -981,7 +981,7 @@ public void shouldGetTagsFromServerOnFirstCall() throws Exception {
       OneSignalInit();
       threadAndTaskWait();
 
-      ShadowOneSignalRestClient.nextSuccessResponse = "{\"tags\": {\"test1\": \"value1\", \"test2\": \"value2\"}}";
+      ShadowOneSignalRestClient.nextSuccessfulGETResponse = "{\"tags\": {\"test1\": \"value1\", \"test2\": \"value2\"}}";
       GetTags();
       threadAndTaskWait(); threadAndTaskWait();
 
@@ -996,11 +996,11 @@ public void shouldGetTagsFromServerOnFirstCall() throws Exception {
 
    @Test
    public void getTagsDelayedAfterRegistering() throws Exception {
+      ShadowOneSignalRestClient.nextSuccessfulGETResponse = "{\"tags\": {\"test1\": \"value1\"}}";
+
       OneSignalInit();
       GetTags();
-      threadAndTaskWait();
-      ShadowOneSignalRestClient.nextSuccessResponse = "{\"tags\": {\"test1\": \"value1\"}}";
-      threadAndTaskWait(); threadAndTaskWait();
+      threadAndTaskWait(); threadAndTaskWait(); threadAndTaskWait();
 
       Assert.assertEquals(3, ShadowOneSignalRestClient.networkCallCount);
       Assert.assertEquals("value1", lastGetTags.getString("test1"));