Merge "Update unit test configs for Widevine unit tests" into oc-dev am: 7778abfb93 am: 4e851cd4cd

am: 40fe5ffa2b

Change-Id: I7c64f86f9761a21dadf4408efb6b99613fc5fd36

13 files changed, 184 insertions, 3 deletions

diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-base64.xml b/res/config/google/test/framework/media/widevine/tests/widevine-base64.xml
new file mode 100644
index 0000000..6bee54b
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-base64.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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="widevineBase64" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <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="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>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-buffer-reader.xml b/res/config/google/test/framework/media/widevine/tests/widevine-buffer-reader.xml
new file mode 100644
index 0000000..48275c4
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-buffer-reader.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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="widevineBufferReader" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <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="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>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-distribution.xml b/res/config/google/test/framework/media/widevine/tests/widevine-distribution.xml
new file mode 100644
index 0000000..9f4a54e
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-distribution.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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="widevineDistribution" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <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="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>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-event-metric.xml b/res/config/google/test/framework/media/widevine/tests/widevine-event-metric.xml
new file mode 100644
index 0000000..80a4022
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-event-metric.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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="widevineEventMetric" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <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="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>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-file-utils-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-file-utils-unit.xml
new file mode 100644
index 0000000..67db9ff
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-file-utils-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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="widevineFileUtilsUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <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="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>
+</configuration>
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
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-libwvdrmdrmplugin-hidl.xml b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmdrmplugin-hidl.xml
new file mode 100644
index 0000000..56cc8df
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmdrmplugin-hidl.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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="widevineLibwvdrmdrmpluginHidl" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <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="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>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmengine-hidl.xml b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmengine-hidl.xml
new file mode 100644
index 0000000..fa22bbe
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmengine-hidl.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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="widevineLibwvdrmengineHidl" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <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="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>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmmediacrypto-hidl.xml b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmmediacrypto-hidl.xml
new file mode 100644
index 0000000..b0cc4ff
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-libwvdrmmediacrypto-hidl.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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="widevineLibwvdrmmediacryptoHidl" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <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="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>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-license-keys-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-license-keys-unit.xml
new file mode 100644
index 0000000..df26cff
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-license-keys-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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="widevineLicenseKeysUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <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="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>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-policy-engine-constraints-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-policy-engine-constraints-unit.xml
new file mode 100644
index 0000000..50a9bfe
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-policy-engine-constraints-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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="widevinePolicyEngineConstraintsUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <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="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>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-service-certificate-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-service-certificate-unit.xml
new file mode 100644
index 0000000..1a3d994
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-service-certificate-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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="widevineServiceCertificateUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <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="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>
+</configuration>
diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-usage-table-header-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-usage-table-header-unit.xml
new file mode 100644
index 0000000..159d6e0
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-usage-table-header-unit.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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="widevineUsageTableHeaderUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <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="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>
+</configuration>