Merge changes from topic "Annotate Platinum Test" into udc-dev
* changes:
[3/7]Add PlatinumTest annotation to tests
[4/7]Add PlatinumTest annotation to tests
diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index 88cac97..7b90ecb 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -26,6 +26,7 @@
import static org.junit.Assume.assumeTrue;
import android.content.Intent;
+import android.platform.test.annotations.PlatinumTest;
import androidx.test.filters.LargeTest;
import androidx.test.platform.app.InstrumentationRegistry;
@@ -99,6 +100,7 @@
@Test
@NavigationModeSwitch
@PortraitLandscape
+ @PlatinumTest(focusArea = "launcher")
public void testWorkspaceSwitchToAllApps() {
assertNotNull("switchToAllApps() returned null",
mLauncher.getWorkspace().switchToAllApps());
@@ -108,6 +110,7 @@
@Test
@PortraitLandscape
+ @PlatinumTest(focusArea = "launcher")
public void testOverview() throws Exception {
startTestAppsWithCheck();
// mLauncher.pressHome() also tests an important case of pressing home while in background.
@@ -175,6 +178,7 @@
@NavigationModeSwitch
@PortraitLandscape
@ScreenRecord // b/195673272
+ @PlatinumTest(focusArea = "launcher")
public void testOverviewActions() throws Exception {
// Experimenting for b/165029151:
final Overview overview = mLauncher.goHome().switchToOverview();
@@ -209,6 +213,7 @@
@NavigationModeSwitch
@PortraitLandscape
@ScreenRecord // b/238461765
+ @PlatinumTest(focusArea = "launcher")
public void testSwitchToOverview() throws Exception {
startTestAppsWithCheck();
assertNotNull("Workspace.switchToOverview() returned null",
@@ -221,6 +226,7 @@
@Test
@NavigationModeSwitch
@PortraitLandscape
+ @PlatinumTest(focusArea = "launcher")
public void testBackground() throws Exception {
startAppFast(CALCULATOR_APP_PACKAGE);
final LaunchedAppState launchedAppState = getAndAssertLaunchedApp();
@@ -275,6 +281,7 @@
@Test
@NavigationModeSwitch
@PortraitLandscape
+ @PlatinumTest(focusArea = "launcher")
public void testQuickSwitchFromApp() throws Exception {
startTestActivity(2);
startTestActivity(3);
@@ -304,6 +311,7 @@
@Test
@ScreenRecord // b/242163205
+ @PlatinumTest(focusArea = "launcher")
public void testQuickSwitchToPreviousAppForTablet() throws Exception {
assumeTrue(mLauncher.isTablet());
startTestActivity(2);
@@ -335,6 +343,7 @@
@Test
@NavigationModeSwitch
@PortraitLandscape
+ @PlatinumTest(focusArea = "launcher")
public void testQuickSwitchFromHome() throws Exception {
startTestActivity(2);
mLauncher.goHome().quickSwitchToPreviousApp();
@@ -346,6 +355,7 @@
@Test
@PortraitLandscape
@NavigationModeSwitch
+ @PlatinumTest(focusArea = "launcher")
public void testPressBack() throws Exception {
InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
READ_DEVICE_CONFIG_PERMISSION);
@@ -364,6 +374,7 @@
@Test
@PortraitLandscape
@TaskbarModeSwitch(mode = PERSISTENT)
+ @PlatinumTest(focusArea = "launcher")
public void testOverviewForTablet() throws Exception {
assumeTrue(mLauncher.isTablet());
diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index 9d9fdc9..9676cb3 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -32,6 +32,7 @@
import android.graphics.Point;
import android.os.SystemClock;
import android.platform.test.annotations.IwTest;
+import android.platform.test.annotations.PlatinumTest;
import android.util.Log;
import androidx.test.filters.FlakyTest;
@@ -237,6 +238,7 @@
false /* tapRight */);
}
+ @PlatinumTest(focusArea = "launcher")
@IwTest(focusArea = "launcher")
@Test
@ScreenRecord // b/202433017
@@ -350,6 +352,7 @@
@Test
@PortraitLandscape
+ @PlatinumTest(focusArea = "launcher")
public void testLaunchMenuItem() throws Exception {
final AllApps allApps = mLauncher.getWorkspace().switchToAllApps();
allApps.freeze();
@@ -370,6 +373,7 @@
}
}
+ @PlatinumTest(focusArea = "launcher")
@IwTest(focusArea = "launcher")
@Test
@PortraitLandscape
@@ -394,6 +398,7 @@
@Test
@PortraitLandscape
+ @PlatinumTest(focusArea = "launcher")
public void testDragShortcut() throws Throwable {
// 1. Open all apps and wait for load complete.
// 2. Find the app and long press it to show shortcuts.
@@ -423,6 +428,7 @@
@PortraitLandscape
@ScreenRecord
@Ignore // b/233075289
+ @PlatinumTest(focusArea = "launcher")
public void testDragToFolder() {
// TODO: add the use case to drag an icon to an existing folder. Currently it either fails
// on tablets or phones due to difference in resolution.
@@ -469,6 +475,7 @@
@Test
@PortraitLandscape
+ @PlatinumTest(focusArea = "launcher")
public void testDragAndCancelAppIcon() {
final HomeAppIcon homeAppIcon = createShortcutInCenterIfNotExist(GMAIL_APP_NAME);
Point positionBeforeDrag =
@@ -511,6 +518,7 @@
@Ignore("b/256615483")
@Test
@PortraitLandscape
+ @PlatinumTest(focusArea = "launcher")
public void testUninstallFromWorkspace() throws Exception {
installDummyAppAndWaitForUIUpdate();
try {
@@ -524,6 +532,7 @@
@Test
@ScreenRecord // b/258071914
@PortraitLandscape
+ @PlatinumTest(focusArea = "launcher")
public void testUninstallFromAllApps() throws Exception {
installDummyAppAndWaitForUIUpdate();
try {
@@ -539,6 +548,7 @@
@Test
@PortraitLandscape
+ @PlatinumTest(focusArea = "launcher")
public void testDragAppIconToWorkspaceCell() throws Exception {
long startTime, endTime, elapsedTime;
Point[] targets = getCornersAndCenterPositions();
@@ -574,6 +584,7 @@
@Test
@ScreenRecord // b/241821721
+ @PlatinumTest(focusArea = "launcher")
public void getIconsPosition_afterIconRemoved_notContained() throws IOException {
Point[] gridPositions = getCornersAndCenterPositions();
createShortcutIfNotExist(STORE_APP_NAME, gridPositions[0]);
@@ -600,6 +611,7 @@
@Test
@PortraitLandscape
+ @PlatinumTest(focusArea = "launcher")
public void testDragShortcutToWorkspaceCell() throws Exception {
Point[] targets = getCornersAndCenterPositions();
diff --git a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
index 78a006e..6d858e0 100644
--- a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
@@ -21,6 +21,7 @@
import static org.junit.Assert.assertTrue;
import android.platform.test.annotations.IwTest;
+import android.platform.test.annotations.PlatinumTest;
import androidx.test.filters.LargeTest;
import androidx.test.runner.AndroidJUnit4;
@@ -48,6 +49,7 @@
@Rule
public ShellCommandRule mGrantWidgetRule = ShellCommandRule.grantWidgetBind();
+ @PlatinumTest(focusArea = "launcher")
@IwTest(focusArea="launcher")
@Test
@PortraitLandscape