diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-02-02 13:52:53 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-02-16 13:50:14 -0800 |
commit | 43bf11d9c95f76c2dfeb625b23cb458df81252b3 (patch) | |
tree | ec2bbed88795b3c02621cd964be56f20d797c263 /tests/src | |
parent | 5a2edd65f2ca3d83b1672835831e2f5b2f16ab82 (diff) | |
download | android_packages_apps_Trebuchet-43bf11d9c95f76c2dfeb625b23cb458df81252b3.tar.gz android_packages_apps_Trebuchet-43bf11d9c95f76c2dfeb625b23cb458df81252b3.tar.bz2 android_packages_apps_Trebuchet-43bf11d9c95f76c2dfeb625b23cb458df81252b3.zip |
Separating methods for updating the model to a sepatate class.
Removing static access to model update methods, to allow for better
access control and testing
Change-Id: I9afe004dbf1b2fe50df422fd28bceea9230a4704
Diffstat (limited to 'tests/src')
-rw-r--r-- | tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java | 8 | ||||
-rw-r--r-- | tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java b/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java index 207138940..d0ba9074c 100644 --- a/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java +++ b/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java @@ -53,14 +53,6 @@ public class AddWorkspaceItemsTaskTest extends BaseModelUpdateTaskTestCase { return new AddWorkspaceItemsTask(Provider.of(Arrays.asList(items))) { @Override - protected void addItemToDatabase(Context context, ItemInfo item, - long screenId, int[] pos) { - item.screenId = screenId; - item.cellX = pos[0]; - item.cellY = pos[1]; - } - - @Override protected void updateScreens(Context context, ArrayList<Long> workspaceScreens) { } }; } diff --git a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java index 9b7fc6ebf..b9944db98 100644 --- a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java +++ b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java @@ -37,6 +37,7 @@ import java.lang.reflect.Field; import java.util.HashMap; import java.util.List; +import static org.mockito.Matchers.anyBoolean; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -54,6 +55,8 @@ public class BaseModelUpdateTaskTestCase extends ProviderTestCase2<TestLauncherP public InvariantDeviceProfile idp; public LauncherAppState appState; + public LauncherModel model; + public ModelWriter modelWriter; public MyIconCache iconCache; public BgDataModel bgDataModel; @@ -70,6 +73,11 @@ public class BaseModelUpdateTaskTestCase extends ProviderTestCase2<TestLauncherP callbacks = mock(Callbacks.class); appState = mock(LauncherAppState.class); + model = mock(LauncherModel.class); + modelWriter = mock(ModelWriter.class); + when(appState.getModel()).thenReturn(model); + when(model.getWriter(anyBoolean())).thenReturn(modelWriter); + myUser = Process.myUserHandle(); bgDataModel = new BgDataModel(); |