Merge branch 'release/10.11.0' into update/support-graphQL

Author: Ali Abdelfattah

.circleci/config.yml

@@ -223,7 +223,7 @@ workflows:
           context: cross-platform
       - test_module
       - test_sample
-      # - test_android
+      - test_android
       - test_ios
       - e2e_ios
       # - e2e_android

InstabugSample/.prettierrc.js renamed to .prettierrc.js

@@ -1,6 +1,8 @@
 ## master
 
 * Adds GraphQL support for APM network traces with proper grouping
+* Adds APM.endAppLaunch API
+* Fixes an issue with iOS sourcemap upload that causes the build to fail
 
 ## 10.9.1 (2021-10-13)
 

CHANGELOG.md

@@ -8,5 +8,5 @@ if github.pr_body.length < 3 && git.lines_of_code > 10
 end
 
 if !git.modified_files.include?("CHANGELOG.md") && !declared_trivial
-  fail("Please include a CHANGELOG entry. \nYou can find it at [CHANGELOG.md](https://github.com/Instabug/Instabug-Flutter/blob/master/CHANGELOG.md).", sticky: false)
+  warn("You have not included a CHANGELOG entry! \nYou can find it at [CHANGELOG.md](https://github.com/Instabug/Instabug-Flutter/blob/master/CHANGELOG.md).", sticky: false)
 end

Dangerfile

@@ -77,6 +77,14 @@ - (void) testSetAppLaunchEnabled {
   OCMVerify([mock setAppLaunchEnabled:isEnabled]);
 }
 
+- (void) testEndAppLaunch {
+  id mock = OCMClassMock([IBGAPM class]);
+  
+  OCMStub([mock endAppLaunch]);
+  [self.instabugBridge endAppLaunch];
+  OCMVerify([mock endAppLaunch]);
+}
+
 - (void) testSetAutoUITraceEnabled {
   id mock = OCMClassMock([IBGAPM class]);
   BOOL isEnabled = YES;

InstabugSample/ios/InstabugSampleTests/InstabugAPMTests.m

@@ -14,4 +14,5 @@ module.exports = {
       },
     }),
   },
+  maxWorkers: 2,
 };

InstabugSample/metro.config.js

