Unit test fixes for O changes

Author: jkasten2

OneSignalSDK/onesignal/src/main/java/com/onesignal/BundleCompat.java

@@ -6,8 +6,9 @@
 import android.os.PersistableBundle;
 import android.support.annotation.RequiresApi;
 
-interface BundleCompat<T> {
+public interface BundleCompat<T> {
    void putString(String key, String value);
+   void putInt(String key, Integer value);
    void putLong(String key, Long value);
    void putBoolean(String key, Boolean value);
 
@@ -39,6 +40,11 @@ public void putString(String key, String value) {
       mBundle.putString(key, value);
    }
 
+   @Override
+   public void putInt(String key, Integer value) {
+      mBundle.putInt(key, value);
+   }
+
    @Override
    public void putLong(String key, Long value) {
       mBundle.putLong(key, value);
@@ -104,6 +110,11 @@ class BundleCompatBundle implements BundleCompat<Bundle> {
    public void putString(String key, String value) {
       mBundle.putString(key, value);
    }
+
+   @Override
+   public void putInt(String key, Integer value) {
+      mBundle.putInt(key, value);
+   }
 
    @Override
    public void putLong(String key, Long value) {

OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationRestorer.java

@@ -51,7 +51,7 @@ class NotificationRestorer {
    };
 
    // Notifications will never be force removed when the app's process is running.
-   private static boolean restored;
+   public static boolean restored;
 
    static void asyncRestore(final Context context) {
       new Thread(new Runnable() {

OneSignalSDK/unittest/build.gradle

@@ -54,19 +54,19 @@ dependencies {
 
     // Test with 7.0.0 to make sure there are no breaking changes in Google's libraries.
     // This insure that the SDK will work if an app developer is using an older version of GMS.
-    compile "com.google.android.gms:play-services-gcm:10.0.1"
+    compile "com.google.android.gms:play-services-gcm:11.0.2"
 
     // play-services-analytics is required for AdvertisingIdClient when using GMS 8.1.0 or lower.
     // 8.3.0 it is included in 'basement' which is required by 'base'.
     //compile "com.google.android.gms:play-services-analytics:7.0.0"
-    compile "com.google.android.gms:play-services-location:10.0.1"
+    compile "com.google.android.gms:play-services-location:11.0.2"
 
     // compile 'com.google.android.gms:play-services-analytics:7.0.0'
 
-    compile 'com.android.support:customtabs:24.0.0'
+    compile 'com.android.support:customtabs:26.0.0-beta2'
 
     testCompile 'junit:junit:4.12'
-    testCompile('org.robolectric:robolectric:3.3.2') {
+    testCompile('org.robolectric:robolectric:3.4-rc5') {
         exclude group: 'commons-logging', module: 'commons-logging'
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
     }

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

@@ -6,6 +6,7 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.os.Looper;
+import android.support.v4.app.*;
 
 import org.json.JSONObject;
 import org.robolectric.util.Scheduler;
@@ -55,8 +56,8 @@ public static JSONObject bundleAsJSONObject(Bundle bundle) {
       return NotificationBundleProcessor.bundleAsJSONObject(bundle);
    }
 
-   public static Bundle createInternalPayloadBundle(Bundle bundle) {
-      Bundle retBundle = new Bundle();
+   public static BundleCompat createInternalPayloadBundle(Bundle bundle) {
+      BundleCompat retBundle = BundleCompatFactory.getInstance();
       retBundle.putString("json_payload", OneSignalPackagePrivateHelper.bundleAsJSONObject(bundle).toString());
       return retBundle;
    }
@@ -65,7 +66,7 @@ public static void NotificationBundleProcessor_ProcessFromGCMIntentService(Conte
       NotificationBundleProcessor.ProcessFromGCMIntentService(context, createInternalPayloadBundle(bundle), overrideSettings);
    }
 
-   public static void NotificationBundleProcessor_ProcessFromGCMIntentService_NoWrap(Context context, Bundle bundle, NotificationExtenderService.OverrideSettings overrideSettings) {
+   public static void NotificationBundleProcessor_ProcessFromGCMIntentService_NoWrap(Context context, BundleCompat bundle, NotificationExtenderService.OverrideSettings overrideSettings) {
       NotificationBundleProcessor.ProcessFromGCMIntentService(context, bundle, overrideSettings);
    }
 
@@ -88,6 +89,8 @@ public static class NotificationGenerationJob extends com.onesignal.Notification
          super(context);
       }
    }
+
+   // public interface BundleCompat<T> extends com.onesignal.BundleCompat {}
 
 
    public static void OneSignalRestClientPublic_getSync(final String url, final OneSignalRestClient.ResponseHandler responseHandler) {

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

@@ -1,7 +1,7 @@
 /**
  * Modified MIT License
  *
- * Copyright 2016 OneSignal
+ * Copyright 2017 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -42,6 +42,7 @@
 import android.support.v4.app.NotificationCompat;
 
 import com.onesignal.BuildConfig;
+import com.onesignal.BundleCompat;
 import com.onesignal.GcmBroadcastReceiver;
 import com.onesignal.GcmIntentService;
 import com.onesignal.NotificationExtenderService;
@@ -80,8 +81,8 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
 import org.robolectric.shadows.ShadowSystemClock;
-import org.robolectric.util.ActivityController;
-import org.robolectric.util.ServiceController;
+import org.robolectric.android.controller.ActivityController;
+import org.robolectric.android.controller.ServiceController;
 
 import java.math.BigInteger;
 import java.util.Iterator;
@@ -180,7 +181,7 @@ public void shouldSetTitleCorrectly() throws Exception {
 
    @Test
    public void shouldProcessRestore() throws Exception {
-      Bundle bundle = createInternalPayloadBundle(getBaseNotifBundle());
+      BundleCompat bundle = createInternalPayloadBundle(getBaseNotifBundle());
       bundle.putInt("android_notif_id", 0);
       bundle.putBoolean("restoring", true);
 
@@ -407,12 +408,10 @@ public void shouldUpdateNormalNotificationDisplayWhenReplacingANotification() th
       ShadowRoboNotificationManager.notifications.clear();
 
       // Setup - Restore
-      bundle = getBaseNotifBundle("UUID2");
-      bundle.putString("grp", "test1");
-      bundle = createInternalPayloadBundle(bundle);
+      BundleCompat bundle2 = createInternalPayloadBundle(bundle);
       bundle.putInt("android_notif_id", lastNotifId);
       bundle.putBoolean("restoring", true);
-      NotificationBundleProcessor_ProcessFromGCMIntentService_NoWrap(blankActivity, bundle, null);
+      NotificationBundleProcessor_ProcessFromGCMIntentService_NoWrap(blankActivity, bundle2, null);
 
       // Test - Restored notifications display exactly the same as they did when recevied.
       postedNotifs = ShadowRoboNotificationManager.notifications;
@@ -803,11 +802,11 @@ private void testNotificationExtenderServiceOverridePropertiesWithSummary() thro
    }
 
 
-   private NotificationExtenderServiceTestBase startNotificationExtender(Bundle bundlePayload, Class serviceClass) {
+   private NotificationExtenderServiceTestBase startNotificationExtender(BundleCompat bundlePayload, Class serviceClass) {
       ServiceController<NotificationExtenderServiceTestBase> controller = Robolectric.buildService(serviceClass);
-      NotificationExtenderServiceTestBase service = controller.attach().create().get();
+      NotificationExtenderServiceTestBase service = controller.create().get();
       Intent testIntent = new Intent(RuntimeEnvironment.application, NotificationExtenderServiceTestReturnFalse.class);
-      testIntent.putExtras(bundlePayload);
+      testIntent.putExtras((Bundle)bundlePayload.getBundle());
       controller.withIntent(testIntent).startCommand(0, 0);
 
       return service;
@@ -825,7 +824,7 @@ public void shouldFireNotificationExtenderService() throws Exception {
       ResolveInfo resolveInfo = new ResolveInfo();
       resolveInfo.serviceInfo = new ServiceInfo();
       resolveInfo.serviceInfo.name = "com.onesignal.example.NotificationExtenderServiceTest";
-      RuntimeEnvironment.getRobolectricPackageManager().addResolveInfoForIntent(serviceIntent, resolveInfo);
+      shadowOf(blankActivity.getPackageManager()).addResolveInfoForIntent(serviceIntent, resolveInfo);
 
       boolean ret = OneSignalPackagePrivateHelper.GcmBroadcastReceiver_processBundle(blankActivity, bundle);
       Assert.assertTrue(ret);

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

@@ -88,7 +88,7 @@
 import org.robolectric.shadows.ShadowConnectivityManager;
 import org.robolectric.shadows.ShadowLog;
 import org.robolectric.shadows.ShadowSystemClock;
-import org.robolectric.util.ActivityController;
+import org.robolectric.android.controller.ActivityController;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -1459,7 +1459,7 @@ public void testLocationFromSyncAlarm() throws Exception {
    @Test
    public void testAppl() throws Exception {
       AddLauncherIntentFilter();
-      RuntimeEnvironment.getRobolectricPackageManager().addPackage("org.robolectric.default");
+      shadowOf(blankActivity.getPackageManager()).addPackage("org.robolectric.default");
 
       OneSignalInit();
       threadAndTaskWait();
@@ -1477,14 +1477,14 @@ public void testAppl() throws Exception {
 
       restartAppAndElapseTimeToNextSession();
       ShadowOneSignalRestClient.lastPost = null;
-      RuntimeEnvironment.getRobolectricPackageManager().addPackage("org.test.app2");
+      shadowOf(blankActivity.getPackageManager()).addPackage("org.test.app2");
       OneSignalInit();
       threadAndTaskWait();
       Assert.assertEquals(1, ShadowOneSignalRestClient.lastPost.getJSONArray(baseKey + "_a").length());
 
       restartAppAndElapseTimeToNextSession();
       ShadowOneSignalRestClient.lastPost = null;
-      RuntimeEnvironment.getRobolectricPackageManager().removePackage("org.test.app2");
+      shadowOf(blankActivity.getPackageManager()).removePackage("org.test.app2");
       OneSignalInit();
       threadAndTaskWait();
       Assert.assertEquals(1, ShadowOneSignalRestClient.lastPost.getJSONArray(baseKey + "_d").length());
@@ -1868,18 +1868,18 @@ private static void AddLauncherIntentFilter() {
       resolveInfo.activityInfo.packageName = "com.onesignal.example";
       resolveInfo.activityInfo.name = "MainActivity";
 
-      RuntimeEnvironment.getRobolectricPackageManager().addResolveInfoForIntent(launchIntent, resolveInfo);
-      RuntimeEnvironment.getRobolectricPackageManager().addManifest(shadowOf(RuntimeEnvironment.application).getAppManifest(), 0);
+      shadowOf(blankActivity.getPackageManager()).addResolveInfoForIntent(launchIntent, resolveInfo);
+      shadowOf(blankActivity.getPackageManager()).addManifest(shadowOf(RuntimeEnvironment.application).getAppManifest());
    }
 
    private static void AddDisableNotificationOpenedToManifest() {
       ShadowApplication.getInstance().getAppManifest().getApplicationMetaData().put("com.onesignal.NotificationOpened.DEFAULT", "DISABLE");
-      RuntimeEnvironment.getRobolectricPackageManager().addManifest(shadowOf(RuntimeEnvironment.application).getAppManifest(), 0);
+      shadowOf(blankActivity.getPackageManager()).addManifest(shadowOf(RuntimeEnvironment.application).getAppManifest());
    }
 
    private static void RemoveDisableNotificationOpenedToManifest() {
       ShadowApplication.getInstance().getAppManifest().getApplicationMetaData().remove("com.onesignal.NotificationOpened.DEFAULT");
-      RuntimeEnvironment.getRobolectricPackageManager().addManifest(shadowOf(RuntimeEnvironment.application).getAppManifest(), 0);
+      shadowOf(blankActivity.getPackageManager()).addManifest(shadowOf(RuntimeEnvironment.application).getAppManifest());
    }
 
    private static int sessionCountOffset = 1;