Verify content url parameters are not stripped
Bug: 11654127
Add a test to verify content url parameters are not stripped. Note that
this CL introduces the code that was reverted in
Id092169b23266e655df814989abeacb57d2befd9, after fixing the problem
with content provider declaration issue.
Change-Id: Ia63fca126814e6b32d059d082f33d5848f838559
(cherry picked from commit 459c8159aa90597f8021961406e3a04a64159e23)
diff --git a/tests/tests/webkit/AndroidManifest.xml b/tests/tests/webkit/AndroidManifest.xml
index 493762e..f4424a8 100644
--- a/tests/tests/webkit/AndroidManifest.xml
+++ b/tests/tests/webkit/AndroidManifest.xml
@@ -22,6 +22,9 @@
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"/>
<application>
+ <provider android:name="android.webkit.cts.MockContentProvider"
+ android:exported="true"
+ android:authorities="android.webkit.cts.MockContentProvider" />
<uses-library android:name="android.test.runner" />
</application>
diff --git a/tests/tests/webkit/src/android/webkit/cts/MockContentProvider.java b/tests/tests/webkit/src/android/webkit/cts/MockContentProvider.java
new file mode 100644
index 0000000..b9f3891
--- /dev/null
+++ b/tests/tests/webkit/src/android/webkit/cts/MockContentProvider.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.webkit.cts;
+
+import android.content.ContentProvider;
+import android.content.ContentProvider.PipeDataWriter;
+import android.content.ContentValues;
+import android.content.res.AssetFileDescriptor;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.ParcelFileDescriptor;
+
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+
+public class MockContentProvider extends ContentProvider
+ implements PipeDataWriter<String> {
+
+ public static final String AUTHORITY = MockContentProvider.class.getName();
+
+ @Override
+ public boolean onCreate() {
+ return true;
+ }
+
+ @Override
+ public int delete(Uri uri, String selection, String[] selectionArgs) {
+ return 0;
+ }
+
+ @Override
+ public String getType(Uri uri) {
+ return "text/html";
+ }
+
+ @Override
+ public Uri insert(Uri uri, ContentValues initialValues) {
+ return null;
+ }
+
+ @Override
+ public Cursor query(Uri uri, String[] projection, String selection,
+ String[] selectionArgs, String sortOrder) {
+ return null;
+ }
+
+ @Override
+ public int update(Uri uri, ContentValues values, String selection,
+ String[] selectionArgs) {
+ return 0;
+ }
+
+ @Override
+ public AssetFileDescriptor openAssetFile(Uri uri, String mode)
+ throws FileNotFoundException {
+ return new AssetFileDescriptor(openPipeHelper(uri, "text/html", null,
+ "<html><title>" + uri.toString() + "</title></html>", this), 0,
+ AssetFileDescriptor.UNKNOWN_LENGTH);
+ }
+
+ @Override
+ public void writeDataToPipe(ParcelFileDescriptor output, Uri uri, String mimeType, Bundle opts,
+ String args) {
+ FileOutputStream outputStream = new FileOutputStream(output.getFileDescriptor());
+ PrintWriter printWriter = null;
+ try {
+ printWriter = new PrintWriter(new OutputStreamWriter(outputStream, "UTF-8"));
+ printWriter.print(args);
+ } catch (UnsupportedEncodingException e) {
+ } finally {
+ if (printWriter != null) {
+ printWriter.flush();
+ }
+ try {
+ outputStream.close();
+ } catch (IOException e) {
+ }
+ }
+ }
+}
+
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
index 5490a6e..9a3645b 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -16,6 +16,7 @@
package android.webkit.cts;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.res.AssetManager;
import android.cts.util.EvaluateJsResultPollingCheck;
@@ -359,6 +360,18 @@
}
@UiThreadTest
+ public void testLoadUrlDoesNotStripParamsWhenLoadingContentUrls() throws Exception {
+ Uri.Builder uriBuilder = new Uri.Builder().scheme(
+ ContentResolver.SCHEME_CONTENT).authority(MockContentProvider.AUTHORITY);
+ uriBuilder.appendPath("foo.html").appendQueryParameter("param","bar");
+ String url = uriBuilder.build().toString();
+ mOnUiThread.loadUrlAndWaitForCompletion(url);
+ // verify the parameter is not stripped.
+ Uri uri = Uri.parse(mWebView.getTitle());
+ assertEquals("bar", uri.getQueryParameter("param"));
+ }
+
+ @UiThreadTest
public void testAppInjectedXRequestedWithHeaderIsNotOverwritten() throws Exception {
startWebServer(false);
String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
