Fixed tests & improved project number format checking

Author: jkasten2

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

@@ -56,7 +56,15 @@ public void registerForPush(Context context, String googleProjectNumber, Registe
       appContext = context;
       registeredHandler = callback;
 
-      if (googleProjectNumber == null || googleProjectNumber.equals("REMOTE")) {
+      boolean isProjectNumberValidFormat;
+      try {
+         Float.parseFloat(googleProjectNumber);
+         isProjectNumberValidFormat = true;
+      } catch(Throwable t) {
+         isProjectNumberValidFormat = false;
+      }
+      
+      if (!isProjectNumberValidFormat) {
          OneSignal.Log(OneSignal.LOG_LEVEL.ERROR, "Missing Google Project number!\nPlease enter a Google Project number / Sender ID on under App Settings > Android > Configuration on the OneSignal dashboard.");
          registeredHandler.complete(null, -6);
          return;

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

@@ -671,16 +671,18 @@ public void shouldSetButtonsCorrectly() throws Exception {
 
       GcmBroadcastReceiver gcmBroadcastReceiver = new GcmBroadcastReceiver();
       gcmBroadcastReceiver.onReceive(blankActivity, intentGcm);
-
-      Intent intent = Shadows.shadowOf(blankActivity).getNextStartedService();
-      Assert.assertEquals("com.onesignal.GcmIntentService", intent.getComponent().getClassName());
-
-      JSONObject jsonPayload = new JSONObject(intent.getStringExtra("json_payload"));
-
-      Assert.assertEquals(null, jsonPayload.optString("o", null));
-      JSONObject customJson = new JSONObject(jsonPayload.optString("custom"));
-      JSONObject additionalData = new JSONObject((customJson.getString("a")));
-      Assert.assertEquals("id1", additionalData.getJSONArray("actionButtons").getJSONObject(0).getString("id"));
+      
+      // Normal notifications should be generated right from the BroadcastReceiver
+      //   without creating a service.
+      Assert.assertNull(Shadows.shadowOf(blankActivity).getNextStartedService());
+      
+      Map<Integer, PostedNotification> postedNotifs = ShadowRoboNotificationManager.notifications;
+      Iterator<Map.Entry<Integer, PostedNotification>> postedNotifsIterator = postedNotifs.entrySet().iterator();
+      PostedNotification lastNotification = postedNotifsIterator.next().getValue();
+      
+      Assert.assertEquals(1, lastNotification.notif.actions.length);
+      String json_data = shadowOf(lastNotification.notif.actions[0].actionIntent).getSavedIntent().getStringExtra("onesignal_data");
+      Assert.assertEquals("id1", new JSONObject(json_data).optString("actionSelected"));
    }
 
    @Test

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

@@ -556,11 +556,12 @@ public void testInvalidGoogleProjectNumberWithSuccessfulRegisterResponse() throw
       GetIdsAvailable();
       // A more real test would be "missing support library" but bad project number is an easier setup
       //   and is testing the same logic.
+      ShadowPushRegistratorGPS.fail = true;
       OneSignalInitWithBadProjectNum();
 
       threadAndTaskWait();
       Robolectric.getForegroundThreadScheduler().runOneTask();
-      Assert.assertEquals(-6, ShadowOneSignalRestClient.lastPost.getInt("notification_types"));
+      Assert.assertEquals(-7, ShadowOneSignalRestClient.lastPost.getInt("notification_types"));
 
       // Test that idsAvailable still fires
       Assert.assertEquals(ShadowOneSignalRestClient.testUserId, callBackUseId);
@@ -590,7 +591,7 @@ public void testInvalidGoogleProjectNumberWithFailedRegisterResponse() throws Ex
 
       threadAndTaskWait();
       Robolectric.getForegroundThreadScheduler().runOneTask();
-      Assert.assertEquals(-6, ShadowOneSignalRestClient.lastPost.getInt("notification_types"));
+      Assert.assertEquals(-7, ShadowOneSignalRestClient.lastPost.getInt("notification_types"));
 
       // Test that idsAvailable still fires
       Assert.assertEquals(ShadowOneSignalRestClient.testUserId, callBackUseId);
@@ -668,12 +669,14 @@ public void shouldSetSubscriptionCorrectlyEvenAfterFirstOneSignalRestInitFail()
 
    @Test
    public void shouldUpdateNotificationTypesCorrectlyEvenWhenSetSubscriptionIsCalledInAnErrorState() throws Exception {
-      OneSignalInitWithBadProjectNum();
+      ShadowPushRegistratorGPS.fail = true;
+      OneSignalInit();
       threadAndTaskWait();
       OneSignal.setSubscription(true);
 
       // Restart app - Should send subscribe with on_session call.
       StaticResetHelper.restSetStaticFields();
+      ShadowPushRegistratorGPS.fail = false;
       OneSignalInit();
       threadAndTaskWait();
       Assert.assertEquals(1, ShadowOneSignalRestClient.lastPost.getInt("notification_types"));