Fixed unit test and updated to latest libraries

jkasten2 · jkasten2 · commit d9b3d286446d · 2017-08-11T11:51:21.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -19,18 +19,18 @@ android:
             # https://github.com/travis-ci/travis-ci/issues/6193
             # Required to get the newest platform-tools.
     - platform-tools
-    - build-tools-25.0.0
+    - build-tools-26.0.1
     - extra-android-m2repository
     - extra-google-m2repository
-    - android-24
+    - android-26
   licenses:
     - '.+'
 before_install:
     - pwd
     - ls -la
-    - wget http://services.gradle.org/distributions/gradle-3.3-bin.zip
-    - unzip gradle-3.3-bin.zip
-    - export GRADLE_HOME=$PWD/gradle-3.3
+    - wget http://services.gradle.org/distributions/gradle-4.1-rc-1-bin.zip
+    - unzip gradle-4.1-rc-1-bin.zip
+    - export GRADLE_HOME=$PWD/gradle-4.1-rc-1
     - export PATH=$GRADLE_HOME/bin:$PATH
     - cd OneSignalSDK/unittest
 script: gradle build
diff --git a/OneSignalSDK/app/build.gradle b/OneSignalSDK/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion '26.0.0'
+    buildToolsVersion '26.0.1'
 
     defaultConfig {
         applicationId "com.onesignal.example"
@@ -30,7 +30,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:26.0.0-beta2'
+    compile 'com.android.support:appcompat-v7:26.0.0'
 
     // Use for SDK Development
     compile(project(':onesignal')) {
@@ -70,7 +70,7 @@ dependencies {
     //    compile 'com.android.support:support-core-utils:24.2.1'
 
     // For Chrome tabs
-    compile 'com.android.support:customtabs:26.0.0-beta2'
+    compile 'com.android.support:customtabs:26.0.0'
 
 
 //    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
diff --git a/OneSignalSDK/build.gradle b/OneSignalSDK/build.gradle
@@ -3,10 +3,11 @@
 buildscript {
     repositories {
         jcenter()
+
         maven { url 'https://maven.google.com' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha7'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha8'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/OneSignalSDK/gradle.properties b/OneSignalSDK/gradle.properties
@@ -15,4 +15,9 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+
+# Work around for robolectric-3.4-RC4 bug
+# https://github.com/robolectric/robolectric/issues/3169
+#    org.robolectric.res.ResourceTableFactory.parseResourceFiles
+android.enableAapt2=false
diff --git a/OneSignalSDK/onesignal/build.gradle b/OneSignalSDK/onesignal/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion '26.0.0'
+    buildToolsVersion '26.0.1'
 
     defaultConfig {
         minSdkVersion 15
@@ -28,12 +28,14 @@ android {
 dependencies {
     provided fileTree(dir: 'libs', include: ['*.jar'])
 
+    compile 'com.android.support:support-v4:26.0.0'
+
     // NOTE: Starting with play-services 10.2.0, minSdkVersion is now 14
     compile 'com.google.android.gms:play-services-gcm:11.0.2'
     compile 'com.google.android.gms:play-services-location:11.0.2'
 
     // NOTE: customtabs sets minSdkVersion to 15.
-    compile 'com.android.support:customtabs:26.0.0-beta2'
+    compile 'com.android.support:customtabs:26.0.0'
 }
 
 // Remove OnActivityPausedListener class.
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/BadgeCountUpdater.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/BadgeCountUpdater.java
@@ -48,8 +48,12 @@ private static boolean areBadgeSettingsEnabled(Context context) {
       try {
          ApplicationInfo ai = context.getPackageManager().getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA);
          Bundle bundle = ai.metaData;
-         String defaultStr = bundle.getString("com.onesignal.BadgeCount");
-         badgesEnabled = "DISABLE".equals(defaultStr) ? 0 : 1;
+         if (bundle != null) {
+            String defaultStr = bundle.getString("com.onesignal.BadgeCount");
+            badgesEnabled = "DISABLE".equals(defaultStr) ? 0 : 1;
+         }
+         else
+            badgesEnabled = 1;
       } catch (Throwable t) {
          badgesEnabled = 0;
          OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Error reading meta-data tag 'com.onesignal.BadgeCount'. Disabling badge setting.", t);
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/GcmBroadcastReceiver.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/GcmBroadcastReceiver.java
@@ -134,13 +134,17 @@ private static void startGCMService(Context context, Bundle bundle) {
       if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
          ComponentName componentName = new ComponentName(context.getPackageName(),
                                                          GcmIntentJobService.class.getName());
-         
          Random random = new Random();
          JobInfo jobInfo = new JobInfo.Builder(random.nextInt(), componentName)
-             .setOverrideDeadline(100)
+             .setOverrideDeadline(0)
              .setExtras((PersistableBundle)taskExtras.getBundle())
              .build();
          JobScheduler jobScheduler = (JobScheduler)context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
+         
+         // TODO: Might want to use enqueue in the future. This will process one notification
+         //         sequentially like an IntentService
+         //       JobIntentService can be used instead, however app developer would have to use
+         //         Android support library 26+
          jobScheduler.schedule(jobInfo);
       }
       else {
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationBundleProcessor.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationBundleProcessor.java
@@ -412,8 +412,8 @@ private static boolean startExtenderService(Context context, Bundle bundle, Proc
       intent.putExtra("json_payload", bundleAsJSONObject(bundle).toString());
       intent.putExtra("timestamp", System.currentTimeMillis() / 1000L);
 
-      // Using Alarm with a short delay for Android O compatibility
-      long atTime = System.currentTimeMillis() + 100;
+      // Using Alarm for Android O compatibility
+      long atTime = System.currentTimeMillis();
       PendingIntent pendingIntent = PendingIntent.getService(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
       AlarmManager alarm = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
       alarm.set(AlarmManager.RTC_WAKEUP, atTime, pendingIntent);
diff --git a/OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationRestorer.java b/OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationRestorer.java
@@ -157,7 +157,7 @@ static void startRestoreTaskFromReceiver(WakefulBroadcastReceiver receiver, Cont
          
          Random random = new Random();
          JobInfo jobInfo = new JobInfo.Builder(random.nextInt(), componentName)
-             .setOverrideDeadline(100)
+             .setOverrideDeadline(0)
              .build();
          JobScheduler jobScheduler = (JobScheduler)context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
          jobScheduler.schedule(jobInfo);
diff --git a/OneSignalSDK/unittest/build.gradle b/OneSignalSDK/unittest/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion '26.0.0'
+    buildToolsVersion '26.0.1'
 
     defaultConfig {
         applicationId "com.onesignal.example"
@@ -37,6 +37,15 @@ repositories {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
+    compile 'com.android.support:support-v4:26.0.0'
+
+//    compile 'com.android.support:support-compat:26.0.0'
+//    compile 'com.android.support:support-media-compat:26.0.0'
+//    compile 'com.android.support:support-fragment:26.0.0'
+//    compile 'com.android.support:support-core-ui:26.0.0'
+//    compile 'com.android.support:support-core-utils:26.0.0'
+
+
     // Use for SDK Development
     compile(project(':onesignal')) {
         exclude group: 'com.android.support', module: 'support-v4'
@@ -63,7 +72,7 @@ dependencies {
 
     // compile 'com.google.android.gms:play-services-analytics:7.0.0'
 
-    compile 'com.android.support:customtabs:26.0.0-beta2'
+    compile 'com.android.support:customtabs:26.0.0'
 
     testCompile 'junit:junit:4.12'
     testCompile('org.robolectric:robolectric:3.4-rc5') {
diff --git a/OneSignalSDK/unittest/src/test/java/com/onesignal/ShadowGcmBroadcastReceiver.java b/OneSignalSDK/unittest/src/test/java/com/onesignal/ShadowGcmBroadcastReceiver.java
@@ -42,6 +42,10 @@ public static void resetStatics() {
       lastResultCode = null;
    }
    
+   public boolean isOrderedBroadcast() {
+      return true;
+   }
+   
    public void abortBroadcast() {
       calledAbortBroadcast = true;
    }
diff --git a/OneSignalSDK/unittest/src/test/java/com/test/onesignal/GenerateNotificationRunner.java b/OneSignalSDK/unittest/src/test/java/com/test/onesignal/GenerateNotificationRunner.java
@@ -28,8 +28,10 @@
 package com.test.onesignal;
 
 import android.app.Activity;
+import android.app.AlarmManager;
 import android.app.Notification;
 import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
@@ -57,6 +59,7 @@
 import com.onesignal.ShadowGcmBroadcastReceiver;
 import com.onesignal.ShadowNotificationManagerCompat;
 import com.onesignal.ShadowNotificationRestorer;
+import com.onesignal.ShadowOSUtils;
 import com.onesignal.ShadowOneSignal;
 import com.onesignal.ShadowOneSignalRestClient;
 import com.onesignal.ShadowRoboNotificationManager;
@@ -99,10 +102,13 @@
 @Config(packageName = "com.onesignal.example",
       constants = BuildConfig.class,
       instrumentedPackages = {"com.onesignal"},
-      shadows = { ShadowRoboNotificationManager.class,
-                  ShadowOneSignalRestClient.class,
-                  ShadowBadgeCountUpdater.class,
-                  ShadowNotificationManagerCompat.class},
+      shadows = {
+         ShadowRoboNotificationManager.class,
+         ShadowOneSignalRestClient.class,
+         ShadowBadgeCountUpdater.class,
+         ShadowNotificationManagerCompat.class,
+         ShadowOSUtils.class,
+      },
       sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class GenerateNotificationRunner {
@@ -409,11 +415,11 @@ public void shouldUpdateNormalNotificationDisplayWhenReplacingANotification() th
       
       // Setup - Restore
       BundleCompat bundle2 = createInternalPayloadBundle(bundle);
-      bundle.putInt("android_notif_id", lastNotifId);
-      bundle.putBoolean("restoring", true);
+      bundle2.putInt("android_notif_id", lastNotifId);
+      bundle2.putBoolean("restoring", true);
       NotificationBundleProcessor_ProcessFromGCMIntentService_NoWrap(blankActivity, bundle2, null);
       
-      // Test - Restored notifications display exactly the same as they did when recevied.
+      // Test - Restored notifications display exactly the same as they did when received.
       postedNotifs = ShadowRoboNotificationManager.notifications;
       postedNotifsIterator = postedNotifs.entrySet().iterator();
       // Test - 1 notifi + 1 summary
@@ -828,11 +834,15 @@ public void shouldFireNotificationExtenderService() throws Exception {
 
       boolean ret = OneSignalPackagePrivateHelper.GcmBroadcastReceiver_processBundle(blankActivity, bundle);
       Assert.assertTrue(ret);
-
-      Intent intent = Shadows.shadowOf(blankActivity).getNextStartedService();
-      Assert.assertEquals("com.onesignal.NotificationExtender", intent.getAction());
-
-
+      
+      // Ensure the Extension service was schedule to start
+      AlarmManager alarmManager = (AlarmManager)RuntimeEnvironment.application.getSystemService(Context.ALARM_SERVICE);
+      Assert.assertEquals(1, shadowOf(alarmManager).getScheduledAlarms().size());
+      PendingIntent intent = shadowOf(alarmManager).getNextScheduledAlarm().operation;
+      Intent savedIntent = shadowOf(intent).getSavedIntent();
+      Assert.assertEquals("com.onesignal.NotificationExtender", savedIntent.getAction());
+      
+      
       // Test that all options are set.
       NotificationExtenderServiceTest service = (NotificationExtenderServiceTest)startNotificationExtender(createInternalPayloadBundle(getBundleWithAllOptionsSet()),
                                                                           NotificationExtenderServiceTest.class);
diff --git a/OneSignalSDK/unittest/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java b/OneSignalSDK/unittest/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java
@@ -110,7 +110,8 @@
                    ShadowPushRegistratorGPS.class,
                    ShadowOSUtils.class,
                    ShadowAdvertisingIdProviderGPS.class,
-                   ShadowCustomTabsClient.class, ShadowCustomTabsSession.class,
+                   ShadowCustomTabsClient.class,
+                   ShadowCustomTabsSession.class,
                    ShadowNotificationManagerCompat.class},
         instrumentedPackages = {"com.onesignal"},
         constants = BuildConfig.class,
