openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Temporary workarounds to make tests pass on a virtual device" into ub-launcher3-qt-r1-dev 

am: e46f9e5cf3

Change-Id: Ib221d9c201f2b396b138631d8548d1862d2e7643
This commit is contained in:
Vadim Tryshev 2019-06-28 14:33:47 -07:00 committed by android-build-merger
parent 6b72e4b33d e46f9e5cf3
commit a3da30f671
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java
View File

@ -51,7 +51,7 @@ public class DigitalWellBeingToastTest extends AbstractQuickStepTest {
mLauncher.pressHome();
final DigitalWellBeingToast toast = getToast();
assertTrue("Toast is not visible", toast.hasLimit());
waitForLauncherCondition("Toast is not visible", launcher -> toast.hasLimit());
assertEquals("Toast text: ", "5 minutes left today", toast.getText());
// Unset time limit for app.

5
quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java
View File

@ -25,6 +25,7 @@ import androidx.test.filters.LargeTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.launcher3.Launcher;
import com.android.launcher3.tapl.LauncherInstrumentation;
import com.android.launcher3.util.RaceConditionReproducer;
import com.android.quickstep.NavigationModeSwitchRule.Mode;
import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
@ -79,6 +80,8 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest {
@Test
@NavigationModeSwitch
public void testStressPressHome() {
if (LauncherInstrumentation.isAvd()) return; // b/136278866
for (int i = 0; i < STRESS_REPEAT_COUNT; ++i) {
// Destroy Launcher activity.
closeLauncherActivity();
@ -91,6 +94,8 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest {
@Test
@NavigationModeSwitch
public void testStressSwipeToOverview() {
if (LauncherInstrumentation.isAvd()) return; // b/136278866
for (int i = 0; i < STRESS_REPEAT_COUNT; ++i) {
// Destroy Launcher activity.
closeLauncherActivity();

2
tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
View File

@ -81,7 +81,7 @@ public abstract class AbstractLauncherUiTest {
public static final long DEFAULT_ACTIVITY_TIMEOUT = TimeUnit.SECONDS.toMillis(10);
public static final long DEFAULT_BROADCAST_TIMEOUT_SECS = 5;
public static final long DEFAULT_UI_TIMEOUT = 10000;
public static final long DEFAULT_UI_TIMEOUT = 60000; // b/136278866
private static final String TAG = "AbstractLauncherUiTest";
protected MainThreadExecutor mMainThreadExecutor = new MainThreadExecutor();

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

@ -432,6 +432,17 @@ public final class LauncherInstrumentation {
private UiObject2 verifyContainerType(ContainerType containerType) {
assertEquals("Unexpected display rotation",
mExpectedRotation, mDevice.getDisplayRotation());
// b/136278866
for (int i = 0; i != 100; ++i) {
if (getNavigationModeMismatchError() == null) break;
try {
Thread.sleep(100);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
final String error = getNavigationModeMismatchError();
assertTrue(error, error == null);
log("verifyContainerType: " + containerType);