Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9592e18c authored by Vinit Nayak's avatar Vinit Nayak Committed by Automerger Merge Worker
Browse files

Merge "Install test app for work profile user" into udc-dev am: 47ab6f8b am: 4d331b6f 

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



Change-Id: I47fbc7af66eb8c884b7ed614f771d366c42878e7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 61e73989 4d331b6f

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

+4 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import static com.android.launcher3.LauncherState.ALL_APPS; 
import static com.android.launcher3.LauncherState.NORMAL;

import static com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST;

import static com.android.launcher3.testing.shared.TestProtocol.WORK_TAB_MISSING;

import static com.android.launcher3.util.TestUtil.installDummyAppForUser;

import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL;

import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT;
@@ -39,6 +40,7 @@ import com.android.launcher3.allapps.WorkPausedCard; 
import com.android.launcher3.allapps.WorkProfileManager;

import com.android.launcher3.tapl.LauncherInstrumentation;

import com.android.launcher3.testing.shared.TestProtocol;

import com.android.launcher3.util.TestUtil;

import com.android.launcher3.util.rule.TestStabilityRule.Stability;



import org.junit.After;
@@ -69,11 +71,11 @@ public class WorkProfileTest extends AbstractLauncherUiTest { 


        String[] tokens = output.split("\\s+");

        mProfileUserId = Integer.parseInt(tokens[tokens.length - 1]);

        output = mDevice.executeShellCommand("am start-user " + mProfileUserId);

        StringBuilder logStr = new StringBuilder().append("profileId: ").append(mProfileUserId);

        for (String str : tokens) {

            logStr.append(str).append("\n");

        }

        installDummyAppForUser(mProfileUserId);

        updateWorkProfileSetupSuccessful("am start-user", output);



        Log.d(WORK_TAB_MISSING, "workProfileSuccessful? " + mWorkProfileSetupSuccessful +
@@ -101,6 +103,7 @@ public class WorkProfileTest extends AbstractLauncherUiTest { 
            }

            launcher.getAppsView().getAppsStore().disableDeferUpdates(DEFER_UPDATES_TEST);

        });

        TestUtil.uninstallDummyApp();

        mDevice.executeShellCommand("pm remove-user " + mProfileUserId);

    }

tests/src/com/android/launcher3/util/TestUtil.java

+6 −1
Original line number Diff line number Diff line
@@ -59,8 +59,13 @@ import java.util.function.ToIntFunction; 


public class TestUtil {

    public static final String DUMMY_PACKAGE = "com.example.android.aardwolf";

    public static final int DEFAULT_USER_ID = 0;



    public static void installDummyApp() throws IOException {

        installDummyAppForUser(DEFAULT_USER_ID);

    }



    public static void installDummyAppForUser(int userId) throws IOException {

        // Copy apk from resources to a local file and install from there.

        final Resources resources = getContext().getResources();

        final InputStream in = resources.openRawResource(
@@ -81,7 +86,7 @@ public class TestUtil { 
            out.close();



            final String result = UiDevice.getInstance(getInstrumentation())

                    .executeShellCommand("pm install " + apkFilename);

                    .executeShellCommand("pm install --user " + userId + " " + apkFilename);

            Assert.assertTrue(

                    "Failed to install wellbeing test apk; make sure the device is rooted",

                    "Success".equals(result.replaceAll("\\s+", "")));