fix(tests): Fix for broken unit tests by renaming method isManifestSe… (#93)

* fix(tests): Fix for broken unit tests by renaming method isManifestSetUp to isManifestSetup.

* fix(tests): fix for broken tests by renaming enableServices to enableFcmServices and enableGcmServices.

Author: Enuviel

AndroidSDKTests/src/test/java/com/leanplum/LeanplumCloudMessagingProviderTest.java

@@ -102,12 +102,12 @@ public String getRegistrationId() {
       }
 
       @Override
-      public boolean isManifestSetUp() {
+      public boolean isInitialized() {
         return false;
       }
 
       @Override
-      public boolean isInitialized() {
+      public boolean isManifestSetup() {
         return false;
       }
 

AndroidSDKTests/src/test/java/com/leanplum/LeanplumNotificationChannelTests.java

@@ -24,6 +24,7 @@
 import android.app.NotificationChannelGroup;
 
 import com.leanplum.__setup.AbstractTest;
+import com.leanplum.utils.BuildUtil;
 
 import org.json.JSONArray;
 import org.junit.Test;
@@ -45,7 +46,8 @@
     sdk = 26
 )
 @PrepareForTest(value = {
-    LeanplumNotificationChannel.class
+    LeanplumNotificationChannel.class,
+    BuildUtil.class
 })
 /**
  * Notifiction channels tests
@@ -62,7 +64,8 @@ public void after() {
   public void before() throws Exception {
     super.before();
     spy(LeanplumNotificationChannel.class);
-    doReturn(26).when(LeanplumNotificationChannel.class, "getTargetSdkVersion", Matchers.anyObject());
+    spy(BuildUtil.class);
+    doReturn(26).when(BuildUtil.class, "getTargetSdkVersion", Matchers.anyObject());
   }
 
   @Test

AndroidSDKTests/src/test/java/com/leanplum/LeanplumPushServiceTest.java

@@ -133,20 +133,21 @@ public void testInitPushService() throws Exception {
     Method initPushServiceMethod = LeanplumPushService.class.
         getDeclaredMethod("initPushService");
     initPushServiceMethod.setAccessible(true);
-    when(LeanplumPushService.class, "enableServices").thenReturn(true);
+    when(LeanplumPushService.class, "enableFcmServices").thenReturn(true);
+    when(LeanplumPushService.class, "enableGcmServices").thenReturn(true);
 
     // Tests for Firebase.
     when(LeanplumPushService.isFirebaseEnabled()).thenReturn(true);
 
     // Test if Manifest is not set up and provider is initialized.
-    doReturn(false).when(fcmProviderMock).isManifestSetUp();
+    doReturn(false).when(fcmProviderMock).isManifestSetup();
     doReturn(true).when(fcmProviderMock).isInitialized();
     initPushServiceMethod.invoke(pushService);
     assertNotNull(initPushServiceMethod);
     verifyPrivate(LeanplumPushService.class, times(0)).invoke("registerInBackground");
 
     // Test if Manifest is set up and provider is initialized.
-    doReturn(true).when(fcmProviderMock).isManifestSetUp();
+    doReturn(true).when(fcmProviderMock).isManifestSetup();
     doReturn(true).when(fcmProviderMock).isInitialized();
     initPushServiceMethod.invoke(pushService);
     assertNotNull(initPushServiceMethod);
@@ -156,21 +157,21 @@ public void testInitPushService() throws Exception {
     when(LeanplumPushService.isFirebaseEnabled()).thenReturn(false);
 
     // Test if Manifest is not set up and provider is initialized.
-    doReturn(false).when(gcmProviderMock).isManifestSetUp();
+    doReturn(false).when(gcmProviderMock).isManifestSetup();
     doReturn(true).when(gcmProviderMock).isInitialized();
     initPushServiceMethod.invoke(pushService);
     assertNotNull(initPushServiceMethod);
     verifyPrivate(LeanplumPushService.class, times(1)).invoke("registerInBackground");
 
     // Test if Manifest is set up and provider not initialized.
-    doReturn(true).when(gcmProviderMock).isManifestSetUp();
+    doReturn(true).when(gcmProviderMock).isManifestSetup();
     doReturn(false).when(gcmProviderMock).isInitialized();
     initPushServiceMethod.invoke(pushService);
     assertNotNull(initPushServiceMethod);
     verifyPrivate(LeanplumPushService.class, times(1)).invoke("registerInBackground");
 
     // Test if Manifest is set up and provider is initialized.
-    doReturn(true).when(gcmProviderMock).isManifestSetUp();
+    doReturn(true).when(gcmProviderMock).isManifestSetup();
     doReturn(true).when(gcmProviderMock).isInitialized();
     initPushServiceMethod.invoke(pushService);
     assertNotNull(initPushServiceMethod);
@@ -337,18 +338,19 @@ public void testRegister() throws Exception {
     Request.setAppId(null, null);
 
     PowerMockito.doReturn(true).when(Util.class, "hasPlayServices");
-    PowerMockito.doReturn(true).when(LeanplumPushService.class, "enableServices");
+    PowerMockito.doReturn(true).when(LeanplumPushService.class, "enableFcmServices");
+    PowerMockito.doReturn(true).when(LeanplumPushService.class, "enableGcmServices");
 
     LeanplumGcmProvider gcmProviderMock = spy(new LeanplumGcmProvider());
     whenNew(LeanplumGcmProvider.class).withNoArguments().thenReturn(gcmProviderMock);
-    doReturn(true).when(gcmProviderMock).isManifestSetUp();
+    doReturn(true).when(gcmProviderMock).isManifestSetup();
     doReturn(true).when(gcmProviderMock).isInitialized();
 
     LeanplumPushService.onStart();
 
     LeanplumFcmProvider fcmProviderMock = spy(new LeanplumFcmProvider());
     whenNew(LeanplumFcmProvider.class).withNoArguments().thenReturn(fcmProviderMock);
-    doReturn(true).when(fcmProviderMock).isManifestSetUp();
+    doReturn(true).when(fcmProviderMock).isManifestSetup();
     doReturn(true).when(fcmProviderMock).isInitialized();
 
     PowerMockito.doReturn(true).when(LeanplumPushService.class, "isFirebaseEnabled");