Add new configs for revised and new widevine unittests

Two unit tests were renamed, and two new tests were added to oc-mr1-dev.
Need to add these "new" tests to tradefed to be executed on oc-mr1-dev or later.

Test: tradefed run google/test/framework/media/widevine/tests/widevine-counter-metric-unit
      tradefed run google/test/framework/media/widevine/tests/widevine-distribution-metric-unit
      tradefed run google/test/framework/media/widevine/tests/widevine-event-metric-unit
      tradefed run google/test/framework/media/widevine/tests/widevine-value-metric-unit

Bug: 65675252
Change-Id: If5a5aa696d776e12cbdf4ddfa879b22c7b8395d4

4 files changed, 60 insertions, 0 deletions

diff --git a/res/config/google/test/framework/media/widevine/tests/widevine-counter-metric-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-counter-metric-unit.xml
new file mode 100644
index 0000000..b65fffc
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-counter-metric-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="widevineCounterMetricUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/counter_metric_unittest" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="counter_metric_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-distribution-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-distribution-unit.xml
new file mode 100644
index 0000000..5337182
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-distribution-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="widevineDistributionUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/distribution_unittest" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="distribution_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-event-metric-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-event-metric-unit.xml
new file mode 100644
index 0000000..d1b27c0
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-event-metric-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="widevineEventMetricUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/event_metric_unittest" />
+    </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_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-value-metric-unit.xml b/res/config/google/test/framework/media/widevine/tests/widevine-value-metric-unit.xml
new file mode 100644
index 0000000..168d98b
--- /dev/null
+++ b/res/config/google/test/framework/media/widevine/tests/widevine-value-metric-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="widevineValueMetricUnit" />
+    <target_preparer class="com.android.tradefed.targetprep.TestFilePushSetup">
+        <option name="test-file-name" value="bin/value_metric_unittest" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest">
+        <option name="native-test-device-path" value="/data/bin" />
+        <option name="module-name" value="value_metric_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>