Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2573909 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Use ArgumentMatchers to replace deprecated org.mockito.Matchers" into main am: 729b91d1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2984754



Change-Id: Iaf4b18ca2c02842025528ef19a15ae174da9a2f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 761c9a29 729b91d1

services/tests/VpnTests/java/android/net/VpnManagerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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;