diff --git a/tests/Android.bp b/tests/Android.bp index d4f964b..b9b02b5 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -29,7 +29,10 @@ android_test { sdk_version: "current", test_suites: ["general-tests"], certificate: "platform", - static_libs: ["mockito-target"], + static_libs: [ + "mockito-target", + "androidx.test.rules", + ], libs: [ "android.test.mock.stubs", "android.test.runner.stubs", diff --git a/tests/src/com/android/messaging/datamodel/BindingTest.java b/tests/src/com/android/messaging/datamodel/BindingTest.java index 9205657..6052ed1 100644 --- a/tests/src/com/android/messaging/datamodel/BindingTest.java +++ b/tests/src/com/android/messaging/datamodel/BindingTest.java @@ -16,7 +16,7 @@ package com.android.messaging.datamodel; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; import com.android.messaging.BugleTestCase; import com.android.messaging.datamodel.binding.BindableData; diff --git a/tests/src/com/android/messaging/datamodel/BitmapPoolTest.java b/tests/src/com/android/messaging/datamodel/BitmapPoolTest.java index 6d0aaa3..c7bb3d9 100644 --- a/tests/src/com/android/messaging/datamodel/BitmapPoolTest.java +++ b/tests/src/com/android/messaging/datamodel/BitmapPoolTest.java @@ -19,7 +19,8 @@ package com.android.messaging.datamodel; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.messaging.BugleTestCase; import com.android.messaging.FakeFactory; diff --git a/tests/src/com/android/messaging/datamodel/ConversationListTest.java b/tests/src/com/android/messaging/datamodel/ConversationListTest.java index f45696b..b9ef5d0 100644 --- a/tests/src/com/android/messaging/datamodel/ConversationListTest.java +++ b/tests/src/com/android/messaging/datamodel/ConversationListTest.java @@ -16,7 +16,7 @@ package com.android.messaging.datamodel; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; import com.android.messaging.BugleTestCase; diff --git a/tests/src/com/android/messaging/datamodel/DataModelTest.java b/tests/src/com/android/messaging/datamodel/DataModelTest.java index 0a1bccd..701f053 100644 --- a/tests/src/com/android/messaging/datamodel/DataModelTest.java +++ b/tests/src/com/android/messaging/datamodel/DataModelTest.java @@ -16,13 +16,13 @@ package com.android.messaging.datamodel; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; import com.android.messaging.BugleTestCase; import com.android.messaging.FakeFactory; import com.android.messaging.datamodel.data.ConversationData; -import com.android.messaging.datamodel.data.ConversationListData; import com.android.messaging.datamodel.data.ConversationData.ConversationDataListener; +import com.android.messaging.datamodel.data.ConversationListData; import com.android.messaging.datamodel.data.ConversationListData.ConversationListDataListener; import org.mockito.Mock; diff --git a/tests/src/com/android/messaging/datamodel/FrequentContactsCursorBuilderTest.java b/tests/src/com/android/messaging/datamodel/FrequentContactsCursorBuilderTest.java index 6b78a07..afa95bb 100644 --- a/tests/src/com/android/messaging/datamodel/FrequentContactsCursorBuilderTest.java +++ b/tests/src/com/android/messaging/datamodel/FrequentContactsCursorBuilderTest.java @@ -16,7 +16,8 @@ package com.android.messaging.datamodel; import android.database.Cursor; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.messaging.BugleTestCase; import com.android.messaging.datamodel.data.TestDataFactory; diff --git a/tests/src/com/android/messaging/datamodel/MemoryCacheManagerTest.java b/tests/src/com/android/messaging/datamodel/MemoryCacheManagerTest.java index 5da9e27..a4d8849 100644 --- a/tests/src/com/android/messaging/datamodel/MemoryCacheManagerTest.java +++ b/tests/src/com/android/messaging/datamodel/MemoryCacheManagerTest.java @@ -17,7 +17,8 @@ package com.android.messaging.datamodel; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.messaging.datamodel.MemoryCacheManager.MemoryCache; diff --git a/tests/src/com/android/messaging/datamodel/ParticipantRefreshTest.java b/tests/src/com/android/messaging/datamodel/ParticipantRefreshTest.java index d585e10..c0d5c0a 100644 --- a/tests/src/com/android/messaging/datamodel/ParticipantRefreshTest.java +++ b/tests/src/com/android/messaging/datamodel/ParticipantRefreshTest.java @@ -20,9 +20,10 @@ import android.content.ContentProvider; import android.content.ContentValues; import android.database.Cursor; import android.net.Uri; -import android.test.suitebuilder.annotation.SmallTest; import android.text.TextUtils; +import androidx.test.filters.SmallTest; + import com.android.messaging.BugleTestCase; import com.android.messaging.FakeContentProvider; import com.android.messaging.FakeContext; diff --git a/tests/src/com/android/messaging/datamodel/action/ActionServiceSystemTest.java b/tests/src/com/android/messaging/datamodel/action/ActionServiceSystemTest.java index 4d1ad5d..725f159 100644 --- a/tests/src/com/android/messaging/datamodel/action/ActionServiceSystemTest.java +++ b/tests/src/com/android/messaging/datamodel/action/ActionServiceSystemTest.java @@ -20,9 +20,10 @@ import android.content.Intent; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.test.suitebuilder.annotation.MediumTest; import android.util.Log; +import androidx.test.filters.MediumTest; + import com.android.messaging.BugleTestCase; import com.android.messaging.Factory; import com.android.messaging.FakeContext; @@ -37,8 +38,6 @@ import com.android.messaging.datamodel.action.ActionTestHelpers.ResultTracker; import com.android.messaging.datamodel.action.ActionTestHelpers.StubBackgroundWorker; import com.android.messaging.datamodel.action.ActionTestHelpers.StubLoader; -import java.util.ArrayList; - @MediumTest public class ActionServiceSystemTest extends BugleServiceTestCase implements ActionCompletedListener, ActionExecutedListener, FakeContextHost { diff --git a/tests/src/com/android/messaging/datamodel/action/ActionServiceTest.java b/tests/src/com/android/messaging/datamodel/action/ActionServiceTest.java index 8daafb8..19c6c00 100644 --- a/tests/src/com/android/messaging/datamodel/action/ActionServiceTest.java +++ b/tests/src/com/android/messaging/datamodel/action/ActionServiceTest.java @@ -21,10 +21,10 @@ import android.os.Bundle; import android.os.Looper; import android.os.Parcel; import android.os.Parcelable; -import android.os.Process; -import android.test.suitebuilder.annotation.MediumTest; import android.util.Log; +import androidx.test.filters.MediumTest; + import com.android.messaging.Factory; import com.android.messaging.FakeContext; import com.android.messaging.FakeContext.FakeContextHost; diff --git a/tests/src/com/android/messaging/datamodel/action/ActionTest.java b/tests/src/com/android/messaging/datamodel/action/ActionTest.java index aefa25e..c24884d 100644 --- a/tests/src/com/android/messaging/datamodel/action/ActionTest.java +++ b/tests/src/com/android/messaging/datamodel/action/ActionTest.java @@ -19,8 +19,9 @@ package com.android.messaging.datamodel.action; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.MediumTest; +import androidx.test.filters.SmallTest; import com.android.messaging.BugleTestCase; import com.android.messaging.FakeFactory; diff --git a/tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java b/tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java index 1b6b8ba..24f488a 100644 --- a/tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java +++ b/tests/src/com/android/messaging/datamodel/action/GetOrCreateConversationActionTest.java @@ -20,7 +20,8 @@ import android.content.pm.ProviderInfo; import android.database.Cursor; import android.net.Uri; import android.test.mock.MockContentProvider; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.messaging.BugleTestCase; import com.android.messaging.FakeContext; diff --git a/tests/src/com/android/messaging/datamodel/action/ReadWriteDraftMessageActionTest.java b/tests/src/com/android/messaging/datamodel/action/ReadWriteDraftMessageActionTest.java index e977aa7..518a722 100644 --- a/tests/src/com/android/messaging/datamodel/action/ReadWriteDraftMessageActionTest.java +++ b/tests/src/com/android/messaging/datamodel/action/ReadWriteDraftMessageActionTest.java @@ -20,9 +20,10 @@ import android.content.ContentProvider; import android.content.pm.ProviderInfo; import android.database.Cursor; import android.net.Uri; -import android.test.suitebuilder.annotation.SmallTest; import android.text.TextUtils; +import androidx.test.filters.SmallTest; + import com.android.messaging.BugleTestCase; import com.android.messaging.FakeContext; import com.android.messaging.FakeFactory; diff --git a/tests/src/com/android/messaging/datamodel/data/ConversationMessageDataTest.java b/tests/src/com/android/messaging/datamodel/data/ConversationMessageDataTest.java index c6b9b20..42b51fd 100644 --- a/tests/src/com/android/messaging/datamodel/data/ConversationMessageDataTest.java +++ b/tests/src/com/android/messaging/datamodel/data/ConversationMessageDataTest.java @@ -15,13 +15,11 @@ */ package com.android.messaging.datamodel.data; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; import com.android.messaging.BugleTestCase; import com.android.messaging.FakeFactory; import com.android.messaging.datamodel.FakeCursor; -import com.android.messaging.datamodel.data.ConversationMessageData; -import com.android.messaging.datamodel.data.MessageData; import com.android.messaging.datamodel.data.ConversationMessageData.ConversationMessageViewColumns; @SmallTest diff --git a/tests/src/com/android/messaging/datamodel/data/ConversationParticipantsDataTest.java b/tests/src/com/android/messaging/datamodel/data/ConversationParticipantsDataTest.java index 527a600..b250f80 100644 --- a/tests/src/com/android/messaging/datamodel/data/ConversationParticipantsDataTest.java +++ b/tests/src/com/android/messaging/datamodel/data/ConversationParticipantsDataTest.java @@ -15,13 +15,11 @@ */ package com.android.messaging.datamodel.data; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; import com.android.messaging.BugleTestCase; -import com.android.messaging.datamodel.FakeCursor; import com.android.messaging.datamodel.DatabaseHelper.ParticipantColumns; -import com.android.messaging.datamodel.data.ConversationParticipantsData; -import com.android.messaging.datamodel.data.ParticipantData; +import com.android.messaging.datamodel.FakeCursor; @SmallTest public class ConversationParticipantsDataTest extends BugleTestCase { diff --git a/tests/src/com/android/messaging/datamodel/media/ImageRequestTest.java b/tests/src/com/android/messaging/datamodel/media/ImageRequestTest.java index 2cfec7d..3e0f4e0 100644 --- a/tests/src/com/android/messaging/datamodel/media/ImageRequestTest.java +++ b/tests/src/com/android/messaging/datamodel/media/ImageRequestTest.java @@ -18,7 +18,8 @@ package com.android.messaging.datamodel.media; import android.content.ContentResolver; import android.graphics.BitmapFactory; import android.net.Uri; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import com.android.messaging.BugleTestCase; import com.android.messaging.FakeFactory; diff --git a/tests/src/com/android/messaging/datamodel/media/MediaResourceManagerTest.java b/tests/src/com/android/messaging/datamodel/media/MediaResourceManagerTest.java index d214067..c5054ad 100644 --- a/tests/src/com/android/messaging/datamodel/media/MediaResourceManagerTest.java +++ b/tests/src/com/android/messaging/datamodel/media/MediaResourceManagerTest.java @@ -15,7 +15,7 @@ */ package com.android.messaging.datamodel.media; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; import com.android.messaging.BugleTestCase; import com.android.messaging.FakeFactory; diff --git a/tests/src/com/android/messaging/ui/MultiAttachmentLayoutTest.java b/tests/src/com/android/messaging/ui/MultiAttachmentLayoutTest.java index cf9a647..db3ff3a 100644 --- a/tests/src/com/android/messaging/ui/MultiAttachmentLayoutTest.java +++ b/tests/src/com/android/messaging/ui/MultiAttachmentLayoutTest.java @@ -19,11 +19,12 @@ package com.android.messaging.ui; import android.content.Context; import android.net.Uri; -import android.test.suitebuilder.annotation.MediumTest; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.test.filters.MediumTest; + import com.android.messaging.FakeFactory; import com.android.messaging.datamodel.data.MessagePartData; diff --git a/tests/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragmentTest.java b/tests/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragmentTest.java index e81cd54..d723a40 100644 --- a/tests/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragmentTest.java +++ b/tests/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragmentTest.java @@ -17,9 +17,10 @@ package com.android.messaging.ui.attachmentchooser; import android.app.Fragment; -import android.test.suitebuilder.annotation.LargeTest; import android.widget.CheckBox; +import androidx.test.filters.LargeTest; + import com.android.messaging.FakeFactory; import com.android.messaging.R; import com.android.messaging.datamodel.DataModel; @@ -28,11 +29,7 @@ import com.android.messaging.datamodel.data.MessageData; import com.android.messaging.datamodel.data.MessagePartData; import com.android.messaging.datamodel.data.TestDataFactory; import com.android.messaging.ui.FragmentTestCase; -import com.android.messaging.ui.TestActivity; import com.android.messaging.ui.TestActivity.FragmentEventListener; -import com.android.messaging.ui.attachmentchooser.AttachmentChooserFragment; -import com.android.messaging.ui.attachmentchooser.AttachmentGridItemView; -import com.android.messaging.ui.attachmentchooser.AttachmentGridView; import com.android.messaging.ui.attachmentchooser.AttachmentChooserFragment.AttachmentChooserFragmentHost; import com.android.messaging.ui.conversationlist.ConversationListFragment; @@ -46,7 +43,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; - /** * Unit tests for {@link ConversationListFragment}. */ diff --git a/tests/src/com/android/messaging/ui/contact/ContactPickerFragmentTest.java b/tests/src/com/android/messaging/ui/contact/ContactPickerFragmentTest.java index 47b65f1..4983cd3 100644 --- a/tests/src/com/android/messaging/ui/contact/ContactPickerFragmentTest.java +++ b/tests/src/com/android/messaging/ui/contact/ContactPickerFragmentTest.java @@ -18,18 +18,17 @@ package com.android.messaging.ui.contact; import android.content.Context; import android.database.Cursor; -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; -import android.test.suitebuilder.annotation.LargeTest; import android.view.View; import android.widget.ListView; +import androidx.test.filters.LargeTest; +import androidx.viewpager.widget.ViewPager; + import com.android.messaging.FakeFactory; import com.android.messaging.R; import com.android.messaging.datamodel.FakeDataModel; import com.android.messaging.datamodel.action.ActionTestHelpers; import com.android.messaging.datamodel.action.ActionTestHelpers.StubActionService; -import com.android.messaging.datamodel.action.ActionTestHelpers.StubActionService.StubActionServiceCallLog; import com.android.messaging.datamodel.action.GetOrCreateConversationAction; import com.android.messaging.datamodel.data.ContactPickerData; import com.android.messaging.datamodel.data.ParticipantData; @@ -37,17 +36,14 @@ import com.android.messaging.datamodel.data.TestDataFactory; import com.android.messaging.ui.CustomHeaderViewPagerAdapter; import com.android.messaging.ui.FragmentTestCase; import com.android.messaging.ui.UIIntents; -import com.android.messaging.ui.contact.ContactPickerFragment; import com.android.messaging.ui.contact.ContactPickerFragment.ContactPickerFragmentHost; import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; -import java.util.ArrayList; import java.util.List; - /** * Unit tests for {@link ContactPickerFragment}. */ diff --git a/tests/src/com/android/messaging/ui/conversation/ComposeMessageViewTest.java b/tests/src/com/android/messaging/ui/conversation/ComposeMessageViewTest.java index 2148c71..9d55b6e 100644 --- a/tests/src/com/android/messaging/ui/conversation/ComposeMessageViewTest.java +++ b/tests/src/com/android/messaging/ui/conversation/ComposeMessageViewTest.java @@ -21,10 +21,11 @@ import static org.mockito.ArgumentMatchers.isNull; import android.content.Context; import android.media.MediaPlayer; -import android.test.suitebuilder.annotation.MediumTest; import android.view.View; import android.widget.EditText; +import androidx.test.filters.MediumTest; + import com.android.messaging.FakeFactory; import com.android.messaging.R; import com.android.messaging.datamodel.DataModel; @@ -42,7 +43,6 @@ import com.android.messaging.util.BugleGservices; import com.android.messaging.util.FakeMediaUtil; import com.android.messaging.util.ImeUtil; -import org.mockito.ArgumentMatcher; import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; diff --git a/tests/src/com/android/messaging/ui/conversation/ConversationActivityUiStateTest.java b/tests/src/com/android/messaging/ui/conversation/ConversationActivityUiStateTest.java index 7c6903d..0fec12e 100644 --- a/tests/src/com/android/messaging/ui/conversation/ConversationActivityUiStateTest.java +++ b/tests/src/com/android/messaging/ui/conversation/ConversationActivityUiStateTest.java @@ -16,12 +16,12 @@ package com.android.messaging.ui.conversation; -import android.test.suitebuilder.annotation.SmallTest; import android.text.TextUtils; +import androidx.test.filters.SmallTest; + import com.android.messaging.BugleTestCase; import com.android.messaging.ui.contact.ContactPickerFragment; -import com.android.messaging.ui.conversation.ConversationActivityUiState; import com.android.messaging.ui.conversation.ConversationActivityUiState.ConversationActivityUiStateHost; import org.mockito.Mock; diff --git a/tests/src/com/android/messaging/ui/conversation/ConversationFragmentTest.java b/tests/src/com/android/messaging/ui/conversation/ConversationFragmentTest.java index 658a1be..030306a 100644 --- a/tests/src/com/android/messaging/ui/conversation/ConversationFragmentTest.java +++ b/tests/src/com/android/messaging/ui/conversation/ConversationFragmentTest.java @@ -19,9 +19,9 @@ package com.android.messaging.ui.conversation; import android.app.Activity; import android.app.Fragment; import android.database.Cursor; + import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.RecyclerView.Adapter; -import android.test.suitebuilder.annotation.LargeTest; +import androidx.test.filters.LargeTest; import com.android.messaging.FakeFactory; import com.android.messaging.R; @@ -44,7 +44,6 @@ import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; - /** * Unit tests for {@link ConversationListFragment}. */ diff --git a/tests/src/com/android/messaging/ui/conversation/ConversationInputManagerTest.java b/tests/src/com/android/messaging/ui/conversation/ConversationInputManagerTest.java index f335785..6dff635 100644 --- a/tests/src/com/android/messaging/ui/conversation/ConversationInputManagerTest.java +++ b/tests/src/com/android/messaging/ui/conversation/ConversationInputManagerTest.java @@ -18,9 +18,10 @@ package com.android.messaging.ui.conversation; import android.app.FragmentManager; import android.app.FragmentTransaction; import android.os.Bundle; -import android.test.suitebuilder.annotation.SmallTest; import android.widget.EditText; +import androidx.test.filters.SmallTest; + import com.android.messaging.BugleTestCase; import com.android.messaging.FakeFactory; import com.android.messaging.R; diff --git a/tests/src/com/android/messaging/ui/conversation/ConversationMessageViewTest.java b/tests/src/com/android/messaging/ui/conversation/ConversationMessageViewTest.java index 6b8b0c0..6833df2 100644 --- a/tests/src/com/android/messaging/ui/conversation/ConversationMessageViewTest.java +++ b/tests/src/com/android/messaging/ui/conversation/ConversationMessageViewTest.java @@ -16,17 +16,16 @@ package com.android.messaging.ui.conversation; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; import android.view.View; import android.widget.TextView; +import androidx.test.filters.MediumTest; + import com.android.messaging.FakeFactory; import com.android.messaging.R; import com.android.messaging.datamodel.FakeCursor; import com.android.messaging.datamodel.data.TestDataFactory; import com.android.messaging.ui.ViewTest; -import com.android.messaging.ui.conversation.ConversationMessageView; import com.android.messaging.ui.conversation.ConversationMessageView.ConversationMessageViewHost; import com.android.messaging.util.Dates; diff --git a/tests/src/com/android/messaging/ui/conversationlist/ConversationListFragmentTest.java b/tests/src/com/android/messaging/ui/conversationlist/ConversationListFragmentTest.java index 6add677..c3da81c 100644 --- a/tests/src/com/android/messaging/ui/conversationlist/ConversationListFragmentTest.java +++ b/tests/src/com/android/messaging/ui/conversationlist/ConversationListFragmentTest.java @@ -18,11 +18,11 @@ package com.android.messaging.ui.conversationlist; import android.content.Context; import android.database.Cursor; -import androidx.recyclerview.widget.RecyclerView; -import android.test.suitebuilder.annotation.LargeTest; import android.view.View; import android.widget.ImageView; -import android.widget.ListView; + +import androidx.recyclerview.widget.RecyclerView; +import androidx.test.filters.LargeTest; import com.android.messaging.FakeFactory; import com.android.messaging.R; @@ -31,14 +31,12 @@ import com.android.messaging.datamodel.data.ConversationListData; import com.android.messaging.datamodel.data.TestDataFactory; import com.android.messaging.ui.FragmentTestCase; import com.android.messaging.ui.UIIntents; -import com.android.messaging.ui.conversationlist.ConversationListFragment; import com.android.messaging.ui.conversationlist.ConversationListFragment.ConversationListFragmentHost; import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Mockito; - /** * Unit tests for {@link ConversationListFragment}. */ diff --git a/tests/src/com/android/messaging/ui/conversationlist/ConversationListItemViewTest.java b/tests/src/com/android/messaging/ui/conversationlist/ConversationListItemViewTest.java index afac0d8..c96ab44 100644 --- a/tests/src/com/android/messaging/ui/conversationlist/ConversationListItemViewTest.java +++ b/tests/src/com/android/messaging/ui/conversationlist/ConversationListItemViewTest.java @@ -17,11 +17,12 @@ package com.android.messaging.ui.conversationlist; import android.content.Context; -import android.test.suitebuilder.annotation.MediumTest; import android.text.TextUtils; import android.view.View; import android.widget.TextView; +import androidx.test.filters.MediumTest; + import com.android.messaging.Factory; import com.android.messaging.FakeFactory; import com.android.messaging.R; @@ -32,7 +33,6 @@ import com.android.messaging.datamodel.data.TestDataFactory; import com.android.messaging.ui.AsyncImageView; import com.android.messaging.ui.UIIntentsImpl; import com.android.messaging.ui.ViewTest; -import com.android.messaging.ui.conversationlist.ConversationListItemView; import com.android.messaging.util.Dates; import org.mockito.ArgumentMatcher; diff --git a/tests/src/com/android/messaging/ui/mediapicker/CameraManagerTest.java b/tests/src/com/android/messaging/ui/mediapicker/CameraManagerTest.java index e81a548..7417c32 100644 --- a/tests/src/com/android/messaging/ui/mediapicker/CameraManagerTest.java +++ b/tests/src/com/android/messaging/ui/mediapicker/CameraManagerTest.java @@ -19,9 +19,12 @@ package com.android.messaging.ui.mediapicker; import android.hardware.Camera; import android.hardware.Camera.CameraInfo; import android.os.AsyncTask; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; + import com.android.messaging.BugleTestCase; import com.android.messaging.ui.mediapicker.CameraManager.CameraWrapper; + import org.mockito.InOrder; import org.mockito.Mockito; diff --git a/tests/src/com/android/messaging/util/BugleGservicesTest.java b/tests/src/com/android/messaging/util/BugleGservicesTest.java index 1a0a10e..e8f1a22 100644 --- a/tests/src/com/android/messaging/util/BugleGservicesTest.java +++ b/tests/src/com/android/messaging/util/BugleGservicesTest.java @@ -15,7 +15,7 @@ */ package com.android.messaging.util; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; import com.android.messaging.BugleTestCase; diff --git a/tests/src/com/android/messaging/util/ContactUtilTest.java b/tests/src/com/android/messaging/util/ContactUtilTest.java index 4f0ca9b..0a3cfe8 100644 --- a/tests/src/com/android/messaging/util/ContactUtilTest.java +++ b/tests/src/com/android/messaging/util/ContactUtilTest.java @@ -22,9 +22,10 @@ import android.database.Cursor; import android.net.Uri; import android.provider.ContactsContract; import android.provider.ContactsContract.Contacts; -import android.test.suitebuilder.annotation.LargeTest; import android.text.TextUtils; +import androidx.test.filters.LargeTest; + import com.android.messaging.BugleTestCase; import com.android.messaging.FakeFactory; diff --git a/tests/src/com/android/messaging/util/YouTubeUtilTest.java b/tests/src/com/android/messaging/util/YouTubeUtilTest.java index 03c461a..072d3e5 100644 --- a/tests/src/com/android/messaging/util/YouTubeUtilTest.java +++ b/tests/src/com/android/messaging/util/YouTubeUtilTest.java @@ -16,7 +16,7 @@ package com.android.messaging.util; -import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SmallTest; import com.android.messaging.BugleTestCase;