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

Commit 161a8830 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove dependency on ModuleTestUtils" am: b8fca94c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487756

Change-Id: Ib264dbe5a46612da1e1fb03c038b1d763372868f
parents 02bfb62c b8fca94c

tests/StagedInstallTest/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ java_test_host { 
    static_libs: [

        "testng",

        "compatibility-tradefed",

        "module_test_util",

        "frameworks-base-hostutils",

        "cts-install-lib-host",

    ],

tests/StagedInstallTest/src/com/android/tests/stagedinstallinternal/host/StagedInstallInternalTest.java

+6 −8
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.cts.install.lib.host.InstallUtilsHost; 


import com.android.ddmlib.Log;

import com.android.tests.rollback.host.AbandonSessionsRule;

import com.android.tests.util.ModuleTestUtils;

import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;

import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;

import com.android.tradefed.util.ProcessInfo;
@@ -52,7 +51,6 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test { 
    private static final String SHIM_V2 = "com.android.apex.cts.shim.v2.apex";

    private static final String APK_A = "TestAppAv1.apk";



    private final ModuleTestUtils mTestUtils = new ModuleTestUtils(this);

    private final InstallUtilsHost mHostUtils = new InstallUtilsHost(this);



    /**
@@ -101,7 +99,7 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test { 
        assumeTrue("Device does not support updating APEX",

                mHostUtils.isApexUpdateSupported());



        final File apexFile = mTestUtils.getTestFile(SHIM_V2);

        final File apexFile = mHostUtils.getTestFile(SHIM_V2);

        final String output = getDevice().executeAdbCommand("install", "--staged",

                "--staged-ready-timeout", "60000", apexFile.getAbsolutePath());

        assertThat(output).contains("Reboot device to apply staged session");
@@ -116,7 +114,7 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test { 
        assumeTrue("Device does not support updating APEX",

                mHostUtils.isApexUpdateSupported());



        final File apexFile = mTestUtils.getTestFile(SHIM_V2);

        final File apexFile = mHostUtils.getTestFile(SHIM_V2);

        final String output = getDevice().executeAdbCommand("install", "--staged",

                apexFile.getAbsolutePath());

        assertThat(output).contains("Reboot device to apply staged session");
@@ -131,7 +129,7 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test { 
        assumeTrue("Device does not support updating APEX",

                mHostUtils.isApexUpdateSupported());



        final File apexFile = mTestUtils.getTestFile(SHIM_V2);

        final File apexFile = mHostUtils.getTestFile(SHIM_V2);

        final String output = getDevice().executeAdbCommand("install", "--staged",

                "--staged-ready-timeout", "0", apexFile.getAbsolutePath());

        assertThat(output).doesNotContain("Reboot device to apply staged session");
@@ -147,7 +145,7 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test { 
        assumeTrue("Device does not support updating APEX",

                mHostUtils.isApexUpdateSupported());



        final File apexFile = mTestUtils.getTestFile(SHIM_V2);

        final File apexFile = mHostUtils.getTestFile(SHIM_V2);

        String output = getDevice().executeAdbCommand("install", "--staged",

                "--enable-rollback", apexFile.getAbsolutePath());

        assertThat(output).contains("Reboot device to apply staged session");
@@ -164,8 +162,8 @@ public class StagedInstallInternalTest extends BaseHostJUnit4Test { 
        assumeTrue("Device does not support updating APEX",

                mHostUtils.isApexUpdateSupported());



        final File apexFile = mTestUtils.getTestFile(SHIM_V2);

        final File apkFile = mTestUtils.getTestFile(APK_A);

        final File apexFile = mHostUtils.getTestFile(SHIM_V2);

        final File apkFile = mHostUtils.getTestFile(APK_A);

        final String output = getDevice().executeAdbCommand("install-multi-package",

                apexFile.getAbsolutePath(), apkFile.getAbsolutePath());

        assertThat(output).contains("Created parent session");