Merge "Split taskbar test methods by persistent/transient" into tm-qpr-dev am: 6f53364c14

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21120291

Change-Id: I5c38a77a1f96e997e7ef42c068b9f502c3bff910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jon Miranda
2023-01-27 21:38:58 +00:00
committed by Automerger Merge Worker

View File

@@ -18,6 +18,7 @@ package com.android.quickstep;
import static androidx.test.InstrumentationRegistry.getInstrumentation;
import static com.android.quickstep.TaskbarModeSwitchRule.Mode.PERSISTENT;
import static com.android.quickstep.TaskbarModeSwitchRule.Mode.TRANSIENT;
import static junit.framework.TestCase.assertEquals;
@@ -82,19 +83,31 @@ public class TaplTestsTaskbar extends AbstractQuickStepTest {
}
@Test
@TaskbarModeSwitch
@TaskbarModeSwitch(mode = PERSISTENT)
public void testLaunchApp() throws Exception {
getTaskbar().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE);
}
@Test
@TaskbarModeSwitch
@TaskbarModeSwitch(mode = TRANSIENT)
public void testTransientLaunchApp() throws Exception {
getTaskbar().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE);
}
@Test
@TaskbarModeSwitch(mode = PERSISTENT)
public void testOpenMenu() throws Exception {
getTaskbar().getAppIcon(TEST_APP_NAME).openMenu();
}
@Test
@TaskbarModeSwitch
@TaskbarModeSwitch(mode = TRANSIENT)
public void testTransientOpenMenu() throws Exception {
getTaskbar().getAppIcon(TEST_APP_NAME).openMenu();
}
@Test
@TaskbarModeSwitch(mode = PERSISTENT)
public void testLaunchShortcut() throws Exception {
getTaskbar().getAppIcon(TEST_APP_NAME)
.openDeepShortcutMenu()
@@ -102,10 +115,19 @@ public class TaplTestsTaskbar extends AbstractQuickStepTest {
.launch(TEST_APP_PACKAGE);
}
@Test
@TaskbarModeSwitch(mode = TRANSIENT)
public void testTransientLaunchShortcut() throws Exception {
getTaskbar().getAppIcon(TEST_APP_NAME)
.openDeepShortcutMenu()
.getMenuItem("Shortcut 1")
.launch(TEST_APP_PACKAGE);
}
@Test
@ScreenRecord // b/231615831
@PortraitLandscape
@TaskbarModeSwitch
@TaskbarModeSwitch(mode = PERSISTENT)
public void testLaunchAppInSplitscreen() throws Exception {
getTaskbar().getAppIcon(TEST_APP_NAME).dragToSplitscreen(
TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
@@ -114,7 +136,16 @@ public class TaplTestsTaskbar extends AbstractQuickStepTest {
@Test
@ScreenRecord // b/231615831
@PortraitLandscape
@TaskbarModeSwitch
@TaskbarModeSwitch(mode = TRANSIENT)
public void testTransientLaunchAppInSplitscreen() throws Exception {
getTaskbar().getAppIcon(TEST_APP_NAME).dragToSplitscreen(
TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
}
@Test
@ScreenRecord // b/231615831
@PortraitLandscape
@TaskbarModeSwitch(mode = PERSISTENT)
public void testLaunchShortcutInSplitscreen() throws Exception {
getTaskbar().getAppIcon(TEST_APP_NAME)
.openDeepShortcutMenu()
@@ -123,19 +154,42 @@ public class TaplTestsTaskbar extends AbstractQuickStepTest {
}
@Test
@TaskbarModeSwitch
@ScreenRecord // b/231615831
@PortraitLandscape
@TaskbarModeSwitch(mode = TRANSIENT)
public void testTransientLaunchShortcutInSplitscreen() throws Exception {
getTaskbar().getAppIcon(TEST_APP_NAME)
.openDeepShortcutMenu()
.getMenuItem("Shortcut 1")
.dragToSplitscreen(TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
}
@Test
@TaskbarModeSwitch(mode = PERSISTENT)
public void testLaunchApp_FromTaskbarAllApps() throws Exception {
getTaskbar().openAllApps().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE);
}
@Test
@TaskbarModeSwitch
@TaskbarModeSwitch(mode = TRANSIENT)
public void testTransientLaunchApp_FromTaskbarAllApps() throws Exception {
getTaskbar().openAllApps().getAppIcon(TEST_APP_NAME).launch(TEST_APP_PACKAGE);
}
@Test
@TaskbarModeSwitch(mode = PERSISTENT)
public void testOpenMenu_FromTaskbarAllApps() throws Exception {
getTaskbar().openAllApps().getAppIcon(TEST_APP_NAME).openMenu();
}
@Test
@TaskbarModeSwitch
@TaskbarModeSwitch(mode = TRANSIENT)
public void testTransientOpenMenu_FromTaskbarAllApps() throws Exception {
getTaskbar().openAllApps().getAppIcon(TEST_APP_NAME).openMenu();
}
@Test
@TaskbarModeSwitch(mode = PERSISTENT)
public void testLaunchShortcut_FromTaskbarAllApps() throws Exception {
getTaskbar().openAllApps()
.getAppIcon(TEST_APP_NAME)
@@ -144,10 +198,20 @@ public class TaplTestsTaskbar extends AbstractQuickStepTest {
.launch(TEST_APP_PACKAGE);
}
@Test
@TaskbarModeSwitch(mode = TRANSIENT)
public void testTransientLaunchShortcut_FromTaskbarAllApps() throws Exception {
getTaskbar().openAllApps()
.getAppIcon(TEST_APP_NAME)
.openDeepShortcutMenu()
.getMenuItem("Shortcut 1")
.launch(TEST_APP_PACKAGE);
}
@Test
@ScreenRecord // b/231615831
@PortraitLandscape
@TaskbarModeSwitch
@TaskbarModeSwitch(mode = PERSISTENT)
public void testLaunchAppInSplitscreen_FromTaskbarAllApps() throws Exception {
getTaskbar().openAllApps()
.getAppIcon(TEST_APP_NAME)
@@ -157,7 +221,17 @@ public class TaplTestsTaskbar extends AbstractQuickStepTest {
@Test
@ScreenRecord // b/231615831
@PortraitLandscape
@TaskbarModeSwitch
@TaskbarModeSwitch(mode = TRANSIENT)
public void testTransientLaunchAppInSplitscreen_FromTaskbarAllApps() throws Exception {
getTaskbar().openAllApps()
.getAppIcon(TEST_APP_NAME)
.dragToSplitscreen(TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
}
@Test
@ScreenRecord // b/231615831
@PortraitLandscape
@TaskbarModeSwitch(mode = PERSISTENT)
public void testLaunchShortcutInSplitscreen_FromTaskbarAllApps() throws Exception {
getTaskbar().openAllApps()
.getAppIcon(TEST_APP_NAME)
@@ -166,6 +240,18 @@ public class TaplTestsTaskbar extends AbstractQuickStepTest {
.dragToSplitscreen(TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
}
@Test
@ScreenRecord // b/231615831
@PortraitLandscape
@TaskbarModeSwitch(mode = TRANSIENT)
public void testTransientLaunchShortcutInSplitscreen_FromTaskbarAllApps() throws Exception {
getTaskbar().openAllApps()
.getAppIcon(TEST_APP_NAME)
.openDeepShortcutMenu()
.getMenuItem("Shortcut 1")
.dragToSplitscreen(TEST_APP_PACKAGE, CALCULATOR_APP_PACKAGE);
}
private Taskbar getTaskbar() {
Taskbar taskbar = mLauncher.getLaunchedAppState().getTaskbar();
List<String> taskbarIconNames = taskbar.getIconNames();