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

Merge "Fix testQuickSwitchFromApp" into ub-launcher3-qt-future-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-24 00:47:01 +00:00
committed by Android (Google) Code Review
parent 7fcbd2379b 476b7d4378
commit ec72bf63df
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+9 -10
View File
@@ -248,33 +248,32 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@Test
@NavigationModeSwitch
@PortraitLandscape
@Ignore("Temporarily disabled b/140252765")
public void testQuickSwitchFromApp() throws Exception {
startAppFast(getAppPackageName());
startTestActivity(2);
String calculatorPackage = resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR);
startAppFast(calculatorPackage);
startTestActivity(3);
startTestActivity(4);
Background background = getAndAssertBackground();
background.quickSwitchToPreviousApp();
assertTrue("The first app we should have quick switched to is not running",
isTestActivityRunning("TestActivity2"));
isTestActivityRunning(3));
background = getAndAssertBackground();
background.quickSwitchToPreviousApp();
if (mLauncher.getNavigationModel() == NavigationModel.THREE_BUTTON) {
// 3-button mode toggles between 2 apps, rather than going back further.
assertTrue("Second quick switch should have returned to the first app.",
mDevice.wait(Until.hasObject(By.pkg(calculatorPackage)), DEFAULT_UI_TIMEOUT));
isTestActivityRunning(4));
} else {
assertTrue("The second app we should have quick switched to is not running",
isTestActivityRunning("Test Pin Item"));
isTestActivityRunning(2));
}
getAndAssertBackground();
}
private boolean isTestActivityRunning(String activityLabel) {
return mDevice.wait(Until.hasObject(By.pkg(getAppPackageName()).text(activityLabel)),
private boolean isTestActivityRunning(int activityNumber) {
return mDevice.wait(Until.hasObject(By.pkg(getAppPackageName())
.text("TestActivity" + activityNumber)),
DEFAULT_UI_TIMEOUT);
}
@@ -285,7 +284,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
startTestActivity(2);
mLauncher.pressHome().quickSwitchToPreviousApp();
assertTrue("The most recent task is not running after quick switching from home",
isTestActivityRunning("TestActivity2"));
isTestActivityRunning(2));
getAndAssertBackground();
}
}
tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+12 -6
View File
@@ -15,8 +15,6 @@
*/
package com.android.launcher3.ui;
import static androidx.test.InstrumentationRegistry.getInstrumentation;
import static com.android.launcher3.tapl.LauncherInstrumentation.ContainerType;
import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName;
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
@@ -25,6 +23,8 @@ import static org.junit.Assert.assertTrue;
import static java.lang.System.exit;
import static androidx.test.InstrumentationRegistry.getInstrumentation;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
@@ -348,7 +348,8 @@ public abstract class AbstractLauncherUiTest {
startIntent(
getInstrumentation().getContext().getPackageManager().getLaunchIntentForPackage(
packageName),
By.pkg(packageName).depth(0));
By.pkg(packageName).depth(0),
true /* newTask */);
}
protected void startTestActivity(int activityNumber) {
@@ -357,12 +358,17 @@ public abstract class AbstractLauncherUiTest {
getLaunchIntentForPackage(packageName);
intent.setComponent(new ComponentName(packageName,
"com.android.launcher3.tests.Activity" + activityNumber));
startIntent(intent, By.pkg(packageName).text("TestActivity" + activityNumber));
startIntent(intent, By.pkg(packageName).text("TestActivity" + activityNumber),
false /* newTask */);
}
private void startIntent(Intent intent, BySelector selector) {
private void startIntent(Intent intent, BySelector selector, boolean newTask) {
intent.addCategory(Intent.CATEGORY_LAUNCHER);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
if (newTask) {
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
} else {
intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK | Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
}
getInstrumentation().getTargetContext().startActivity(intent);
assertTrue("App didn't start: " + selector,
mDevice.wait(Until.hasObject(selector), DEFAULT_UI_TIMEOUT));