Merge "Started converting Launcher to be gesture-stable" into ub-launcher3-master (a950d40d) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/allapps/AllAppsContainerView.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -390,6 +390,26 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
		}
		}

		// Used by tests only
		private boolean isDescendantViewVisible(int viewId) {
		final View view = findViewById(viewId);
		if (view == null) return false;

		if (!view.isShown()) return false;

		return view.getGlobalVisibleRect(new Rect());
		}

		// Used by tests only
		public boolean isPersonalTabVisible() {
		return isDescendantViewVisible(R.id.tab_personal);
		}

		// Used by tests only
		public boolean isWorkTabVisible() {
		return isDescendantViewVisible(R.id.tab_work);
		}

		public AlphabeticalAppsList getApps() {
		return mAH[AdapterHolder.MAIN].appsList;
		}

tests/Android.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,8 @@ LOCAL_PATH := $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_MODULE_TAGS := tests
		LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator mockito-target-minus-junit4
		LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator mockito-target-minus-junit4 \
		ub-launcher-aosp-tapl

		LOCAL_SRC_FILES := $(call all-java-files-under, src)
		LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml

tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java

+44 −4

Original line number	Diff line number	Diff line
		@@ -15,6 +15,9 @@
		*/
		package com.android.launcher3.ui;

		import static org.junit.Assert.assertNotNull;
		import static org.junit.Assert.assertNull;

		import android.app.Instrumentation;
		import android.content.BroadcastReceiver;
		import android.content.ComponentName;
		@@ -36,24 +39,30 @@ import android.support.test.uiautomator.Until;
		import android.util.Log;
		import android.view.MotionEvent;

		import com.android.launcher3.Launcher;
		import com.android.launcher3.LauncherAppState;
		import com.android.launcher3.LauncherAppWidgetProviderInfo;
		import com.android.launcher3.LauncherSettings;
		import com.android.launcher3.LauncherState;
		import com.android.launcher3.MainThreadExecutor;
		import com.android.launcher3.R;
		import com.android.launcher3.compat.AppWidgetManagerCompat;
		import com.android.launcher3.compat.LauncherAppsCompat;
		import com.android.launcher3.tapl.LauncherInstrumentation;
		import com.android.launcher3.testcomponent.AppWidgetNoConfig;
		import com.android.launcher3.testcomponent.AppWidgetWithConfig;
		import com.android.launcher3.util.Condition;
		import com.android.launcher3.util.Wait;
		import com.android.launcher3.util.rule.LauncherActivityRule;

		import org.junit.Before;
		import org.junit.Rule;

		import java.util.concurrent.Callable;
		import java.util.concurrent.CountDownLatch;
		import java.util.concurrent.TimeUnit;

		import static org.junit.Assert.assertNotNull;
		import static org.junit.Assert.assertNull;
		import java.util.function.Consumer;
		import java.util.function.Function;

		/**
		* Base class for all instrumentation tests providing various utility methods.
		@@ -65,19 +74,23 @@ public abstract class AbstractLauncherUiTest {

		public static final long SHORT_UI_TIMEOUT= 300;
		public static final long DEFAULT_UI_TIMEOUT = 3000;
		public static final long LARGE_UI_TIMEOUT = 10000;
		public static final long DEFAULT_WORKER_TIMEOUT_SECS = 5;

		protected MainThreadExecutor mMainThreadExecutor = new MainThreadExecutor();
		protected UiDevice mDevice;
		protected LauncherInstrumentation mLauncher;
		protected Context mTargetContext;
		protected String mTargetPackage;

		private static final String TAG = "AbstractLauncherUiTest";

		@Rule
		public LauncherActivityRule mActivityMonitor = new LauncherActivityRule();

		@Before
		public void setUp() throws Exception {
		mDevice = UiDevice.getInstance(getInstrumentation());
		mLauncher = new LauncherInstrumentation(mDevice);
		mTargetContext = InstrumentationRegistry.getTargetContext();
		mTargetPackage = mTargetContext.getPackageName();
		}
		@@ -236,6 +249,33 @@ public abstract class AbstractLauncherUiTest {
		}
		}

		protected <T> T getFromLauncher(Function<Launcher, T> f) {
		return getOnUiThread(() -> f.apply(mActivityMonitor.getActivity()));
		}

		protected void executeOnLauncher(Consumer<Launcher> f) {
		getFromLauncher(launcher -> {
		f.accept(launcher);
		return null;
		});
		}

		// Cannot be used between a Tapl call injecting a gesture and a tapl call expecting the
		// results of that gesture because the wait can hide flakeness.
		protected boolean waitForState(LauncherState state) {
		return waitForLauncherCondition(launcher -> launcher.getStateManager().getState() == state);
		}

		// Cannot be used after injecting any gesture using Tapl because this can hide flakiness.
		protected boolean waitForLauncherCondition(Function<Launcher, Boolean> condition) {
		return Wait.atMost(new Condition() {
		@Override
		public boolean isTrue() {
		return getFromLauncher(condition);
		}
		}, DEFAULT_ACTIVITY_TIMEOUT);
		}

		/**
		* Finds a widget provider which can fit on the home screen.
		* @param hasConfigureScreen if true, a provider with a config screen is returned.

tests/src/com/android/launcher3/ui/AllAppsAppLaunchTest.java

deleted100644 → 0

+0 −55

Original line number	Diff line number	Diff line
		package com.android.launcher3.ui;

		import android.content.pm.LauncherActivityInfo;
		import android.support.test.filters.LargeTest;
		import android.support.test.runner.AndroidJUnit4;
		import android.support.test.uiautomator.By;
		import android.support.test.uiautomator.UiObject2;
		import android.support.test.uiautomator.Until;

		import com.android.launcher3.util.Condition;
		import com.android.launcher3.util.Wait;
		import com.android.launcher3.util.rule.LauncherActivityRule;

		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		import static org.junit.Assert.assertTrue;

		/**
		* Test for verifying apps is launched from all-apps
		*/
		@LargeTest
		@RunWith(AndroidJUnit4.class)
		public class AllAppsAppLaunchTest extends AbstractLauncherUiTest {

		@Rule public LauncherActivityRule mActivityMonitor = new LauncherActivityRule();

		@Test
		public void testAppLauncher_portrait() throws Exception {
		lockRotation(true);
		performTest();
		}

		@Test
		public void testAppLauncher_landscape() throws Exception {
		lockRotation(false);
		performTest();
		}

		private void performTest() throws Exception {
		mActivityMonitor.startLauncher();

		LauncherActivityInfo testApp = getChromeApp();

		// Open all apps and wait for load complete
		final UiObject2 appsContainer = openAllApps();
		assertTrue(Wait.atMost(Condition.minChildCount(appsContainer, 2), DEFAULT_UI_TIMEOUT));

		// Open app and verify app launched
		scrollAndFind(appsContainer, By.text(testApp.getLabel().toString())).click();
		assertTrue(mDevice.wait(Until.hasObject(By.pkg(
		testApp.getComponentName().getPackageName()).depth(0)), DEFAULT_UI_TIMEOUT));
		}
		}

tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java

+2 −4

Original line number	Diff line number	Diff line
		package com.android.launcher3.ui;

		import static org.junit.Assert.assertTrue;

		import android.content.pm.LauncherActivityInfo;
		import android.support.test.filters.LargeTest;
		import android.support.test.runner.AndroidJUnit4;
		@@ -9,15 +11,12 @@ import android.support.test.uiautomator.Until;

		import com.android.launcher3.util.Condition;
		import com.android.launcher3.util.Wait;
		import com.android.launcher3.util.rule.LauncherActivityRule;
		import com.android.launcher3.util.rule.ShellCommandRule;

		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		import static org.junit.Assert.assertTrue;

		/**
		* Test for dragging an icon from all-apps to homescreen.
		*/
		@@ -25,7 +24,6 @@ import static org.junit.Assert.assertTrue;
		@RunWith(AndroidJUnit4.class)
		public class AllAppsIconToHomeTest extends AbstractLauncherUiTest {

		@Rule public LauncherActivityRule mActivityMonitor = new LauncherActivityRule();
		@Rule public ShellCommandRule mDefaultLauncherRule = ShellCommandRule.setDefaultLauncher();

		@Test