Migrate to Mockito 4.1.0

shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java

@@ -106,6 +106,24 @@ public class FlutterJNI {
   // platform thread and doesn't require locking.
   private ReentrantReadWriteLock shellHolderLock = new ReentrantReadWriteLock();
 
+  // Prefer using the FlutterJNI.Factory so it's easier to test.
+  public FlutterJNI() {
+    // We cache the main looper so that we can ensure calls are made on the main thread
+    // without consistently paying the synchronization cost of getMainLooper().
+    mainLooper = Looper.getMainLooper();
+  }
+
+  /**
+   * A factory for creating {@code FlutterJNI} instances. Useful for FlutterJNI injections during
+   * tests.
+   */
+  public static class Factory {
+    /** @return a {@link FlutterJNI} instance. */
+    public FlutterJNI provideFlutterJNI() {
+      return new FlutterJNI();
+    }
+  }
+
   // BEGIN Methods related to loading for FlutterLoader.
   /**
    * Loads the libflutter.so C++ library.
@@ -126,6 +144,8 @@ public void loadLibrary() {
 
   private static boolean loadLibraryCalled = false;
 
+  private static native void nativePrefetchDefaultFontManager();
+
   /**
    * Prefetch the default font manager provided by SkFontMgr::RefDefault() which is a process-wide
    * singleton owned by Skia. Note that, the first call to SkFontMgr::RefDefault() will take
@@ -142,10 +162,16 @@ public void prefetchDefaultFontManager() {
     FlutterJNI.prefetchDefaultFontManagerCalled = true;
   }
 
-  private static native void nativePrefetchDefaultFontManager();
-
   private static boolean prefetchDefaultFontManagerCalled = false;
 
+  private static native void nativeInit(
+      @NonNull Context context,
+      @NonNull String[] args,
+      @Nullable String bundlePath,
+      @NonNull String appStoragePath,
+      @NonNull String engineCachesPath,
+      long initTimeMillis);
+
   /**
    * Perform one time initialization of the Dart VM and Flutter engine.
    *
@@ -174,14 +200,6 @@ public void init(
     FlutterJNI.initCalled = true;
   }
 
-  private static native void nativeInit(
-      @NonNull Context context,
-      @NonNull String[] args,
-      @Nullable String bundlePath,
-      @NonNull String appStoragePath,
-      @NonNull String engineCachesPath,
-      long initTimeMillis);
-
   private static boolean initCalled = false;
   // END methods related to FlutterLoader
 
@@ -201,23 +219,23 @@ private static native void nativeInit(
 
   private native boolean nativeGetIsSoftwareRenderingEnabled();
 
-  @UiThread
   /**
    * Checks launch settings for whether software rendering is requested.
    *
    * <p>The value is the same per program.
    */
+  @UiThread
   public boolean getIsSoftwareRenderingEnabled() {
     return nativeGetIsSoftwareRenderingEnabled();
   }
 
-  @Nullable
   /**
    * Observatory URI for the VM instance.
    *
    * <p>Its value is set by the native engine once {@link #init(Context, String[], String, String,
    * String, long)} is run.
    */
+  @Nullable
   public static String getObservatoryUri() {
     return observatoryUri;
   }
@@ -245,7 +263,7 @@ public void setRefreshRateFPS(float refreshRateFPS) {
    * The Android vsync waiter implementation in C++ needs to know when a vsync signal arrives, which
    * is obtained via Java API. The delegate set here is called on the C++ side when the engine is
    * ready to wait for the next vsync signal. The delegate is expected to add a postFrameCallback to
-   * the {@link android.view.Choreographer}, and call {@link nativeOnVsync} to notify the engine.
+   * the {@link android.view.Choreographer}, and call {@link onVsync} to notify the engine.
    *
    * @param delegate The delegate that will call the engine back on the next vsync signal.
    */
@@ -264,6 +282,8 @@ private static void asyncWaitForVsync(final long cookie) {
     }
   }
 
+  private native void nativeOnVsync(long frameDelayNanos, long refreshPeriodNanos, long cookie);
+
   /**
    * Notifies the engine that the Choreographer has signaled a vsync.
    *
@@ -272,23 +292,44 @@ private static void asyncWaitForVsync(final long cookie) {
    * @param refreshPeriodNanos The display refresh period in nanoseconds.
    * @param cookie An opaque handle to the C++ VSyncWaiter object.
    */
-  public native void nativeOnVsync(long frameDelayNanos, long refreshPeriodNanos, long cookie);
+  public void onVsync(long frameDelayNanos, long refreshPeriodNanos, long cookie) {
+    nativeOnVsync(frameDelayNanos, refreshPeriodNanos, cookie);
+  }
 
-  // TODO(mattcarroll): add javadocs
   @NonNull
+  @Deprecated
   public static native FlutterCallbackInformation nativeLookupCallbackInformation(long handle);
 
   // ----- Start FlutterTextUtils Methods ----
+  private native boolean nativeFlutterTextUtilsIsEmoji(int codePoint);
 
-  public native boolean nativeFlutterTextUtilsIsEmoji(int codePoint);
+  public boolean isCodePointEmoji(int codePoint) {
+    return nativeFlutterTextUtilsIsEmoji(codePoint);
+  }
+
+  private native boolean nativeFlutterTextUtilsIsEmojiModifier(int codePoint);
 
-  public native boolean nativeFlutterTextUtilsIsEmojiModifier(int codePoint);
+  public boolean isCodePointEmojiModifier(int codePoint) {
+    return nativeFlutterTextUtilsIsEmojiModifier(codePoint);
+  }
 
-  public native boolean nativeFlutterTextUtilsIsEmojiModifierBase(int codePoint);
+  private native boolean nativeFlutterTextUtilsIsEmojiModifierBase(int codePoint);
+
+  public boolean isCodePointEmojiModifierBase(int codePoint) {
+    return nativeFlutterTextUtilsIsEmojiModifierBase(codePoint);
+  }
 
-  public native boolean nativeFlutterTextUtilsIsVariationSelector(int codePoint);
+  private native boolean nativeFlutterTextUtilsIsVariationSelector(int codePoint);
 
-  public native boolean nativeFlutterTextUtilsIsRegionalIndicator(int codePoint);
+  public boolean isCodePointVariantSelector(int codePoint) {
+    return nativeFlutterTextUtilsIsVariationSelector(codePoint);
+  }
+
+  private native boolean nativeFlutterTextUtilsIsRegionalIndicator(int codePoint);
+
+  public boolean isCodePointRegionalIndicator(int codePoint) {
+    return nativeFlutterTextUtilsIsRegionalIndicator(codePoint);
+  }
 
   // ----- End Engine FlutterTextUtils Methods ----
 
@@ -312,13 +353,6 @@ private static void asyncWaitForVsync(final long cookie) {
 
   @NonNull private final Looper mainLooper; // cached to avoid synchronization on repeat access.
 
-  // Prefer using the FlutterJNI.Factory so it's easier to test.
-  public FlutterJNI() {
-    // We cache the main looper so that we can ensure calls are made on the main thread
-    // without consistently paying the synchronization cost of getMainLooper().
-    mainLooper = Looper.getMainLooper();
-  }
-
   // ------ Start Native Attach/Detach Support ----
   /**
    * Returns true if this instance of {@code FlutterJNI} is connected to Flutter's native engine via
@@ -1402,15 +1436,4 @@ void updateSemantics(
   public interface AsyncWaitForVsyncDelegate {
     void asyncWaitForVsync(final long cookie);
   }
-
-  /**
-   * A factory for creating {@code FlutterJNI} instances. Useful for FlutterJNI injections during
-   * tests.
-   */
-  public static class Factory {
-    /** @return a {@link FlutterJNI} instance. */
-    public FlutterJNI provideFlutterJNI() {
-      return new FlutterJNI();
-    }
-  }
 }

shell/platform/android/io/flutter/plugin/editing/FlutterTextUtils.java

@@ -19,23 +19,23 @@ public FlutterTextUtils(FlutterJNI flutterJNI) {
   }
 
   public boolean isEmoji(int codePoint) {
-    return flutterJNI.nativeFlutterTextUtilsIsEmoji(codePoint);
+    return flutterJNI.isCodePointEmoji(codePoint);
   }
 
   public boolean isEmojiModifier(int codePoint) {
-    return flutterJNI.nativeFlutterTextUtilsIsEmojiModifier(codePoint);
+    return flutterJNI.isCodePointEmojiModifier(codePoint);
   }
 
   public boolean isEmojiModifierBase(int codePoint) {
-    return flutterJNI.nativeFlutterTextUtilsIsEmojiModifierBase(codePoint);
+    return flutterJNI.isCodePointEmojiModifierBase(codePoint);
   }
 
   public boolean isVariationSelector(int codePoint) {
-    return flutterJNI.nativeFlutterTextUtilsIsVariationSelector(codePoint);
+    return flutterJNI.isCodePointVariantSelector(codePoint);
   }
 
   public boolean isRegionalIndicatorSymbol(int codePoint) {
-    return flutterJNI.nativeFlutterTextUtilsIsRegionalIndicator(codePoint);
+    return flutterJNI.isCodePointRegionalIndicator(codePoint);
   }
 
   public boolean isTagSpecChar(int codePoint) {

shell/platform/android/io/flutter/view/VsyncWaiter.java

@@ -97,7 +97,7 @@ public void doFrame(long frameTimeNanos) {
                       if (delay < 0) {
                         delay = 0;
                       }
-                      flutterJNI.nativeOnVsync(delay, refreshPeriodNanos, cookie);
+                      flutterJNI.onVsync(delay, refreshPeriodNanos, cookie);
                     }
                   });
         }

