aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 15:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "fix custom shortcut test" into ub-launcher3-master

Browse Source
This commit is contained in:
TreeHugger Robot
2019-11-15 00:48:29 +00:00
committed by Android (Google) Code Review
parent 445cc2421e 44677f7e88
commit 498c9d63e1
2 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
View File

@@ -18,10 +18,6 @@ package com.android.launcher3.ui;
import static androidx.test.InstrumentationRegistry.getInstrumentation;
import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_PRESUBMIT;
import static com.android.launcher3.util.rule.TestStabilityRule.RUN_FLAFOR;
import static com.android.launcher3.util.rule.TestStabilityRule.UNBUNDLED_PRESUBMIT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -38,7 +34,6 @@ import com.android.launcher3.tapl.AllApps;
import com.android.launcher3.tapl.AppIcon;
import com.android.launcher3.tapl.AppIconMenu;
import com.android.launcher3.tapl.AppIconMenuItem;
import com.android.launcher3.tapl.TestHelpers;
import com.android.launcher3.tapl.Widgets;
import com.android.launcher3.tapl.Workspace;
import com.android.launcher3.views.OptionsPopupView;
@@ -344,24 +339,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
}
}
/**
* Test dragging a custom shortcut to the workspace and launch it.
*
* A custom shortcut is a 1x1 widget that launches a specific intent when user tap on it.
* Custom shortcuts are replaced by deep shortcuts after api 25.
*/
@Test
@Ignore // b/143725213
@PortraitLandscape
public void testDragCustomShortcut() {
if (!TestHelpers.isInLauncherProcess()) return; // b/143725213
mLauncher.getWorkspace().openAllWidgets()
.getWidget("com.android.launcher3.testcomponent.CustomShortcutConfigActivity")
.dragToWorkspace();
mLauncher.getWorkspace().getWorkspaceAppIcon("Shortcut")
.launch(getAppPackageName());
}
public static String getAppPackageName() {
return getInstrumentation().getContext().getPackageName();
}

20
tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
View File

@@ -16,7 +16,6 @@
package com.android.launcher3.ui.widget;
import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName;
import static com.android.launcher3.util.rule.TestStabilityRule.UNBUNDLED_POSTSUBMIT;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -30,7 +29,6 @@ import com.android.launcher3.tapl.Widget;
import com.android.launcher3.ui.AbstractLauncherUiTest;
import com.android.launcher3.ui.TestViewHelpers;
import com.android.launcher3.util.rule.ShellCommandRule;
import com.android.launcher3.util.rule.TestStabilityRule.Stability;
import org.junit.Rule;
import org.junit.Test;
@@ -71,4 +69,22 @@ public class AddWidgetTest extends AbstractLauncherUiTest {
assertNotNull("Widget not found on the workspace", widget);
widget.launch(getAppPackageName());
}
/**
* Test dragging a custom shortcut to the workspace and launch it.
*
* A custom shortcut is a 1x1 widget that launches a specific intent when user tap on it.
* Custom shortcuts are replaced by deep shortcuts after api 25.
*/
@Test
@PortraitLandscape
public void testDragCustomShortcut() throws Throwable {
clearHomescreen();
mDevice.pressHome();
mLauncher.getWorkspace().openAllWidgets()
.getWidget("com.android.launcher3.testcomponent.CustomShortcutConfigActivity")
.dragToWorkspace();
mLauncher.getWorkspace().getWorkspaceAppIcon("Shortcut")
.launch(getAppPackageName());
}
}