diff options
| author | 2024-03-06 00:52:31 +0000 | |
|---|---|---|
| committer | 2024-03-06 00:52:31 +0000 | |
| commit | c25739091a645b4bd9393269e85e51bb553951a6 (patch) | |
| tree | af712b54bd960b0b32529b3702e1a43c98cb1637 | |
| parent | 761c9a29b1623815592efbfda76e804df956d02d (diff) | |
| parent | 729b91d11c5213cb5f440c63f24925cd55e54dbd (diff) | |
Merge "Use ArgumentMatchers to replace deprecated org.mockito.Matchers" into main am: 729b91d11c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2984754
Change-Id: Iaf4b18ca2c02842025528ef19a15ae174da9a2f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/tests/VpnTests/java/android/net/VpnManagerTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/tests/VpnTests/java/android/net/VpnManagerTest.java b/services/tests/VpnTests/java/android/net/VpnManagerTest.java index 0d55102b07b2..365b4d1c25f8 100644 --- a/services/tests/VpnTests/java/android/net/VpnManagerTest.java +++ b/services/tests/VpnTests/java/android/net/VpnManagerTest.java @@ -20,8 +20,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assume.assumeFalse; -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.verify; import static org.mockito.Mockito.when; |