From 5675c918fbc90027e49caca92a12dfe98795517b Mon Sep 17 00:00:00 2001
From: hanlixy <hanlixy@google.com>
Date: Mon, 10 Oct 2022 16:45:19 +0000
Subject: Use RunCommandTargetPeparer to override general flags for CTS tests

Bug: 251155745
Test: atest  CtsAdIdEndToEndTest CtsAppSetIdEndToEndTest CtsAdServicesEndToEndTestMeasurement CtsAdServicesPermissionsAppOptOutEndToEndTests CtsAdServicesPermissionsNoPermEndToEndTests CtsAdServicesNotInAllowListEndToEndTests CtsAdServicesPermissionsValidEndToEndTests CtsAdServicesNotInAllowListEndToEndTests CtsAdServicesEndToEndTests CtsAdServicesTopicsAppUpdateTests CtsAdServicesTopicsConnectionTests CtsAdServicesHostTests CtsSandboxedFledgeManagerTests CtsSandboxedMeasurementManagerTests CtsSandboxedTopicsManagerTests CtsAdServicesDeviceTestCases AdServicesEndToEndTests CtsAdServicesDebuggableDeviceTestCases AdServicesApkUITests
Change-Id: I91b373d47eb0b2a9f5eb299352d65d68f7677baf
---
 .../endtoends/permissions/noperm/AndroidTest.xml   | 52 +++++++++++++---------
 1 file changed, 31 insertions(+), 21 deletions(-)

(limited to 'adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.xml')

diff --git a/adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.xml b/adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.xml
index 1c659026cc..5186c18da7 100644
--- a/adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.xml
+++ b/adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.xml
@@ -15,29 +15,39 @@
   ~ limitations under the License.
   -->
 <configuration description="Config for Cts Ad Services Permissions E2E tests">
-<option name="test-suite-tag" value="cts" />
-<option name="test-tag" value="CtsAdServicesPermissionsNoPermEndToEndTests" />
-<option name="config-descriptor:metadata" key="component" value="framework"/>
-<option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
-<option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
-<option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="test-suite-tag" value="cts" />
+    <option name="test-tag" value="CtsAdServicesPermissionsNoPermEndToEndTests" />
+    <option name="config-descriptor:metadata" key="component" value="framework"/>
+    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
 
-<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
-    <option name="cleanup-apks" value="true"/>
-    <option name="test-file-name" value="CtsAdServicesPermissionsNoPermEndToEndTests.apk"/>
-</target_preparer>
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true"/>
+        <option name="test-file-name" value="CtsAdServicesPermissionsNoPermEndToEndTests.apk"/>
+    </target_preparer>
 
-<target_preparer class="com.android.tradefed.targetprep.DeviceSetup" >
-    <option name="force-skip-system-props" value="true" />
-    <option name="disable-device-config-sync" value="true" />
-</target_preparer>
+    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup" >
+        <option name="force-skip-system-props" value="true" />
+        <option name="disable-device-config-sync" value="true" />
+    </target_preparer>
 
-<test class="com.android.tradefed.testtype.AndroidJUnitTest">
-    <option name="package" value="com.android.adservices.tests.permissions.noperm"/>
-</test>
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <!-- Disable global_kill_switch to ignore the effect of actual PH values. -->
+        <option name="run-command" value="device_config put adservices global_kill_switch false" />
+        <!-- Override Consent Manager to debug mode to grant user consent -->
+        <option name="run-command" value="setprop debug.adservices.consent_manager_debug_mode true" />
+        <option name="run-command" value="setprop log.tag.adservices VERBOSE" />
 
-<object type="module_controller"
-        class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
-    <option name="mainline-module-package-name" value="com.google.android.adservices"/>
-</object>
+        <option name="teardown-command" value="setprop debug.adservices.consent_manager_debug_mode false"/>
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest">
+        <option name="package" value="com.android.adservices.tests.permissions.noperm"/>
+    </test>
+
+    <object type="module_controller"
+            class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+        <option name="mainline-module-package-name" value="com.google.android.adservices"/>
+    </object>
 </configuration>
-- 
cgit v1.2.3