shell/platform/android/test/io/flutter/FlutterInjectorTest.java

@@ -37,7 +37,7 @@ public class FlutterInjectorTest {
   public void setUp() {
     // Since the intent is to have a convenient static class to use for production.
     FlutterInjector.reset();
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
   }
 
   @After

shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java

@@ -5,10 +5,10 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
-import static org.mockito.Matchers.notNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNotNull;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -230,7 +230,7 @@ public void itGivesHostAnOpportunityToConfigureFlutterSurfaceView() {
     delegate.onCreateView(null, null, null, 0, true);
 
     // Verify that the host was asked to configure a FlutterSurfaceView.
-    verify(mockHost, times(1)).onFlutterSurfaceViewCreated(notNull(FlutterSurfaceView.class));
+    verify(mockHost, times(1)).onFlutterSurfaceViewCreated(isNotNull());
   }
 
   @Test
@@ -259,7 +259,7 @@ public void itGivesHostAnOpportunityToConfigureFlutterTextureView() {
     delegate.onCreateView(null, null, null, 0, false);
 
     // Verify that the host was asked to configure a FlutterTextureView.
-    verify(customMockHost, times(1)).onFlutterTextureViewCreated(notNull(FlutterTextureView.class));
+    verify(customMockHost, times(1)).onFlutterTextureViewCreated(isNotNull());
   }
 
   @Test

shell/platform/android/test/io/flutter/embedding/android/FlutterAndroidComponentTest.java

@@ -1,8 +1,8 @@
 package io.flutter.embedding.android;
 
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;

shell/platform/android/test/io/flutter/embedding/android/FlutterViewTest.java

@@ -3,8 +3,8 @@
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -76,7 +76,7 @@ public class FlutterViewTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     when(mockFlutterJni.isAttached()).thenReturn(true);
   }
 

