diff --git a/android/src/test/java/com/facebook/flipper/plugins/inspector/ApplicationWrapperTest.java b/android/src/test/java/com/facebook/flipper/plugins/inspector/ApplicationWrapperTest.java index 84e5cd354..48295d721 100644 --- a/android/src/test/java/com/facebook/flipper/plugins/inspector/ApplicationWrapperTest.java +++ b/android/src/test/java/com/facebook/flipper/plugins/inspector/ApplicationWrapperTest.java @@ -9,6 +9,7 @@ package com.facebook.flipper.plugins.inspector; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockito.ArgumentMatchers.any; import android.app.Activity; import android.app.Application; @@ -40,7 +41,7 @@ public class ApplicationWrapperTest { } }) .when(app) - .registerActivityLifecycleCallbacks(Mockito.any(ActivityLifecycleCallbacks.class)); + .registerActivityLifecycleCallbacks(any(ActivityLifecycleCallbacks.class)); mWrapper = new ApplicationWrapper(app); } diff --git a/android/src/test/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPluginTest.java b/android/src/test/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPluginTest.java index f138f5b17..627997138 100644 --- a/android/src/test/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPluginTest.java +++ b/android/src/test/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPluginTest.java @@ -11,6 +11,7 @@ import static com.facebook.flipper.plugins.inspector.ThrowableMessageMatcher.has import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockito.ArgumentMatchers.any; import android.app.Application; import android.graphics.Rect; @@ -288,12 +289,12 @@ public class InspectorFlipperPluginTest { plugin.mSetSearchActive.onReceive( new FlipperObject.Builder().put("active", true).build(), responder); - Mockito.verify(decorView, Mockito.times(1)).addView(Mockito.any(TouchOverlayView.class)); + Mockito.verify(decorView, Mockito.times(1)).addView(any(TouchOverlayView.class)); plugin.mSetSearchActive.onReceive( new FlipperObject.Builder().put("active", false).build(), responder); - Mockito.verify(decorView, Mockito.times(1)).removeView(Mockito.any(TouchOverlayView.class)); + Mockito.verify(decorView, Mockito.times(1)).removeView(any(TouchOverlayView.class)); } @Test diff --git a/android/src/test/java/com/facebook/flipper/plugins/inspector/descriptors/ViewGroupDescriptorTest.java b/android/src/test/java/com/facebook/flipper/plugins/inspector/descriptors/ViewGroupDescriptorTest.java index 149fdb60d..b7ebf8c78 100644 --- a/android/src/test/java/com/facebook/flipper/plugins/inspector/descriptors/ViewGroupDescriptorTest.java +++ b/android/src/test/java/com/facebook/flipper/plugins/inspector/descriptors/ViewGroupDescriptorTest.java @@ -9,7 +9,7 @@ package com.facebook.flipper.plugins.inspector.descriptors; import static android.view.View.MeasureSpec.EXACTLY; import static android.view.View.MeasureSpec.makeMeasureSpec; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import android.view.View; import android.view.ViewGroup; @@ -36,8 +36,7 @@ public class ViewGroupDescriptorTest { root.layout(0, 0, 100, 100); final Touch touch = Mockito.mock(Touch.class); - Mockito.when(touch.containedIn(any(int.class), any(int.class), any(int.class), any(int.class))) - .thenReturn(true); + Mockito.when(touch.containedIn(anyInt(), anyInt(), anyInt(), anyInt())).thenReturn(true); descriptor.hitTest(root, touch); Mockito.verify(touch, Mockito.times(1)).continueWithOffset(0, 0, 0); } @@ -55,8 +54,7 @@ public class ViewGroupDescriptorTest { root.layout(0, 0, 100, 100); final Touch touch = Mockito.mock(Touch.class); - Mockito.when(touch.containedIn(any(int.class), any(int.class), any(int.class), any(int.class))) - .thenReturn(true); + Mockito.when(touch.containedIn(anyInt(), anyInt(), anyInt(), anyInt())).thenReturn(true); descriptor.hitTest(root, touch); Mockito.verify(touch, Mockito.times(1)).finish(); } diff --git a/build.gradle b/build.gradle index 4e4bc1283..cb71e17be 100644 --- a/build.gradle +++ b/build.gradle @@ -83,10 +83,10 @@ ext.deps = [ lithoTesting : "com.facebook.litho:litho-testing:$LITHO_VERSION", // Debugging and testing guava : 'com.google.guava:guava:20.0', - robolectric : 'org.robolectric:robolectric:3.3', + robolectric : 'org.robolectric:robolectric:4.3.1', junit : 'junit:junit:4.12', hamcrest : 'org.hamcrest:hamcrest-library:1.3', - mockito : 'org.mockito:mockito-core:1.9.5', + mockito : 'org.mockito:mockito-core:2.26.0', okhttp3 : 'com.squareup.okhttp3:okhttp:3.14.1', leakcanary : 'com.squareup.leakcanary:leakcanary-android:1.6.3', testCore : 'androidx.test:core:1.1.0',