Index: android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java |
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java |
index 609b62e1102458305ac1acc261d7c6f4935d9f4d..7f6e72d33a36870122ee44901c7640cd1b4be494 100644 |
--- a/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java |
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java |
@@ -6,6 +6,7 @@ package org.chromium.android_webview.test; |
import android.test.suitebuilder.annotation.SmallTest; |
+import org.chromium.android_webview.AwContents; |
import org.chromium.android_webview.test.util.CommonResources; |
import org.chromium.android_webview.test.util.TestWebServer; |
import org.chromium.base.test.util.Feature; |
@@ -23,14 +24,17 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase { |
protected static int WAIT_TIMEOUT_SECONDS = 15; |
private TestAwContentsClient mContentsClient; |
+ private AwContents mAwContents; |
private ContentViewCore mContentViewCore; |
@Override |
public void setUp() throws Exception { |
super.setUp(); |
mContentsClient = new TestAwContentsClient(); |
- mContentViewCore = |
- createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore(); |
+ final AwTestContainerView testContainerView = |
+ createAwTestContainerViewOnMainSync(mContentsClient); |
+ mAwContents = testContainerView.getAwContents(); |
+ mContentViewCore = testContainerView.getContentViewCore(); |
} |
protected void loadDataWithBaseUrlSync( |
@@ -50,7 +54,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase { |
runTestOnUiThread(new Runnable() { |
@Override |
public void run() { |
- mContentViewCore.loadUrl(LoadUrlParams.createLoadDataParamsWithBaseUrl( |
+ mAwContents.loadUrl(LoadUrlParams.createLoadDataParamsWithBaseUrl( |
data, mimeType, isBase64Encoded, baseUrl, historyUrl)); |
} |
}); |
@@ -92,7 +96,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase { |
webServer.setResponseBase64("/" + CommonResources.FAVICON_FILENAME, |
CommonResources.FAVICON_DATA_BASE64, CommonResources.getImagePngHeaders(true)); |
- ContentSettings contentSettings = getContentSettingsOnUiThread(mContentViewCore); |
+ ContentSettings contentSettings = getContentSettingsOnUiThread(mAwContents); |
contentSettings.setImagesEnabled(true); |
contentSettings.setJavaScriptEnabled(true); |
@@ -100,7 +104,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase { |
CommonResources.getOnImageLoadedHtml(CommonResources.FAVICON_FILENAME), |
"text/html", false, webServer.getBaseUrl(), null); |
- assertEquals("5", getTitleOnUiThread(mContentViewCore)); |
+ assertEquals("5", getTitleOnUiThread(mAwContents)); |
} finally { |
if (webServer != null) webServer.shutdown(); |
} |
@@ -117,9 +121,9 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase { |
CommonResources.getTextJavascriptHeaders(true)); |
final String pageHtml = getScriptFileTestPageHtml(scriptUrl); |
- getContentSettingsOnUiThread(mContentViewCore).setJavaScriptEnabled(true); |
+ getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true); |
loadDataWithBaseUrlSync(pageHtml, "text/html", false, webServer.getBaseUrl(), null); |
- assertEquals(SCRIPT_LOADED, getTitleOnUiThread(mContentViewCore)); |
+ assertEquals(SCRIPT_LOADED, getTitleOnUiThread(mAwContents)); |
} finally { |
if (webServer != null) webServer.shutdown(); |
@@ -136,9 +140,9 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase { |
CommonResources.ABOUT_HTML, CommonResources.getTextHtmlHeaders(true)); |
final String html = getCrossOriginAccessTestPageHtml(frameUrl); |
- getContentSettingsOnUiThread(mContentViewCore).setJavaScriptEnabled(true); |
+ getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true); |
loadDataWithBaseUrlSync(html, "text/html", false, webServer.getBaseUrl(), null); |
- assertEquals(frameUrl, getTitleOnUiThread(mContentViewCore)); |
+ assertEquals(frameUrl, getTitleOnUiThread(mAwContents)); |
} finally { |
if (webServer != null) webServer.shutdown(); |
@@ -156,12 +160,12 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase { |
final String html = getCrossOriginAccessTestPageHtml(frameUrl); |
final String baseUrl = webServer.getBaseUrl().replaceFirst("localhost", "127.0.0.1"); |
- getContentSettingsOnUiThread(mContentViewCore).setJavaScriptEnabled(true); |
+ getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true); |
loadDataWithBaseUrlSync(html, "text/html", false, baseUrl, null); |
// TODO(mnaganov): Catch a security exception and set the title accordingly, |
// once https://bugs.webkit.org/show_bug.cgi?id=43504 is fixed. |
- assertEquals("undefined", getTitleOnUiThread(mContentViewCore)); |
+ assertEquals("undefined", getTitleOnUiThread(mAwContents)); |
} finally { |
if (webServer != null) webServer.shutdown(); |
@@ -171,11 +175,11 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase { |
@SmallTest |
@Feature({"Android-WebView"}) |
public void testNullBaseUrl() throws Throwable { |
- getContentSettingsOnUiThread(mContentViewCore).setJavaScriptEnabled(true); |
+ getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true); |
final String pageHtml = "<html><body onload='document.title=document.location.href'>" + |
"</body></html>"; |
loadDataWithBaseUrlSync(pageHtml, "text/html", false, null, null); |
- assertEquals("about:blank", getTitleOnUiThread(mContentViewCore)); |
+ assertEquals("about:blank", getTitleOnUiThread(mAwContents)); |
} |
@SmallTest |
@@ -209,23 +213,23 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase { |
@SmallTest |
@Feature({"Android-WebView"}) |
public void testAccessToLocalFile() throws Throwable { |
- getContentSettingsOnUiThread(mContentViewCore).setJavaScriptEnabled(true); |
+ getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true); |
final String baseUrl = UrlUtils.getTestFileUrl("webview/"); |
final String scriptFile = baseUrl + "script.js"; |
final String pageHtml = getScriptFileTestPageHtml(scriptFile); |
loadDataWithBaseUrlSync(pageHtml, "text/html", false, baseUrl, null); |
- assertEquals(SCRIPT_LOADED, getTitleOnUiThread(mContentViewCore)); |
+ assertEquals(SCRIPT_LOADED, getTitleOnUiThread(mAwContents)); |
} |
@SmallTest |
@Feature({"Android-WebView"}) |
public void testFailedAccessToLocalFile() throws Throwable { |
- getContentSettingsOnUiThread(mContentViewCore).setJavaScriptEnabled(true); |
+ getContentSettingsOnUiThread(mAwContents).setJavaScriptEnabled(true); |
final String scriptFile = UrlUtils.getTestFileUrl("webview/script.js"); |
final String pageHtml = getScriptFileTestPageHtml(scriptFile); |
final String baseUrl = "http://example.com"; |
loadDataWithBaseUrlSync(pageHtml, "text/html", false, baseUrl, null); |
- assertEquals(SCRIPT_NOT_LOADED, getTitleOnUiThread(mContentViewCore)); |
+ assertEquals(SCRIPT_NOT_LOADED, getTitleOnUiThread(mAwContents)); |
} |
@SmallTest |
@@ -242,7 +246,7 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase { |
"<body>" + page1Title + "</body></html>"; |
loadDataWithBaseUrlSync(page1Html, "text/html", false, null, historyUrl); |
- assertEquals(page1Title, getTitleOnUiThread(mContentViewCore)); |
+ assertEquals(page1Title, getTitleOnUiThread(mAwContents)); |
final String page2Title = "Page2"; |
final String page2Html = "<html><head><title>" + page2Title + "</title>" + |
@@ -250,12 +254,12 @@ public class LoadDataWithBaseUrlTest extends AndroidWebViewTestBase { |
final TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper = |
mContentsClient.getOnPageFinishedHelper(); |
- loadDataSync(mContentViewCore, onPageFinishedHelper, page2Html, "text/html", false); |
- assertEquals(page2Title, getTitleOnUiThread(mContentViewCore)); |
+ loadDataSync(mAwContents, onPageFinishedHelper, page2Html, "text/html", false); |
+ assertEquals(page2Title, getTitleOnUiThread(mAwContents)); |
HistoryUtils.goBackSync(getInstrumentation(), mContentViewCore, onPageFinishedHelper); |
// The title of the 'about.html' specified via historyUrl. |
- assertEquals(CommonResources.ABOUT_TITLE, getTitleOnUiThread(mContentViewCore)); |
+ assertEquals(CommonResources.ABOUT_TITLE, getTitleOnUiThread(mAwContents)); |
} finally { |
if (webServer != null) webServer.shutdown(); |