aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-05 02:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Added extra check to CLI command that was not checked for" into tm-qpr-dev am: 5d7aec8e03

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19801569

Change-Id: I105db267b74f0279c43722a7e596b4d1b77e80c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brandon Dayauon
2022-09-09 21:16:01 +00:00
committed by Automerger Merge Worker
parent 54a7e01a9b 5d7aec8e03
commit f52626345e
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/src/com/android/launcher3/ui/WorkProfileTest.java
View File

@@ -48,6 +48,7 @@ public class WorkProfileTest extends AbstractLauncherUiTest {
private int mProfileUserId;
private boolean mWorkProfileSetupSuccessful;
private final String TAG = "WorkProfileTest";
@Before
@Override
@@ -56,18 +57,17 @@ public class WorkProfileTest extends AbstractLauncherUiTest {
String output =
mDevice.executeShellCommand(
"pm create-user --profileOf 0 --managed TestProfile");
Log.d("b/203817455", "pm create-user; output: " + output);
if (output.startsWith("Success")){
assertTrue("Failed to create work profile", output.startsWith("Success"));
mWorkProfileSetupSuccessful = true;
} else {
return; // no need to setup launcher since all tests will skip.
}
// b/203817455
updateWorkProfileSetupSuccessful("pm create-user", output);
String[] tokens = output.split("\\s+");
mProfileUserId = Integer.parseInt(tokens[tokens.length - 1]);
mDevice.executeShellCommand("am start-user " + mProfileUserId);
output = mDevice.executeShellCommand("am start-user " + mProfileUserId);
updateWorkProfileSetupSuccessful("am start-user", output);
if (!mWorkProfileSetupSuccessful) {
return; // no need to setup launcher since all tests will skip.
}
mDevice.pressHome();
waitForLauncherCondition("Launcher didn't start", Objects::nonNull);
@@ -107,6 +107,7 @@ public class WorkProfileTest extends AbstractLauncherUiTest {
@Test
public void workTabExists() {
assumeTrue(mWorkProfileSetupSuccessful);
waitForWorkTabSetup();
waitForLauncherCondition("Personal tab is missing",
launcher -> launcher.getAppsView().isPersonalTabVisible(),
LauncherInstrumentation.WAIT_TIME_MS);
@@ -183,4 +184,14 @@ public class WorkProfileTest extends AbstractLauncherUiTest {
}
}, LauncherInstrumentation.WAIT_TIME_MS);
}
private void updateWorkProfileSetupSuccessful(String cli, String output) {
Log.d(TAG, "updateWorkProfileSetupSuccessful, cli=" + cli + " " + "output=" + output);
if (output.startsWith("Success")) {
assertTrue(output, output.startsWith("Success"));
mWorkProfileSetupSuccessful = true;
} else {
mWorkProfileSetupSuccessful = false;
}
}
}