aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 15:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

TAPL tests - make all apps in overview checks less fragile.

Browse Source 
Tests that check for all apps in overview mode were only checking for
actions being enabled. This isn't sufficient logic, two button mode also
uses all apps.

Centralize the check for all apps.

Test: local tapl tests
Change-Id: If1bf98019e6f1aea8f7967883aba6780743e9d6b
This commit is contained in:
Zak Cohen
2020-02-28 11:59:33 -08:00
parent 1fabbf5a23
commit dc24231e4f
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
View File

@@ -81,8 +81,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@Test
public void testAllAppsFromOverview() throws Exception {
// When actions are enabled, all apps isn't present in overview
if (mLauncher.overviewActionsEnabled()) {
if (!mLauncher.hasAllAppsInOverview()) {
return;
}
@@ -146,7 +145,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
launcher -> assertEquals("Dismissing a task didn't remove 1 task from Overview",
numTasks - 1, getTaskCount(launcher)));
if (!mLauncher.overviewActionsEnabled() && (!TestHelpers.isInLauncherProcess()
if (mLauncher.hasAllAppsInOverview() && (!TestHelpers.isInLauncherProcess()
|| getFromLauncher(launcher -> !launcher.getDeviceProfile().isLandscape))) {
// Test switching to all apps and back.
final AllAppsFromOverview allApps = overview.switchToAllApps();
@@ -190,8 +189,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@Test
public void testAppIconLaunchFromAllAppsFromOverview() throws Exception {
// All apps doesn't exist in Overview when actions are enabled
if (mLauncher.overviewActionsEnabled()) {
if (!mLauncher.hasAllAppsInOverview()) {
return;
}

21
tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
View File

@@ -565,7 +565,7 @@ public final class LauncherInstrumentation {
return waitForLauncherObject(APPS_RES_ID);
}
case OVERVIEW: {
if (mDevice.isNaturalOrientation() && !overviewActionsEnabled()) {
if (hasAllAppsInOverview()) {
waitForLauncherObject(APPS_RES_ID);
} else {
waitUntilGone(APPS_RES_ID);
@@ -1213,7 +1213,24 @@ public final class LauncherInstrumentation {
getTestInfo(TestProtocol.REQUEST_ENABLE_DEBUG_TRACING);
}
public boolean overviewActionsEnabled() {
public boolean hasAllAppsInOverview() {
// Vertical bar layouts don't contain all apps
if (!mDevice.isNaturalOrientation()) {
return false;
}
// Portrait two button (quickstep) always has all apps.
if (getNavigationModel() == NavigationModel.TWO_BUTTON) {
return true;
}
// Overview actions hide all apps
if (overviewActionsEnabled()) {
return false;
}
// ...otherwise there should be all apps
return true;
}
private boolean overviewActionsEnabled() {
return getTestInfo(TestProtocol.REQUEST_OVERVIEW_ACTIONS_ENABLED).getBoolean(
TestProtocol.TEST_INFO_RESPONSE_FIELD);
}