diff options
Diffstat (limited to 'tests/src/com/android/contacts/model')
11 files changed, 34 insertions, 16 deletions
diff --git a/tests/src/com/android/contacts/model/AccountTypeManagerTest.java b/tests/src/com/android/contacts/model/AccountTypeManagerTest.java index dfcb3909f..1ccfd823b 100644 --- a/tests/src/com/android/contacts/model/AccountTypeManagerTest.java +++ b/tests/src/com/android/contacts/model/AccountTypeManagerTest.java @@ -16,16 +16,20 @@ package com.android.contacts.model; +import static org.mockito.Mockito.when; + import android.accounts.Account; import android.accounts.AccountManager; import android.content.SharedPreferences; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.contacts.model.account.AccountType; import com.android.contacts.model.account.AccountTypeWithDataSet; import com.android.contacts.model.account.AccountWithDataSet; import com.android.contacts.model.account.GoogleAccountType; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -38,8 +42,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.mockito.Mockito.when; - /** * Test case for {@link com.android.contacts.model.AccountTypeManager}. * diff --git a/tests/src/com/android/contacts/model/AccountWithDataSetTest.java b/tests/src/com/android/contacts/model/AccountWithDataSetTest.java index 7d6dfa397..6cac27435 100644 --- a/tests/src/com/android/contacts/model/AccountWithDataSetTest.java +++ b/tests/src/com/android/contacts/model/AccountWithDataSetTest.java @@ -19,7 +19,8 @@ package com.android.contacts.model; import android.os.Bundle; import android.test.AndroidTestCase; import android.test.MoreAsserts; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.contacts.model.account.AccountWithDataSet; diff --git a/tests/src/com/android/contacts/model/ContactLoaderTest.java b/tests/src/com/android/contacts/model/ContactLoaderTest.java index 8aa078b1e..37a33d868 100644 --- a/tests/src/com/android/contacts/model/ContactLoaderTest.java +++ b/tests/src/com/android/contacts/model/ContactLoaderTest.java @@ -27,7 +27,9 @@ import android.provider.ContactsContract.DisplayNameSources; import android.provider.ContactsContract.RawContacts; import android.provider.ContactsContract.StatusUpdates; import android.test.LoaderTestCase; -import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.filters.LargeTest; + import com.android.contacts.compat.CompatUtils; import com.android.contacts.model.account.AccountType; import com.android.contacts.model.account.AccountWithDataSet; @@ -37,11 +39,14 @@ import com.android.contacts.test.mocks.MockAccountTypeManager; import com.android.contacts.test.mocks.MockContentProvider; import com.android.contacts.testing.InjectedServices; import com.android.contacts.util.Constants; + import com.google.common.collect.Lists; -import java.util.List; + import org.json.JSONException; import org.json.JSONObject; +import java.util.List; + /** * Runs ContactLoader tests for the the contact-detail and editor view. */ diff --git a/tests/src/com/android/contacts/model/RawContactDeltaListTests.java b/tests/src/com/android/contacts/model/RawContactDeltaListTests.java index d9ff184c0..9853870cb 100644 --- a/tests/src/com/android/contacts/model/RawContactDeltaListTests.java +++ b/tests/src/com/android/contacts/model/RawContactDeltaListTests.java @@ -29,7 +29,8 @@ import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.Data; import android.provider.ContactsContract.RawContacts; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.filters.LargeTest; import com.android.contacts.compat.CompatUtils; import com.android.contacts.model.account.AccountType; diff --git a/tests/src/com/android/contacts/model/RawContactDeltaTests.java b/tests/src/com/android/contacts/model/RawContactDeltaTests.java index f5d4181d6..4c2c17483 100644 --- a/tests/src/com/android/contacts/model/RawContactDeltaTests.java +++ b/tests/src/com/android/contacts/model/RawContactDeltaTests.java @@ -25,7 +25,8 @@ import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.Data; import android.provider.ContactsContract.RawContacts; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.filters.LargeTest; import com.android.contacts.compat.CompatUtils; diff --git a/tests/src/com/android/contacts/model/RawContactModifierTests.java b/tests/src/com/android/contacts/model/RawContactModifierTests.java index 594bb443f..3cf1224bc 100644 --- a/tests/src/com/android/contacts/model/RawContactModifierTests.java +++ b/tests/src/com/android/contacts/model/RawContactModifierTests.java @@ -30,7 +30,8 @@ import android.provider.ContactsContract.Data; import android.provider.ContactsContract.Intents.Insert; import android.provider.ContactsContract.RawContacts; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.LargeTest; + +import androidx.test.filters.LargeTest; import com.android.contacts.R; import com.android.contacts.compat.CompatUtils; diff --git a/tests/src/com/android/contacts/model/RawContactTest.java b/tests/src/com/android/contacts/model/RawContactTest.java index d9f05c9ac..9af655c14 100644 --- a/tests/src/com/android/contacts/model/RawContactTest.java +++ b/tests/src/com/android/contacts/model/RawContactTest.java @@ -20,7 +20,8 @@ import android.content.ContentValues; import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import junit.framework.TestCase; diff --git a/tests/src/com/android/contacts/model/ValuesDeltaTests.java b/tests/src/com/android/contacts/model/ValuesDeltaTests.java index b7161d785..f8febd7d3 100644 --- a/tests/src/com/android/contacts/model/ValuesDeltaTests.java +++ b/tests/src/com/android/contacts/model/ValuesDeltaTests.java @@ -21,7 +21,8 @@ import android.content.ContentValues; import android.os.Build; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.Data; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.contacts.compat.CompatUtils; diff --git a/tests/src/com/android/contacts/model/account/AccountTypeTest.java b/tests/src/com/android/contacts/model/account/AccountTypeTest.java index 7c74b21b6..b9a11ee1a 100644 --- a/tests/src/com/android/contacts/model/account/AccountTypeTest.java +++ b/tests/src/com/android/contacts/model/account/AccountTypeTest.java @@ -18,7 +18,8 @@ package com.android.contacts.model.account; import android.content.Context; import android.test.InstrumentationTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.contacts.tests.R; diff --git a/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java b/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java index 17d815eaa..71b01f344 100644 --- a/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java +++ b/tests/src/com/android/contacts/model/account/ExternalAccountTypeTest.java @@ -29,11 +29,12 @@ import android.provider.ContactsContract.CommonDataKinds.StructuredName; import android.provider.ContactsContract.CommonDataKinds.StructuredPostal; import android.provider.ContactsContract.CommonDataKinds.Website; import android.test.InstrumentationTestCase; -import android.test.suitebuilder.annotation.SmallTest; -import android.test.suitebuilder.annotation.Suppress; -import com.android.contacts.tests.R; +import androidx.test.filters.SmallTest; +import androidx.test.filters.Suppress; + import com.android.contacts.model.dataitem.DataKind; +import com.android.contacts.tests.R; import com.google.common.base.Objects; diff --git a/tests/src/com/android/contacts/model/dataitem/DataItemTests.java b/tests/src/com/android/contacts/model/dataitem/DataItemTests.java index 4b76d0c5d..f169e29d9 100644 --- a/tests/src/com/android/contacts/model/dataitem/DataItemTests.java +++ b/tests/src/com/android/contacts/model/dataitem/DataItemTests.java @@ -30,11 +30,14 @@ import android.provider.ContactsContract.CommonDataKinds.StructuredPostal; import android.provider.ContactsContract.CommonDataKinds.Website; import android.provider.ContactsContract.Contacts.Data; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; + import com.android.contacts.Collapser; import com.android.contacts.model.account.AccountType.EditType; import com.android.contacts.model.account.BaseAccountType; import com.android.contacts.model.account.GoogleAccountType; + import java.util.ArrayList; import java.util.List; |