Test fix up for time changes

Author: jkasten2

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

@@ -2700,14 +2700,13 @@ public void syncHashedEmailTest() throws Exception {
    public void sendsOnFocus() throws Exception {
       OneSignalInit();
       threadAndTaskWait();
-      advanceSystemTimeBy(60);
-      blankActivityController.resume();
-      advanceSystemTimeBy(60);
 
+      advanceSystemTimeBy(60);
       blankActivityController.pause();
       threadAndTaskWait();
-      assertEquals(60, ShadowOneSignalRestClient.lastPost.getInt("active_time"));
-      RestClientAsserts.assertRestCalls(3);
+
+      assertOnFocusAtIndex(2, 60);
+      assertRestCalls(3);
    }
 
    @Test

OneSignalSDK/unittest/src/test/java/com/test/onesignal/OutcomeEventUnitTests.java

@@ -27,6 +27,8 @@
 
 package com.test.onesignal;
 
+import android.os.SystemClock;
+
 import com.onesignal.BuildConfig;
 import com.onesignal.MockOutcomeEventsController;
 import com.onesignal.MockOutcomeEventsRepository;
@@ -50,10 +52,14 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
+import org.robolectric.shadows.ShadowSystemClock;
 
 import java.util.List;
 
 import static com.onesignal.OneSignalPackagePrivateHelper.OneSignal_getOutcomeSettings;
+import static com.test.onesignal.TestHelpers.advanceSystemTimeBy;
+import static com.test.onesignal.TestHelpers.lockTimeTo;
+import static com.test.onesignal.TestHelpers.resetSystemClock;
 import static com.test.onesignal.TestHelpers.threadAndTaskWait;
 import static junit.framework.Assert.assertNull;
 import static junit.framework.TestCase.assertTrue;
@@ -424,6 +430,7 @@ public void run() {
 
     @Test
     public void testOutcomeMultipleFailsSavedOnDB() throws Exception {
+        lockTimeTo(0);
         service.setSuccess(false);
 
         sessionManager.setSessionResult(OSSessionManager.SessionResult.Builder.newInstance()
@@ -523,11 +530,11 @@ public void run() {
 
     @Test
     public void testSendFailedOutcomeWithValueOnDB() throws Exception {
+        lockTimeTo(0);
         service.setSuccess(false);
         sessionManager.setSessionResult(OSSessionManager.SessionResult.Builder.newInstance()
                 .setSession(OSSessionManager.Session.UNATTRIBUTED)
                 .build());
-
         controller.sendOutcomeEventWithValue(OUTCOME_NAME, 1.1f, null);
         threadAndTaskWait();
 

OneSignalSDK/unittest/src/test/java/com/test/onesignal/TestHelpers.java

@@ -303,6 +303,15 @@ static List<OutcomeEvent>  getAllOutcomesRecords() {
       return events;
    }
 
+   /**
+    * Calling setNanoTime ends up locking time to zero.
+    * NOTE: This setNanoTime is going away in future robolectric versions
+    */
+   static void lockTimeTo(long sec) {
+      long nano = sec * 1_000L * 1_000L;
+      ShadowSystemClock.setNanoTime(nano);
+   }
+
    static void resetSystemClock() {
       SystemClock.setCurrentTimeMillis(System.currentTimeMillis());
    }