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

am: a2da6221c0

Change-Id: I59ed1b0b9bc8ee262f9bc1602ab03773e9f71026
This commit is contained in:
jdesprez
2018-03-20 04:54:41 +00:00
committed by android-build-merger
2 changed files with 8 additions and 4 deletions

View File

@@ -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" />

View File

@@ -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" />