shell/platform/android/test/io/flutter/embedding/android/KeyChannelResponderTest.java

@@ -30,7 +30,7 @@ public class KeyChannelResponderTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     channelResponder = new KeyChannelResponder(keyEventChannel);
   }
 

shell/platform/android/test/io/flutter/embedding/android/KeyboardManagerTest.java

@@ -69,7 +69,7 @@ private FlutterEngine mockFlutterEngine() {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     when(mockFlutterJni.isAttached()).thenReturn(true);
     mockEngine = mockFlutterEngine();
     mockKeyEventChannel = mockEngine.getKeyEventChannel();

shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineGroupComponentTest.java

@@ -51,7 +51,7 @@ public class FlutterEngineGroupComponentTest {
   public void setUp() {
     FlutterInjector.reset();
 
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     jniAttached = false;
     when(mockflutterJNI.isAttached()).thenAnswer(invocation -> jniAttached);
     doAnswer(invocation -> jniAttached = true).when(mockflutterJNI).attachToNative();
@@ -165,7 +165,7 @@ public void canCreateAndRunCustomEntrypoints() {
         .runBundleAndSnapshotFromLibrary(
             eq("some/path/to/flutter_assets"),
             eq("other entrypoint"),
-            isNull(String.class),
+            isNull(),
             any(AssetManager.class),
             nullable(List.class));
   }
@@ -215,7 +215,7 @@ public void canCreateAndRunWithCustomEntrypointArgs() {
         .runBundleAndSnapshotFromLibrary(
             nullable(String.class),
             nullable(String.class),
-            isNull(String.class),
+            isNull(),
             any(AssetManager.class),
             eq(firstDartEntrypointArgs));
 

shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineTest.java

@@ -45,7 +45,7 @@ public class FlutterEngineTest {
 
   @Before
   public void setUp() {
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
     jniAttached = false;
     when(flutterJNI.isAttached()).thenAnswer(invocation -> jniAttached);
     doAnswer(

shell/platform/android/test/io/flutter/embedding/engine/dart/DartExecutorTest.java

@@ -3,8 +3,8 @@
 import static junit.framework.TestCase.assertNotNull;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -32,7 +32,7 @@ public class DartExecutorTest {
   @Before
   public void setUp() {
     FlutterInjector.reset();
-    MockitoAnnotations.initMocks(this);
+    MockitoAnnotations.openMocks(this);
   }
 
   @Test

shell/platform/android/test/io/flutter/embedding/engine/dart/DartMessengerTest.java

@@ -5,9 +5,9 @@
 import static junit.framework.TestCase.assertNotNull;
 import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.assertArrayEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;