wip: evenhandler build successfull

Author: muzahidul-opti

event-handler/build.gradle

@@ -59,8 +59,9 @@ dependencies {
 
     testImplementation "junit:junit:$junit_ver"
     testImplementation "org.mockito:mockito-core:$mockito_ver"
-    testImplementation "org.powermock:powermock-module-junit4:$powermock_ver"
-    testImplementation "org.powermock:powermock-api-mockito2:$powermock_ver"
+    testImplementation "org.mockito:mockito-inline:$mockito_ver"
+//    testImplementation "org.powermock:powermock-module-junit4:$powermock_ver"
+//    testImplementation "org.powermock:powermock-api-mockito2:$powermock_ver"
     testImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
 
     androidTestImplementation "androidx.work:work-testing:$work_runtime"
@@ -72,9 +73,10 @@ dependencies {
     androidTestImplementation "androidx.test:core-ktx:$androidx_test_core"
 
     androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
-    androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"
-    androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"
-    androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:$dexmaker_ver"
+    androidTestImplementation "org.mockito:mockito-android:$mockito_ver"
+//    androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"
+//    androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"
+//    androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:$dexmaker_ver"
     androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

event-handler/src/androidTest/java/com/optimizely/ab/android/event_handler/EventClientTest.java

@@ -34,9 +34,9 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.contains;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.contains;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

event-handler/src/androidTest/java/com/optimizely/ab/android/event_handler/EventReschedulerTest.java

@@ -23,11 +23,11 @@
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.Logger;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.matches;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.matches;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;

event-handler/src/test/java/com/optimizely/ab/android/event_handler/EventClientTest.java

@@ -24,7 +24,7 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.exceptions.base.MockitoException;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.Logger;
 
 import java.io.IOException;
@@ -35,8 +35,8 @@
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

event-handler/src/test/java/com/optimizely/ab/android/event_handler/EventWorkerUnitTest.java

@@ -19,10 +19,14 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
+
+import org.mockito.MockedStatic;
+
 
 import android.content.Context;
 
@@ -35,22 +39,17 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.io.IOException;
 
 /**
  * Tests {@link EventWorker}
  */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ EventWorker.class, EventHandlerUtils.class, WorkerParameters.class })
-@PowerMockIgnore("jdk.internal.reflect.*")
+@RunWith(MockitoJUnitRunner.class)
 public class EventWorkerUnitTest {
 
-    private WorkerParameters mockWorkParams = PowerMockito.mock(WorkerParameters.class);
+    private WorkerParameters mockWorkParams = mock(WorkerParameters.class);
     private EventWorker eventWorker = new EventWorker(mock(Context.class), mockWorkParams);
 
     private String host = "http://www.foo.com";
@@ -72,31 +71,40 @@ public void dataForCompressedEvent() {
         assertEquals(data.getString("bodyCompressed"), base64);
         assertNull(data.getString("body"));
     }
-
     @Test
     public void compressEvent() throws IOException {
         String base64 = "abc123";
-        PowerMockito.mockStatic(EventHandlerUtils.class);
-        when(EventHandlerUtils.compress(anyString())).thenReturn(base64);
 
-        Data data = EventWorker.compressEvent(host, smallBody);
-        assertEquals(data.getString("url"), host);
-        assertEquals(data.getString("bodyCompressed"), base64);
-        assertNull(data.getString("body"));
+        // Mocking the static method compress in EventHandlerUtils
+        try (MockedStatic<EventHandlerUtils> mockedStatic = mockStatic(EventHandlerUtils.class)) {
+            mockedStatic.when(() -> EventHandlerUtils.compress(anyString())).thenReturn(base64);
+
+            Data data = EventWorker.compressEvent(host, smallBody);
+
+            // Verify the results
+            assertEquals(data.getString("url"), host);
+            assertEquals(data.getString("bodyCompressed"), base64);
+            assertNull(data.getString("body"));
+
+            // Optionally, verify that the method was called
+            mockedStatic.verify(() -> EventHandlerUtils.compress(anyString()));
+        }
     }
 
+
     @Test
     public void compressEventWithCompressionFailure() throws IOException {
-        PowerMockito.mockStatic(EventHandlerUtils.class);
-        PowerMockito.doThrow(new IOException()).when(EventHandlerUtils.class);
-        EventHandlerUtils.compress(anyString());  // PowerMockito throws exception on this static method
+        try (MockedStatic<EventHandlerUtils> mockedStatic = mockStatic(EventHandlerUtils.class)) {
+            mockedStatic.when(() -> EventHandlerUtils.compress(anyString())).thenThrow(new IOException());
 
-        // return original body if compress fails
+            // return original body if compress fails
 
-        Data data = EventWorker.compressEvent(host, smallBody);
-        assertEquals(data.getString("url"), host);
-        assertEquals(data.getString("body"), smallBody);
-        assertNull(data.getByteArray("bodyCompressed"));
+            Data data = EventWorker.compressEvent(host, smallBody);
+            assertEquals(data.getString("url"), host);
+            assertEquals(data.getString("body"), smallBody);
+            assertNull(data.getByteArray("bodyCompressed"));
+
+        }
     }
 
     @Test
@@ -155,12 +163,17 @@ public void getEventBodyFromInputDataCompressed() {
     public void getEventBodyFromInputDataDecompressFailure() throws Exception {
         Data data = EventWorker.compressEvent(host, smallBody);
 
-        PowerMockito.mockStatic(EventHandlerUtils.class);
-        PowerMockito.doThrow(new IOException()).when(EventHandlerUtils.class);
-        EventHandlerUtils.decompress(any());  // PowerMockito throws exception on this static method
+        try (MockedStatic<EventHandlerUtils> mockedStatic = mockStatic(EventHandlerUtils.class)) {
+            mockedStatic.when(() -> EventHandlerUtils.compress(anyString())).thenThrow(new IOException());
 
-        String str = eventWorker.getEventBodyFromInputData(data);
-        assertNull(str);
+            // return original body if compress fails
+
+            EventHandlerUtils.decompress(any());
+
+            String str = eventWorker.getEventBodyFromInputData(data);
+            assertNull(str);
+
+        }
     }
 
     @Test

event-handler/src/test/resources/org.mockito.plugins.MockMaker

@@ -0,0 +1 @@
+mock-maker-inline