diff options
| author | Vadim Tryshev <vadimt@google.com> | 2019-06-20 21:39:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-20 21:39:32 +0000 |
| commit | b4ff31218166527e4fc48b65f8cbbb3ba5086251 (patch) | |
| tree | 210ec5137af660c30884be8de351d6df8db90fa6 /quickstep | |
| parent | 73769f0a88c44ffa4f3212a612e5018085591ceb (diff) | |
| parent | e244a5802d48c1d57279e5a95eacc97156f96a04 (diff) | |
| download | android_packages_apps_Trebuchet-b4ff31218166527e4fc48b65f8cbbb3ba5086251.tar.gz android_packages_apps_Trebuchet-b4ff31218166527e4fc48b65f8cbbb3ba5086251.tar.bz2 android_packages_apps_Trebuchet-b4ff31218166527e4fc48b65f8cbbb3ba5086251.zip | |
Merge "Tests: waiting for nav bar to match nav mode" into ub-launcher3-qt-dev
Diffstat (limited to 'quickstep')
| -rw-r--r-- | quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java index 90763b871..3b35c86af 100644 --- a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java +++ b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java @@ -159,13 +159,20 @@ public class NavigationModeSwitchRule implements TestRule { } for (int i = 0; i != 100; ++i) { - if (mLauncher.getNavigationModel() == expectedMode) { - Thread.sleep(5000); - return; - } + if (mLauncher.getNavigationModel() == expectedMode) break; + Thread.sleep(100); + } + Assert.assertTrue("Couldn't switch to " + overlayPackage, + mLauncher.getNavigationModel() == expectedMode); + + for (int i = 0; i != 100; ++i) { + if (mLauncher.getNavigationModeMismatchError() == null) break; Thread.sleep(100); } - Assert.fail("Couldn't switch to " + overlayPackage); + final String error = mLauncher.getNavigationModeMismatchError(); + Assert.assertTrue("Switching nav mode: " + error, error == null); + + Thread.sleep(5000); } private void setOverlayPackageEnabled(String overlayPackage, boolean enable) |