diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-01-11 10:48:34 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-01-11 12:52:03 -0800 |
commit | 87f784c285fdeed9091a4de8b9b44db3eca677d8 (patch) | |
tree | 94870e68378e8d0e1fb09555fc1be4ca149ba99b /tests/src/com/android | |
parent | 41307051416b3e027d89e72301704432bd1c5eb3 (diff) | |
download | android_packages_apps_Trebuchet-87f784c285fdeed9091a4de8b9b44db3eca677d8.tar.gz android_packages_apps_Trebuchet-87f784c285fdeed9091a4de8b9b44db3eca677d8.tar.bz2 android_packages_apps_Trebuchet-87f784c285fdeed9091a4de8b9b44db3eca677d8.zip |
Removing static Context access using LauncherAppState
> This ensures that LauncherAppState is only accessed in the presence of
a valid context
Bug: 33032833
Change-Id: I955e5cb022f8bd6374681ae6c0720a2666d5b750
Diffstat (limited to 'tests/src/com/android')
4 files changed, 21 insertions, 27 deletions
diff --git a/tests/src/com/android/launcher3/BindWidgetTest.java b/tests/src/com/android/launcher3/BindWidgetTest.java index 72533e7e1..575b42b87 100644 --- a/tests/src/com/android/launcher3/BindWidgetTest.java +++ b/tests/src/com/android/launcher3/BindWidgetTest.java @@ -16,7 +16,6 @@ import com.android.launcher3.compat.AppWidgetManagerCompat; import com.android.launcher3.compat.PackageInstallerCompat; import com.android.launcher3.ui.LauncherInstrumentationTestCase; import com.android.launcher3.util.ContentWriter; -import com.android.launcher3.util.ManagedProfileHeuristic; import com.android.launcher3.widget.PendingAddWidgetInfo; import com.android.launcher3.widget.WidgetHostViewLoader; @@ -223,20 +222,9 @@ public class BindWidgetTest extends LauncherInstrumentationTestCase { item.screenId = screenId; item.onAddToDatabase(writer); writer.put(LauncherSettings.Favorites._ID, item.id); - mResolver.insert(LauncherSettings.Favorites.CONTENT_URI, writer.getValues()); - - // Reset loader - try { - runTestOnUiThread(new Runnable() { - @Override - public void run() { - ManagedProfileHeuristic.markExistingUsersForNoFolderCreation(mTargetContext); - LauncherAppState.getInstance().getModel().resetLoadedState(true, true); - } - }); - } catch (Throwable t) { - throw new IllegalArgumentException(t); - } + mResolver.insert(LauncherSettings.Favorites.CONTENT_URI, writer.getValues(mTargetContext)); + resetLoaderState(); + // Launch the home activity startLauncher(); // Verify UI diff --git a/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java b/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java index b2f0cbbbc..207138940 100644 --- a/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java +++ b/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java @@ -164,7 +164,7 @@ public class AddWorkspaceItemsTaskTest extends BaseModelUpdateTaskTestCase { info.cellX = x; info.cellY = y; info.container = LauncherSettings.Favorites.CONTAINER_DESKTOP; - bgDataModel.addItem(info, false); + bgDataModel.addItem(targetContext, info, false); } } return startId; diff --git a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java index 3a27d0dbf..73c90dade 100644 --- a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java +++ b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java @@ -128,7 +128,7 @@ public class BaseModelUpdateTaskTestCase extends ProviderTestCase2<TestLauncherP classMap.put(commands[1], Class.forName(commands[2])); break; case "bgItem": - bgDataModel.addItem( + bgDataModel.addItem(targetContext, (ItemInfo) initItem(classMap.get(commands[1]), commands, 2), false); break; case "allApps": diff --git a/tests/src/com/android/launcher3/ui/LauncherInstrumentationTestCase.java b/tests/src/com/android/launcher3/ui/LauncherInstrumentationTestCase.java index fcf712227..42c6cd729 100644 --- a/tests/src/com/android/launcher3/ui/LauncherInstrumentationTestCase.java +++ b/tests/src/com/android/launcher3/ui/LauncherInstrumentationTestCase.java @@ -211,15 +211,22 @@ public class LauncherInstrumentationTestCase extends InstrumentationTestCase { LauncherSettings.Settings.METHOD_CREATE_EMPTY_DB); LauncherSettings.Settings.call(mTargetContext.getContentResolver(), LauncherSettings.Settings.METHOD_CLEAR_EMPTY_DB_FLAG); - ManagedProfileHeuristic.markExistingUsersForNoFolderCreation(mTargetContext); + resetLoaderState(); + } - runTestOnUiThread(new Runnable() { - @Override - public void run() { - // Reset the loader state - LauncherAppState.getInstance().getModel().resetLoadedState(true, true); - } - }); + protected void resetLoaderState() { + try { + runTestOnUiThread(new Runnable() { + @Override + public void run() { + ManagedProfileHeuristic.markExistingUsersForNoFolderCreation(mTargetContext); + LauncherAppState.getInstance(mTargetContext).getModel() + .resetLoadedState(true, true); + } + }); + } catch (Throwable t) { + throw new IllegalArgumentException(t); + } } /** @@ -248,8 +255,7 @@ public class LauncherInstrumentationTestCase extends InstrumentationTestCase { LauncherAppWidgetProviderInfo info = getOnUiThread(new Callable<LauncherAppWidgetProviderInfo>() { @Override public LauncherAppWidgetProviderInfo call() throws Exception { - InvariantDeviceProfile idv = - LauncherAppState.getInstance().getInvariantDeviceProfile(); + InvariantDeviceProfile idv = LauncherAppState.getIDP(mTargetContext); ComponentName searchComponent = ((SearchManager) mTargetContext .getSystemService(Context.SEARCH_SERVICE)).getGlobalSearchActivity(); |