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

Commit cdf5814b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "frameworks/opt/telephony: remove deprecated Mockito usages" into main

parents 188ba24a 8e734d7b

tests/telephonytests/src/android/telephony/ims/ImsFeatureTest.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.telephony.ims; 
import static junit.framework.Assert.assertEquals;

import static junit.framework.Assert.assertTrue;



import static org.mockito.Matchers.eq;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.verify;

tests/telephonytests/src/android/telephony/ims/ImsServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import static junit.framework.Assert.assertTrue; 
import static junit.framework.Assert.fail;



import static org.junit.Assert.assertNotNull;

import static org.mockito.Matchers.eq;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.times;

tests/telephonytests/src/android/telephony/ims/SipTransportImplBaseTest.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import static junit.framework.Assert.assertTrue; 


import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyList;

import static org.mockito.Matchers.eq;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

tests/telephonytests/src/com/android/internal/telephony/CallManagerTest.java

+5 −5
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ package com.android.internal.telephony; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.mockito.Matchers.anyBoolean;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.eq;

import static org.mockito.Matchers.isA;

import static org.mockito.Matchers.isNull;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.isA;

import static org.mockito.ArgumentMatchers.isNull;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.anyChar;

import static org.mockito.Mockito.anyString;

tests/telephonytests/src/com/android/internal/telephony/CarrierActionAgentTest.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
package com.android.internal.telephony;



import static org.junit.Assert.assertEquals;

import static org.mockito.Matchers.anyLong;

import static org.mockito.ArgumentMatchers.anyLong;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.times;