aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 09:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improving navigation mode switch rule and around

Browse Source 
Logging assertion failures.
Modifying waits for condition to avoid timing out the whole test if the
iteration takes too long in favor of failing with an actionable diag.

Bug: 145985438
Change-Id: Ie32d93e1548ce6ec64c38449eb1be1287ff9cf56
This commit is contained in:
vadimt
2019-12-12 14:18:19 -08:00
parent a11ff18d6b
commit 2eb48498b4
6 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
View File

@@ -35,6 +35,7 @@ import androidx.test.uiautomator.UiDevice;
import com.android.launcher3.tapl.LauncherInstrumentation;
import com.android.launcher3.tapl.TestHelpers;
import com.android.launcher3.util.Wait;
import com.android.launcher3.util.rule.FailureWatcher;
import com.android.systemui.shared.system.QuickStepContract;
@@ -57,6 +58,8 @@ public class NavigationModeSwitchRule implements TestRule {
static final String TAG = "QuickStepOnOffRule";
public static final int WAIT_TIME_MS = 10000;
public enum Mode {
THREE_BUTTON, TWO_BUTTON, ZERO_BUTTON, ALL
}
@@ -118,8 +121,8 @@ public class NavigationModeSwitchRule implements TestRule {
if (mode == THREE_BUTTON || mode == ALL) {
evaluateWithThreeButtons();
}
} catch (Exception e) {
Log.e(TAG, "Exception", e);
} catch (Throwable e) {
Log.e(TAG, "Error", e);
throw e;
} finally {
assertTrue("Couldn't set overlay",
@@ -195,19 +198,14 @@ public class NavigationModeSwitchRule implements TestRule {
currentSysUiNavigationMode() == expectedMode);
}
for (int i = 0; i != 100; ++i) {
if (mLauncher.getNavigationModel() == expectedMode) break;
Thread.sleep(100);
}
assertTrue("Couldn't switch to " + overlayPackage,
mLauncher.getNavigationModel() == expectedMode);
Wait.atMost("Couldn't switch to " + overlayPackage,
() -> mLauncher.getNavigationModel() == expectedMode, WAIT_TIME_MS,
mLauncher);
for (int i = 0; i != 100; ++i) {
if (mLauncher.getNavigationModeMismatchError() == null) break;
Thread.sleep(100);
}
final String error = mLauncher.getNavigationModeMismatchError();
assertTrue("Switching nav mode: " + error, error == null);
Wait.atMost(() -> "Switching nav mode: "
+ mLauncher.getNavigationModeMismatchError(),
() -> mLauncher.getNavigationModeMismatchError() == null, WAIT_TIME_MS,
mLauncher);
return true;
}