PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix flakiness in getIconPosition test" into tm-qpr-dev

Browse Source
This commit is contained in:
Nicolò Mazzucato
2022-05-24 21:33:01 +00:00
committed by Android (Google) Code Review
parent 03b821a8f2 25b36f7716
commit dff1a938e1
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+13 -15
View File
@@ -53,7 +53,6 @@ import com.android.launcher3.widget.picker.WidgetsFullSheet;
import com.android.launcher3.widget.picker.WidgetsRecyclerView;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -199,8 +198,8 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
// Test that ensureWorkspaceIsScrollable adds a page by dragging an icon there.
executeOnLauncher(launcher -> assertFalse("Initial workspace state is scrollable",
isWorkspaceScrollable(launcher)));
assertNull("Chrome app was found on empty workspace",
workspace.tryGetWorkspaceAppIcon("Chrome"));
workspace.verifyWorkspaceAppIconIsGone(
"Chrome app was found on empty workspace", "Chrome");
workspace.ensureWorkspaceIsScrollable();
@@ -388,10 +387,10 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
folder.getAppIcon(GMAIL_APP_NAME);
Workspace workspace = folder.close();
assertNull(STORE_APP_NAME + " should be moved to a folder.",
workspace.tryGetWorkspaceAppIcon(STORE_APP_NAME));
assertNull(GMAIL_APP_NAME + " should be moved to a folder.",
workspace.tryGetWorkspaceAppIcon(GMAIL_APP_NAME));
workspace.verifyWorkspaceAppIconIsGone(STORE_APP_NAME + " should be moved to a folder.",
STORE_APP_NAME);
workspace.verifyWorkspaceAppIconIsGone(GMAIL_APP_NAME + " should be moved to a folder.",
GMAIL_APP_NAME);
final HomeAppIcon mapIcon = createShortcutInCenterIfNotExist(MAPS_APP_NAME);
folderIcon = mapIcon.dragToIcon(folderIcon);
@@ -399,8 +398,8 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
folder.getAppIcon(MAPS_APP_NAME);
workspace = folder.close();
assertNull(MAPS_APP_NAME + " should be moved to a folder.",
workspace.tryGetWorkspaceAppIcon(MAPS_APP_NAME));
workspace.verifyWorkspaceAppIconIsGone(MAPS_APP_NAME + " should be moved to a folder.",
MAPS_APP_NAME);
}
@Test
@@ -424,8 +423,9 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
for (String appName : new String[]{"Gmail", "Play Store", APP_NAME}) {
final HomeAppIcon homeAppIcon = createShortcutInCenterIfNotExist(appName);
Workspace workspace = mLauncher.getWorkspace().deleteAppIcon(homeAppIcon);
assertNull(appName + " app was found after being deleted from workspace",
workspace.tryGetWorkspaceAppIcon(appName));
workspace.verifyWorkspaceAppIconIsGone(
appName + " app was found after being deleted from workspace",
appName);
}
}
@@ -509,10 +509,8 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
.containsAtLeast(DUMMY_APP_NAME, MAPS_APP_NAME, STORE_APP_NAME);
mLauncher.getWorkspace().getWorkspaceAppIcon(DUMMY_APP_NAME).uninstall();
assertNull(
DUMMY_APP_NAME + " app was found after being uninstalled",
mLauncher.getWorkspace().tryGetWorkspaceAppIcon(DUMMY_APP_NAME));
mLauncher.getWorkspace().verifyWorkspaceAppIconIsGone(
DUMMY_APP_NAME + " was expected to disappear after uninstall.", DUMMY_APP_NAME);
Map<String, Point> finalPositions =
mLauncher.getWorkspace().getWorkspaceIconsPositions();
tests/tapl/com/android/launcher3/tapl/Workspace.java
+14
View File
@@ -140,6 +140,20 @@ public final class Workspace extends Home {
}
}
/**
* Waits for an app icon to be gone (e.g. after uninstall). Fails if it remains.
*
* @param errorMessage error message thrown then the icon doesn't disappear.
* @param appName app that should be gone.
*/
public void verifyWorkspaceAppIconIsGone(String errorMessage, String appName) {
final UiObject2 workspace = verifyActiveContainer();
assertTrue(errorMessage,
workspace.wait(
Until.gone(AppIcon.getAppIconSelector(appName, mLauncher)),
LauncherInstrumentation.WAIT_TIME_MS));
}
/**
* Returns an icon for the app; fails if the icon doesn't exist.