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

Commit e656fba0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "packages/apps/Contacts: remove deprecated Mockito usages" into main am:... 

Merge "packages/apps/Contacts: remove deprecated Mockito usages" into main am: dafeddf7 am: ad859791

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/3506155



Change-Id: Ibc4f0f45ba5e4395a8a9ce1548ea1a98d3494157
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c9ebcfb2 ad859791

tests/src/com/android/contacts/DynamicShortcutsTests.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -17,8 +17,8 @@ package com.android.contacts; 




import static org.hamcrest.MatcherAssert.assertThat;

import static org.hamcrest.MatcherAssert.assertThat;

import static org.hamcrest.Matchers.equalTo;

import static org.hamcrest.Matchers.equalTo;

import static org.mockito.Matchers.anyString;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.when;

tests/src/com/android/contacts/activities/SimImportActivityTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ import static com.android.contacts.tests.ContactsMatchers.hasValueForColumn; 
import static org.hamcrest.MatcherAssert.assertThat;

import static org.hamcrest.MatcherAssert.assertThat;

import static org.hamcrest.Matchers.allOf;

import static org.hamcrest.Matchers.allOf;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.assertTrue;

import static org.mockito.Matchers.anyInt;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.spy;

tests/src/com/android/contacts/database/SimContactDaoTests.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -26,8 +26,8 @@ import static org.hamcrest.Matchers.allOf; 
import static org.hamcrest.Matchers.equalTo;

import static org.hamcrest.Matchers.equalTo;

import static org.junit.Assert.assertThat;

import static org.junit.Assert.assertThat;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.assertTrue;

import static org.mockito.Matchers.any;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Matchers.anyString;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.when;