Merge branch 'feature/auto-retry' into feature/sdk-346-unauthenticated-apis

Author: franco-zalamena-iterable

iterableapi/src/main/java/com/iterable/iterableapi/IterablePushNotificationUtil.java

@@ -14,6 +14,10 @@ class IterablePushNotificationUtil {
     private static PendingAction pendingAction = null;
     private static final String TAG = "IterablePushNotificationUtil";
 
+    static void clearPendingAction() {
+        pendingAction = null;
+    }
+
     static boolean processPendingAction(Context context) {
         boolean handled = false;
         if (pendingAction != null) {

iterableapi/src/test/java/com/iterable/iterableapi/BaseTest.java

@@ -6,6 +6,7 @@
 
 import com.iterable.iterableapi.unit.TestRunner;
 
+import org.junit.After;
 import org.junit.Rule;
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
@@ -22,6 +23,14 @@ public abstract class BaseTest {
     @Rule
     public AsyncTaskRule asyncTaskRule = new AsyncTaskRule();
 
+    @After
+    public void baseTestTearDown() {
+        IterableActivityMonitor.getInstance().unregisterLifecycleCallbacks(getContext());
+        IterableActivityMonitor.instance = new IterableActivityMonitor();
+        IterablePushNotificationUtil.clearPendingAction();
+        IterableApi.sharedInstance = new IterableApi();
+    }
+
     protected IterableUtilImpl getIterableUtilSpy() {
         return utilsRule.iterableUtilSpy;
     }

iterableapi/src/test/java/com/iterable/iterableapi/IterableActivityMonitorTest.java

@@ -2,7 +2,6 @@
 
 import android.app.Activity;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.robolectric.Robolectric;
@@ -22,12 +21,6 @@ public void setUp() {
         IterableActivityMonitor.getInstance().registerLifecycleCallbacks(getContext());
     }
 
-    @After
-    public void tearDown() {
-        IterableActivityMonitor.getInstance().unregisterLifecycleCallbacks(getContext());
-        IterableActivityMonitor.instance = new IterableActivityMonitor();
-    }
-
     @Test
     public void testOneActivityStarted() {
         Robolectric.buildActivity(Activity.class).create().start().resume();

iterableapi/src/test/java/com/iterable/iterableapi/IterableApiTest.java

@@ -143,8 +143,8 @@ public void testAttributionInfoPersistence() throws Exception {
         assertEquals(attributionInfo.templateId, storedAttributionInfo.templateId);
         assertEquals(attributionInfo.messageId, storedAttributionInfo.messageId);
 
-        // 24 hours, expired, attributionInfo should be null
-        doReturn(System.currentTimeMillis() + 3600 * 24 * 1000).when(utilsRule.iterableUtilSpy).currentTimeMillis();
+        // Just past 24 hours, expired, attributionInfo should be null
+        doReturn(System.currentTimeMillis() + 3600 * 24 * 1000 + 1).when(utilsRule.iterableUtilSpy).currentTimeMillis();
         storedAttributionInfo = IterableApi.getInstance().getAttributionInfo();
         assertNull(storedAttributionInfo);
     }

iterableapi/src/test/java/com/iterable/iterableapi/IterableInAppManagerTest.java

@@ -88,8 +88,6 @@ public IterableConfig.Builder run(IterableConfig.Builder builder) {
     public void tearDown() throws IOException {
         server.shutdown();
         server = null;
-        IterableActivityMonitor.getInstance().unregisterLifecycleCallbacks(getContext());
-        IterableActivityMonitor.instance = new IterableActivityMonitor();
     }
 
     @Ignore("Ignoring due to stalling")

iterableapi/src/test/java/com/iterable/iterableapi/IterableTaskRunnerTest.java

@@ -190,13 +190,15 @@ private IterableAuthHandler initApiWithAutoRetry(boolean autoRetryEnabled) {
                 .putBoolean(IterableConstants.SHARED_PREFS_AUTO_RETRY_KEY, autoRetryEnabled)
                 .apply();
 
-        IterableTestUtils.createIterableApiNew(new IterableTestUtils.ConfigBuilderExtender() {
-            @Override
-            public IterableConfig.Builder run(IterableConfig.Builder builder) {
-                return builder
-                        .setAuthHandler(mockAuthHandler);
-            }
-        });
+        // Initialize directly without calling setEmail to avoid triggering an async
+        // auth flow. The null token from the mock handler would race with the test,
+        // and the resulting syncInApp() call would send unexpected requests to the
+        // mock server, breaking assertions that check for no requests.
+        IterableConfig config = new IterableConfig.Builder()
+                .setAutoPushRegistration(false)
+                .setAuthHandler(mockAuthHandler)
+                .build();
+        IterableApi.initialize(context, IterableTestUtils.apiKey, config);
         return mockAuthHandler;
     }