Merge "Refactor code incompatible with Mockito 2.7.13"

3 files changed, 7 insertions, 5 deletions

diff --git a/tests/wifitests/Android.mk b/tests/wifitests/Android.mk
index c04a6a74e..b285db6e9 100644
--- a/tests/wifitests/Android.mk
+++ b/tests/wifitests/Android.mk
@@ -49,6 +49,8 @@ jacoco_include := com.android.server.wifi.*
 LOCAL_JACK_COVERAGE_INCLUDE_FILTER := $(jacoco_include)
 LOCAL_JACK_COVERAGE_EXCLUDE_FILTER := $(jacoco_exclude)
 
+LOCAL_JACK_FLAGS := --multi-dex native
+
 # wifi-service and services must be included here so that the latest changes
 # will be used when tests. Otherwise the tests would run against the installed
 # system.
diff --git a/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java b/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java
index bba1eda41..93ebd0b0c 100644
--- a/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WificondControlTest.java
@@ -46,7 +46,7 @@ import com.android.server.wifi.wificond.SingleScanSettings;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
-import org.mockito.ArgumentMatcher;
+import org.mockito.compat.ArgumentMatcher;
 
 import java.util.ArrayList;
 import java.util.BitSet;
@@ -637,7 +637,7 @@ public class WificondControlTest {
         }
 
         @Override
-        public boolean matches(Object argument) {
+        public boolean matchesObject(Object argument) {
             SingleScanSettings settings = (SingleScanSettings) argument;
             ArrayList<ChannelSettings> channelSettings = settings.channelSettings;
             ArrayList<HiddenNetwork> hiddenNetworks = settings.hiddenNetworks;
@@ -682,7 +682,7 @@ public class WificondControlTest {
             this.mExpectedPnoSettings = expectedPnoSettings;
         }
         @Override
-        public boolean matches(Object argument) {
+        public boolean matchesObject(Object argument) {
             PnoSettings settings = (PnoSettings) argument;
             if (mExpectedPnoSettings == null) {
                 return false;
diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
index 671435f85..e0fb426a0 100644
--- a/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
@@ -66,7 +66,7 @@ import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.Spy;
-import org.mockito.internal.matchers.CapturingMatcher;
+import org.mockito.compat.CapturingMatcher;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -163,7 +163,7 @@ public class WifiScanningServiceTest {
     private static Message verifyHandleMessageAndGetMessage(InOrder order, Handler handler,
             final int what) {
         CapturingMatcher<Message> messageMatcher = new CapturingMatcher<Message>() {
-            public boolean matches(Object argument) {
+            public boolean matchesObject(Object argument) {
                 Message message = (Message) argument;
                 return message.what == what;
             }