filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

packages/apps/Messaging: remove deprecated Mockito usages

Browse Source 
Test: m checkbuild
Flag: TEST_ONLY
Change-Id: I9e62dd82bfbf00b13dce8210574bf146eea191f0
This commit is contained in:
Adrian Roos
2025-02-25 15:37:37 +01:00
parent b0f8c82e37
commit 29980d714f
10 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/src/com/android/messaging/FakeFactory.java
View File

@@ -40,7 +40,7 @@ import com.android.messaging.util.MediaUtil;
import com.android.messaging.util.OsUtil;
import com.android.messaging.util.PhoneUtils;
import org.mockito.Matchers;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
@@ -86,7 +86,7 @@ public class FakeFactory extends Factory {
ApnDatabase.initializeAppContext(context);
Mockito.when(factory.mPhoneUtils.getCanonicalBySystemLocale(Matchers.anyString()))
Mockito.when(factory.mPhoneUtils.getCanonicalBySystemLocale(ArgumentMatchers.anyString()))
.thenAnswer(new Answer<String>() {
@Override
public String answer(final InvocationOnMock invocation) throws Throwable {
@@ -95,7 +95,7 @@ public class FakeFactory extends Factory {
}
}
);
Mockito.when(factory.mPhoneUtils.getCanonicalBySimLocale(Matchers.anyString())).thenAnswer(
Mockito.when(factory.mPhoneUtils.getCanonicalBySimLocale(ArgumentMatchers.anyString())).thenAnswer(
new Answer<String>() {
@Override
public String answer(final InvocationOnMock invocation) throws Throwable {
@@ -104,7 +104,7 @@ public class FakeFactory extends Factory {
}
}
);
Mockito.when(factory.mPhoneUtils.formatForDisplay(Matchers.anyString())).thenAnswer(
Mockito.when(factory.mPhoneUtils.formatForDisplay(ArgumentMatchers.anyString())).thenAnswer(
new Answer<String>() {
@Override
public String answer(final InvocationOnMock invocation) throws Throwable {