From 20e7a59bff4edf468410b0806c9ee4d4422d7f5c Mon Sep 17 00:00:00 2001 From: Federico Baron Date: Mon, 8 Jul 2024 22:32:48 +0000 Subject: [PATCH] Revert "Fix attempt for TaplTwoPanelWorkspaceTest#testSinglePageDragIconWhenMultiplePageScrollingIsPossible" This reverts commit 347b408f90cce803735bb3af8b3a040ccb196f73. Reason for revert: didn't resolve the issue Change-Id: I05563ffd3c83b4633007407953e2050ee2c87866 --- .../launcher3/ui/workspace/TaplTwoPanelWorkspaceTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/src/com/android/launcher3/ui/workspace/TaplTwoPanelWorkspaceTest.java b/tests/src/com/android/launcher3/ui/workspace/TaplTwoPanelWorkspaceTest.java index bc26c00c47..ae24a57bfa 100644 --- a/tests/src/com/android/launcher3/ui/workspace/TaplTwoPanelWorkspaceTest.java +++ b/tests/src/com/android/launcher3/ui/workspace/TaplTwoPanelWorkspaceTest.java @@ -352,11 +352,8 @@ public class TaplTwoPanelWorkspaceTest extends AbstractLauncherUiTest } private void assertPagesExist(Launcher launcher, int... pageIds) { - waitForLauncherCondition("Existing page count does NOT match. " - + "Expected: " + pageIds.length - + ". Actual: " + launcher.getWorkspace().getPageCount(), - l -> pageIds.length == l.getWorkspace().getPageCount()); int pageCount = launcher.getWorkspace().getPageCount(); + assertEquals("Existing page count does NOT match.", pageIds.length, pageCount); for (int i = 0; i < pageCount; i++) { CellLayout page = (CellLayout) launcher.getWorkspace().getPageAt(i); int pageId = launcher.getWorkspace().getCellLayoutId(page);