diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-11-09 10:43:58 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-12-13 10:31:12 -0800 |
commit | 1cd01b023acc123b771765b7297d8aaedac224e0 (patch) | |
tree | 9f275f4cbf290c7fb7e67a913bba14079abcd982 /tests/src | |
parent | 824c540f1911101321ebe7f05cb0885a4922e363 (diff) | |
download | android_packages_apps_Trebuchet-1cd01b023acc123b771765b7297d8aaedac224e0.tar.gz android_packages_apps_Trebuchet-1cd01b023acc123b771765b7297d8aaedac224e0.tar.bz2 android_packages_apps_Trebuchet-1cd01b023acc123b771765b7297d8aaedac224e0.zip |
Ensuring that ShortcutInfo always has an icon
> Making iconBitmap public instead of a getter (similar to AppInfo)
> Removing getIcon() which can lead to IO on UI thread
> Removing updateIcon and handling the update at the caller
Bug: 21325319
Change-Id: I6a49b9043f974e9629ea25e77012d97cc04c0594
Diffstat (limited to 'tests/src')
-rw-r--r-- | tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java b/tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java index 25b8df933..646ef2794 100644 --- a/tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java +++ b/tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java @@ -1,15 +1,12 @@ package com.android.launcher3.model; import com.android.launcher3.AppInfo; -import com.android.launcher3.IconCache; import com.android.launcher3.ItemInfo; import com.android.launcher3.ShortcutInfo; import java.util.Arrays; import java.util.HashSet; -import static org.mockito.Mockito.mock; - /** * Tests for {@link CacheDataUpdatedTask} */ @@ -67,14 +64,13 @@ public class CacheDataUpdatedTaskTest extends BaseModelUpdateTaskTestCase { private void verifyUpdate(Long... idsUpdated) { HashSet<Long> updates = new HashSet<>(Arrays.asList(idsUpdated)); - IconCache noOpIconCache = mock(IconCache.class); for (ItemInfo info : bgDataModel.itemsIdMap) { if (updates.contains(info.id)) { assertEquals(NEW_LABEL_PREFIX + info.id, info.title); - assertNotNull(((ShortcutInfo) info).getIcon(noOpIconCache)); + assertNotNull(((ShortcutInfo) info).iconBitmap); } else { assertNotSame(NEW_LABEL_PREFIX + info.id, info.title); - assertNull(((ShortcutInfo) info).getIcon(noOpIconCache)); + assertNull(((ShortcutInfo) info).iconBitmap); } } } |