PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Avoid confusing errors "Launcher pid should be 0" when test setup fails

Browse Source 
Change-Id: Ic5e8114a0f86d1a08738785c4098645e59a24975
This commit is contained in:
vadimt
2020-01-24 14:30:40 -08:00
parent 8f76378bf5
commit fcaab044a3
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+4 -1
View File
@@ -56,6 +56,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@Before
public void setUp() throws Exception {
mLauncherPid = 0;
super.setUp();
TaplTestsLauncher3.initialize(this);
mLauncherPid = mLauncher.getPid();
@@ -63,7 +64,9 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
@After
public void teardown() {
assertEquals("Launcher crashed, pid mismatch:", mLauncherPid, mLauncher.getPid());
if (mLauncherPid != 0) {
assertEquals("Launcher crashed, pid mismatch:", mLauncherPid, mLauncher.getPid());
}
}
private void startTestApps() throws Exception {
tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+5 -2
View File
@@ -59,6 +59,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
@Before
public void setUp() throws Exception {
mLauncherPid = 0;
super.setUp();
initialize(this);
mLauncherPid = mLauncher.getPid();
@@ -66,7 +67,9 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
@After
public void teardown() {
assertEquals("Launcher crashed, pid mismatch:", mLauncherPid, mLauncher.getPid());
if (mLauncherPid != 0) {
assertEquals("Launcher crashed, pid mismatch:", mLauncherPid, mLauncher.getPid());
}
}
public static void initialize(AbstractLauncherUiTest test) throws Exception {
@@ -120,7 +123,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
mDevice.pressMenu();
mDevice.waitForIdle();
mLauncher.getOptionsPopupMenu().getMenuItem("Home settings")
.launch(mDevice.getLauncherPackageName());
.launch(mDevice.getLauncherPackageName());
}
@Test