Keep alive improvements am: 5c964bbdc7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/IPsec/+/3530097
Change-Id: I3b6bf71e50669ab34ac9cd896a7e89d7cf813321
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/tests/iketests/src/java/com/android/internal/net/TestUtils.java b/tests/iketests/src/java/com/android/internal/net/TestUtils.java
index ae6731a..7c9684d 100644
--- a/tests/iketests/src/java/com/android/internal/net/TestUtils.java
+++ b/tests/iketests/src/java/com/android/internal/net/TestUtils.java
@@ -16,8 +16,8 @@
package com.android.internal.net;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
@@ -82,7 +82,7 @@
throw (Throwable) invocation.getArguments()[2];
})
.when(spyLog)
- .wtf(anyString(), anyString(), anyObject());
+ .wtf(anyString(), anyString(), any());
return spyLog;
}
@@ -109,7 +109,7 @@
return null;
})
.when(spyLog)
- .wtf(anyString(), anyString(), anyObject());
+ .wtf(anyString(), anyString(), any());
return spyLog;
}
diff --git a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/ChildSessionStateMachineTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/ChildSessionStateMachineTest.java
index e063e17..6bd7a44 100644
--- a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/ChildSessionStateMachineTest.java
+++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/ChildSessionStateMachineTest.java
@@ -52,13 +52,12 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
@@ -341,7 +340,7 @@
private void setUpSpiResource(InetAddress address, int spiRequested) throws Exception {
when(mMockIpSecService.allocateSecurityParameterIndex(
- eq(address.getHostAddress()), anyInt(), anyObject()))
+ eq(address.getHostAddress()), anyInt(), any()))
.thenReturn(MockIpSecTestUtils.buildDummyIpSecSpiResponse(spiRequested));
}
@@ -1984,7 +1983,7 @@
// Verify no response sent.
verify(mMockChildSessionSmCallback, never())
- .onOutboundPayloadsReady(anyInt(), anyBoolean(), any(List.class), anyObject());
+ .onOutboundPayloadsReady(anyInt(), anyBoolean(), any(List.class), any());
// Verify Child SA has been renewed
verifyChildSaUpdated(mSpyCurrentChildSaRecord, mSpyRemoteInitNewChildSaRecord);
diff --git a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeLocalRequestSchedulerTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeLocalRequestSchedulerTest.java
index e7ae658..6020495 100644
--- a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeLocalRequestSchedulerTest.java
+++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeLocalRequestSchedulerTest.java
@@ -24,7 +24,7 @@
import static com.android.internal.net.ipsec.test.ike.IkeSessionStateMachine.CMD_LOCAL_REQUEST_MOBIKE;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.anyString;
diff --git a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSessionStateMachineTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSessionStateMachineTest.java
index 7674bdd..7fd36d2 100644
--- a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSessionStateMachineTest.java
+++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSessionStateMachineTest.java
@@ -92,14 +92,13 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
@@ -1474,8 +1473,8 @@
private IkeMessage verifyEncryptAndEncodeAndGetMessage(IkeSaRecord ikeSaRecord) {
verify(mMockIkeMessageHelper)
.encryptAndEncode(
- anyObject(),
- anyObject(),
+ any(),
+ any(),
eq(ikeSaRecord),
mIkeMessageCaptor.capture(),
anyBoolean(),
@@ -1486,8 +1485,8 @@
private void verifyEncryptAndEncodeNeverCalled(IkeSaRecord ikeSaRecord) {
verify(mMockIkeMessageHelper, never())
.encryptAndEncode(
- anyObject(),
- anyObject(),
+ any(),
+ any(),
eq(ikeSaRecord),
any(IkeMessage.class),
anyBoolean(),
@@ -1497,8 +1496,8 @@
private void verifyEncryptAndEncodeNeverCalled() {
verify(mMockIkeMessageHelper, never())
.encryptAndEncode(
- anyObject(),
- anyObject(),
+ any(),
+ any(),
any(IkeSaRecord.class),
any(IkeMessage.class),
anyBoolean(),
@@ -3286,8 +3285,8 @@
private void verifyEmptyInformationalSent(int count, boolean expectedResp) {
verify(mMockIkeMessageHelper, times(count))
.encryptAndEncode(
- anyObject(),
- anyObject(),
+ any(),
+ any(),
eq(mSpyCurrentIkeSaRecord),
argThat(
msg -> {
@@ -3724,8 +3723,8 @@
verify(mMockIkeMessageHelper, times(2))
.encryptAndEncode(
- anyObject(),
- anyObject(),
+ any(),
+ any(),
eq(mSpyCurrentIkeSaRecord),
mIkeMessageCaptor.capture(),
anyBoolean(),
@@ -4762,7 +4761,7 @@
mLooper.dispatchAll();
// Verify no request received, or response sent.
- verify(mMockIkeMessageHelper, never()).decode(anyInt(), anyObject(), anyObject());
+ verify(mMockIkeMessageHelper, never()).decode(anyInt(), any(), any());
verifyEncryptAndEncodeNeverCalled(mSpyCurrentIkeSaRecord);
// Verify final state has not changed - signal was not sent.
@@ -4786,7 +4785,7 @@
mLooper.dispatchAll();
// Verify no request received, or response sent.
- verify(mMockIkeMessageHelper, never()).decode(anyInt(), anyObject(), anyObject());
+ verify(mMockIkeMessageHelper, never()).decode(anyInt(), any(), any());
verifyEncryptAndEncodeNeverCalled(mSpyCurrentIkeSaRecord);
// Verify final state - Idle, with new SA, and old SA closed.
@@ -7576,8 +7575,8 @@
// Verify that message is EXCHANGE_TYPE_CREATE_CHILD_SA.
verify(mMockIkeMessageHelper, times(1))
.encryptAndEncode(
- anyObject(),
- anyObject(),
+ any(),
+ any(),
eq(mSpyCurrentIkeSaRecord),
mIkeMessageCaptor.capture(),
anyBoolean(),
@@ -7629,8 +7628,8 @@
// Verify that message is EXCHANGE_TYPE_INFORMATIONAL.
verify(mMockIkeMessageHelper, times(2))
.encryptAndEncode(
- anyObject(),
- anyObject(),
+ any(),
+ any(),
eq(mSpyCurrentIkeSaRecord),
mIkeMessageCaptor.capture(),
anyBoolean(),
diff --git a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSessionTestBase.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSessionTestBase.java
index bcfff00..a7e9602 100644
--- a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSessionTestBase.java
+++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSessionTestBase.java
@@ -22,9 +22,9 @@
import static com.android.internal.net.ipsec.test.ike.IkeSocket.SERVER_PORT_UDP_ENCAPSULATED;
import static org.mockito.ArgumentMatchers.argThat;
-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.any;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.doAnswer;
diff --git a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeUdpEncapSocketTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeUdpEncapSocketTest.java
index 62028c9..b12d91a 100644
--- a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeUdpEncapSocketTest.java
+++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeUdpEncapSocketTest.java
@@ -20,7 +20,6 @@
import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyObject;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -91,11 +90,11 @@
IpSecManager dummyIpSecManager = mockIpSecTestUtils.getIpSecManager();
IpSecService ipSecService = mockIpSecTestUtils.getIpSecService();
- when(ipSecService.openUdpEncapsulationSocket(anyInt(), anyObject()))
+ when(ipSecService.openUdpEncapsulationSocket(anyInt(), any()))
.thenReturn(MockIpSecTestUtils.buildDummyIpSecUdpEncapResponse(12345));
mSpyDummyUdpEncapSocketOne = spy(dummyIpSecManager.openUdpEncapsulationSocket());
- when(ipSecService.openUdpEncapsulationSocket(anyInt(), anyObject()))
+ when(ipSecService.openUdpEncapsulationSocket(anyInt(), any()))
.thenReturn(MockIpSecTestUtils.buildDummyIpSecUdpEncapResponse(23456));
mSpyDummyUdpEncapSocketTwo = spy(dummyIpSecManager.openUdpEncapsulationSocket());
diff --git a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/SaRecordTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/SaRecordTest.java
index 344b53d..748b9c6 100644
--- a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/SaRecordTest.java
+++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/SaRecordTest.java
@@ -23,10 +23,10 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.AdditionalMatchers.aryEq;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -245,10 +245,10 @@
Context context = mockIpSecTestUtils.getContext();
when(mockIpSecService.allocateSecurityParameterIndex(
- eq(LOCAL_ADDRESS.getHostAddress()), anyInt(), anyObject()))
+ eq(LOCAL_ADDRESS.getHostAddress()), anyInt(), any()))
.thenReturn(MockIpSecTestUtils.buildDummyIpSecSpiResponse(FIRST_CHILD_INIT_SPI));
when(mockIpSecService.allocateSecurityParameterIndex(
- eq(REMOTE_ADDRESS.getHostAddress()), anyInt(), anyObject()))
+ eq(REMOTE_ADDRESS.getHostAddress()), anyInt(), any()))
.thenReturn(MockIpSecTestUtils.buildDummyIpSecSpiResponse(FIRST_CHILD_RESP_SPI));
SecurityParameterIndex childInitSpi =
diff --git a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/keepalive/IkeNattKeepaliveTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/keepalive/IkeNattKeepaliveTest.java
index 4915bd2..eba0cbc 100644
--- a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/keepalive/IkeNattKeepaliveTest.java
+++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/keepalive/IkeNattKeepaliveTest.java
@@ -24,9 +24,8 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -122,12 +121,12 @@
doReturn(mMockSocketKeepalive)
.when(mMockConnectManager)
.createSocketKeepalive(
- anyObject(),
- anyObject(),
- anyObject(),
- anyObject(),
- anyObject(),
- anyObject());
+ any(),
+ any(),
+ any(),
+ any(),
+ any(),
+ any());
}
private void resetMockDeps(
@@ -135,10 +134,10 @@
reset(mMockDeps);
doReturn(softwareKeepalive)
.when(mMockDeps)
- .createSoftwareKeepaliveImpl(anyObject(), anyObject(), anyObject(), anyObject());
+ .createSoftwareKeepaliveImpl(any(), any(), any(), any());
doReturn(hardwareKeepalive)
.when(mMockDeps)
- .createHardwareKeepaliveImpl(anyObject(), anyObject(), anyObject(), anyObject());
+ .createHardwareKeepaliveImpl(any(), any(), any(), any());
}
private IkeNattKeepalive createIkeNattKeepalive() throws Exception {
@@ -150,7 +149,7 @@
reset(mMockDeps);
doReturn(mMockSoftwareKeepalive)
.when(mMockDeps)
- .createSoftwareKeepaliveImpl(anyObject(), anyObject(), anyObject(), anyObject());
+ .createSoftwareKeepaliveImpl(any(), any(), any(), any());
return createIkeNattKeepalive();
}
@@ -218,11 +217,11 @@
verify(mockConnectManager)
.createSocketKeepalive(
- anyObject(),
- anyObject(),
- anyObject(),
- anyObject(),
- anyObject(),
+ any(),
+ any(),
+ any(),
+ any(),
+ any(),
socketKeepaliveCbCaptor.capture());
return socketKeepaliveCbCaptor.getValue();
diff --git a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeConfigPayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeConfigPayloadTest.java
index 21f0f12..0322994 100644
--- a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeConfigPayloadTest.java
+++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeConfigPayloadTest.java
@@ -38,7 +38,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
diff --git a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeMessageTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeMessageTest.java
index 1b917c7..bf2bcbf 100644
--- a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeMessageTest.java
+++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeMessageTest.java
@@ -31,10 +31,10 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.eq;
diff --git a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeSaPayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeSaPayloadTest.java
index 4ddba3f..9f6d497 100644
--- a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeSaPayloadTest.java
+++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeSaPayloadTest.java
@@ -34,10 +34,9 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
-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.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -252,12 +251,12 @@
IpSecService mMockIpSecService = mMockIpSecTestUtils.getIpSecService();
when(mMockIpSecService.allocateSecurityParameterIndex(
- eq(LOCAL_ADDRESS.getHostAddress()), anyInt(), anyObject()))
+ eq(LOCAL_ADDRESS.getHostAddress()), anyInt(), any()))
.thenReturn(MockIpSecTestUtils.buildDummyIpSecSpiResponse(CHILD_SPI_LOCAL_ONE))
.thenReturn(MockIpSecTestUtils.buildDummyIpSecSpiResponse(CHILD_SPI_LOCAL_TWO));
when(mMockIpSecService.allocateSecurityParameterIndex(
- eq(REMOTE_ADDRESS.getHostAddress()), anyInt(), anyObject()))
+ eq(REMOTE_ADDRESS.getHostAddress()), anyInt(), any()))
.thenReturn(MockIpSecTestUtils.buildDummyIpSecSpiResponse(CHILD_SPI_REMOTE));
mIkeSpiGenerator = new IkeSpiGenerator(createMockRandomFactory());
diff --git a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeSkfPayloadTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeSkfPayloadTest.java
index 5abb6f5..9a759fa 100644
--- a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeSkfPayloadTest.java
+++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/message/IkeSkfPayloadTest.java
@@ -19,7 +19,7 @@
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
diff --git a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallbackTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallbackTest.java
index 0bf7d24..2297771 100644
--- a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallbackTest.java
+++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallbackTest.java
@@ -16,8 +16,8 @@
package com.android.internal.net.ipsec.test.ike.net;
-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.never;
import static org.mockito.Mockito.spy;
diff --git a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/testutils/MockIpSecTestUtils.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/testutils/MockIpSecTestUtils.java
index f6fee18..4662bd4 100644
--- a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/testutils/MockIpSecTestUtils.java
+++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/testutils/MockIpSecTestUtils.java
@@ -20,9 +20,9 @@
import static android.system.OsConstants.IPPROTO_UDP;
import static android.system.OsConstants.SOCK_DGRAM;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -53,14 +53,14 @@
mContext = InstrumentationRegistry.getContext();
mIpSecManager = new IpSecManager(mContext, mMockIpSecService);
- when(mMockIpSecService.allocateSecurityParameterIndex(anyString(), anyInt(), anyObject()))
+ when(mMockIpSecService.allocateSecurityParameterIndex(anyString(), anyInt(), any()))
.thenReturn(
new IpSecSpiResponse(
IpSecManager.Status.OK,
DUMMY_CHILD_SPI_RESOURCE_ID,
DUMMY_CHILD_SPI));
- when(mMockIpSecService.openUdpEncapsulationSocket(anyInt(), anyObject()))
+ when(mMockIpSecService.openUdpEncapsulationSocket(anyInt(), any()))
.thenReturn(
new IpSecUdpEncapResponse(
IpSecManager.Status.OK,
diff --git a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/utils/RetransmitterTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/utils/RetransmitterTest.java
index 95ced5f..7a63862 100644
--- a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/utils/RetransmitterTest.java
+++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/utils/RetransmitterTest.java
@@ -21,9 +21,8 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -69,7 +68,7 @@
mMockHandler = mock(Handler.class);
Message mockMessage = mock(Message.class);
- doReturn(mockMessage).when(mMockHandler).obtainMessage(eq(CMD_RETRANSMIT), anyObject());
+ doReturn(mockMessage).when(mMockHandler).obtainMessage(eq(CMD_RETRANSMIT), any());
mMockIkeMessage = mock(IkeMessage.class);
mRetransmitter =
