fix crossplatform test cases

android-core/src/main/java/com/mparticle/identity/IdentityApi.java

@@ -37,19 +37,22 @@ public class IdentityApi {
     public static int THROTTLE_ERROR = 429;
     public static int BAD_REQUEST = 400;
     public static int SERVER_ERROR = 500;
-    private static final Object lock = new Object();
-    ConfigManager mConfigManager;
-    MessageManager mMessageManager;
-    KitManager mKitManager;
-    MParticleUserDelegate mUserDelegate;
-    Set<IdentityStateListener> identityStateListeners = new HashSet<IdentityStateListener>();
+
     private Context mContext;
     private BaseHandler mBackgroundHandler;
     private BaseHandler mMainHandler;
     private MParticle.OperatingSystem mOperatingSystem;
-    private final Internal mInternal = new Internal();
+    ConfigManager mConfigManager;
+    MessageManager mMessageManager;
+    KitManager mKitManager;
+    private Internal mInternal = new Internal();
+
+    MParticleUserDelegate mUserDelegate;
     private MParticleIdentityClient mApiClient;
 
+    Set<IdentityStateListener> identityStateListeners = new HashSet<IdentityStateListener>();
+    private static Object lock = new Object();
+
     protected IdentityApi() {
     }
 
@@ -62,7 +65,7 @@ public IdentityApi(Context context, AppStateManager appStateManager, MessageMana
         this.mMessageManager = messageManager;
         this.mKitManager = kitManager;
         this.mOperatingSystem = operatingSystem;
-        ConfigManager.addMpIdChangeListener(new IdentityStateListenerManager());
+        configManager.addMpIdChangeListener(new IdentityStateListenerManager());
         setApiClient(new MParticleIdentityClientImpl(context, configManager, operatingSystem));
     }
 
@@ -155,7 +158,7 @@ public MParticleTask<IdentityApiResult> logout() {
     /**
      * @return an MParticleTask<IdentityApiResult> to handle the Asynchronous results
      * @see IdentityApiRequest
-     * <p>
+     *
      * calls the Identity Logout endpoint
      * @see MParticleTask and
      * @see IdentityApiResult
@@ -414,18 +417,6 @@ public interface MpIdChangeListener {
         void onMpIdChanged(long newMpid, long previousMpid);
     }
 
-    public static abstract class SingleUserIdentificationCallback implements IdentityStateListener {
-
-        @Override
-        public void onUserIdentified(MParticleUser user, MParticleUser previousUser) {
-            MParticle.getInstance().Identity().removeIdentityStateListener(this);
-            onUserFound(user);
-        }
-
-        public abstract void onUserFound(MParticleUser user);
-
-    }
-
     class IdentityStateListenerManager implements MpIdChangeListener {
 
         @Override
@@ -463,6 +454,18 @@ public void run() {
         }
     }
 
+    public static abstract class SingleUserIdentificationCallback implements IdentityStateListener {
+
+        @Override
+        public void onUserIdentified(MParticleUser user, MParticleUser previousUser) {
+            MParticle.getInstance().Identity().removeIdentityStateListener(this);
+            onUserFound(user);
+        }
+
+        public abstract void onUserFound(MParticleUser user);
+
+    }
+
     /**
      * @hidden
      */

android-core/src/main/kotlin/com/mparticle/internal/CoreCallbacks.kt

@@ -8,34 +8,34 @@ import org.json.JSONArray
 import java.lang.ref.WeakReference
 
 interface CoreCallbacks {
-    fun isBackgrounded(): Boolean
+    val isBackgrounded: Boolean
 
-    fun getUserBucket(): Int
+    val userBucket: Int
 
-    fun isEnabled(): Boolean
+    val isEnabled: Boolean
 
     fun setIntegrationAttributes(kitId: Int, integrationAttributes: Map<String, String>)
 
     fun getIntegrationAttributes(kitId: Int): Map<String, String>?
 
-    fun getCurrentActivity(): WeakReference<Activity>?
+    val currentActivity: WeakReference<Activity>
 
-    @WorkerThread
-    fun getLatestKitConfiguration(): JSONArray?
+    @get:WorkerThread
+    val latestKitConfiguration: JSONArray?
 
-    fun getDataplanOptions(): MParticleOptions.DataplanOptions?
+    val dataplanOptions: MParticleOptions.DataplanOptions?
 
-    fun isPushEnabled(): Boolean
+    val isPushEnabled: Boolean
 
-    fun getPushSenderId(): String?
+    val pushSenderId: String?
 
-    fun getPushInstanceId(): String?
+    val pushInstanceId: String?
 
-    fun getLaunchUri(): Uri?
+    val launchUri: Uri?
 
-    fun getLaunchAction(): String?
+    val launchAction: String?
 
-    fun getKitListener(): KitListener
+    val kitListener: KitListener
 
     interface KitListener {
         fun kitFound(kitId: Int)
@@ -53,29 +53,13 @@ interface CoreCallbacks {
         companion object {
             @JvmField
             val EMPTY: KitListener = object : KitListener {
-                override fun kitFound(kitId: Int) {
-                }
-
-                override fun kitConfigReceived(kitId: Int, configuration: String?) {
-                }
-
-                override fun kitExcluded(kitId: Int, reason: String?) {
-                }
-
-                override fun kitStarted(kitId: Int) {
-                }
-
-                override fun onKitApiCalled(kitId: Int, used: Boolean?, vararg objects: Any?) {
-                }
-
-                override fun onKitApiCalled(
-                    methodName: String?,
-                    kitId: Int,
-                    used: Boolean?,
-                    vararg objects: Any?
-                ) {
-                }
+                override fun kitFound(kitId: Int) {}
+                override fun kitConfigReceived(kitId: Int, configuration: String?) {}
+                override fun kitExcluded(kitId: Int, reason: String?) {}
+                override fun kitStarted(kitId: Int) {}
+                override fun onKitApiCalled(kitId: Int, used: Boolean?, vararg objects: Any?) {}
+                override fun onKitApiCalled(methodName: String?, kitId: Int, used: Boolean?, vararg objects: Any?) {}
             }
         }
     }
-}
+}

android-core/src/test/kotlin/com/mparticle/internal/KitFrameworkWrapperTest.kt

@@ -89,8 +89,8 @@ class KitFrameworkWrapperTest {
             true,
             Mockito.mock(MParticleOptions::class.java)
         )
-        Mockito.`when`(wrapper.mCoreCallbacks.getPushInstanceId()).thenReturn("instanceId")
-        Mockito.`when`(wrapper.mCoreCallbacks.getPushSenderId()).thenReturn("1234545")
+        Mockito.`when`(wrapper.mCoreCallbacks.pushInstanceId).thenReturn("instanceId")
+        Mockito.`when`(wrapper.mCoreCallbacks.pushSenderId).thenReturn("1234545")
         MParticle.setInstance(MockMParticle())
         wrapper.replayEvents()
         val mockKitManager = Mockito.mock(KitManager::class.java)
@@ -594,15 +594,15 @@ class KitFrameworkWrapperTest {
             mockConfigManager,
             mockAppStateManager
         )
-        Assert.assertEquals(mockActivity, coreCallbacks.getCurrentActivity()?.get() ?: null)
-        Assert.assertEquals(mockKitConfiguration, coreCallbacks.getLatestKitConfiguration())
-        Assert.assertEquals(mockLaunchUri, coreCallbacks.getLaunchUri())
-        Assert.assertEquals(mockPushInstanceId, coreCallbacks.getPushInstanceId())
-        Assert.assertEquals(mockPushSenderId, coreCallbacks.getPushSenderId())
-        Assert.assertEquals(mockUserBucket.toLong(), coreCallbacks.getUserBucket().toLong())
-        Assert.assertEquals(isBackground, coreCallbacks.isBackgrounded())
-        Assert.assertEquals(isEnabled, coreCallbacks.isEnabled())
-        Assert.assertEquals(isPushEnabled, coreCallbacks.isPushEnabled())
+        Assert.assertEquals(mockActivity, coreCallbacks.currentActivity.get())
+        Assert.assertEquals(mockKitConfiguration, coreCallbacks.latestKitConfiguration)
+        Assert.assertEquals(mockLaunchUri, coreCallbacks.launchUri)
+        Assert.assertEquals(mockPushInstanceId, coreCallbacks.pushInstanceId)
+        Assert.assertEquals(mockPushSenderId, coreCallbacks.pushSenderId)
+        Assert.assertEquals(mockUserBucket.toLong(), coreCallbacks.userBucket.toLong())
+        Assert.assertEquals(isBackground, coreCallbacks.isBackgrounded)
+        Assert.assertEquals(isEnabled, coreCallbacks.isEnabled)
+        Assert.assertEquals(isPushEnabled, coreCallbacks.isPushEnabled)
         Assert.assertEquals(mockIntegrationAttributes1, coreCallbacks.getIntegrationAttributes(1))
         Assert.assertEquals(mockIntegrationAttributes2, coreCallbacks.getIntegrationAttributes(2))
     }

android-kit-base/src/test/kotlin/com/mparticle/kits/KitManagerImplTest.kt

@@ -331,7 +331,7 @@ class KitManagerImplTest {
         manager.updateKits(kitConfiguration)
         Assert.assertEquals(0, manager.providers.size)
         Mockito.`when`(mockUser.isLoggedIn).thenReturn(true)
-        Mockito.`when`(manager.mCoreCallbacks.getLatestKitConfiguration()).thenReturn(kitConfiguration)
+        Mockito.`when`(manager.mCoreCallbacks.latestKitConfiguration).thenReturn(kitConfiguration)
         manager.onUserIdentified(mockUser, null)
         TestCase.assertEquals(3, manager.providers.size)
     }
@@ -377,7 +377,7 @@ class KitManagerImplTest {
         manager.updateKits(kitConfiguration)
         Assert.assertEquals(3, manager.providers.size)
         Mockito.`when`(mockUser.isLoggedIn).thenReturn(false)
-        Mockito.`when`(mockCoreCallbacks.getLatestKitConfiguration()).thenReturn(kitConfiguration)
+        Mockito.`when`(mockCoreCallbacks.latestKitConfiguration).thenReturn(kitConfiguration)
         manager.onUserIdentified(mockUser, null)
         TestCase.assertEquals(0, manager.providers.size)
     }
@@ -573,7 +573,7 @@ class KitManagerImplTest {
                 put(JSONObject().apply { put("id", idOne) })
                 put(JSONObject().apply { put("id", idTwo) })
             }
-        Mockito.`when`(manager.mCoreCallbacks.getLatestKitConfiguration()).thenReturn(kitConfiguration)
+        Mockito.`when`(manager.mCoreCallbacks.latestKitConfiguration).thenReturn(kitConfiguration)
         val factory = Mockito.mock(
             KitIntegrationFactory::class.java
         )
@@ -613,7 +613,7 @@ class KitManagerImplTest {
         val kitConfiguration = JSONArray()
         kitConfiguration.put(JSONObject("{\"id\":1}"))
         kitConfiguration.put(JSONObject("{\"id\":2}"))
-        Mockito.`when`(manager.mCoreCallbacks.getLatestKitConfiguration()).thenReturn(kitConfiguration)
+        Mockito.`when`(manager.mCoreCallbacks.latestKitConfiguration).thenReturn(kitConfiguration)
         val factory = Mockito.mock(
             KitIntegrationFactory::class.java
         )