From 0e02d74cbf4aec5a2411059762a3fb665ec9a720 Mon Sep 17 00:00:00 2001 From: Sebastian Franco Date: Wed, 22 Nov 2023 12:40:58 -0600 Subject: [PATCH] Moving the static initialization method from TaplTestsLauncher3 to AbstractLauncherUiTest Flag: NA Bug: 298234173 Test: atest TaplWorkspaceTest Change-Id: I49dadefa17ef0ea78ca342b8b6d7bb9e38d4d0c9 --- .../quickstep/AbstractTaplTestsTaskbar.java | 3 +-- .../StartLauncherViaGestureTests.java | 4 ++-- .../quickstep/TaplOverviewIconTest.java | 2 +- .../TaplTestsKeyboardQuickSwitch.java | 4 ++-- .../android/quickstep/TaplTestsQuickstep.java | 4 ++-- .../quickstep/TaplTestsSplitscreen.java | 5 ++--- .../android/quickstep/TaplTestsTrackpad.java | 5 ++--- .../quickstep/ViewInflationDuringSwipeUp.java | 4 ++-- .../allapps/TaplKeyboardFocusTest.java | 2 +- .../allapps/TaplOpenCloseAllApps.java | 2 +- .../allapps/TaplTestsAllAppsIconsWorking.java | 2 +- .../appiconmenu/TaplAppIconMenuTest.java | 2 +- .../launcher3/celllayout/ReorderWidgets.java | 3 +-- .../launcher3/dragging/TaplDragTest.java | 2 +- .../dragging/TaplUninstallRemove.java | 2 +- .../launcher3/ui/AbstractLauncherUiTest.java | 17 +++++++++++++++++ .../launcher3/ui/TaplTestsLauncher3.java | 19 ------------------- .../ui/widget/RequestPinItemTest.java | 5 +---- .../ui/widget/TaplWidgetPickerTest.java | 2 +- .../ui/workspace/TaplWorkspaceTest.java | 2 +- .../ui/workspace/ThemeIconsTest.java | 9 ++++----- .../ui/workspace/TwoPanelWorkspaceTest.java | 3 +-- 22 files changed, 46 insertions(+), 57 deletions(-) diff --git a/quickstep/tests/src/com/android/quickstep/AbstractTaplTestsTaskbar.java b/quickstep/tests/src/com/android/quickstep/AbstractTaplTestsTaskbar.java index ba9ae6771d..fc757b44c9 100644 --- a/quickstep/tests/src/com/android/quickstep/AbstractTaplTestsTaskbar.java +++ b/quickstep/tests/src/com/android/quickstep/AbstractTaplTestsTaskbar.java @@ -25,7 +25,6 @@ import android.content.Intent; import com.android.launcher3.tapl.LauncherInstrumentation; import com.android.launcher3.tapl.Taskbar; import com.android.launcher3.ui.AbstractLauncherUiTest; -import com.android.launcher3.ui.TaplTestsLauncher3; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.LauncherLayoutBuilder; import com.android.launcher3.util.TestUtil; @@ -55,7 +54,7 @@ public class AbstractTaplTestsTaskbar extends AbstractQuickStepTest { "com.google.android.apps.nexuslauncher.tests", "com.android.launcher3.testcomponent.BaseTestingActivity"); mLauncherLayout = TestUtil.setLauncherDefaultLayout(mTargetContext, layoutBuilder); - TaplTestsLauncher3.initialize(this); + AbstractLauncherUiTest.initialize(this); startAppFast(CALCULATOR_APP_PACKAGE); mLauncher.enableBlockTimeout(true); mLauncher.showTaskbarIfHidden(); diff --git a/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java b/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java index a89eab540f..835521663d 100644 --- a/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java +++ b/quickstep/tests/src/com/android/quickstep/StartLauncherViaGestureTests.java @@ -22,7 +22,7 @@ import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUB import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; -import com.android.launcher3.ui.TaplTestsLauncher3; +import com.android.launcher3.ui.AbstractLauncherUiTest; import com.android.launcher3.util.rule.TestStabilityRule.Stability; import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch; @@ -40,7 +40,7 @@ public class StartLauncherViaGestureTests extends AbstractQuickStepTest { @Before public void setUp() throws Exception { super.setUp(); - TaplTestsLauncher3.initialize(this); + AbstractLauncherUiTest.initialize(this); // b/143488140 mLauncher.goHome(); // Start an activity where the gestures start. diff --git a/quickstep/tests/src/com/android/quickstep/TaplOverviewIconTest.java b/quickstep/tests/src/com/android/quickstep/TaplOverviewIconTest.java index c4c95bcf38..3f806d1764 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplOverviewIconTest.java +++ b/quickstep/tests/src/com/android/quickstep/TaplOverviewIconTest.java @@ -15,7 +15,7 @@ */ package com.android.quickstep; -import static com.android.launcher3.ui.TaplTestsLauncher3.initialize; +import static com.android.launcher3.ui.AbstractLauncherUiTest.initialize; import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL; import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT; diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsKeyboardQuickSwitch.java b/quickstep/tests/src/com/android/quickstep/TaplTestsKeyboardQuickSwitch.java index 74f37a493c..829e54bdff 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsKeyboardQuickSwitch.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsKeyboardQuickSwitch.java @@ -22,7 +22,7 @@ import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.tapl.KeyboardQuickSwitch; -import com.android.launcher3.ui.TaplTestsLauncher3; +import com.android.launcher3.ui.AbstractLauncherUiTest; import org.junit.Assume; import org.junit.Test; @@ -56,7 +56,7 @@ public class TaplTestsKeyboardQuickSwitch extends AbstractQuickStepTest { public void setUp() throws Exception { Assume.assumeTrue(mLauncher.isTablet()); super.setUp(); - TaplTestsLauncher3.initialize(this); + AbstractLauncherUiTest.initialize(this); startAppFast(CALCULATOR_APP_PACKAGE); startTestActivity(2); } diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java index 8e142c391b..b3cc215abc 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java @@ -45,8 +45,8 @@ import com.android.launcher3.tapl.LauncherInstrumentation.NavigationModel; import com.android.launcher3.tapl.Overview; import com.android.launcher3.tapl.OverviewActions; import com.android.launcher3.tapl.OverviewTask; +import com.android.launcher3.ui.AbstractLauncherUiTest; import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape; -import com.android.launcher3.ui.TaplTestsLauncher3; import com.android.launcher3.util.Wait; import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord; import com.android.launcher3.util.rule.TestStabilityRule; @@ -72,7 +72,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { @Before public void setUp() throws Exception { super.setUp(); - TaplTestsLauncher3.initialize(this); + AbstractLauncherUiTest.initialize(this); executeOnLauncher(launcher -> { RecentsView recentsView = launcher.getOverviewPanel(); recentsView.getPagedViewOrientedState().forceAllowRotationForTesting(true); diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsSplitscreen.java b/quickstep/tests/src/com/android/quickstep/TaplTestsSplitscreen.java index 234fe63787..1e33635a23 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsSplitscreen.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsSplitscreen.java @@ -32,15 +32,14 @@ import androidx.test.platform.app.InstrumentationRegistry; import com.android.launcher3.tapl.Overview; import com.android.launcher3.tapl.Taskbar; import com.android.launcher3.tapl.TaskbarAppIcon; +import com.android.launcher3.ui.AbstractLauncherUiTest; import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape; -import com.android.launcher3.ui.TaplTestsLauncher3; import com.android.launcher3.util.rule.TestStabilityRule; import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch; import com.android.wm.shell.Flags; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -58,7 +57,7 @@ public class TaplTestsSplitscreen extends AbstractQuickStepTest { @Before public void setUp() throws Exception { super.setUp(); - TaplTestsLauncher3.initialize(this); + AbstractLauncherUiTest.initialize(this); if (mLauncher.isTablet()) { mLauncher.enableBlockTimeout(true); diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsTrackpad.java b/quickstep/tests/src/com/android/quickstep/TaplTestsTrackpad.java index 907dbccb91..0eec8b7a37 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsTrackpad.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsTrackpad.java @@ -19,7 +19,6 @@ package com.android.quickstep; import static com.android.quickstep.NavigationModeSwitchRule.Mode.ZERO_BUTTON; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeFalse; import static org.junit.Assume.assumeTrue; @@ -32,8 +31,8 @@ import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.tapl.LauncherInstrumentation.TrackpadGestureType; import com.android.launcher3.tapl.Workspace; +import com.android.launcher3.ui.AbstractLauncherUiTest; import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape; -import com.android.launcher3.ui.TaplTestsLauncher3; import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch; import org.junit.After; @@ -51,7 +50,7 @@ public class TaplTestsTrackpad extends AbstractQuickStepTest { @Before public void setUp() throws Exception { super.setUp(); - TaplTestsLauncher3.initialize(this); + AbstractLauncherUiTest.initialize(this); } @After diff --git a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java b/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java index 8cc84875e0..2318f5486d 100644 --- a/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java +++ b/quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java @@ -56,7 +56,7 @@ import com.android.launcher3.tapl.LaunchedAppState; import com.android.launcher3.testcomponent.ListViewService; import com.android.launcher3.testcomponent.ListViewService.SimpleViewsFactory; import com.android.launcher3.testcomponent.TestCommandReceiver; -import com.android.launcher3.ui.TaplTestsLauncher3; +import com.android.launcher3.ui.AbstractLauncherUiTest; import com.android.launcher3.ui.TestViewHelpers; import com.android.launcher3.util.Executors; import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; @@ -102,7 +102,7 @@ public class ViewInflationDuringSwipeUp extends AbstractQuickStepTest { // is started only after starting another app. startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR)); - TaplTestsLauncher3.initialize(this); + AbstractLauncherUiTest.initialize(this); mModel = LauncherAppState.getInstance(mTargetContext).getModel(); Executors.MODEL_EXECUTOR.submit(mModel.getModelDbController()::createEmptyDB).get(); diff --git a/tests/src/com/android/launcher3/allapps/TaplKeyboardFocusTest.java b/tests/src/com/android/launcher3/allapps/TaplKeyboardFocusTest.java index d71bf84f11..b14d7c7f1f 100644 --- a/tests/src/com/android/launcher3/allapps/TaplKeyboardFocusTest.java +++ b/tests/src/com/android/launcher3/allapps/TaplKeyboardFocusTest.java @@ -15,7 +15,7 @@ */ package com.android.launcher3.allapps; -import static com.android.launcher3.ui.TaplTestsLauncher3.initialize; +import static com.android.launcher3.ui.AbstractLauncherUiTest.initialize; import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL; import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT; diff --git a/tests/src/com/android/launcher3/allapps/TaplOpenCloseAllApps.java b/tests/src/com/android/launcher3/allapps/TaplOpenCloseAllApps.java index 39dbcb2ca2..c43865f958 100644 --- a/tests/src/com/android/launcher3/allapps/TaplOpenCloseAllApps.java +++ b/tests/src/com/android/launcher3/allapps/TaplOpenCloseAllApps.java @@ -16,7 +16,7 @@ package com.android.launcher3.allapps; import static com.android.launcher3.ui.TaplTestsLauncher3.expectFail; -import static com.android.launcher3.ui.TaplTestsLauncher3.initialize; +import static com.android.launcher3.ui.AbstractLauncherUiTest.initialize; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/tests/src/com/android/launcher3/allapps/TaplTestsAllAppsIconsWorking.java b/tests/src/com/android/launcher3/allapps/TaplTestsAllAppsIconsWorking.java index fd4619ecb0..9f6bbdfbca 100644 --- a/tests/src/com/android/launcher3/allapps/TaplTestsAllAppsIconsWorking.java +++ b/tests/src/com/android/launcher3/allapps/TaplTestsAllAppsIconsWorking.java @@ -15,7 +15,7 @@ */ package com.android.launcher3.allapps; -import static com.android.launcher3.ui.TaplTestsLauncher3.initialize; +import static com.android.launcher3.ui.AbstractLauncherUiTest.initialize; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/tests/src/com/android/launcher3/appiconmenu/TaplAppIconMenuTest.java b/tests/src/com/android/launcher3/appiconmenu/TaplAppIconMenuTest.java index 0f5d85bb34..a1f2cefb4c 100644 --- a/tests/src/com/android/launcher3/appiconmenu/TaplAppIconMenuTest.java +++ b/tests/src/com/android/launcher3/appiconmenu/TaplAppIconMenuTest.java @@ -16,7 +16,7 @@ package com.android.launcher3.appiconmenu; import static com.android.launcher3.util.TestConstants.AppNames.TEST_APP_NAME; -import static com.android.launcher3.ui.TaplTestsLauncher3.initialize; +import static com.android.launcher3.ui.AbstractLauncherUiTest.initialize; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/tests/src/com/android/launcher3/celllayout/ReorderWidgets.java b/tests/src/com/android/launcher3/celllayout/ReorderWidgets.java index 72de8858a2..30bde0a8c3 100644 --- a/tests/src/com/android/launcher3/celllayout/ReorderWidgets.java +++ b/tests/src/com/android/launcher3/celllayout/ReorderWidgets.java @@ -38,7 +38,6 @@ import com.android.launcher3.celllayout.board.WidgetRect; import com.android.launcher3.tapl.Widget; import com.android.launcher3.tapl.WidgetResizeFrame; import com.android.launcher3.ui.AbstractLauncherUiTest; -import com.android.launcher3.ui.TaplTestsLauncher3; import com.android.launcher3.util.ModelTestExtensions; import com.android.launcher3.util.rule.ShellCommandRule; @@ -73,7 +72,7 @@ public class ReorderWidgets extends AbstractLauncherUiTest { @Before public void setup() throws Throwable { mWorkspaceBuilder = new TestWorkspaceBuilder(mTargetContext); - TaplTestsLauncher3.initialize(this); + AbstractLauncherUiTest.initialize(this); } @After diff --git a/tests/src/com/android/launcher3/dragging/TaplDragTest.java b/tests/src/com/android/launcher3/dragging/TaplDragTest.java index 7ec78267aa..e0403678ba 100644 --- a/tests/src/com/android/launcher3/dragging/TaplDragTest.java +++ b/tests/src/com/android/launcher3/dragging/TaplDragTest.java @@ -19,7 +19,7 @@ import static com.android.launcher3.util.TestConstants.AppNames.TEST_APP_NAME; import static com.android.launcher3.util.TestConstants.AppNames.GMAIL_APP_NAME; import static com.android.launcher3.util.TestConstants.AppNames.MAPS_APP_NAME; import static com.android.launcher3.util.TestConstants.AppNames.STORE_APP_NAME; -import static com.android.launcher3.ui.TaplTestsLauncher3.initialize; +import static com.android.launcher3.ui.AbstractLauncherUiTest.initialize; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/tests/src/com/android/launcher3/dragging/TaplUninstallRemove.java b/tests/src/com/android/launcher3/dragging/TaplUninstallRemove.java index d69287bfa1..ed343073fe 100644 --- a/tests/src/com/android/launcher3/dragging/TaplUninstallRemove.java +++ b/tests/src/com/android/launcher3/dragging/TaplUninstallRemove.java @@ -16,7 +16,7 @@ package com.android.launcher3.dragging; import static com.android.launcher3.testing.shared.TestProtocol.ICON_MISSING; -import static com.android.launcher3.ui.TaplTestsLauncher3.initialize; +import static com.android.launcher3.ui.AbstractLauncherUiTest.initialize; import static com.android.launcher3.util.TestConstants.AppNames.DUMMY_APP_NAME; import static com.android.launcher3.util.TestConstants.AppNames.GMAIL_APP_NAME; import static com.android.launcher3.util.TestConstants.AppNames.MAPS_APP_NAME; diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index cb1102e334..5f536c7d9a 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -220,6 +220,23 @@ public abstract class AbstractLauncherUiTest { @Rule public SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT); + public static void initialize(AbstractLauncherUiTest test) throws Exception { + initialize(test, false); + } + + public static void initialize( + AbstractLauncherUiTest test, boolean clearWorkspace) throws Exception { + test.reinitializeLauncherData(clearWorkspace); + test.mDevice.pressHome(); + test.waitForLauncherCondition("Launcher didn't start", launcher -> launcher != null); + test.waitForState("Launcher internal state didn't switch to Home", + () -> LauncherState.NORMAL); + test.waitForResumed("Launcher internal state is still Background"); + // Check that we switched to home. + test.mLauncher.getWorkspace(); + AbstractLauncherUiTest.checkDetectedLeaks(test.mLauncher, true); + } + protected void clearPackageData(String pkg) throws IOException, InterruptedException { final CountDownLatch count = new CountDownLatch(2); final SimpleBroadcastReceiver broadcastReceiver = diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java index f2cbd923a5..65d1f4664b 100644 --- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java +++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java @@ -22,8 +22,6 @@ import static org.junit.Assert.assertTrue; import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; -import com.android.launcher3.LauncherState; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -38,23 +36,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { initialize(this); } - public static void initialize(AbstractLauncherUiTest test) throws Exception { - initialize(test, false); - } - - public static void initialize( - AbstractLauncherUiTest test, boolean clearWorkspace) throws Exception { - test.reinitializeLauncherData(clearWorkspace); - test.mDevice.pressHome(); - test.waitForLauncherCondition("Launcher didn't start", launcher -> launcher != null); - test.waitForState("Launcher internal state didn't switch to Home", - () -> LauncherState.NORMAL); - test.waitForResumed("Launcher internal state is still Background"); - // Check that we switched to home. - test.mLauncher.getWorkspace(); - AbstractLauncherUiTest.checkDetectedLeaks(test.mLauncher, true); - } - // Please don't add negative test cases for methods that fail only after a long wait. public static void expectFail(String message, Runnable action) { boolean failed = false; diff --git a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java index 5c753f98c1..3c88f1d69c 100644 --- a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java +++ b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java @@ -18,8 +18,6 @@ package com.android.launcher3.ui.widget; import static android.app.PendingIntent.FLAG_MUTABLE; import static android.app.PendingIntent.FLAG_ONE_SHOT; -import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName; - import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; @@ -44,7 +42,6 @@ import com.android.launcher3.testcomponent.AppWidgetNoConfig; import com.android.launcher3.testcomponent.AppWidgetWithConfig; import com.android.launcher3.testcomponent.RequestPinItemActivity; import com.android.launcher3.ui.AbstractLauncherUiTest; -import com.android.launcher3.ui.TaplTestsLauncher3; import com.android.launcher3.util.LauncherBindableItemsContainer.ItemOperator; import com.android.launcher3.util.Wait; import com.android.launcher3.util.Wait.Condition; @@ -77,7 +74,7 @@ public class RequestPinItemTest extends AbstractLauncherUiTest { super.setUp(); mCallbackAction = UUID.randomUUID().toString(); mShortcutId = UUID.randomUUID().toString(); - TaplTestsLauncher3.initialize(this); + AbstractLauncherUiTest.initialize(this); } @Test diff --git a/tests/src/com/android/launcher3/ui/widget/TaplWidgetPickerTest.java b/tests/src/com/android/launcher3/ui/widget/TaplWidgetPickerTest.java index a5e986833d..4ae2baa9ca 100644 --- a/tests/src/com/android/launcher3/ui/widget/TaplWidgetPickerTest.java +++ b/tests/src/com/android/launcher3/ui/widget/TaplWidgetPickerTest.java @@ -15,7 +15,7 @@ */ package com.android.launcher3.ui.widget; -import static com.android.launcher3.ui.TaplTestsLauncher3.initialize; +import static com.android.launcher3.ui.AbstractLauncherUiTest.initialize; import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL; import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT; diff --git a/tests/src/com/android/launcher3/ui/workspace/TaplWorkspaceTest.java b/tests/src/com/android/launcher3/ui/workspace/TaplWorkspaceTest.java index d776f21c6f..59c82a7b2f 100644 --- a/tests/src/com/android/launcher3/ui/workspace/TaplWorkspaceTest.java +++ b/tests/src/com/android/launcher3/ui/workspace/TaplWorkspaceTest.java @@ -15,7 +15,7 @@ */ package com.android.launcher3.ui.workspace; -import static com.android.launcher3.ui.TaplTestsLauncher3.initialize; +import static com.android.launcher3.ui.AbstractLauncherUiTest.initialize; import static com.android.launcher3.util.TestConstants.AppNames.CHROME_APP_NAME; import static org.junit.Assert.assertEquals; diff --git a/tests/src/com/android/launcher3/ui/workspace/ThemeIconsTest.java b/tests/src/com/android/launcher3/ui/workspace/ThemeIconsTest.java index 34c7707bba..e21918f1e3 100644 --- a/tests/src/com/android/launcher3/ui/workspace/ThemeIconsTest.java +++ b/tests/src/com/android/launcher3/ui/workspace/ThemeIconsTest.java @@ -36,7 +36,6 @@ import com.android.launcher3.tapl.HomeAllApps; import com.android.launcher3.tapl.HomeAppIcon; import com.android.launcher3.tapl.HomeAppIconMenuItem; import com.android.launcher3.ui.AbstractLauncherUiTest; -import com.android.launcher3.ui.TaplTestsLauncher3; import com.android.launcher3.util.Executors; import org.junit.Test; @@ -58,7 +57,7 @@ public class ThemeIconsTest extends AbstractLauncherUiTest { @Test public void testIconWithoutTheme() throws Exception { setThemeEnabled(false); - TaplTestsLauncher3.initialize(this); + AbstractLauncherUiTest.initialize(this); HomeAllApps allApps = mLauncher.getWorkspace().switchToAllApps(); allApps.freeze(); @@ -76,7 +75,7 @@ public class ThemeIconsTest extends AbstractLauncherUiTest { @Test public void testShortcutIconWithoutTheme() throws Exception { setThemeEnabled(false); - TaplTestsLauncher3.initialize(this); + AbstractLauncherUiTest.initialize(this); HomeAllApps allApps = mLauncher.getWorkspace().switchToAllApps(); allApps.freeze(); @@ -95,7 +94,7 @@ public class ThemeIconsTest extends AbstractLauncherUiTest { @Test public void testIconWithTheme() throws Exception { setThemeEnabled(true); - TaplTestsLauncher3.initialize(this); + AbstractLauncherUiTest.initialize(this); HomeAllApps allApps = mLauncher.getWorkspace().switchToAllApps(); allApps.freeze(); @@ -113,7 +112,7 @@ public class ThemeIconsTest extends AbstractLauncherUiTest { @Test public void testShortcutIconWithTheme() throws Exception { setThemeEnabled(true); - TaplTestsLauncher3.initialize(this); + AbstractLauncherUiTest.initialize(this); HomeAllApps allApps = mLauncher.getWorkspace().switchToAllApps(); allApps.freeze(); diff --git a/tests/src/com/android/launcher3/ui/workspace/TwoPanelWorkspaceTest.java b/tests/src/com/android/launcher3/ui/workspace/TwoPanelWorkspaceTest.java index 35b4883329..e7112d14b0 100644 --- a/tests/src/com/android/launcher3/ui/workspace/TwoPanelWorkspaceTest.java +++ b/tests/src/com/android/launcher3/ui/workspace/TwoPanelWorkspaceTest.java @@ -35,7 +35,6 @@ import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.tapl.Workspace; import com.android.launcher3.ui.AbstractLauncherUiTest; import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape; -import com.android.launcher3.ui.TaplTestsLauncher3; import com.android.launcher3.util.LauncherLayoutBuilder; import com.android.launcher3.util.TestUtil; @@ -74,7 +73,7 @@ public class TwoPanelWorkspaceTest extends AbstractLauncherUiTest { .atWorkspace(3, -1, 0).putApp( "com.android.vending", "com.android.vending.AssetBrowserActivity"); mLauncherLayout = TestUtil.setLauncherDefaultLayout(mTargetContext, builder); - TaplTestsLauncher3.initialize(this); + AbstractLauncherUiTest.initialize(this); assumeTrue(mLauncher.isTwoPanels()); // Pre verifying the screens