Merge "Improve test isolation in AbstractLauncherUiTests" into main (892ad691) · Commits · e / os / BlissLauncher3

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -56,8 +56,6 @@ public class TaplPrivateSpaceTest extends AbstractQuickStepTest {
		@Override
		public void setUp() throws Exception {
		super.setUp();
		initialize(this);

		createAndStartPrivateProfileUser();

		mDevice.pressHome();

+1 −0

Original line number	Diff line number	Diff line
		@@ -414,6 +414,7 @@ public abstract class AbstractLauncherUiTest<LAUNCHER_TYPE extends Launcher> {
		public void verifyLauncherState() {
		try {
		// Limits UI tests affecting tests running after them.
		mDevice.pressHome();
		mLauncher.waitForLauncherInitialized();
		if (mLauncherPid != 0) {
		assertEquals("Launcher crashed, pid mismatch:",

+0 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,6 @@ public class TaplWorkProfileTest extends AbstractLauncherUiTest<Launcher> {
		@Override
		public void setUp() throws Exception {
		super.setUp();
		initialize(this);
		String output =
		mDevice.executeShellCommand(
		"pm create-user --profileOf 0 --managed TestProfile");

+0 −7

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import com.android.launcher3.util.TestUtil;
		import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Test;

		/**
		@@ -50,12 +49,6 @@ public class TaplWorkspaceTest extends AbstractLauncherUiTest<Launcher> {
		return launcher.getWorkspace().getCurrentPage();
		}

		@Before
		public void setUp() throws Exception {
		super.setUp();
		initialize(this);
		}

		@After
		public void tearDown() throws Exception {
		if (mLauncherLayout != null) {