@@ -21,6 +21,7 @@ describe("APM Module", () => {
   const endExecutionTrace = sinon.spy(NativeModules.IBGAPM, "endExecutionTrace");
   const startUITrace = sinon.spy(NativeModules.IBGAPM, "startUITrace");
   const endUITrace = sinon.spy(NativeModules.IBGAPM, "endUITrace");
+  const endAppLaunch = sinon.spy(NativeModules.IBGAPM, "endAppLaunch");
   const setNetworkLoggingEnabled = sinon.spy(NativeModules.Instabug, "setNetworkLoggingEnabled");
   const _ibgSleep = sinon.spy(NativeModules.IBGAPM, "ibgSleep");
 
@@ -47,6 +48,12 @@ describe("APM Module", () => {
     expect(setNetworkLoggingEnabled.calledOnceWithExactly(true)).toBe(true);
   });
 
+  it("should call the native method endAppLaunch", () => {
+    APM.endAppLaunch();
+
+    expect(endAppLaunch.calledOnceWithExactly()).toBe(true);
+  });
+
   it("should call the native method setAutoUITraceEnabled", () => {
     APM.setAutoUITraceEnabled(true);
 

__tests__/apm.spec.js

@@ -29,15 +29,13 @@ android {
 dependencies {
     implementation 'com.android.support:multidex:1.0.3'
     implementation 'com.facebook.react:react-native:+'
-    api('com.instabug.library:instabug:10.9.1') {
+    api('com.instabug.library:instabug:10.11.0') {
         exclude group: 'com.android.support:appcompat-v7'
     }
-    testImplementation 'org.mockito:mockito-core:1.10.19'
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.powermock:powermock-api-mockito:1.6.6'
-    testImplementation 'org.powermock:powermock-module-junit4-rule-agent:1.6.2'
-    testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.6'
-    testImplementation 'org.powermock:powermock-module-junit4:1.6.6'
+    testImplementation "org.mockito:mockito-inline:3.4.0"
+    testImplementation "org.mockito:mockito-android:3.4.0"
+    testImplementation 'junit:junit:4.13.2'
+
 }
 
 

android/build.gradle

@@ -128,6 +128,23 @@ public void run() {
         });
     }
 
+    /**
+     * Ends app launch
+     */
+    @ReactMethod
+    public void endAppLaunch() {
+        MainThreadHandler.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    APM.endAppLaunch();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
     /**
      * Enables or disables auto UI tracing
      * @param isEnabled boolean indicating enabled or disabled.

android/src/main/java/com/instabug/reactlibrary/RNInstabugAPMModule.java

@@ -1,122 +1,127 @@
 package com.instabug.reactlibrary;
-
-import android.os.Handler;
 import android.os.Looper;
-import android.os.SystemClock;
 
 import com.facebook.react.bridge.Callback;
 import com.instabug.apm.APM;
-import com.instabug.apm.model.ExecutionTrace;
 
-import com.facebook.react.bridge.Arguments;
-import com.instabug.reactlibrary.utils.InstabugUtil;
 import com.instabug.reactlibrary.utils.MainThreadHandler;
 
-import org.json.JSONArray;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Matchers;
-import org.mockito.internal.verification.VerificationModeFactory;
+import org.mockito.MockedStatic;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.powermock.api.mockito.PowerMockito.doAnswer;
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({Looper.class, android.os.Handler.class, APM.class, ExecutionTrace.class, SystemClock.class, Runnable.class, RNInstabugAPMModule.class, Arguments.class, InstabugUtil.class, MainThreadHandler.class})
+import static org.mockito.Mockito.when;
 
 public class RNInstabugAPMModuleTest {
 
     private RNInstabugAPMModule apmModule = new RNInstabugAPMModule(null);
-
     private final static ScheduledExecutorService mainThread = Executors.newSingleThreadScheduledExecutor();
 
+    // Mock Objects
+    private MockedStatic<Looper> mockLooper;
+    private MockedStatic <MainThreadHandler> mockMainThreadHandler;
+    private MockedStatic <APM> mockAPM;
+
     @Before
     public void mockMainThreadHandler() throws Exception {
-        PowerMockito.mockStatic(Looper.class);
+        // Mock static functions
+        mockAPM = mockStatic(APM.class);
+        mockLooper = mockStatic(Looper.class);
+        mockMainThreadHandler = mockStatic(MainThreadHandler.class);
+
+        // Mock Looper class
         Looper mockMainThreadLooper = mock(Looper.class);
         when(Looper.getMainLooper()).thenReturn(mockMainThreadLooper);
-        Handler mockMainThreadHandler = mock(Handler.class);
+
+        // Override runOnMainThread
         Answer<Boolean> handlerPostAnswer = new Answer<Boolean>() {
             @Override
             public Boolean answer(InvocationOnMock invocation) throws Throwable {
-                invocation.getArgumentAt(0, Runnable.class).run();
+                invocation.getArgument(0, Runnable.class).run();
                 return true;
             }
         };
-        doAnswer(handlerPostAnswer).when(mockMainThreadHandler).post(any(Runnable.class));
-        doAnswer(handlerPostAnswer).when(mockMainThreadHandler).postDelayed(any(Runnable.class), anyLong());
-        PowerMockito.whenNew(Handler.class).withArguments(mockMainThreadLooper).thenReturn(mockMainThreadHandler);
+        doAnswer(handlerPostAnswer).when(MainThreadHandler.class);
+        MainThreadHandler.runOnMainThread(any(Runnable.class));
+    }
+    @After
+    public void tearDown() {
+        // Remove static mocks
+        mockLooper.close();
+        mockMainThreadHandler.close();
+        mockAPM.close();
     }
 
     /********APM*********/
 
     @Test
-    public void givenFalse$setEnabled_whenQuery_thenShouldCallNativeApiWithDisabled() {
-        // given
-        PowerMockito.mockStatic(APM.class);
+    public void givenFalsesetEnabled_whenQuery_thenShouldCallNativeApiWithDisabled() {
         // when
         apmModule.setEnabled(false);
         // then
-        PowerMockito.verifyStatic(VerificationModeFactory.times(1));
+        verify(APM.class, times(1));
         APM.setEnabled(false);
     }
 
     @Test
-    public void givenTrue$setEnabled_whenQuery_thenShouldCallNativeApiWithEnabled() {
-        // given
-        PowerMockito.mockStatic(APM.class);
+    public void givenTruesetEnabled_whenQuery_thenShouldCallNativeApiWithEnabled() {
         // when
         apmModule.setEnabled(true);
         // then
-        PowerMockito.verifyStatic(VerificationModeFactory.times(1));
+        verify(APM.class, times(1));
         APM.setEnabled(true);
     }
 
     @Test
     public void givenFalse$setAppLaunchEnabled_whenQuery_thenShouldCallNativeApiWithDisabled() {
-        // given
-        PowerMockito.mockStatic(APM.class);
+
         // when
         apmModule.setAppLaunchEnabled(false);
         // then
-        PowerMockito.verifyStatic(VerificationModeFactory.times(1));
+        verify(APM.class, times(1));
         APM.setAppLaunchEnabled(false);
     }
 
     @Test
     public void givenTrue$setAppLaunchEnabled_whenQuery_thenShouldCallNativeApiWithEnabled() {
-        // given
-        PowerMockito.mockStatic(APM.class);
+
         // when
         apmModule.setAppLaunchEnabled(true);
         // then
-        PowerMockito.verifyStatic(VerificationModeFactory.times(1));
+        verify(APM.class, times(1));
         APM.setAppLaunchEnabled(true);
     }
 
+    @Test
+    public void given$endAppLaunch_whenQuery_thenShouldCallNativeApiWithEnabled() {
+
+        // when
+        apmModule.endAppLaunch();
+        // then
+        verify(APM.class, times(1));
+        APM.endAppLaunch();
+    }
+
     @Test
     public void givenString$startExecutionTrace_whenQuery_thenShouldCallNativeApi() {
-        // given
-        PowerMockito.mockStatic(APM.class);
+
         Callback callback = mock(Callback.class);
         // when
         apmModule.startExecutionTrace("trace", "1", callback);
         // then
-        PowerMockito.verifyStatic(VerificationModeFactory.times(1));
+        verify(APM.class, times(1));
         APM.startExecutionTrace("trace");
         verify(callback).invoke(any());
     }
@@ -151,24 +156,22 @@ public Boolean answer(InvocationOnMock invocation) throws Throwable {
 
     @Test
     public void givenString$startUITrace_whenQuery_thenShouldCallNativeApiWithEnabled() {
-        // given
-        PowerMockito.mockStatic(APM.class);
+
         // when
         apmModule.startUITrace("uiTrace");
         // then
-        PowerMockito.verifyStatic(VerificationModeFactory.times(1));
+        verify(APM.class, times(1));
         APM.startUITrace("uiTrace");
     }
 
     @Test
     public void given$endUITrace_whenQuery_thenShouldCallNativeApiWithEnabled() {
-        // given
-        PowerMockito.mockStatic(APM.class);
+
         // when
         apmModule.startUITrace("uiTrace");
         apmModule.endUITrace();
         // then
-        PowerMockito.verifyStatic(VerificationModeFactory.times(1));
+        verify(APM.class, times(1));
         APM.endUITrace();
     }
 }