Fix unit tests in AOSP Contacts
Fixes: 142947789
Change-Id: I7b36f8066819d59db6a2291160b1713284c14d12
Test: atest ContactsTests
diff --git a/tests/README b/tests/README
index 3829344..43d905c 100644
--- a/tests/README
+++ b/tests/README
@@ -2,6 +2,8 @@
Build and install Contacts.apk
+Grant Contacts permissions to Contacts.apk
+
Run
```shell
$ atest ContactsTests
diff --git a/tests/src/com/android/contacts/activities/SimImportActivityTest.java b/tests/src/com/android/contacts/activities/SimImportActivityTest.java
index 9c90426..7069ef1 100644
--- a/tests/src/com/android/contacts/activities/SimImportActivityTest.java
+++ b/tests/src/com/android/contacts/activities/SimImportActivityTest.java
@@ -327,9 +327,9 @@
mDevice.findObject(By.textContains(targetAccount.name)).click();
mDevice.waitForIdle();
- assertTrue(mDevice.wait(Until.hasObject(By.text("Import One").checked(false).enabled(false)), TIMEOUT));
- assertTrue(mDevice.hasObject(By.text("Import Three").checked(false).enabled(false)));
- assertTrue(mDevice.hasObject(By.text("Import Six").checked(false).enabled(false)));
+ assertTrue(mDevice.wait(Until.hasObject(By.text("Import One").checked(false)), TIMEOUT));
+ assertTrue(mDevice.hasObject(By.text("Import Three").checked(false)));
+ assertTrue(mDevice.hasObject(By.text("Import Six").checked(false)));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
contactsProviderClient.close();
diff --git a/tests/src/com/android/contacts/model/AccountTypeManagerTest.java b/tests/src/com/android/contacts/model/AccountTypeManagerTest.java
index 982517b..dfcb390 100644
--- a/tests/src/com/android/contacts/model/AccountTypeManagerTest.java
+++ b/tests/src/com/android/contacts/model/AccountTypeManagerTest.java
@@ -96,7 +96,7 @@
}
public void testGetDefaultAccount_NoAccounts_DefaultPreferenceSet() {
- when(mPrefs.getString(Mockito.anyString(), Mockito.anyString())).thenReturn(
+ when(mPrefs.getString(Mockito.anyString(), Mockito.any())).thenReturn(
getDefaultAccountPreference("name1", GoogleAccountType.ACCOUNT_TYPE));
assertNull(getDefaultGoogleAccountName());
}
@@ -108,21 +108,21 @@
public void testGetDefaultAccount_DefaultAccountPreferenceSet() {
when(mAccountManager.getAccountsByType(Mockito.anyString())).thenReturn(ACCOUNTS);
- when(mPrefs.getString(Mockito.anyString(), Mockito.anyString())).thenReturn(
+ when(mPrefs.getString(Mockito.anyString(), Mockito.any())).thenReturn(
getDefaultAccountPreference("name2", GoogleAccountType.ACCOUNT_TYPE));
assertEquals("name2", getDefaultGoogleAccountName());
}
public void testGetDefaultAccount_DefaultAccountPreferenceSet_NonGoogleAccountType() {
when(mAccountManager.getAccountsByType(Mockito.anyString())).thenReturn(ACCOUNTS);
- when(mPrefs.getString(Mockito.anyString(), Mockito.anyString())).thenReturn(
+ when(mPrefs.getString(Mockito.anyString(), Mockito.any())).thenReturn(
getDefaultAccountPreference("name3", "type3"));
assertEquals("name1", getDefaultGoogleAccountName());
}
public void testGetDefaultAccount_DefaultAccountPreferenceSet_UnknownName() {
when(mAccountManager.getAccountsByType(Mockito.anyString())).thenReturn(ACCOUNTS);
- when(mPrefs.getString(Mockito.anyString(), Mockito.anyString())).thenReturn(
+ when(mPrefs.getString(Mockito.anyString(), Mockito.any())).thenReturn(
getDefaultAccountPreference("name4",GoogleAccountType.ACCOUNT_TYPE));
assertEquals("name1", getDefaultGoogleAccountName());
}
diff --git a/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java b/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java
index 998f385..d7f34ee 100644
--- a/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java
+++ b/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java
@@ -56,7 +56,7 @@
Mockito.when(mResources.getString(Mockito.anyInt()))
.thenReturn(ACCOUNT_KEY); // contact_editor_default_account_key
- Mockito.when(mContext.getSharedPreferences(Mockito.anyString(), Mockito.anyInt()))
+ Mockito.when(mContext.getSharedPreferences(Mockito.any(), Mockito.anyInt()))
.thenReturn(mSharedPreferences);
Mockito.when(mSharedPreferences.contains(ContactsPreferences.SORT_ORDER_KEY))
.thenReturn(true);
@@ -184,7 +184,7 @@
mContactsPreferences = new ContactsPreferences(mContext,
/* isDefaultAccountUserChangeable */ true);
- Mockito.when(mSharedPreferences.getString(Mockito.eq(ACCOUNT_KEY), Mockito.anyString()))
+ Mockito.when(mSharedPreferences.getString(Mockito.eq(ACCOUNT_KEY), Mockito.any()))
.thenReturn(new AccountWithDataSet("name1", "type1", "dataset1").stringify(),
new AccountWithDataSet("name2", "type2", "dataset2").stringify());
@@ -199,7 +199,7 @@
public void testShouldShowAccountChangedNotificationIfAccountNotSaved() {
mContactsPreferences = new ContactsPreferences(mContext,
/* isDefaultAccountUserChangeable */ true);
- Mockito.when(mSharedPreferences.getString(Mockito.eq(ACCOUNT_KEY), Mockito.anyString()))
+ Mockito.when(mSharedPreferences.getString(Mockito.eq(ACCOUNT_KEY), Mockito.any()))
.thenReturn(null);
assertTrue("Should prompt to change default if no default is saved",
@@ -211,7 +211,7 @@
public void testShouldShowAccountChangedNotification() {
mContactsPreferences = new ContactsPreferences(mContext,
/* isDefaultAccountUserChangeable */ true);
- Mockito.when(mSharedPreferences.getString(Mockito.eq(ACCOUNT_KEY), Mockito.anyString()))
+ Mockito.when(mSharedPreferences.getString(Mockito.eq(ACCOUNT_KEY), Mockito.any()))
.thenReturn(new AccountWithDataSet("name", "type", "dataset").stringify());
assertFalse("Should not prompt to change default if current default exists",
@@ -228,7 +228,7 @@
public void testShouldShowAccountChangedNotificationWhenThereIsOneAccount() {
mContactsPreferences = new ContactsPreferences(mContext,
/* isDefaultAccountUserChangeable */ true);
- Mockito.when(mSharedPreferences.getString(Mockito.eq(ACCOUNT_KEY), Mockito.anyString()))
+ Mockito.when(mSharedPreferences.getString(Mockito.eq(ACCOUNT_KEY), Mockito.any()))
.thenReturn(null);
// Normally we would prompt because there is no default set but if there is just one
diff --git a/tests/src/com/android/contacts/test/mocks/ForwardingContentProvider.java b/tests/src/com/android/contacts/test/mocks/ForwardingContentProvider.java
index 993d0b7..a08bff9 100644
--- a/tests/src/com/android/contacts/test/mocks/ForwardingContentProvider.java
+++ b/tests/src/com/android/contacts/test/mocks/ForwardingContentProvider.java
@@ -23,8 +23,10 @@
import android.content.res.AssetFileDescriptor;
import android.database.Cursor;
import android.net.Uri;
+import android.os.Binder;
import android.os.Bundle;
import android.os.CancellationSignal;
+import android.os.IBinder;
import android.os.ParcelFileDescriptor;
import android.os.RemoteException;
import androidx.annotation.Nullable;
@@ -203,4 +205,8 @@
throw new RuntimeException(e);
}
}
+
+ public IBinder getIContentProviderBinder() {
+ return new Binder();
+ }
}