Merge "Update unit test configs for Widevine unit tests" into oc-dev am: 7778abfb93 am: 4e851cd4cd
am: 40fe5ffa2b
Change-Id: I7c64f86f9761a21dadf4408efb6b99613fc5fd36
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-base64.xml
similarity index 78%
copy from res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
copy to res/config/google/test/framework/media/widevine/tests/widevine-base64.xml
index 088d688..6bee54b 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-base64.xml
@@ -2,13 +2,13 @@
<!-- Copyright 2015 Google Inc. All Rights Reserved -->
<!-- Required options: branch build-flavor -->
<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
- <option name="test-tag" value="widevineMaxResEngineUnit" />
+ <option name="test-tag" value="widevineBase64" />
<target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
- <option name="test-file-name" value="bin/max_res_engine_unittest" />
+ <option name="test-file-name" value="bin/base64_test" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest">
<option name="native-test-device-path" value="/data/bin" />
- <option name="module-name" value="max_res_engine_unittest" />
+ <option name="module-name" value="base64_test" />
<option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
<option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
</test>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-buffer-reader.xml
similarity index 78%
rename from res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
rename to res/config/google/test/framework/media/widevine/tests/widevine-buffer-reader.xml
index 088d688..48275c4 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-buffer-reader.xml
@@ -2,13 +2,13 @@
<!-- Copyright 2015 Google Inc. All Rights Reserved -->
<!-- Required options: branch build-flavor -->
<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
- <option name="test-tag" value="widevineMaxResEngineUnit" />
+ <option name="test-tag" value="widevineBufferReader" />
<target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
- <option name="test-file-name" value="bin/max_res_engine_unittest" />
+ <option name="test-file-name" value="bin/buffer_reader_test" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest">
<option name="native-test-device-path" value="/data/bin" />
- <option name="module-name" value="max_res_engine_unittest" />
+ <option name="module-name" value="buffer_reader_test" />
<option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
<option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
</test>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-distribution.xml
similarity index 78%
copy from res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
copy to res/config/google/test/framework/media/widevine/tests/widevine-distribution.xml
index 088d688..9f4a54e 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-distribution.xml
@@ -2,13 +2,13 @@
<!-- Copyright 2015 Google Inc. All Rights Reserved -->
<!-- Required options: branch build-flavor -->
<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
- <option name="test-tag" value="widevineMaxResEngineUnit" />
+ <option name="test-tag" value="widevineDistribution" />
<target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
- <option name="test-file-name" value="bin/max_res_engine_unittest" />
+ <option name="test-file-name" value="bin/distribution_test" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest">
<option name="native-test-device-path" value="/data/bin" />
- <option name="module-name" value="max_res_engine_unittest" />
+ <option name="module-name" value="distribution_test" />
<option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
<option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
</test>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-event-metric.xml
similarity index 78%
copy from res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
copy to res/config/google/test/framework/media/widevine/tests/widevine-event-metric.xml
index 088d688..80a4022 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-event-metric.xml
@@ -2,13 +2,13 @@
<!-- Copyright 2015 Google Inc. All Rights Reserved -->
<!-- Required options: branch build-flavor -->
<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
- <option name="test-tag" value="widevineMaxResEngineUnit" />
+ <option name="test-tag" value="widevineEventMetric" />
<target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
- <option name="test-file-name" value="bin/max_res_engine_unittest" />
+ <option name="test-file-name" value="bin/event_metric_test" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest">
<option name="native-test-device-path" value="/data/bin" />
- <option name="module-name" value="max_res_engine_unittest" />
+ <option name="module-name" value="event_metric_test" />
<option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
<option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
</test>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-file-utils-unit.xml
similarity index 78%
copy from res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
copy to res/config/google/test/framework/media/widevine/tests/widevine-file-utils-unit.xml
index 088d688..67db9ff 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-file-utils-unit.xml
@@ -2,13 +2,13 @@
<!-- Copyright 2015 Google Inc. All Rights Reserved -->
<!-- Required options: branch build-flavor -->
<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
- <option name="test-tag" value="widevineMaxResEngineUnit" />
+ <option name="test-tag" value="widevineFileUtilsUnit" />
<target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
- <option name="test-file-name" value="bin/max_res_engine_unittest" />
+ <option name="test-file-name" value="bin/file_utils_unittest" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest">
<option name="native-test-device-path" value="/data/bin" />
- <option name="module-name" value="max_res_engine_unittest" />
+ <option name="module-name" value="file_utils_unittest" />
<option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
<option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
</test>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-http-socket.xml
similarity index 78%
copy from res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
copy to res/config/google/test/framework/media/widevine/tests/widevine-http-socket.xml
index 088d688..fed3db1 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-http-socket.xml
@@ -2,13 +2,13 @@
<!-- Copyright 2015 Google Inc. All Rights Reserved -->
<!-- Required options: branch build-flavor -->
<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
- <option name="test-tag" value="widevineMaxResEngineUnit" />
+ <option name="test-tag" value="widevineHttpSocket" />
<target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
- <option name="test-file-name" value="bin/max_res_engine_unittest" />
+ <option name="test-file-name" value="bin/http_socket_test" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest">
<option name="native-test-device-path" value="/data/bin" />
- <option name="module-name" value="max_res_engine_unittest" />
+ <option name="module-name" value="http_socket_test" />
<option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
<option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
</test>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmdrmplugin-hidl.xml
similarity index 77%
copy from res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
copy to res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmdrmplugin-hidl.xml
index 088d688..56cc8df 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmdrmplugin-hidl.xml
@@ -2,13 +2,13 @@
<!-- Copyright 2015 Google Inc. All Rights Reserved -->
<!-- Required options: branch build-flavor -->
<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
- <option name="test-tag" value="widevineMaxResEngineUnit" />
+ <option name="test-tag" value="widevineLibwvdrmdrmpluginHidl" />
<target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
- <option name="test-file-name" value="bin/max_res_engine_unittest" />
+ <option name="test-file-name" value="bin/libwvdrmdrmplugin_hidl_test" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest">
<option name="native-test-device-path" value="/data/bin" />
- <option name="module-name" value="max_res_engine_unittest" />
+ <option name="module-name" value="libwvdrmdrmplugin_hidl_test" />
<option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
<option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
</test>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmengine-hidl.xml
similarity index 72%
copy from res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
copy to res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmengine-hidl.xml
index 088d688..fa22bbe 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmengine-hidl.xml
@@ -2,13 +2,14 @@
<!-- Copyright 2015 Google Inc. All Rights Reserved -->
<!-- Required options: branch build-flavor -->
<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
- <option name="test-tag" value="widevineMaxResEngineUnit" />
+ <option name="test-tag" value="widevineLibwvdrmengineHidl" />
<target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
- <option name="test-file-name" value="bin/max_res_engine_unittest" />
+ <option name="test-file-name" value="bin/libwvdrmengine_hidl_test" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest">
<option name="native-test-device-path" value="/data/bin" />
- <option name="module-name" value="max_res_engine_unittest" />
+ <option name="module-name" value="libwvdrmengine_hidl_test" />
+ <option name="ld-library-path" value="/system/vendor/lib/mediadrm" />
<option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
<option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
</test>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmmediacrypto-hidl.xml
similarity index 76%
copy from res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
copy to res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmmediacrypto-hidl.xml
index 088d688..b0cc4ff 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmmediacrypto-hidl.xml
@@ -2,13 +2,13 @@
<!-- Copyright 2015 Google Inc. All Rights Reserved -->
<!-- Required options: branch build-flavor -->
<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
- <option name="test-tag" value="widevineMaxResEngineUnit" />
+ <option name="test-tag" value="widevineLibwvdrmmediacryptoHidl" />
<target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
- <option name="test-file-name" value="bin/max_res_engine_unittest" />
+ <option name="test-file-name" value="bin/libwvdrmmediacrypto_hidl_test" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest">
<option name="native-test-device-path" value="/data/bin" />
- <option name="module-name" value="max_res_engine_unittest" />
+ <option name="module-name" value="libwvdrmmediacrypto_hidl_test" />
<option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
<option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
</test>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-license-keys-unit.xml
similarity index 78%
copy from res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
copy to res/config/google/test/framework/media/widevine/tests/widevine-license-keys-unit.xml
index 088d688..df26cff 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-license-keys-unit.xml
@@ -2,13 +2,13 @@
<!-- Copyright 2015 Google Inc. All Rights Reserved -->
<!-- Required options: branch build-flavor -->
<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
- <option name="test-tag" value="widevineMaxResEngineUnit" />
+ <option name="test-tag" value="widevineLicenseKeysUnit" />
<target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
- <option name="test-file-name" value="bin/max_res_engine_unittest" />
+ <option name="test-file-name" value="bin/license_keys_unittest" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest">
<option name="native-test-device-path" value="/data/bin" />
- <option name="module-name" value="max_res_engine_unittest" />
+ <option name="module-name" value="license_keys_unittest" />
<option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
<option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
</test>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-policy-engine-constraints-unit.xml
similarity index 75%
copy from res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
copy to res/config/google/test/framework/media/widevine/tests/widevine-policy-engine-constraints-unit.xml
index 088d688..50a9bfe 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-policy-engine-constraints-unit.xml
@@ -2,13 +2,13 @@
<!-- Copyright 2015 Google Inc. All Rights Reserved -->
<!-- Required options: branch build-flavor -->
<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
- <option name="test-tag" value="widevineMaxResEngineUnit" />
+ <option name="test-tag" value="widevinePolicyEngineConstraintsUnit" />
<target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
- <option name="test-file-name" value="bin/max_res_engine_unittest" />
+ <option name="test-file-name" value="bin/policy_engine_constraints_unittest" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest">
<option name="native-test-device-path" value="/data/bin" />
- <option name="module-name" value="max_res_engine_unittest" />
+ <option name="module-name" value="policy_engine_constraints_unittest" />
<option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
<option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
</test>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-service-certificate-unit.xml
similarity index 77%
copy from res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
copy to res/config/google/test/framework/media/widevine/tests/widevine-service-certificate-unit.xml
index 088d688..1a3d994 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-service-certificate-unit.xml
@@ -2,13 +2,13 @@
<!-- Copyright 2015 Google Inc. All Rights Reserved -->
<!-- Required options: branch build-flavor -->
<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
- <option name="test-tag" value="widevineMaxResEngineUnit" />
+ <option name="test-tag" value="widevineServiceCertificateUnit" />
<target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
- <option name="test-file-name" value="bin/max_res_engine_unittest" />
+ <option name="test-file-name" value="bin/service_certificate_unittest" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest">
<option name="native-test-device-path" value="/data/bin" />
- <option name="module-name" value="max_res_engine_unittest" />
+ <option name="module-name" value="service_certificate_unittest" />
<option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
<option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
</test>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-usage-table-header-unit.xml
similarity index 77%
copy from res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
copy to res/config/google/test/framework/media/widevine/tests/widevine-usage-table-header-unit.xml
index 088d688..159d6e0 100644
--- a/res/config/google/test/framework/media/widevine/tests/widevine-max-res-engine-unit.xml
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-usage-table-header-unit.xml
@@ -2,13 +2,13 @@
<!-- Copyright 2015 Google Inc. All Rights Reserved -->
<!-- Required options: branch build-flavor -->
<configuration description="Downloads build, flashes on device, and runs Widevine Modular DRM tests">
- <option name="test-tag" value="widevineMaxResEngineUnit" />
+ <option name="test-tag" value="widevineUsageTableHeaderUnit" />
<target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
- <option name="test-file-name" value="bin/max_res_engine_unittest" />
+ <option name="test-file-name" value="bin/usage_table_header_unittest" />
</target_preparer>
<test class="com.android.tradefed.testtype.GTest">
<option name="native-test-device-path" value="/data/bin" />
- <option name="module-name" value="max_res_engine_unittest" />
+ <option name="module-name" value="usage_table_header_unittest" />
<option name="before-test-cmd" value="pm disable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
<option name="after-test-cmd" value="pm enable com.google.android.gms/com.google.android.gms.droidguard.DroidGuardService" />
</test>