From 2bab114f59b5dd1476114e9f9b0e00465b898e3a Mon Sep 17 00:00:00 2001
From: Jeff Tinker <jtinker@google.com>
Date: Fri, 30 May 2014 08:19:12 -0700
Subject: [PATCH] Fix cast v2 authentication unit test

Merge of https://widevine-internal-review.googlesource.com/#/c/10309 from the widevine cdm repo.

bug: 15341137

Change-Id: I188d7d7a3861dcbec1950dfbe8dd9504a60899bf
---
 .../test/castv2/AndroidManifest.xml           | 22 +++++++++----------
 .../castv2/test/CertificateRequester.java     |  4 ++--
 .../castv2/test/ProvisionRequester.java       |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libwvdrmengine/test/castv2/AndroidManifest.xml b/libwvdrmengine/test/castv2/AndroidManifest.xml
index acd97a52..67d6dec4 100644
--- a/libwvdrmengine/test/castv2/AndroidManifest.xml
+++ b/libwvdrmengine/test/castv2/AndroidManifest.xml
@@ -2,22 +2,22 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.android.castv2.test"
 >
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_DRM_CERTIFICATES" />
-    <uses-library android:name="com.android.mediadrm.signer"
-                  android:required="true" />
 
     <uses-sdk android:minSdkVersion="18"></uses-sdk>
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.Holo.NoActionBar">
-        <activity android:name="CastSignAPITest"
-                  android:label="@string/app_name"
-                  android:screenOrientation="landscape">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+      <uses-library android:name="com.android.mediadrm.signer"
+                android:required="true" />
+      <activity android:name="CastSignAPITest"
+                android:label="@string/app_name"
+                android:screenOrientation="landscape">
+        <intent-filter>
+          <action android:name="android.intent.action.MAIN" />
+          <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
+      </activity>
     </application>
-
 </manifest>
diff --git a/libwvdrmengine/test/castv2/src/com/android/castv2/test/CertificateRequester.java b/libwvdrmengine/test/castv2/src/com/android/castv2/test/CertificateRequester.java
index bceae2ef..b59c42c6 100644
--- a/libwvdrmengine/test/castv2/src/com/android/castv2/test/CertificateRequester.java
+++ b/libwvdrmengine/test/castv2/src/com/android/castv2/test/CertificateRequester.java
@@ -28,7 +28,7 @@ public class CertificateRequester {
         MediaDrmSigner.Certificate result = null;
         MediaDrmSigner.CertificateRequest certificateRequest =
             MediaDrmSigner.getCertificateRequest(drm, MediaDrmSigner.CERTIFICATE_TYPE_X509,
-                                                 "test-certificate");
+                                                 "cast.google.com");
 
         PostRequestTask postTask = new PostRequestTask(certificateRequest.getData());
         Log.i(TAG, "Requesting certificate from server '" + certificateRequest.getDefaultUrl() + "'");
@@ -82,7 +82,7 @@ public class CertificateRequester {
 
         private byte[] postRequest(String url, byte[] certificateRequest) {
             HttpClient httpclient = new DefaultHttpClient();
-            HttpPost httppost = new HttpPost(url + "?signedRequest=" + new String(certificateRequest));
+            HttpPost httppost = new HttpPost(url + "&signedRequest=" + new String(certificateRequest));
 
             Log.d(TAG, "PostRequest:" + httppost.getRequestLine());
 
diff --git a/libwvdrmengine/test/castv2/src/com/android/castv2/test/ProvisionRequester.java b/libwvdrmengine/test/castv2/src/com/android/castv2/test/ProvisionRequester.java
index 1d28c5fc..06704703 100644
--- a/libwvdrmengine/test/castv2/src/com/android/castv2/test/ProvisionRequester.java
+++ b/libwvdrmengine/test/castv2/src/com/android/castv2/test/ProvisionRequester.java
@@ -75,7 +75,7 @@ public class ProvisionRequester {
 
         private byte[] postRequest(String url, byte[] drmRequest) {
             HttpClient httpclient = new DefaultHttpClient();
-            HttpPost httppost = new HttpPost(url + "?signedRequest=" + new String(drmRequest));
+            HttpPost httppost = new HttpPost(url + "&signedRequest=" + new String(drmRequest));
 
             Log.d(TAG, "PostRequest:" + httppost.getRequestLine());