From 0e18dee91dbc06cf84d5181e00a5c95c6ceff8eb Mon Sep 17 00:00:00 2001 From: Charlie Anderson Date: Tue, 18 Feb 2025 13:42:48 -0500 Subject: [PATCH] Fix WorkspaceItemProcessorTest for HSUM Bug: 395684478 Test: WorkspaceItemProcessorTest Flag: EXEMPT test fix Change-Id: Ib884af01fd225a01a7ba5408bcb38991b7b4c2c4 --- .../android/launcher3/model/WorkspaceItemProcessorTest.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemProcessorTest.kt b/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemProcessorTest.kt index 7a403e1826..a55d64ba4f 100644 --- a/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemProcessorTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/model/WorkspaceItemProcessorTest.kt @@ -454,7 +454,7 @@ class WorkspaceItemProcessorTest { assertThat(mAllDeepShortcuts).isEmpty() verify(mockCursor) .markDeleted( - "Pinned shortcut not found from request. package=pkg, user=UserHandle{0}", + "Pinned shortcut not found from request. package=pkg, user=$mUserHandle", "shortcut_not_found", ) } @@ -513,7 +513,7 @@ class WorkspaceItemProcessorTest { verify(mockCursor, times(0)).checkAndAddItem(any(), any(), anyOrNull()) verify(mockCursor) .markDeleted( - "Pinned shortcut not found from request. package=pkg, user=UserHandle{0}", + "Pinned shortcut not found from request. package=pkg, user=$mUserHandle", "shortcut_not_found", ) } @@ -533,7 +533,7 @@ class WorkspaceItemProcessorTest { whenever(disabledMessage).thenReturn("") whenever(disabledReason).thenReturn(0) whenever(persons).thenReturn(EMPTY_PERSON_ARRAY) - whenever(userHandle).thenReturn(Process.myUserHandle()) + whenever(userHandle).thenReturn(mUserHandle) } mIconRequestInfos = mutableListOf() // Make sure shortcuts map has expected key from expected package @@ -565,7 +565,7 @@ class WorkspaceItemProcessorTest { mockBgDataModel = mock() mockCursor = mock().apply { - user = UserHandle(0) + user = mUserHandle itemType = ITEM_TYPE_FOLDER id = 1 container = 100