diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-03-02 15:16:12 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-03-05 17:38:47 -0800 |
commit | 605bcf3367ab85b50ee4897418678416cc8b2f0c (patch) | |
tree | 7dbe0c842340ea9550fbf08cb7874591e8af1cf0 /tests/src/com/android/launcher3/model | |
parent | d912e3f82ad0ddd09c16eb5575fc911b32e9b076 (diff) | |
download | android_packages_apps_Trebuchet-605bcf3367ab85b50ee4897418678416cc8b2f0c.tar.gz android_packages_apps_Trebuchet-605bcf3367ab85b50ee4897418678416cc8b2f0c.tar.bz2 android_packages_apps_Trebuchet-605bcf3367ab85b50ee4897418678416cc8b2f0c.zip |
Fixing bug when model was not reflected properly on the UI.
If launcher submits a job, and then reloads before the job is executed, the correct model
is not reflected on the Launcher. In that case, we simply rebind the launcher
Change-Id: I380242a4de13e7b2bc326d1a076f0a974435999c
Diffstat (limited to 'tests/src/com/android/launcher3/model')
-rw-r--r-- | tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java index cf90afd4b..b217847f5 100644 --- a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java +++ b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java @@ -1,5 +1,11 @@ package com.android.launcher3.model; +import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; @@ -24,8 +30,8 @@ import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.ItemInfo; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherModel; -import com.android.launcher3.LauncherModel.ModelUpdateTask; import com.android.launcher3.LauncherModel.Callbacks; +import com.android.launcher3.LauncherModel.ModelUpdateTask; import com.android.launcher3.LauncherProvider; import com.android.launcher3.graphics.BitmapInfo; import com.android.launcher3.util.ComponentKey; @@ -43,12 +49,6 @@ import java.util.HashMap; import java.util.List; import java.util.concurrent.Executor; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Mockito.atLeast; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - /** * Base class for writing tests for Model update tasks. */ @@ -82,7 +82,7 @@ public class BaseModelUpdateTaskTestCase { modelWriter = mock(ModelWriter.class); when(appState.getModel()).thenReturn(model); - when(model.getWriter(anyBoolean())).thenReturn(modelWriter); + when(model.getWriter(anyBoolean(), anyBoolean())).thenReturn(modelWriter); when(model.getCallback()).thenReturn(callbacks); myUser = Process.myUserHandle(); |