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

Commit ef3ada58 authored by Mohammad Islam's avatar Mohammad Islam Committed by Gerrit Code Review
Browse files

Merge "Update tests to use new InstallUtilsHost lib"

parents 45415f39 e1107958

tests/hostdriven/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ java_test_host { 
    ],

    static_libs: [

        "kotlin-test",

        "module_test_util",

        "cts-install-lib-host",

    ],

    test_suites: ["device-tests"],

    data: [":NetworkStack"],

tests/hostdriven/host/src/com/android/networkstack/hosttests/NetworkStackHostTests.kt

+2 −5
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.networkstack.hosttests



import com.android.tests.util.ModuleTestUtils

import android.cts.install.lib.host.InstallUtilsHost

import com.android.tradefed.device.ITestDevice

import com.android.tradefed.testtype.DeviceJUnit4ClassRunner

import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test
@@ -42,8 +42,7 @@ private const val NETWORKSTACK_TIMEOUT_MS = 5 * 60_000 
@RunWith(DeviceJUnit4ClassRunner::class)

class NetworkStackHostTests : BaseHostJUnit4Test() {



    private val mUtils = ModuleTestUtils(this)

    private val mModuleApk = mUtils.getTestFile(APP_APK)

    private val mModuleApk = InstallUtilsHost(this).getTestFile(APP_APK)

    private val mPackageName = AaptParser.parse(mModuleApk)?.packageName

            ?: throw IllegalStateException("Could not parse test package name")

    private val mDevice by lazy { getDevice() }
@@ -74,12 +73,10 @@ class NetworkStackHostTests : BaseHostJUnit4Test() { 
        assumeFalse(error != null && error.contains("Unknown option --staged"))

        assertNull(error, "Error installing module package: $error")

        try {

            mUtils.waitForStagedSessionReady()

            applyUpdateAndCheckNetworkStackRegistered()

            assertNotEquals(initialUpdateTime, getLastUpdateTime(), "Update time did not change")

        } finally {

            assertCommandSucceeds("pm rollback-app $mPackageName")

            mUtils.waitForStagedSessionReady()

            applyUpdateAndCheckNetworkStackRegistered()

        }

    }

tests/hostlib/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -24,6 +24,6 @@ java_library_host { 
    ],

    static_libs: [

        "kotlin-test",

        "module_test_util",

        "cts-install-lib-host",

    ],

}
 
 No newline at end of file

tests/hostlib/src/com/android/testutils/host/DeflakeHostTestBase.kt

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.testutils.host



import com.android.tests.util.ModuleTestUtils

import android.cts.install.lib.host.InstallUtilsHost

import com.android.tradefed.config.Option

import com.android.tradefed.testtype.DeviceJUnit4ClassRunner

import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test
@@ -99,7 +99,7 @@ abstract class DeflakeHostTestBase : BaseHostJUnit4Test() { 


    @Test

    fun testDeflake() {

        val apkFile = ModuleTestUtils(this).getTestFile(testApkFilename)

        val apkFile = InstallUtilsHost(this).getTestFile(testApkFilename)

        val pkgName = AaptParser.parse(apkFile)?.packageName

                ?: fail("Could not parse test package name")