Merge pull request #1338 from OneSignal/upgrade/roboelectric4.4

Upgrade tests to Roboelectric 4.4

Author: jkasten2

.travis.yml

@@ -10,14 +10,14 @@ android:
             # https://github.com/travis-ci/travis-ci/issues/6193
             # Required to get the newest platform-tools.
     - platform-tools
-    - build-tools-28.0.3
-    - android-28
+    - build-tools-29.0.3
+    - android-29
   licenses:
     - '.+'
     - 'android-sdk-license-.+'
 before_install:
-    - yes | sdkmanager "platforms;android-28"
-    - yes | sdkmanager "build-tools;28.0.3"
+    - yes | sdkmanager "platforms;android-29"
+    - yes | sdkmanager "build-tools;29.0.3"
     - pwd
     - ls -la
     - cd OneSignalSDK

OneSignalSDK/build.gradle

@@ -4,7 +4,7 @@ buildscript {
 
     ext {
         buildVersions = [
-                compileSdkVersion: 28,
+                compileSdkVersion: 29,
                 targetSdkVersion: 28
         ]
         androidGradlePluginVersion = '3.6.2'

OneSignalSDK/onesignal/src/main/java/com/onesignal/influence/OSInfluenceConstants.kt

@@ -13,11 +13,11 @@ internal object OSInfluenceConstants {
     const val INFLUENCE_IDS = "influence_ids"
 
     // OSInAppMessageTracker Constants
-    val IAM_TAG: String = OSInAppMessageTracker::class.java.canonicalName
+    val IAM_TAG: String = OSInAppMessageTracker::class.java.canonicalName as String
     const val IAM_ID_TAG = "iam_id"
 
     // OSNotificationTracker Constants
-    val NOTIFICATION_TAG: String = OSNotificationTracker::class.java.canonicalName
+    val NOTIFICATION_TAG: String = OSNotificationTracker::class.java.canonicalName as String
     const val DIRECT_TAG = "direct"
     const val NOTIFICATIONS_IDS = "notification_ids"
     const val NOTIFICATION_ID_TAG = "notification_id"

OneSignalSDK/unittest/build.gradle

@@ -11,7 +11,7 @@ ext {
     googlePlayServicesVersion = '17.0.0'
     jUnitVersion = '4.12'
     reflectionsVersion = '0.9.12'
-    roboelectricVersion = '4.3.1'
+    roboelectricVersion = '4.4'
 }
 
 apply plugin: 'com.android.application'

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

@@ -1,7 +1,7 @@
 package com.onesignal;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.HashMap;
 import java.util.Set;

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

@@ -1,6 +1,6 @@
 package com.onesignal;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.json.JSONObject;
 

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

@@ -1,7 +1,8 @@
 package com.onesignal;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
 
 import com.huawei.hms.aaid.HmsInstanceId;
 import com.huawei.hms.common.ApiException;

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

@@ -96,6 +96,7 @@
 import org.robolectric.Shadows;
 import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.LooperMode;
 import org.robolectric.shadows.ShadowLog;
 
 import java.lang.reflect.Field;
@@ -153,6 +154,7 @@
         sdk = 21
 )
 @RunWith(RobolectricTestRunner.class)
+@LooperMode(LooperMode.Mode.LEGACY)
 public class GenerateNotificationRunner {
 
    private static int callbackCounter = 0;

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

@@ -47,6 +47,7 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.LooperMode;
 import org.robolectric.shadows.ShadowLog;
 
 import java.lang.reflect.Field;
@@ -92,6 +93,7 @@
         sdk = 21
 )
 @RunWith(RobolectricTestRunner.class)
+@LooperMode(LooperMode.Mode.LEGACY)
 public class InAppMessageIntegrationTests {
 
     private static final String ONESIGNAL_APP_ID = "b2f7f966-d8cc-11e4-bed1-df8f05be55ba";

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

@@ -36,6 +36,7 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.LooperMode;
 import org.robolectric.shadows.ShadowLog;
 
 import java.util.ArrayList;
@@ -70,6 +71,7 @@
         sdk = 26
 )
 @RunWith(RobolectricTestRunner.class)
+@LooperMode(LooperMode.Mode.LEGACY)
 public class InAppMessagingUnitTests {
 
     private static final String IAM_CLICK_ID = "button_id_123";