Merge pull request #1584 from OneSignal/fix/flaky_test_shouldSetExpireTimeCorrectlyWhenMissingFromPayload

[Fix Tests] Top Flaky tests; shouldSetExpireTimeCorrectlyWhenMissingFromPayload and HMS osIAMPreview_showsPreview

Author: jkasten2

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

@@ -20,6 +20,11 @@ public long getElapsedRealtime() {
         return mockedElapsedTime != null ? mockedElapsedTime : super.getElapsedRealtime();
     }
 
+    public void freezeTime() {
+        mockedTime = getCurrentTimeMillis();
+        mockedElapsedTime = getElapsedRealtime();
+    }
+
     public void setMockedTime(Long mockedTime) {
         this.mockedTime = mockedTime;
     }

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

@@ -1271,11 +1271,14 @@ public void notShowNotificationPastTTL() throws Exception {
    @Test
    @Config(shadows = { ShadowGenerateNotification.class })
    public void shouldSetExpireTimeCorrectlyWhenMissingFromPayload() throws Exception {
+      time.freezeTime();
       NotificationBundleProcessor_ProcessFromFCMIntentService(blankActivity, getBaseNotifBundle());
       threadAndTaskWait();
 
+      long currentTime = time.getCurrentTimeMillis() / 1_000L;
       long expireTime = (Long)TestHelpers.getAllNotificationRecords(dbHelper).get(0).get(NotificationTable.COLUMN_NAME_EXPIRE_TIME);
-      assertEquals((System.currentTimeMillis() / 1_000L) + 259_200, expireTime);
+      long expectedExpireTime = currentTime + 259_200;
+      assertEquals(expectedExpireTime, expireTime);
    }
 
    // TODO: Once we figure out the correct way to process notifications with high priority using the WorkManager

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

@@ -200,6 +200,8 @@ public void osIAMPreview_showsPreview() throws Exception {
                 );
 
         helper_startHMSOpenActivity(intent);
+        threadAndTaskWait();
+        threadAndTaskWait();
         assertEquals("PGh0bWw+PC9odG1sPgoKPHNjcmlwdD4KICAgIHNldFBsYXllclRhZ3MobnVsbCk7Cjwvc2NyaXB0Pg==", ShadowOSWebView.lastData);
     }
 }