diff options
Diffstat (limited to 'tests/src/com/android')
33 files changed, 75 insertions, 40 deletions
diff --git a/tests/src/com/android/contacts/ContactsUtilsTests.java b/tests/src/com/android/contacts/ContactsUtilsTests.java index 114ce67dc..7c497ebd1 100644 --- a/tests/src/com/android/contacts/ContactsUtilsTests.java +++ b/tests/src/com/android/contacts/ContactsUtilsTests.java @@ -22,9 +22,10 @@ import android.net.Uri; import android.provider.ContactsContract.CommonDataKinds.Email; import android.provider.ContactsContract.CommonDataKinds.Im; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; import android.util.Pair; +import androidx.test.filters.SmallTest; + import com.android.contacts.model.dataitem.DataItem; import com.android.contacts.model.dataitem.EmailDataItem; import com.android.contacts.model.dataitem.ImDataItem; diff --git a/tests/src/com/android/contacts/DynamicShortcutsTests.java b/tests/src/com/android/contacts/DynamicShortcutsTests.java index 199e2c9f0..8673c5e71 100644 --- a/tests/src/com/android/contacts/DynamicShortcutsTests.java +++ b/tests/src/com/android/contacts/DynamicShortcutsTests.java @@ -38,9 +38,9 @@ import android.provider.ContactsContract; import android.provider.ContactsContract.Contacts; import android.test.AndroidTestCase; import android.test.mock.MockContentResolver; -import android.test.suitebuilder.annotation.SmallTest; import androidx.test.filters.SdkSuppress; +import androidx.test.filters.SmallTest; import com.android.contacts.test.mocks.MockContentProvider; diff --git a/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java b/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java index 4057ee821..179a51edd 100644 --- a/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java +++ b/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java @@ -30,7 +30,8 @@ import android.provider.ContactsContract; import android.provider.ContactsContract.CommonDataKinds.GroupMembership; import android.provider.ContactsContract.Data; import android.test.InstrumentationTestCase; -import android.test.suitebuilder.annotation.MediumTest; + +import androidx.test.filters.MediumTest; import com.android.contacts.model.account.AccountWithDataSet; diff --git a/tests/src/com/android/contacts/MoreContactUtilsTest.java b/tests/src/com/android/contacts/MoreContactUtilsTest.java index 6c9d54132..3639e06b6 100644 --- a/tests/src/com/android/contacts/MoreContactUtilsTest.java +++ b/tests/src/com/android/contacts/MoreContactUtilsTest.java @@ -1,7 +1,8 @@ package com.android.contacts; import android.provider.ContactsContract.CommonDataKinds.Phone; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import junit.framework.TestCase; diff --git a/tests/src/com/android/contacts/activities/PeopleActivityTest.java b/tests/src/com/android/contacts/activities/PeopleActivityTest.java index 4e5796993..3d70f3f54 100644 --- a/tests/src/com/android/contacts/activities/PeopleActivityTest.java +++ b/tests/src/com/android/contacts/activities/PeopleActivityTest.java @@ -25,7 +25,8 @@ import android.provider.ContactsContract.Directory; import android.provider.ContactsContract.Groups; import android.provider.ContactsContract.ProviderStatus; import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.contacts.ContactPhotoManager; import com.android.contacts.ContactsApplication; diff --git a/tests/src/com/android/contacts/compat/CompatUtilsTest.java b/tests/src/com/android/contacts/compat/CompatUtilsTest.java index 22694cb9f..d698ae712 100644 --- a/tests/src/com/android/contacts/compat/CompatUtilsTest.java +++ b/tests/src/com/android/contacts/compat/CompatUtilsTest.java @@ -17,7 +17,8 @@ package com.android.contacts.compat; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; @SmallTest public class CompatUtilsTest extends AndroidTestCase { diff --git a/tests/src/com/android/contacts/database/NoNullCursorAsyncQueryHandlerTest.java b/tests/src/com/android/contacts/database/NoNullCursorAsyncQueryHandlerTest.java index 987882b62..24feb0dc2 100644 --- a/tests/src/com/android/contacts/database/NoNullCursorAsyncQueryHandlerTest.java +++ b/tests/src/com/android/contacts/database/NoNullCursorAsyncQueryHandlerTest.java @@ -21,7 +21,8 @@ import android.net.Uri; import android.test.InstrumentationTestCase; import android.test.mock.MockContentProvider; import android.test.mock.MockContentResolver; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java b/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java index 9eea4d1e1..870f3b536 100644 --- a/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java +++ b/tests/src/com/android/contacts/editor/EditorUiUtilsTest.java @@ -22,7 +22,8 @@ import android.net.Uri; import android.os.Build; import android.provider.Settings; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.contacts.R; import com.android.contacts.model.account.AccountDisplayInfo; diff --git a/tests/src/com/android/contacts/format/FormatUtilsTests.java b/tests/src/com/android/contacts/format/FormatUtilsTests.java index febed74a3..5c2d18090 100644 --- a/tests/src/com/android/contacts/format/FormatUtilsTests.java +++ b/tests/src/com/android/contacts/format/FormatUtilsTests.java @@ -18,7 +18,8 @@ package com.android.contacts.format; import android.database.CharArrayBuffer; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; /** * Test cases for format utility methods. diff --git a/tests/src/com/android/contacts/format/TextHighlighterTest.java b/tests/src/com/android/contacts/format/TextHighlighterTest.java index 211d9440b..670cd0b11 100644 --- a/tests/src/com/android/contacts/format/TextHighlighterTest.java +++ b/tests/src/com/android/contacts/format/TextHighlighterTest.java @@ -17,9 +17,10 @@ package com.android.contacts.format; import android.graphics.Typeface; -import android.test.suitebuilder.annotation.SmallTest; import android.text.SpannableString; +import androidx.test.filters.SmallTest; + import junit.framework.TestCase; /** diff --git a/tests/src/com/android/contacts/group/GroupUtilTest.java b/tests/src/com/android/contacts/group/GroupUtilTest.java index 5f72e9d14..569979f32 100644 --- a/tests/src/com/android/contacts/group/GroupUtilTest.java +++ b/tests/src/com/android/contacts/group/GroupUtilTest.java @@ -20,7 +20,8 @@ import android.os.Bundle; import android.provider.ContactsContract.Contacts; import android.test.AndroidTestCase; import android.test.MoreAsserts; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.contacts.list.ContactsSectionIndexer; diff --git a/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java b/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java index 258b81895..0ad8d6d0b 100644 --- a/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java +++ b/tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java @@ -21,7 +21,8 @@ import android.net.Uri; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Contacts.Entity; import android.test.ActivityInstrumentationTestCase2; -import android.test.suitebuilder.annotation.MediumTest; + +import androidx.test.filters.MediumTest; import com.android.contacts.ContactsApplication; import com.android.contacts.R; diff --git a/tests/src/com/android/contacts/interactions/ContactInteractionUtilTest.java b/tests/src/com/android/contacts/interactions/ContactInteractionUtilTest.java index 654533b63..43efb6faf 100644 --- a/tests/src/com/android/contacts/interactions/ContactInteractionUtilTest.java +++ b/tests/src/com/android/contacts/interactions/ContactInteractionUtilTest.java @@ -16,9 +16,8 @@ package com.android.contacts.interactions; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; -import java.util.Calendar; -import java.util.Locale; + +import androidx.test.filters.SmallTest; /** * Tests for utility functions in {@link ContactInteractionUtil} diff --git a/tests/src/com/android/contacts/list/ContactListItemViewTest.java b/tests/src/com/android/contacts/list/ContactListItemViewTest.java index 09c2f36a7..e36334d8c 100644 --- a/tests/src/com/android/contacts/list/ContactListItemViewTest.java +++ b/tests/src/com/android/contacts/list/ContactListItemViewTest.java @@ -20,9 +20,10 @@ import android.database.Cursor; import android.database.MatrixCursor; import android.test.ActivityInstrumentationTestCase2; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.LargeTest; import android.widget.TextView; +import androidx.test.filters.LargeTest; + import com.android.contacts.format.SpannedTestUtils; import com.android.contacts.preference.ContactsPreferences; 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; diff --git a/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java b/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java index d7f34ee0f..d2fd13e61 100644 --- a/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java +++ b/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java @@ -20,9 +20,9 @@ import android.content.Context; import android.content.SharedPreferences; import android.content.res.Resources; import android.test.InstrumentationTestCase; -import android.test.suitebuilder.annotation.SmallTest; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; import com.android.contacts.model.account.AccountWithDataSet; diff --git a/tests/src/com/android/contacts/util/AccountDisplayInfoFactoryTests.java b/tests/src/com/android/contacts/util/AccountDisplayInfoFactoryTests.java index ca6d16538..be27bcf4e 100644 --- a/tests/src/com/android/contacts/util/AccountDisplayInfoFactoryTests.java +++ b/tests/src/com/android/contacts/util/AccountDisplayInfoFactoryTests.java @@ -20,7 +20,8 @@ import android.graphics.ColorFilter; import android.graphics.PixelFormat; import android.graphics.drawable.Drawable; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.contacts.model.AccountTypeManager; import com.android.contacts.model.account.AccountDisplayInfo; diff --git a/tests/src/com/android/contacts/util/BitmapUtilTests.java b/tests/src/com/android/contacts/util/BitmapUtilTests.java index ee7ebc06e..ffbc17046 100644 --- a/tests/src/com/android/contacts/util/BitmapUtilTests.java +++ b/tests/src/com/android/contacts/util/BitmapUtilTests.java @@ -18,7 +18,8 @@ package com.android.contacts.util; import android.graphics.Bitmap; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java b/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java index 150321505..3f4dc6caa 100644 --- a/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java +++ b/tests/src/com/android/contacts/util/ContactDisplayUtilTests.java @@ -19,7 +19,8 @@ package com.android.contacts.util; import static android.provider.ContactsContract.CommonDataKinds.Phone; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.contacts.R; import com.android.contacts.preference.ContactsPreferences; diff --git a/tests/src/com/android/contacts/util/ContactPhotoUtilsTest.java b/tests/src/com/android/contacts/util/ContactPhotoUtilsTest.java index d17b98c2d..8a01c3142 100644 --- a/tests/src/com/android/contacts/util/ContactPhotoUtilsTest.java +++ b/tests/src/com/android/contacts/util/ContactPhotoUtilsTest.java @@ -2,7 +2,8 @@ package com.android.contacts.util; import android.net.Uri; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; /** * Test cases for {@link ContactPhotoUtils}. diff --git a/tests/src/com/android/contacts/util/SearchUtilTest.java b/tests/src/com/android/contacts/util/SearchUtilTest.java index e2156ca80..f957a6a56 100644 --- a/tests/src/com/android/contacts/util/SearchUtilTest.java +++ b/tests/src/com/android/contacts/util/SearchUtilTest.java @@ -16,7 +16,7 @@ package com.android.contacts.util; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; import junit.framework.TestCase; diff --git a/tests/src/com/android/contacts/util/SyncUtilTests.java b/tests/src/com/android/contacts/util/SyncUtilTests.java index 508ff04a0..b8c8dae5c 100644 --- a/tests/src/com/android/contacts/util/SyncUtilTests.java +++ b/tests/src/com/android/contacts/util/SyncUtilTests.java @@ -17,7 +17,8 @@ package com.android.contacts.util; import android.accounts.Account; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; /** * Tests for SyncUtil. diff --git a/tests/src/com/android/contacts/widget/CompositeListAdapterTest.java b/tests/src/com/android/contacts/widget/CompositeListAdapterTest.java index a46a17c6b..306aa45e1 100644 --- a/tests/src/com/android/contacts/widget/CompositeListAdapterTest.java +++ b/tests/src/com/android/contacts/widget/CompositeListAdapterTest.java @@ -18,11 +18,12 @@ package com.android.contacts.widget; import android.content.Context; import android.database.DataSetObserver; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; +import androidx.test.filters.SmallTest; + import com.google.common.collect.Lists; import java.util.ArrayList; |