Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java

Issue 11098030: Revert 160959 - [android_webview] Use AwContents loadUrl method instead of ContentViewCore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/AwContents.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.android_webview.test; 5 package org.chromium.android_webview.test;
6 6
7 import android.test.suitebuilder.annotation.SmallTest; 7 import android.test.suitebuilder.annotation.SmallTest;
8 8
9 import org.apache.http.Header; 9 import org.apache.http.Header;
10 import org.apache.http.HttpRequest; 10 import org.apache.http.HttpRequest;
11 11
12 import org.chromium.android_webview.AwContents;
13 import org.chromium.base.test.util.Feature; 12 import org.chromium.base.test.util.Feature;
13 import org.chromium.content.browser.ContentViewCore;
14 import org.chromium.content.browser.LoadUrlParams; 14 import org.chromium.content.browser.LoadUrlParams;
15 import org.chromium.content.browser.test.util.CallbackHelper; 15 import org.chromium.content.browser.test.util.CallbackHelper;
16 import org.chromium.android_webview.test.util.TestWebServer; 16 import org.chromium.android_webview.test.util.TestWebServer;
17 17
18 import java.util.concurrent.TimeUnit; 18 import java.util.concurrent.TimeUnit;
19 import java.util.HashMap; 19 import java.util.HashMap;
20 import java.util.Map; 20 import java.util.Map;
21 21
22 /** 22 /**
23 * Test suite for loadUrl(). 23 * Test suite for loadUrl().
24 */ 24 */
25 public class AndroidWebViewLoadUrlTest extends AndroidWebViewTestBase { 25 public class AndroidWebViewLoadUrlTest extends AndroidWebViewTestBase {
26 @SmallTest 26 @SmallTest
27 @Feature({"Android-WebView"}) 27 @Feature({"Android-WebView"})
28 public void testDataUrl() throws Throwable { 28 public void testDataUrl() throws Throwable {
29 final String expectedTitle = "dataUrlTest"; 29 final String expectedTitle = "dataUrlTest";
30 final String data = 30 final String data =
31 "<html><head><title>" + expectedTitle + "</title></head><body>foo</b ody></html>"; 31 "<html><head><title>" + expectedTitle + "</title></head><body>foo</b ody></html>";
32 32
33 final TestAwContentsClient contentsClient = new TestAwContentsClient(); 33 final TestAwContentsClient contentsClient = new TestAwContentsClient();
34 final AwTestContainerView testContainerView = 34 final ContentViewCore contentViewCore =
35 createAwTestContainerViewOnMainSync(contentsClient); 35 createAwTestContainerViewOnMainSync(contentsClient).getContentViewCo re();
36 final AwContents awContents = testContainerView.getAwContents(); 36 loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(), data,
37 loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(), data,
38 "text/html", false); 37 "text/html", false);
39 assertEquals(expectedTitle, getTitleOnUiThread(awContents)); 38 assertEquals(expectedTitle, getTitleOnUiThread(contentViewCore));
40 } 39 }
41 40
42 @SmallTest 41 @SmallTest
43 @Feature({"Android-WebView"}) 42 @Feature({"Android-WebView"})
44 public void testDataUrlBase64() throws Throwable { 43 public void testDataUrlBase64() throws Throwable {
45 final String expectedTitle = "dataUrlTestBase64"; 44 final String expectedTitle = "dataUrlTestBase64";
46 final String data = "PGh0bWw+PGhlYWQ+PHRpdGxlPmRhdGFVcmxUZXN0QmFzZTY0PC9 0aXRsZT48" + 45 final String data = "PGh0bWw+PGhlYWQ+PHRpdGxlPmRhdGFVcmxUZXN0QmFzZTY0PC9 0aXRsZT48" +
47 "L2hlYWQ+PC9odG1sPg=="; 46 "L2hlYWQ+PC9odG1sPg==";
48 47
49 final TestAwContentsClient contentsClient = new TestAwContentsClient(); 48 final TestAwContentsClient contentsClient = new TestAwContentsClient();
50 final AwTestContainerView testContainerView = 49 final ContentViewCore contentViewCore =
51 createAwTestContainerViewOnMainSync(contentsClient); 50 createAwTestContainerViewOnMainSync(contentsClient).getContentViewCo re();
52 final AwContents awContents = testContainerView.getAwContents(); 51 loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(), data,
53 loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(), data,
54 "text/html", true); 52 "text/html", true);
55 assertEquals(expectedTitle, getTitleOnUiThread(awContents)); 53 assertEquals(expectedTitle, getTitleOnUiThread(contentViewCore));
56 } 54 }
57 55
58 /** 56 /**
59 * Loads url on the UI thread and blocks until onPageFinished is called. 57 * Loads url on the UI thread and blocks until onPageFinished is called.
60 */ 58 */
61 protected void loadUrlWithExtraHeadersSync( 59 protected void loadUrlWithExtraHeadersSync(
62 final AwContents awContents, 60 final ContentViewCore contentViewCore,
63 CallbackHelper onPageFinishedHelper, 61 CallbackHelper onPageFinishedHelper,
64 final String url, 62 final String url,
65 final Map<String, String> extraHeaders) throws Throwable { 63 final Map<String, String> extraHeaders) throws Throwable {
66 int currentCallCount = onPageFinishedHelper.getCallCount(); 64 int currentCallCount = onPageFinishedHelper.getCallCount();
67 runTestOnUiThread(new Runnable() { 65 runTestOnUiThread(new Runnable() {
68 @Override 66 @Override
69 public void run() { 67 public void run() {
70 LoadUrlParams params = new LoadUrlParams(url); 68 LoadUrlParams params = new LoadUrlParams(url);
71 params.setExtraHeaders(extraHeaders); 69 params.setExtraHeaders(extraHeaders);
72 awContents.loadUrl(params); 70 contentViewCore.loadUrl(params);
73 } 71 }
74 }); 72 });
75 onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_S ECONDS, 73 onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_S ECONDS,
76 TimeUnit.SECONDS); 74 TimeUnit.SECONDS);
77 } 75 }
78 76
79 @SmallTest 77 @SmallTest
80 @Feature({"Android-WebView"}) 78 @Feature({"Android-WebView"})
81 public void testLoadUrlWithExtraHeaders() throws Throwable { 79 public void testLoadUrlWithExtraHeaders() throws Throwable {
82 final TestAwContentsClient contentsClient = new TestAwContentsClient(); 80 final TestAwContentsClient contentsClient = new TestAwContentsClient();
83 final AwTestContainerView testContainerView = 81 final ContentViewCore contentViewCore =
84 createAwTestContainerViewOnMainSync(contentsClient); 82 createAwTestContainerViewOnMainSync(contentsClient).getContentViewCo re();
85 final AwContents awContents = testContainerView.getAwContents();
86 83
87 TestWebServer webServer = null; 84 TestWebServer webServer = null;
88 try { 85 try {
89 webServer = new TestWebServer(false); 86 webServer = new TestWebServer(false);
90 final String path = "/load_url_with_extra_headers_test.html"; 87 final String path = "/load_url_with_extra_headers_test.html";
91 final String url = webServer.setResponse(path, "<html><body>foo</bod y></html>", null); 88 final String url = webServer.setResponse(path, "<html><body>foo</bod y></html>", null);
92 89
93 String[] headerNames = {"X-ExtraHeaders1", "x-extraHeaders2"}; 90 String[] headerNames = {"X-ExtraHeaders1", "x-extraHeaders2"};
94 String[] headerValues = {"extra-header-data1", "EXTRA-HEADER-DATA2"} ; 91 String[] headerValues = {"extra-header-data1", "EXTRA-HEADER-DATA2"} ;
95 Map<String, String> extraHeaders = new HashMap<String, String>(); 92 Map<String, String> extraHeaders = new HashMap<String, String>();
96 for (int i = 0; i < headerNames.length; ++i) 93 for (int i = 0; i < headerNames.length; ++i)
97 extraHeaders.put(headerNames[i], headerValues[i]); 94 extraHeaders.put(headerNames[i], headerValues[i]);
98 95
99 loadUrlWithExtraHeadersSync(awContents, 96 loadUrlWithExtraHeadersSync(contentViewCore,
100 contentsClient.getOnPageFinishedHelper() , 97 contentsClient.getOnPageFinishedHelper() ,
101 url, 98 url,
102 extraHeaders); 99 extraHeaders);
103 100
104 HttpRequest request = webServer.getLastRequest(path); 101 HttpRequest request = webServer.getLastRequest(path);
105 for (int i = 0; i < headerNames.length; ++i) { 102 for (int i = 0; i < headerNames.length; ++i) {
106 Header[] matchingHeaders = request.getHeaders(headerNames[i]); 103 Header[] matchingHeaders = request.getHeaders(headerNames[i]);
107 assertEquals(1, matchingHeaders.length); 104 assertEquals(1, matchingHeaders.length);
108 105
109 Header header = matchingHeaders[0]; 106 Header header = matchingHeaders[0];
110 assertEquals(headerNames[i].toLowerCase(), header.getName()); 107 assertEquals(headerNames[i].toLowerCase(), header.getName());
111 assertEquals(headerValues[i], header.getValue()); 108 assertEquals(headerValues[i], header.getValue());
112 } 109 }
113 } finally { 110 } finally {
114 if (webServer != null) webServer.shutdown(); 111 if (webServer != null) webServer.shutdown();
115 } 112 }
116 } 113 }
117 } 114 }
OLDNEW
« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/AwContents.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698