Fix Android tests

Author: a7medev

android/src/main/java/com/instabug/reactlibrary/utils/EventEmitterModule.java

@@ -1,6 +1,7 @@
 package com.instabug.reactlibrary.utils;
 
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -14,7 +15,8 @@ public EventEmitterModule(ReactApplicationContext context) {
         super(context);
     }
 
-    protected void sendEvent(String event, @Nullable WritableMap params) {
+    @VisibleForTesting
+    public void sendEvent(String event, @Nullable WritableMap params) {
         if (listenerCount > 0) {
             getReactApplicationContext()
                     .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)

android/src/test/java/com/instabug/reactlibrary/RNInstabugBugReportingModuleTest.java

@@ -37,12 +37,13 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 public class RNInstabugBugReportingModuleTest {
 
-    private RNInstabugBugReportingModule bugReportingModule = new RNInstabugBugReportingModule(mock(ReactApplicationContext.class));
+    private RNInstabugBugReportingModule bugReportingModule = spy(new RNInstabugBugReportingModule(mock(ReactApplicationContext.class)));
     private final static ScheduledExecutorService mainThread = Executors.newSingleThreadScheduledExecutor();
 
     // Mock Objects
@@ -240,8 +241,7 @@ public Object answer(InvocationOnMock invocation) {
         bugReportingModule.setOnInvokeHandler(null);
 
         // then
-        verify(InstabugUtil.class,VerificationModeFactory.times(1));
-        InstabugUtil.sendEvent(any(ReactApplicationContext.class), eq(Constants.IBG_PRE_INVOCATION_HANDLER), Matchers.isNull(WritableMap.class));
+        verify(bugReportingModule).sendEvent(Constants.IBG_PRE_INVOCATION_HANDLER, null);
     }
 
 
@@ -255,7 +255,6 @@ public Object answer(InvocationOnMock invocation) {
         when(Arguments.createMap()).thenReturn(new JavaOnlyMap());
         mockBugReporting.when(() -> BugReporting.setOnDismissCallback(any(OnSdkDismissCallback.class))).thenAnswer(new Answer() {
             public Object answer(InvocationOnMock invocation) {
-                InstabugUtil.sendEvent(any(),any(),any());
                 ((OnSdkDismissCallback) invocation.getArguments()[0])
                         .call(OnSdkDismissCallback.DismissType.CANCEL, OnSdkDismissCallback.ReportType.BUG);
                 return null;
@@ -266,8 +265,7 @@ public Object answer(InvocationOnMock invocation) {
         WritableMap params = new JavaOnlyMap();
         params.putString("dismissType", OnSdkDismissCallback.DismissType.CANCEL.toString());
         params.putString("reportType", OnSdkDismissCallback.ReportType.BUG.toString());
-        verify(InstabugUtil.class,VerificationModeFactory.times(1));
-        InstabugUtil.sendEvent(any(ReactApplicationContext.class), eq(Constants.IBG_POST_INVOCATION_HANDLER), eq(params));
+        verify(bugReportingModule).sendEvent(Constants.IBG_POST_INVOCATION_HANDLER, params);
         mockArgument.close();
         mockReactApplicationContext.close();
     }

android/src/test/java/com/instabug/reactlibrary/RNInstabugSurveysModuleTest.java

@@ -7,7 +7,6 @@
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.JavaOnlyArray;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.WritableMap;
 import com.instabug.library.Feature;
 import com.instabug.reactlibrary.utils.InstabugUtil;
 import com.instabug.survey.Survey;
@@ -23,7 +22,6 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.Matchers;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
@@ -34,19 +32,17 @@
 import java.util.concurrent.ScheduledExecutorService;
 
 import static org.mockito.Matchers.any;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 
 public class RNInstabugSurveysModuleTest {
 
-    private RNInstabugSurveysModule surveysModule = new RNInstabugSurveysModule(mock(ReactApplicationContext.class));
-
-    private final static ScheduledExecutorService mainThread = Executors.newSingleThreadScheduledExecutor();
+    private RNInstabugSurveysModule surveysModule = spy(new RNInstabugSurveysModule(mock(ReactApplicationContext.class)));
 
     // Mock Objects
     private MockedStatic<Looper> mockLooper;
@@ -180,8 +176,7 @@ public Object answer(InvocationOnMock invocation) {
         surveysModule.setOnShowHandler(null);
 
         // then
-        verify(InstabugUtil.class,times(1));
-        InstabugUtil.sendEvent(any(ReactApplicationContext.class), eq(Constants.IBG_ON_SHOW_SURVEY_HANDLER), Matchers.isNull(WritableMap.class));
+        verify(surveysModule).sendEvent(Constants.IBG_ON_SHOW_SURVEY_HANDLER, null);
     }
 
     @Test
@@ -200,8 +195,7 @@ public Object answer(InvocationOnMock invocation) {
         surveysModule.setOnDismissHandler(null);
 
         // then
-        verify(InstabugUtil.class,times(1));
-        InstabugUtil.sendEvent(any(ReactApplicationContext.class), eq(Constants.IBG_ON_DISMISS_SURVEY_HANDLER), Matchers.isNull(WritableMap.class));
+        verify(surveysModule).sendEvent(Constants.IBG_ON_DISMISS_SURVEY_HANDLER, null);
     }
 
     @Test