Upgrade Mockito to 5.X

Author: jselbo

dexmaker-mockito-inline-extended-tests/build.gradle

@@ -30,5 +30,5 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
 
-    androidTestImplementation 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' }
+    androidTestImplementation libs.mockito.core, { exclude group: 'net.bytebuddy' }
 }

dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/MockStatic.java

@@ -25,7 +25,7 @@
 import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
 import static com.android.dx.mockito.inline.extended.ExtendedMockito.reset;
 import static com.android.dx.mockito.inline.extended.ExtendedMockito.staticMockMarker;
-import static com.android.dx.mockito.inline.extended.ExtendedMockito.verifyZeroInteractions;
+import static com.android.dx.mockito.inline.extended.ExtendedMockito.verifyNoInteractions;
 import static com.android.dx.mockito.inline.extended.ExtendedMockito.when;
 
 import static org.junit.Assert.assertEquals;
@@ -401,7 +401,7 @@ public void clearInvocationsRemovedInvocations() throws Exception {
         try {
             SuperClass.returnB();
             clearInvocations(staticMockMarker(SuperClass.class));
-            verifyZeroInteractions(staticMockMarker(SuperClass.class));
+            verifyNoInteractions(staticMockMarker(SuperClass.class));
         } finally {
             session.finishMocking();
         }

dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/StaticMockitoSessionVsMockitoJUnitRunner.java

@@ -20,7 +20,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class StaticMockitoSessionVsMockitoJUnitRunner {
     @Test
     public void simpleStubbing() throws Exception {

dexmaker-mockito-inline-extended-tests/src/androidTest/java/com/android/dx/mockito/inline/extended/tests/VerifyStatic.java

@@ -30,7 +30,7 @@
 import static com.android.dx.mockito.inline.extended.ExtendedMockito.staticMockMarker;
 import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify;
 import static com.android.dx.mockito.inline.extended.ExtendedMockito.verifyNoMoreInteractions;
-import static com.android.dx.mockito.inline.extended.ExtendedMockito.verifyZeroInteractions;
+import static com.android.dx.mockito.inline.extended.ExtendedMockito.verifyNoInteractions;
 import static com.android.dx.mockito.inline.extended.ExtendedMockito.when;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -180,7 +180,7 @@ public void zeroInvocationsThrowsIfThereWasAnInvocation() throws Exception {
         MockitoSession session = mockitoSession().mockStatic(EchoClass.class).startMocking();
         try {
             EchoClass.echo("marco!");
-            verifyZeroInteractions(staticMockMarker(EchoClass.class));
+            verifyNoInteractions(staticMockMarker(EchoClass.class));
             fail();
         } finally {
             session.finishMocking();

dexmaker-mockito-inline-extended/build.gradle

@@ -46,5 +46,5 @@ dependencies {
 
     implementation project(':dexmaker-mockito-inline')
 
-    api 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' }
+    api libs.mockito.core, { exclude group: 'net.bytebuddy' }
 }

dexmaker-mockito-inline-extended/src/main/java/com/android/dx/mockito/inline/extended/StaticInOrder.java

@@ -17,6 +17,7 @@
 package com.android.dx.mockito.inline.extended;
 
 import org.mockito.InOrder;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.verification.VerificationMode;
 
@@ -141,6 +142,12 @@ public void verify(MockedMethod method, VerificationMode mode) {
         verify((MockedVoidMethod) method::get, mode);
     }
 
+    @Override
+    public void verify(MockedStatic<?> mockedStatic, MockedStatic.Verification verification,
+            VerificationMode mode) {
+        instanceInOrder.verify(mockedStatic, verification, mode);
+    }
+
     @Override
     public void verifyNoMoreInteractions() {
         instanceInOrder.verifyNoMoreInteractions();

dexmaker-mockito-inline-tests/build.gradle

@@ -30,5 +30,5 @@ dependencies {
 
     androidTestImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' }
+    androidTestImplementation libs.mockito.core, { exclude group: 'net.bytebuddy' }
 }

dexmaker-mockito-inline/build.gradle

@@ -41,5 +41,5 @@ dependencies {
 
     implementation project(':dexmaker')
 
-    api 'org.mockito:mockito-core:2.28.2', { exclude group: 'net.bytebuddy' }
+    api libs.mockito.core, { exclude group: 'net.bytebuddy' }
 }

dexmaker-mockito-inline/src/main/java/com/android/dx/mockito/inline/JvmtiAgent.java

@@ -80,7 +80,7 @@ class JvmtiAgent {
     private static String resolveAgentPath(ClassLoader cl) throws IOException {
         String path = ((BaseDexClassLoader) cl).findLibrary("dexmakerjvmtiagent");
 
-        if (path != null && !path.contains("=")) {
+        if (path != null && !path.contains("=") && !path.contains("!")) {
             return path;
         }
 

dexmaker-mockito-inline/src/main/java/com/android/dx/mockito/inline/MockMakerMultiplexer.java

@@ -23,7 +23,6 @@
 import org.mockito.plugins.InlineMockMaker;
 import org.mockito.plugins.MockMaker;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 
 /**
@@ -36,7 +35,7 @@ public final class MockMakerMultiplexer implements InlineMockMaker {
     static {
         String[] potentialMockMakers = new String[] {
                 "com.android.dx.mockito.inline.InlineStaticMockMaker",
-                InlineDexmakerMockMaker.class.getName()
+                "com.android.dx.mockito.inline.InlineDexmakerMockMaker"
         };
 
         ArrayList<MockMaker> mockMakers = new ArrayList<>();
@@ -45,14 +44,10 @@ public final class MockMakerMultiplexer implements InlineMockMaker {
                 Class<? extends MockMaker> mockMakerClass = (Class<? extends MockMaker>)
                         Class.forName(potentialMockMaker);
                 mockMakers.add(mockMakerClass.getDeclaredConstructor().newInstance());
-            } catch (ClassNotFoundException | InstantiationException | IllegalAccessException
-                    | NoSuchMethodException | InvocationTargetException e) {
-                if (potentialMockMaker.equals(InlineDexmakerMockMaker.class.getName())) {
-                    Log.e(LOG_TAG, "Could not init mockmaker " + potentialMockMaker, e);
-                } else {
-                    // Additional mock makers might not be loaded
-                    Log.e(LOG_TAG, "Could not init mockmaker " + potentialMockMaker);
-                }
+            } catch (Exception e) {
+                Log.e(LOG_TAG, "Could not init mockmaker " + potentialMockMaker, e);
+            } catch (Error e) {
+                Log.e(LOG_TAG, "Could not init mockmaker " + potentialMockMaker, e);
             }
         }
 
@@ -102,7 +97,17 @@ public TypeMockability isTypeMockable(Class<?> type) {
             }
         }
 
-        return null;
+        return new TypeMockability() {
+            @Override
+            public boolean mockable() {
+                return false;
+            }
+
+            @Override
+            public String nonMockableReason() {
+                return "No mock makers available to mock this type";
+            }
+        };
     }
 
     @Override