Performing a check for a crashed Launcher process for each UI test (b79614cc) · Commits · e / os / BlissLauncher3

quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ import com.android.launcher3.util.rule.TestStabilityRule;
		import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
		import com.android.quickstep.views.RecentsView;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		@@ -53,21 +52,10 @@ import org.junit.runner.RunWith;
		@LargeTest
		@RunWith(AndroidJUnit4.class)
		public class TaplTestsQuickstep extends AbstractQuickStepTest {
		private int mLauncherPid;

		@Before
		public void setUp() throws Exception {
		mLauncherPid = 0;
		super.setUp();
		TaplTestsLauncher3.initialize(this);
		mLauncherPid = mLauncher.getPid();
		}

		@After
		public void teardown() {
		if (mLauncherPid != 0) {
		assertEquals("Launcher crashed, pid mismatch:", mLauncherPid, mLauncher.getPid());
		}
		}

		private void startTestApps() throws Exception {

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -22,10 +22,9 @@ import static com.android.launcher3.tapl.LauncherInstrumentation.ContainerType;
		import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName;
		import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertTrue;

		import static java.lang.System.exit;

		import android.content.BroadcastReceiver;
		import android.content.ComponentName;
		import android.content.ContentResolver;
		@@ -38,7 +37,6 @@ import android.content.pm.LauncherApps;
		import android.content.pm.PackageManager;
		import android.os.Process;
		import android.os.RemoteException;
		import android.util.Log;

		import androidx.test.InstrumentationRegistry;
		import androidx.test.uiautomator.By;
		@@ -102,6 +100,7 @@ public abstract class AbstractLauncherUiTest {
		protected final LauncherInstrumentation mLauncher = new LauncherInstrumentation();
		protected Context mTargetContext;
		protected String mTargetPackage;
		private int mLauncherPid;

		protected AbstractLauncherUiTest() {
		mLauncher.enableCheckEventsForSuccessfulGestures();
		@@ -175,17 +174,22 @@ public abstract class AbstractLauncherUiTest {

		@Before
		public void setUp() throws Exception {
		mLauncherPid = 0;
		// Disable app tracker
		AppLaunchTracker.INSTANCE.initializeForTesting(new AppLaunchTracker());

		mTargetContext = InstrumentationRegistry.getTargetContext();
		mTargetPackage = mTargetContext.getPackageName();
		mLauncherPid = mLauncher.getPid();
		}

		@After
		public void verifyLauncherState() {
		// Limits UI tests affecting tests running after them.
		mLauncher.waitForLauncherInitialized();
		if (mLauncherPid != 0) {
		assertEquals("Launcher crashed, pid mismatch:", mLauncherPid, mLauncher.getPid());
		}
		}

		protected void clearLauncherData() throws IOException, InterruptedException {
		@@ -196,6 +200,7 @@ public abstract class AbstractLauncherUiTest {
		} else {
		clearPackageData(mDevice.getLauncherPackageName());
		mLauncher.enableDebugTracing();
		mLauncherPid = mLauncher.getPid();
		}
		}

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

+0 −12

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ import com.android.launcher3.views.OptionsPopupView;
		import com.android.launcher3.widget.WidgetsFullSheet;
		import com.android.launcher3.widget.WidgetsRecyclerView;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		@@ -51,21 +50,10 @@ import org.junit.runner.RunWith;
		public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
		private static final String APP_NAME = "LauncherTestApp";

		private int mLauncherPid;

		@Before
		public void setUp() throws Exception {
		mLauncherPid = 0;
		super.setUp();
		initialize(this);
		mLauncherPid = mLauncher.getPid();
		}

		@After
		public void teardown() {
		if (mLauncherPid != 0) {
		assertEquals("Launcher crashed, pid mismatch:", mLauncherPid, mLauncher.getPid());
		}
		}

		public static void initialize(AbstractLauncherUiTest test) throws Exception {