Add a test for push registration with userId, fix threading issue

Author: vbabenkoru

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

@@ -525,25 +525,27 @@ public void registerDeviceToken(final String applicationName, final String token
         }
 
         if (token != null) {
-            new Thread(new Runnable() {
+            final Thread registrationThread = new Thread(new Runnable() {
                 public void run() {
-                    if (getUserId() != null) {
-                        createUserForUserId(new IterableHelper.SuccessHandler() {
-                            @Override
-                            public void onSuccess(JSONObject data) {
-                                registerDeviceToken(applicationName, token, IterableConstants.MESSAGING_PLATFORM_FIREBASE, null);
-                            }
-                        }, new IterableHelper.FailureHandler() {
-                            @Override
-                            public void onFailure(String reason, JSONObject data) {
-                                IterableLogger.e(TAG, "Could not create user: " + reason);
-                            }
-                        });
-                    } else {
-                        registerDeviceToken(applicationName, token, IterableConstants.MESSAGING_PLATFORM_FIREBASE, null);
-                    }
+                    registerDeviceToken(applicationName, token, IterableConstants.MESSAGING_PLATFORM_FIREBASE, null);
                 }
-            }).start();
+            });
+
+            if (getUserId() != null) {
+                createUserForUserId(new IterableHelper.SuccessHandler() {
+                    @Override
+                    public void onSuccess(JSONObject data) {
+                        registrationThread.start();
+                    }
+                }, new IterableHelper.FailureHandler() {
+                    @Override
+                    public void onFailure(String reason, JSONObject data) {
+                        IterableLogger.e(TAG, "Could not create user: " + reason);
+                    }
+                });
+            } else {
+                registrationThread.start();
+            }
         }
     }
 

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

@@ -240,4 +240,23 @@ public void testPushRegistrationDeviceFields() throws Exception {
         assertEquals(IterableConstants.ITBL_KEY_SDK_VERSION_NUMBER, dataFields.getString("iterableSdkVersion"));
     }
 
+    @Test
+    public void testPushRegistrationWithUserId() throws Exception {
+        server.enqueue(new MockResponse().setResponseCode(200).setBody("{}"));
+        server.enqueue(new MockResponse().setResponseCode(200).setBody("{}"));
+
+        IterableApi.initialize(RuntimeEnvironment.application, "apiKey", new IterableConfig.Builder().setAutoPushRegistration(false).build());
+        IterableApi.getInstance().setUserId("testUserId");
+        IterableApi.getInstance().registerDeviceToken("pushIntegration", "token", IterableConstants.MESSAGING_PLATFORM_FIREBASE);
+        Thread.sleep(1000);  // Since the network request is queued from a background thread, we need to wait
+        Robolectric.flushBackgroundThreadScheduler();
+        RecordedRequest createUserRequest = server.takeRequest(1, TimeUnit.SECONDS);
+        assertNotNull(createUserRequest);
+        assertEquals("/" + IterableConstants.ENDPOINT_CREATE_USERID, createUserRequest.getPath());
+
+        RecordedRequest registerDeviceRequest = server.takeRequest(1, TimeUnit.SECONDS);
+        assertNotNull(registerDeviceRequest);
+        assertEquals("/" + IterableConstants.ENDPOINT_REGISTER_DEVICE_TOKEN, registerDeviceRequest.getPath());
+    }
+
 }