diff options
author | Vadim Tryshev <vadimt@google.com> | 2018-08-15 15:28:47 -0700 |
---|---|---|
committer | Jeff Gaston <jeffrygaston@google.com> | 2018-08-21 15:04:48 -0400 |
commit | 0a9f3ab4a6acf1a5560d4e4039c88a697529d9d4 (patch) | |
tree | 66bef7bcd61632bb01dbc336061da3abb510293b /tests/src/com/android/launcher3/model | |
parent | 58ad76fd62daef166346b49847ce23690252a04a (diff) | |
download | android_packages_apps_Trebuchet-0a9f3ab4a6acf1a5560d4e4039c88a697529d9d4.tar.gz android_packages_apps_Trebuchet-0a9f3ab4a6acf1a5560d4e4039c88a697529d9d4.tar.bz2 android_packages_apps_Trebuchet-0a9f3ab4a6acf1a5560d4e4039c88a697529d9d4.zip |
Converting tests to Androidx
Bug: 112610679
Change-Id: I712826e668f1fbeb4e47cc541d4f5296d8eb74c0
Diffstat (limited to 'tests/src/com/android/launcher3/model')
7 files changed, 15 insertions, 15 deletions
diff --git a/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java b/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java index 401711d07..dae8f2f9a 100644 --- a/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java +++ b/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java @@ -7,7 +7,7 @@ import android.content.Context; import android.content.Intent; import android.graphics.Rect; import android.net.Uri; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.runner.AndroidJUnit4; import android.util.Pair; import com.android.launcher3.ItemInfo; diff --git a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java index 5d5af4f24..dd3e859fd 100644 --- a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java +++ b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java @@ -18,8 +18,8 @@ import android.graphics.Bitmap.Config; import android.graphics.Color; import android.os.Process; import android.os.UserHandle; -import android.support.test.InstrumentationRegistry; -import android.support.test.rule.provider.ProviderTestRule; +import androidx.test.InstrumentationRegistry; +import androidx.test.rule.provider.ProviderTestRule; import com.android.launcher3.AllAppsList; import com.android.launcher3.AppFilter; diff --git a/tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java b/tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java index ac9d319c8..59f807acf 100644 --- a/tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java +++ b/tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java @@ -1,6 +1,6 @@ package com.android.launcher3.model; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.AppInfo; import com.android.launcher3.ItemInfo; diff --git a/tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java b/tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java index 1d9148ba1..0903ddc16 100644 --- a/tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java +++ b/tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java @@ -25,9 +25,9 @@ import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.LauncherProvider; import com.android.launcher3.LauncherProvider.DatabaseHelper; diff --git a/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java b/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java index 031909fe1..b2fd1d968 100644 --- a/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java +++ b/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java @@ -7,10 +7,10 @@ import android.content.ContextWrapper; import android.content.Intent; import android.database.Cursor; import android.graphics.Point; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.MediumTest; -import android.support.test.rule.provider.ProviderTestRule; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.MediumTest; +import androidx.test.rule.provider.ProviderTestRule; +import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherModel; diff --git a/tests/src/com/android/launcher3/model/LoaderCursorTest.java b/tests/src/com/android/launcher3/model/LoaderCursorTest.java index dfefa3140..29e54b137 100644 --- a/tests/src/com/android/launcher3/model/LoaderCursorTest.java +++ b/tests/src/com/android/launcher3/model/LoaderCursorTest.java @@ -6,9 +6,9 @@ import android.content.Intent; import android.database.MatrixCursor; import android.graphics.Bitmap; import android.os.Process; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.IconCache; import com.android.launcher3.InvariantDeviceProfile; diff --git a/tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java b/tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java index 0a741c479..51e21e2c7 100644 --- a/tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java +++ b/tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java @@ -1,6 +1,6 @@ package com.android.launcher3.model; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.ItemInfo; import com.android.launcher3.LauncherAppWidgetInfo; |