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

Commit 57b9e155 authored by jdesprez's avatar jdesprez Committed by android-build-merger
Browse files

Merge "Update AndroidTest.xml to be APCT suite ready" into pi-dev am: a2da6221 

am: 42e58da8

Change-Id: I7e6eafdc273f656120739c301564554759abf301
parents ccba53cb 42e58da8

tests/uitests/AndroidTest.xml

+4 −2
Original line number Diff line number Diff line
@@ -14,11 +14,13 @@ 
     limitations under the License.

-->

<configuration description="Run Android Settings Functional UI Tests.">

    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-instrumentation" />

    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="SettingsUITests.apk" />

    </target_preparer>



    <option name="test-suite-tag" value="apct" />

    <option name="test-tag" value="SettingsUITests" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.settings.ui" />

tests/unit/AndroidTest.xml

+4 −2
Original line number Diff line number Diff line
@@ -14,11 +14,13 @@ 
     limitations under the License.

-->

<configuration description="Runs Settings Test Cases.">

    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-instrumentation" />

    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="SettingsUnitTests.apk" />

    </target_preparer>



    <option name="test-suite-tag" value="apct" />

    <option name="test-tag" value="SettingsUnitTests" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.settings.tests.unit" />