From 957e4e513eaa189f8c0e379c985d3b0d68dfaf4b Mon Sep 17 00:00:00 2001 From: Sebastian Franco Date: Thu, 7 Dec 2023 15:59:13 -0600 Subject: [PATCH] Make all tapl test start with Tapl Flag: NA Bug: 298234173 Test: only test name change Change-Id: Ib2e67a569599568cf1e681a7f1ac44924da83b84 --- ....java => TaplDigitalWellBeingToastTest.java} | 17 ++++++++++++++++- ...va => TaplStartLauncherViaGestureTests.java} | 2 +- ...java => TaplViewInflationDuringSwipeUp.java} | 2 +- ...Widgets.java => TaplReorderWidgetsTest.java} | 4 ++-- ...onUiTest.java => TaplPromiseIconUiTest.java} | 2 +- ...va => TaplSecondaryDisplayLauncherTest.java} | 2 +- ...rofileTest.java => TaplWorkProfileTest.java} | 2 +- ...etTest.java => TaplAddConfigWidgetTest.java} | 13 ++++++++----- ...ddWidgetTest.java => TaplAddWidgetTest.java} | 2 +- ...dWidgetTest.java => TaplBindWidgetTest.java} | 2 +- ...temTest.java => TaplRequestPinItemTest.java} | 2 +- ...meIconsTest.java => TaplThemeIconsTest.java} | 2 +- ...Test.java => TaplTwoPanelWorkspaceTest.java} | 2 +- 13 files changed, 36 insertions(+), 18 deletions(-) rename quickstep/tests/src/com/android/quickstep/{DigitalWellBeingToastTest.java => TaplDigitalWellBeingToastTest.java} (83%) rename quickstep/tests/src/com/android/quickstep/{StartLauncherViaGestureTests.java => TaplStartLauncherViaGestureTests.java} (97%) rename quickstep/tests/src/com/android/quickstep/{ViewInflationDuringSwipeUp.java => TaplViewInflationDuringSwipeUp.java} (99%) rename tests/src/com/android/launcher3/celllayout/{ReorderWidgets.java => TaplReorderWidgetsTest.java} (98%) rename tests/src/com/android/launcher3/compat/{PromiseIconUiTest.java => TaplPromiseIconUiTest.java} (98%) rename tests/src/com/android/launcher3/secondarydisplay/{SecondaryDisplayLauncherTest.java => TaplSecondaryDisplayLauncherTest.java} (99%) rename tests/src/com/android/launcher3/ui/{WorkProfileTest.java => TaplWorkProfileTest.java} (99%) rename tests/src/com/android/launcher3/ui/widget/{AddConfigWidgetTest.java => TaplAddConfigWidgetTest.java} (92%) rename tests/src/com/android/launcher3/ui/widget/{AddWidgetTest.java => TaplAddWidgetTest.java} (98%) rename tests/src/com/android/launcher3/ui/widget/{BindWidgetTest.java => TaplBindWidgetTest.java} (99%) rename tests/src/com/android/launcher3/ui/widget/{RequestPinItemTest.java => TaplRequestPinItemTest.java} (99%) rename tests/src/com/android/launcher3/ui/workspace/{ThemeIconsTest.java => TaplThemeIconsTest.java} (98%) rename tests/src/com/android/launcher3/ui/workspace/{TwoPanelWorkspaceTest.java => TaplTwoPanelWorkspaceTest.java} (99%) diff --git a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java b/quickstep/tests/src/com/android/quickstep/TaplDigitalWellBeingToastTest.java similarity index 83% rename from quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java rename to quickstep/tests/src/com/android/quickstep/TaplDigitalWellBeingToastTest.java index 1129a337e3..728fe6741d 100644 --- a/quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java +++ b/quickstep/tests/src/com/android/quickstep/TaplDigitalWellBeingToastTest.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.android.quickstep; import static androidx.test.InstrumentationRegistry.getInstrumentation; @@ -27,7 +42,7 @@ import java.time.Duration; @LargeTest @RunWith(AndroidJUnit4.class) -public class DigitalWellBeingToastTest extends AbstractQuickStepTest { +public class TaplDigitalWellBeingToastTest extends AbstractQuickStepTest { private static final String CALCULATOR_PACKAGE = resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR); diff --git a/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java b/quickstep/tests/src/com/android/quickstep/TaplStartLauncherViaGestureTests.java similarity index 97% rename from quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java rename to quickstep/tests/src/com/android/quickstep/TaplStartLauncherViaGestureTests.java index 85440e99be..7e274e8833 100644 --- a/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java +++ b/quickstep/tests/src/com/android/quickstep/TaplStartLauncherViaGestureTests.java @@ -32,7 +32,7 @@ import org.junit.runner.RunWith; @LargeTest @RunWith(AndroidJUnit4.class) -public class StartLauncherViaGestureTests extends AbstractQuickStepTest { +public class TaplStartLauncherViaGestureTests extends AbstractQuickStepTest { static final int STRESS_REPEAT_COUNT = 10; diff --git a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java b/quickstep/tests/src/com/android/quickstep/TaplViewInflationDuringSwipeUp.java similarity index 99% rename from quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java rename to quickstep/tests/src/com/android/quickstep/TaplViewInflationDuringSwipeUp.java index 2318f5486d..f76e17aa27 100644 --- a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java +++ b/quickstep/tests/src/com/android/quickstep/TaplViewInflationDuringSwipeUp.java @@ -85,7 +85,7 @@ import java.util.function.IntConsumer; */ @LargeTest @RunWith(AndroidJUnit4.class) -public class ViewInflationDuringSwipeUp extends AbstractQuickStepTest { +public class TaplViewInflationDuringSwipeUp extends AbstractQuickStepTest { private SparseArray mConfigMap; private InitTracker mInitTracker; diff --git a/tests/src/com/android/launcher3/celllayout/ReorderWidgets.java b/tests/src/com/android/launcher3/celllayout/TaplReorderWidgetsTest.java similarity index 98% rename from tests/src/com/android/launcher3/celllayout/ReorderWidgets.java rename to tests/src/com/android/launcher3/celllayout/TaplReorderWidgetsTest.java index 30bde0a8c3..8bdcd033f7 100644 --- a/tests/src/com/android/launcher3/celllayout/ReorderWidgets.java +++ b/tests/src/com/android/launcher3/celllayout/TaplReorderWidgetsTest.java @@ -58,12 +58,12 @@ import java.util.Map; @SmallTest @RunWith(AndroidJUnit4.class) -public class ReorderWidgets extends AbstractLauncherUiTest { +public class TaplReorderWidgetsTest extends AbstractLauncherUiTest { @Rule public ShellCommandRule mGrantWidgetRule = ShellCommandRule.grantWidgetBind(); - private static final String TAG = ReorderWidgets.class.getSimpleName(); + private static final String TAG = TaplReorderWidgetsTest.class.getSimpleName(); private static final List FOLDABLE_GRIDS = List.of("normal", "practical", "reasonable"); diff --git a/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java b/tests/src/com/android/launcher3/compat/TaplPromiseIconUiTest.java similarity index 98% rename from tests/src/com/android/launcher3/compat/PromiseIconUiTest.java rename to tests/src/com/android/launcher3/compat/TaplPromiseIconUiTest.java index c5d5de8a39..8200c9443c 100644 --- a/tests/src/com/android/launcher3/compat/PromiseIconUiTest.java +++ b/tests/src/com/android/launcher3/compat/TaplPromiseIconUiTest.java @@ -41,7 +41,7 @@ import java.util.UUID; */ @LargeTest @RunWith(AndroidJUnit4.class) -public class PromiseIconUiTest extends AbstractLauncherUiTest { +public class TaplPromiseIconUiTest extends AbstractLauncherUiTest { private int mSessionId = -1; diff --git a/tests/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncherTest.java b/tests/src/com/android/launcher3/secondarydisplay/TaplSecondaryDisplayLauncherTest.java similarity index 99% rename from tests/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncherTest.java rename to tests/src/com/android/launcher3/secondarydisplay/TaplSecondaryDisplayLauncherTest.java index c7431f20dd..d7b9638ef2 100644 --- a/tests/src/com/android/launcher3/secondarydisplay/SecondaryDisplayLauncherTest.java +++ b/tests/src/com/android/launcher3/secondarydisplay/TaplSecondaryDisplayLauncherTest.java @@ -47,7 +47,7 @@ import org.junit.runner.RunWith; */ @LargeTest @RunWith(AndroidJUnit4.class) -public final class SecondaryDisplayLauncherTest extends AbstractLauncherUiTest { +public final class TaplSecondaryDisplayLauncherTest extends AbstractLauncherUiTest { private static final int WAIT_TIME_MS = 5000; private static final int LONG_PRESS_DURATION_MS = 1000; private static final int DRAG_TIME_MS = 160; diff --git a/tests/src/com/android/launcher3/ui/WorkProfileTest.java b/tests/src/com/android/launcher3/ui/TaplWorkProfileTest.java similarity index 99% rename from tests/src/com/android/launcher3/ui/WorkProfileTest.java rename to tests/src/com/android/launcher3/ui/TaplWorkProfileTest.java index 485ef9488d..f8185641bd 100644 --- a/tests/src/com/android/launcher3/ui/WorkProfileTest.java +++ b/tests/src/com/android/launcher3/ui/TaplWorkProfileTest.java @@ -48,7 +48,7 @@ import org.junit.Test; import java.util.Objects; import java.util.function.Predicate; -public class WorkProfileTest extends AbstractLauncherUiTest { +public class TaplWorkProfileTest extends AbstractLauncherUiTest { private static final int WORK_PAGE = ActivityAllAppsContainerView.AdapterHolder.WORK; diff --git a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/TaplAddConfigWidgetTest.java similarity index 92% rename from tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java rename to tests/src/com/android/launcher3/ui/widget/TaplAddConfigWidgetTest.java index a28b4ef460..ca72c097d4 100644 --- a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/TaplAddConfigWidgetTest.java @@ -52,7 +52,7 @@ import org.junit.runner.RunWith; */ @LargeTest @RunWith(AndroidJUnit4.class) -public class AddConfigWidgetTest extends AbstractLauncherUiTest { +public class TaplAddConfigWidgetTest extends AbstractLauncherUiTest { @Rule public ShellCommandRule mGrantWidgetRule = ShellCommandRule.grantWidgetBind(); @@ -82,6 +82,7 @@ public class AddConfigWidgetTest extends AbstractLauncherUiTest { runTest(false); } + /** * @param acceptConfig accept the config activity */ @@ -111,10 +112,12 @@ public class AddConfigWidgetTest extends AbstractLauncherUiTest { } } - private static void setResult(boolean success) { - getInstrumentation().getTargetContext().sendBroadcast( - WidgetConfigActivity.getCommandIntent(WidgetConfigActivity.class, - success ? "clickOK" : "clickCancel")); + private void setResult(boolean success) { + mLauncher.executeAndWaitForWallpaperAnimation(() -> + getInstrumentation().getTargetContext().sendBroadcast( + WidgetConfigActivity.getCommandIntent(WidgetConfigActivity.class, + success ? "clickOK" : "clickCancel")), + "setting widget coinfig result"); } /** diff --git a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/TaplAddWidgetTest.java similarity index 98% rename from tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java rename to tests/src/com/android/launcher3/ui/widget/TaplAddWidgetTest.java index fd4b7f1f6c..27fda9b680 100644 --- a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/TaplAddWidgetTest.java @@ -42,7 +42,7 @@ import org.junit.runner.RunWith; */ @LargeTest @RunWith(AndroidJUnit4.class) -public class AddWidgetTest extends AbstractLauncherUiTest { +public class TaplAddWidgetTest extends AbstractLauncherUiTest { @Rule public ShellCommandRule mGrantWidgetRule = ShellCommandRule.grantWidgetBind(); diff --git a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/TaplBindWidgetTest.java similarity index 99% rename from tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java rename to tests/src/com/android/launcher3/ui/widget/TaplBindWidgetTest.java index 32793cc084..6aa746d6d3 100644 --- a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/TaplBindWidgetTest.java @@ -76,7 +76,7 @@ import java.util.function.Consumer; */ @LargeTest @RunWith(AndroidJUnit4.class) -public class BindWidgetTest extends AbstractLauncherUiTest { +public class TaplBindWidgetTest extends AbstractLauncherUiTest { @Rule public ShellCommandRule mGrantWidgetRule = ShellCommandRule.grantWidgetBind(); diff --git a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java b/tests/src/com/android/launcher3/ui/widget/TaplRequestPinItemTest.java similarity index 99% rename from tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java rename to tests/src/com/android/launcher3/ui/widget/TaplRequestPinItemTest.java index 3c88f1d69c..f12f96153b 100644 --- a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java +++ b/tests/src/com/android/launcher3/ui/widget/TaplRequestPinItemTest.java @@ -59,7 +59,7 @@ import java.util.UUID; */ @LargeTest @RunWith(AndroidJUnit4.class) -public class RequestPinItemTest extends AbstractLauncherUiTest { +public class TaplRequestPinItemTest extends AbstractLauncherUiTest { @Rule public ShellCommandRule mGrantWidgetRule = ShellCommandRule.grantWidgetBind(); diff --git a/tests/src/com/android/launcher3/ui/workspace/ThemeIconsTest.java b/tests/src/com/android/launcher3/ui/workspace/TaplThemeIconsTest.java similarity index 98% rename from tests/src/com/android/launcher3/ui/workspace/ThemeIconsTest.java rename to tests/src/com/android/launcher3/ui/workspace/TaplThemeIconsTest.java index e21918f1e3..a3d33441d4 100644 --- a/tests/src/com/android/launcher3/ui/workspace/ThemeIconsTest.java +++ b/tests/src/com/android/launcher3/ui/workspace/TaplThemeIconsTest.java @@ -49,7 +49,7 @@ import java.util.Queue; * Note running these tests will clear the workspace on the device. */ @LargeTest -public class ThemeIconsTest extends AbstractLauncherUiTest { +public class TaplThemeIconsTest extends AbstractLauncherUiTest { private static final String APP_NAME = "IconThemedActivity"; private static final String SHORTCUT_NAME = "Shortcut 1"; diff --git a/tests/src/com/android/launcher3/ui/workspace/TwoPanelWorkspaceTest.java b/tests/src/com/android/launcher3/ui/workspace/TaplTwoPanelWorkspaceTest.java similarity index 99% rename from tests/src/com/android/launcher3/ui/workspace/TwoPanelWorkspaceTest.java rename to tests/src/com/android/launcher3/ui/workspace/TaplTwoPanelWorkspaceTest.java index e7112d14b0..3693163d21 100644 --- a/tests/src/com/android/launcher3/ui/workspace/TwoPanelWorkspaceTest.java +++ b/tests/src/com/android/launcher3/ui/workspace/TaplTwoPanelWorkspaceTest.java @@ -54,7 +54,7 @@ import java.util.stream.Collectors; */ @LargeTest @RunWith(AndroidJUnit4.class) -public class TwoPanelWorkspaceTest extends AbstractLauncherUiTest { +public class TaplTwoPanelWorkspaceTest extends AbstractLauncherUiTest { private AutoCloseable mLauncherLayout;