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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java

Issue 11028094: [android_webview] Use AwContents loadUrl method instead of ContentViewCore. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase yet again 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwShouldIgnoreNavigationTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
index bb73435b9e330e34292ef39ef8bdb230ee64117d..07b7998f0b8042b027d70f791a37306c08af5e7c 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
@@ -7,7 +7,6 @@ package org.chromium.android_webview.test;
import android.content.Context;
import android.os.Build;
import android.test.suitebuilder.annotation.SmallTest;
-import android.util.Pair;
import org.chromium.android_webview.AndroidProtocolHandler;
import org.chromium.android_webview.AwContents;
@@ -50,16 +49,16 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
* In this case, requiresJsEnabled constructor argument must be set to true.
*/
abstract class AwSettingsTestHelper<T> {
- protected final ContentViewCore mContentViewCore;
+ protected final AwContents mAwContents;
protected final TestAwContentsClient mContentViewClient;
protected final ContentSettings mContentSettings;
- AwSettingsTestHelper(ContentViewCore contentViewCore,
+ AwSettingsTestHelper(AwContents awContents,
TestAwContentsClient contentViewClient,
boolean requiresJsEnabled) throws Throwable {
- mContentViewCore = contentViewCore;
+ mAwContents = awContents;
mContentViewClient = contentViewClient;
- mContentSettings = getContentSettingsOnUiThread(mContentViewCore);
+ mContentSettings = getContentSettingsOnUiThread(mAwContents);
if (requiresJsEnabled) {
mContentSettings.setJavaScriptEnabled(true);
}
@@ -92,12 +91,12 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
protected abstract void doEnsureSettingHasValue(T value) throws Throwable;
protected String getTitleOnUiThread() throws Throwable {
- return AwSettingsTest.this.getTitleOnUiThread(mContentViewCore);
+ return AwSettingsTest.this.getTitleOnUiThread(mAwContents);
}
protected void loadDataSync(String data) throws Throwable {
AwSettingsTest.this.loadDataSync(
- mContentViewCore,
+ mAwContents,
mContentViewClient.getOnPageFinishedHelper(),
data,
"text/html",
@@ -106,14 +105,14 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
protected void loadUrlSync(String url) throws Throwable {
AwSettingsTest.this.loadUrlSync(
- mContentViewCore,
+ mAwContents,
mContentViewClient.getOnPageFinishedHelper(),
url);
}
protected void loadUrlSyncAndExpectError(String url) throws Throwable {
AwSettingsTest.this.loadUrlSyncAndExpectError(
- mContentViewCore,
+ mAwContents,
mContentViewClient.getOnPageFinishedHelper(),
mContentViewClient.getOnReceivedErrorHelper(),
url);
@@ -129,9 +128,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String JS_ENABLED_STRING = "JS Enabled";
private static final String JS_DISABLED_STRING = "JS Disabled";
- AwSettingsJavaScriptTestHelper(ContentViewCore contentViewCore,
+ AwSettingsJavaScriptTestHelper(AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, false);
+ super(awContents, contentViewClient, false);
}
@Override
@@ -173,9 +172,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// JavaScript state.
class AwSettingsJavaScriptDynamicTestHelper extends AwSettingsJavaScriptTestHelper {
AwSettingsJavaScriptDynamicTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient);
+ super(awContents, contentViewClient);
// Load the page.
super.doEnsureSettingHasValue(getInitialValue());
}
@@ -185,7 +184,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
String oldTitle = getTitleOnUiThread();
String newTitle = oldTitle + "_modified";
executeJavaScriptAndWaitForResult(
- mContentViewCore, mContentViewClient, getScript(newTitle));
+ mAwContents, mContentViewClient, getScript(newTitle));
assertEquals(value == ENABLED ? newTitle : oldTitle, getTitleOnUiThread());
}
@@ -198,9 +197,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String PLUGINS_ENABLED_STRING = "Embed";
private static final String PLUGINS_DISABLED_STRING = "NoEmbed";
- AwSettingsPluginsTestHelper(ContentViewCore contentViewCore,
+ AwSettingsPluginsTestHelper(AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
}
@Override
@@ -239,9 +238,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
class AwSettingsStandardFontFamilyTestHelper extends AwSettingsTestHelper<String> {
AwSettingsStandardFontFamilyTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
}
@Override
@@ -279,9 +278,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
class AwSettingsDefaultFontSizeTestHelper extends AwSettingsTestHelper<Integer> {
AwSettingsDefaultFontSizeTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
}
@Override
@@ -321,10 +320,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private ImagePageGenerator mGenerator;
AwSettingsLoadImagesAutomaticallyTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient,
ImagePageGenerator generator) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
mGenerator = generator;
}
@@ -360,9 +359,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
class AwSettingsDefaultTextEncodingTestHelper extends AwSettingsTestHelper<String> {
AwSettingsDefaultTextEncodingTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
}
@Override
@@ -402,9 +401,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String CUSTOM_UA = "ChromeViewTest";
AwSettingsUserAgentStringTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
mDefaultUa = mContentSettings.getUserAgentString();
}
@@ -452,9 +451,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String HAS_LOCAL_STORAGE = "Has localStorage";
AwSettingsDomStorageEnabledTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
}
@Override
@@ -494,9 +493,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String ACCESS_DENIED_TITLE = "undefined";
AwSettingsUniversalAccessFromFilesTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
mIframeContainerUrl = UrlUtils.getTestFileUrl("webview/iframe_access.html");
mIframeUrl = UrlUtils.getTestFileUrl("webview/hello_world.html");
// The value of the setting depends on the SDK version.
@@ -545,9 +544,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String ACCESS_DENIED_TITLE = "undefined";
AwSettingsFileAccessFromFilesIframeTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
mIframeContainerUrl = UrlUtils.getTestFileUrl("webview/iframe_access.html");
mIframeUrl = UrlUtils.getTestFileUrl("webview/hello_world.html");
mContentSettings.setAllowUniversalAccessFromFileURLs(false);
@@ -592,9 +591,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String ACCESS_DENIED_TITLE = "Exception";
AwSettingsFileAccessFromFilesXhrTestHelper(
- ContentViewCore contentViewCore,
+ AwContents awContents,
TestAwContentsClient contentViewClient) throws Throwable {
- super(contentViewCore, contentViewClient, true);
+ super(awContents, contentViewClient, true);
mXhrContainerUrl = UrlUtils.getTestFileUrl("webview/xhr_access.html");
mContentSettings.setAllowUniversalAccessFromFileURLs(false);
// The value of the setting depends on the SDK version.
@@ -637,12 +636,11 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
protected AwSettings mAwSettings;
AwSettingsWithSettingsTestHelper(
- AwTestContainerView containerView,
+ AwContents awContents,
TestAwContentsClient contentViewClient,
boolean requiresJsEnabled) throws Throwable {
- super(containerView.getContentViewCore(), contentViewClient, requiresJsEnabled);
- mAwSettings =
- AwSettingsTest.this.getAwSettingsOnUiThread(containerView.getAwContents());
+ super(awContents, contentViewClient, requiresJsEnabled);
+ mAwSettings = AwSettingsTest.this.getAwSettingsOnUiThread(awContents);
}
}
@@ -650,10 +648,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String ACCESS_GRANTED_TITLE = "Hello, World!";
AwSettingsFileUrlAccessTestHelper(
- AwTestContainerView containerView,
+ AwContents awContents,
TestAwContentsClient contentViewClient,
int startIndex) throws Throwable {
- super(containerView, contentViewClient, true);
+ super(awContents, contentViewClient, true);
mIndex = startIndex;
}
@@ -706,10 +704,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
class AwSettingsContentUrlAccessTestHelper extends AwSettingsWithSettingsTestHelper<Boolean> {
AwSettingsContentUrlAccessTestHelper(
- AwTestContainerView containerView,
+ AwContents awContents,
TestAwContentsClient contentViewClient,
int index) throws Throwable {
- super(containerView, contentViewClient, true);
+ super(awContents, contentViewClient, true);
mTarget = "content_access_" + index;
}
@@ -752,10 +750,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
private static final String TARGET = "content_from_file";
AwSettingsContentUrlAccessFromFileTestHelper(
- AwTestContainerView containerView,
+ AwContents awContents,
TestAwContentsClient contentViewClient,
int index) throws Throwable {
- super(containerView, contentViewClient, true);
+ super(awContents, contentViewClient, true);
mIndex = index;
mTempDir = getInstrumentation().getTargetContext().getCacheDir().getPath();
}
@@ -824,15 +822,16 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
+ "</head><body onload=\"document.title='" + JS_ENABLED_STRING
+ "';\"></body></html>";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
loadDataSync(
- contentView,
+ awContents,
contentClient.getOnPageFinishedHelper(),
TEST_PAGE_HTML,
"text/html",
false);
- assertEquals(JS_DISABLED_STRING, getTitleOnUiThread(contentView));
+ assertEquals(JS_DISABLED_STRING, getTitleOnUiThread(awContents));
}
@SmallTest
@@ -840,8 +839,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsJavaScriptTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -849,8 +848,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsJavaScriptTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -858,8 +857,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsJavaScriptTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -867,8 +866,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledDynamicNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptDynamicTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsJavaScriptDynamicTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -876,8 +875,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledDynamicIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptDynamicTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsJavaScriptDynamicTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -885,8 +884,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testJavaScriptEnabledDynamicBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptDynamicTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsJavaScriptDynamicTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -894,8 +893,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testPluginsEnabledNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsPluginsTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsPluginsTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -903,8 +902,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testPluginsEnabledIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsPluginsTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsPluginsTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -912,8 +911,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testPluginsEnabledBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsPluginsTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsPluginsTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -921,8 +920,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testStandardFontFamilyNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsStandardFontFamilyTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsStandardFontFamilyTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -930,8 +929,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testStandardFontFamilyIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsStandardFontFamilyTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsStandardFontFamilyTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -939,8 +938,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testStandardFontFamilyBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsStandardFontFamilyTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsStandardFontFamilyTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -948,8 +947,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultFontSizeNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultFontSizeTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDefaultFontSizeTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -957,8 +956,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultFontSizeIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultFontSizeTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDefaultFontSizeTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -966,8 +965,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultFontSizeBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultFontSizeTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDefaultFontSizeTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
}
// The test verifies that disabling images loading by setting
@@ -978,63 +977,67 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
@SmallTest
public void testLoadsImagesAutomaticallyWithCachedImage() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
- ContentSettings settings0 = getContentSettingsOnUiThread(views.getView0());
+ ContentSettings settings0 = getContentSettingsOnUiThread(views.getContents0());
settings0.setJavaScriptEnabled(true);
- ContentSettings settings1 = getContentSettingsOnUiThread(views.getView1());
+ ContentSettings settings1 = getContentSettingsOnUiThread(views.getContents1());
settings1.setJavaScriptEnabled(true);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
// First disable images loading and verify it.
settings0.setLoadsImagesAutomatically(false);
settings1.setLoadsImagesAutomatically(false);
- loadDataSync(views.getView0(),
+ loadDataSync(views.getContents0(),
views.getClient0().getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
- loadDataSync(views.getView1(),
+ loadDataSync(views.getContents1(),
views.getClient1().getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(views.getView0()));
+ getTitleOnUiThread(views.getContents0()));
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(views.getView1()));
+ getTitleOnUiThread(views.getContents1()));
// Now enable images loading only for view 0.
settings0.setLoadsImagesAutomatically(true);
- loadDataSync(views.getView0(),
+ loadDataSync(views.getContents0(),
views.getClient0().getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
- loadDataSync(views.getView1(),
+ loadDataSync(views.getContents1(),
views.getClient1().getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
// Once the image has been cached by contentView0, it is available to contentView1.
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView0()));
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView1()));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING,
+ getTitleOnUiThread(views.getContents0()));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING,
+ getTitleOnUiThread(views.getContents1()));
ImagePageGenerator generator1 = new ImagePageGenerator(1, false);
// This is a new image. view 1 can't load it.
- loadDataSync(views.getView1(),
+ loadDataSync(views.getContents1(),
views.getClient1().getOnPageFinishedHelper(),
generator1.getPageSource(),
"text/html", false);
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(views.getView1()));
- loadDataSync(views.getView0(),
+ getTitleOnUiThread(views.getContents1()));
+ loadDataSync(views.getContents0(),
views.getClient0().getOnPageFinishedHelper(),
generator1.getPageSource(),
"text/html", false);
- loadDataSync(views.getView1(),
+ loadDataSync(views.getContents1(),
views.getClient1().getOnPageFinishedHelper(),
generator1.getPageSource(),
"text/html", false);
// Once the image has been cached by contentViewCore0, it is available to contentViewCore1.
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView0()));
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView1()));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING,
+ getTitleOnUiThread(views.getContents0()));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING,
+ getTitleOnUiThread(views.getContents1()));
}
// The test verifies that after changing the LoadsImagesAutomatically
@@ -1044,26 +1047,27 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView", "Preferences"})
public void testLoadsImagesAutomaticallyNoPageReload() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
CallbackHelper onPageFinishedHelper = contentClient.getOnPageFinishedHelper();
- ContentSettings settings = getContentSettingsOnUiThread(contentView);
+ ContentSettings settings = getContentSettingsOnUiThread(awContents);
settings.setJavaScriptEnabled(true);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
settings.setLoadsImagesAutomatically(false);
- loadDataSync(contentView,
+ loadDataSync(awContents,
contentClient.getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(contentView));
+ getTitleOnUiThread(awContents));
settings.setLoadsImagesAutomatically(true);
assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
@Override
public boolean isSatisfied() {
try {
return !ImagePageGenerator.IMAGE_NOT_LOADED_STRING.equals(
- getTitleOnUiThread(contentView));
+ getTitleOnUiThread(awContents));
} catch (Throwable t) {
t.printStackTrace();
fail("Failed to getTitleOnUiThread: " + t.toString());
@@ -1071,7 +1075,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
}
}
}, TEST_TIMEOUT, CHECK_INTERVAL));
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(contentView));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(awContents));
}
@SmallTest
@@ -1080,9 +1084,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getView0(), views.getClient0(), new ImagePageGenerator(0, true)),
+ views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getView1(), views.getClient1(), new ImagePageGenerator(1, true)));
+ views.getContents1(), views.getClient1(), new ImagePageGenerator(1, true)));
}
@SmallTest
@@ -1091,9 +1095,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getView0(), views.getClient0(), new ImagePageGenerator(0, true)),
+ views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getView1(), views.getClient1(), new ImagePageGenerator(1, true)));
+ views.getContents1(), views.getClient1(), new ImagePageGenerator(1, true)));
}
@SmallTest
@@ -1102,9 +1106,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getView0(), views.getClient0(), new ImagePageGenerator(0, true)),
+ views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getView1(), views.getClient1(), new ImagePageGenerator(1, true)));
+ views.getContents1(), views.getClient1(), new ImagePageGenerator(1, true)));
}
@SmallTest
@@ -1112,8 +1116,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultTextEncodingNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultTextEncodingTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDefaultTextEncodingTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1121,8 +1125,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultTextEncodingIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultTextEncodingTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDefaultTextEncodingTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1130,8 +1134,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDefaultTextEncodingBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultTextEncodingTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDefaultTextEncodingTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
}
// The test verifies that the default user agent string follows the format
@@ -1144,9 +1148,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView", "Preferences"})
public void testUserAgentStringDefault() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
- ContentSettings settings = getContentSettingsOnUiThread(contentView);
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ ContentSettings settings = getContentSettingsOnUiThread(awContents);
final String actualUserAgentString = settings.getUserAgentString();
final String patternString =
"Mozilla/5\\.0 \\(Linux;( U;)? Android ([^;]+);( (\\w+)-(\\w+);)?" +
@@ -1172,9 +1177,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView", "Preferences"})
public void testUserAgentStringOverride() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
- ContentSettings settings = getContentSettingsOnUiThread(contentView);
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ ContentSettings settings = getContentSettingsOnUiThread(awContents);
final String defaultUserAgentString = settings.getUserAgentString();
// Check that an attempt to reset the default UA string has no effect.
@@ -1201,10 +1207,12 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
@Feature({"Android-WebView", "Preferences"})
public void testUserAgentStringOverrideForHistory() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ final ContentViewCore contentView = testContainerView.getContentViewCore();
CallbackHelper onPageFinishedHelper = contentClient.getOnPageFinishedHelper();
- ContentSettings settings = getContentSettingsOnUiThread(contentView);
+ ContentSettings settings = getContentSettingsOnUiThread(awContents);
settings.setJavaScriptEnabled(true);
final String defaultUserAgentString = settings.getUserAgentString();
final String customUserAgentString = "ContentSettingsTest";
@@ -1220,19 +1228,19 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
final String page2 = String.format(pageTemplate, page2Title);
settings.setUserAgentString(customUserAgentString);
loadDataSync(
- contentView, contentClient.getOnPageFinishedHelper(), page1, "text/html", false);
- assertEquals(page1Title + customUserAgentString, getTitleOnUiThread(contentView));
+ awContents, contentClient.getOnPageFinishedHelper(), page1, "text/html", false);
+ assertEquals(page1Title + customUserAgentString, getTitleOnUiThread(awContents));
loadDataSync(
- contentView, contentClient.getOnPageFinishedHelper(), page2, "text/html", false);
- assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(contentView));
+ awContents, contentClient.getOnPageFinishedHelper(), page2, "text/html", false);
+ assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(awContents));
settings.setUserAgentString(null);
// Must not cause any changes until the next page loading.
- assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(contentView));
+ assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(awContents));
HistoryUtils.goBackSync(getInstrumentation(), contentView, onPageFinishedHelper);
- assertEquals(page1Title + defaultUserAgentString, getTitleOnUiThread(contentView));
+ assertEquals(page1Title + defaultUserAgentString, getTitleOnUiThread(awContents));
HistoryUtils.goForwardSync(getInstrumentation(), contentView,
onPageFinishedHelper);
- assertEquals(page2Title + defaultUserAgentString, getTitleOnUiThread(contentView));
+ assertEquals(page2Title + defaultUserAgentString, getTitleOnUiThread(awContents));
}
@SmallTest
@@ -1240,8 +1248,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUserAgentStringNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsUserAgentStringTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsUserAgentStringTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1249,8 +1257,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUserAgentStringIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsUserAgentStringTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsUserAgentStringTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1258,8 +1266,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUserAgentStringBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsUserAgentStringTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsUserAgentStringTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1267,8 +1275,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDomStorageEnabledNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsDomStorageEnabledTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDomStorageEnabledTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1276,8 +1284,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDomStorageEnabledIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDomStorageEnabledTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDomStorageEnabledTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1285,8 +1293,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testDomStorageEnabledBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDomStorageEnabledTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsDomStorageEnabledTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
+ new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1294,8 +1302,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUniversalAccessFromFilesNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
+ views.getClient0()),
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents1(),
+ views.getClient1()));
}
@SmallTest
@@ -1303,8 +1313,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUniversalAccessFromFilesIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
+ views.getClient0()),
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents1(),
+ views.getClient1()));
}
@SmallTest
@@ -1312,8 +1324,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testUniversalAccessFromFilesBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
+ views.getClient0()),
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents1(),
+ views.getClient1()));
}
// This test verifies that local image resources can be loaded from file:
@@ -1324,14 +1338,15 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
final String imageContainerUrl = UrlUtils.getTestFileUrl("webview/image_access.html");
final String imageHeight = "16";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
- ContentSettings settings = getContentSettingsOnUiThread(contentView);
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ ContentSettings settings = getContentSettingsOnUiThread(awContents);
settings.setJavaScriptEnabled(true);
settings.setAllowUniversalAccessFromFileURLs(false);
settings.setAllowFileAccessFromFileURLs(false);
- loadUrlSync(contentView, contentClient.getOnPageFinishedHelper(), imageContainerUrl);
- assertEquals(imageHeight, getTitleOnUiThread(contentView));
+ loadUrlSync(awContents, contentClient.getOnPageFinishedHelper(), imageContainerUrl);
+ assertEquals(imageHeight, getTitleOnUiThread(awContents));
}
@SmallTest
@@ -1340,9 +1355,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getView0(), views.getClient0()),
+ views.getContents0(), views.getClient0()),
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getView1(), views.getClient1()));
+ views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1351,9 +1366,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getView0(), views.getClient0()),
+ views.getContents0(), views.getClient0()),
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getView1(), views.getClient1()));
+ views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1362,9 +1377,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getView0(), views.getClient0()),
+ views.getContents0(), views.getClient0()),
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getView1(), views.getClient1()));
+ views.getContents1(), views.getClient1()));
}
@SmallTest
@@ -1372,8 +1387,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileAccessFromFilesXhrNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
+ views.getClient0()),
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents1(),
+ views.getClient1()));
}
@SmallTest
@@ -1381,8 +1398,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileAccessFromFilesXhrIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
+ views.getClient0()),
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents1(),
+ views.getClient1()));
}
@SmallTest
@@ -1390,8 +1409,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileAccessFromFilesXhrBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView0(), views.getClient0()),
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView1(), views.getClient1()));
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
+ views.getClient0()),
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents1(),
+ views.getClient1()));
}
@SmallTest
@@ -1399,8 +1420,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileUrlAccessNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
- new AwSettingsFileUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+ new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+ new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@@ -1408,8 +1429,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileUrlAccessIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
- new AwSettingsFileUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+ new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+ new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@@ -1417,8 +1438,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testFileUrlAccessBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
- new AwSettingsFileUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+ new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+ new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@@ -1426,8 +1447,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testContentUrlAccessNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsContentUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
- new AwSettingsContentUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+ new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+ new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@@ -1435,8 +1456,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testContentUrlAccessIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsContentUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
- new AwSettingsContentUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+ new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+ new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@@ -1444,16 +1465,17 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public void testContentUrlAccessBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsContentUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
- new AwSettingsContentUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+ new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+ new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@Feature({"Android-WebView", "Preferences", "Navigation"})
public void testBlockingContentUrlsFromDataUrls() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
final String target = "content_from_data";
final String page = "<html><body>" +
"<img src=\"" +
@@ -1461,7 +1483,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
"</body></html>";
resetResourceRequestCountInContentProvider(target);
loadDataSync(
- contentView,
+ awContents,
contentClient.getOnPageFinishedHelper(),
page,
"text/html",
@@ -1475,9 +1497,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
new AwSettingsContentUrlAccessFromFileTestHelper(
- views.getContainer0(), views.getClient0(), 0),
+ views.getContents0(), views.getClient0(), 0),
new AwSettingsContentUrlAccessFromFileTestHelper(
- views.getContainer1(), views.getClient1(), 1));
+ views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@@ -1486,9 +1508,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsContentUrlAccessFromFileTestHelper(
- views.getContainer0(), views.getClient0(), 0),
+ views.getContents0(), views.getClient0(), 0),
new AwSettingsContentUrlAccessFromFileTestHelper(
- views.getContainer1(), views.getClient1(), 1));
+ views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@@ -1497,37 +1519,39 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsContentUrlAccessFromFileTestHelper(
- views.getContainer0(), views.getClient0(), 0),
+ views.getContents0(), views.getClient0(), 0),
new AwSettingsContentUrlAccessFromFileTestHelper(
- views.getContainer1(), views.getClient1(), 1));
+ views.getContents1(), views.getClient1(), 1));
}
@SmallTest
@Feature({"Android-WebView", "Preferences"})
public void testBlockNetworkImagesDoesNotBlockDataUrlImage() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
- final ContentSettings settings = getContentSettingsOnUiThread(contentView);
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ final ContentSettings settings = getContentSettingsOnUiThread(awContents);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
settings.setJavaScriptEnabled(true);
settings.setImagesEnabled(false);
- loadDataSync(contentView,
+ loadDataSync(awContents,
contentClient.getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html",
false);
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(contentView));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(awContents));
}
@SmallTest
@Feature({"Android-WebView", "Preferences"})
public void testBlockNetworkImagesBlocksNetworkImageAndReloadInPlace() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
- final ContentSettings settings = getContentSettingsOnUiThread(contentView);
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ final ContentSettings settings = getContentSettingsOnUiThread(awContents);
settings.setJavaScriptEnabled(true);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
@@ -1543,9 +1567,9 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
final String httpImageUrl = webServer.setResponse(pagePath, httpUrlImageHtml, null);
settings.setImagesEnabled(false);
- loadUrlSync(contentView, contentClient.getOnPageFinishedHelper(), httpImageUrl);
+ loadUrlSync(awContents, contentClient.getOnPageFinishedHelper(), httpImageUrl);
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(contentView));
+ getTitleOnUiThread(awContents));
settings.setImagesEnabled(true);
assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
@@ -1553,7 +1577,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
public boolean isSatisfied() {
try {
return ImagePageGenerator.IMAGE_NOT_LOADED_STRING.equals(
- getTitleOnUiThread(contentView));
+ getTitleOnUiThread(awContents));
} catch (Throwable t) {
t.printStackTrace();
fail("Failed to getTitleOnUIThread: " + t.toString());
@@ -1574,14 +1598,15 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// below.
final String expectedTitle = "Asset File";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
try {
useTestResourceContext();
- loadUrlSync(contentView,
+ loadUrlSync(awContents,
contentClient.getOnPageFinishedHelper(),
"file:///android_asset/asset_file.html");
- assertEquals(expectedTitle, getTitleOnUiThread(contentView));
+ assertEquals(expectedTitle, getTitleOnUiThread(awContents));
} finally {
resetResourceContext();
}
@@ -1595,14 +1620,15 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// below.
final String expectedTitle = "Resource File";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final ContentViewCore contentView =
- createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
try {
useTestResourceContext();
- loadUrlSync(contentView,
+ loadUrlSync(awContents,
contentClient.getOnPageFinishedHelper(),
"file:///android_res/raw/resource_file.html");
- assertEquals(expectedTitle, getTitleOnUiThread(contentView));
+ assertEquals(expectedTitle, getTitleOnUiThread(awContents));
} finally {
resetResourceContext();
}
@@ -1616,17 +1642,17 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// below.
final String expectedTitle = "Asset File";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView containerView =
- createAwTestContainerViewOnMainSync(false, contentClient);
- final ContentViewCore contentView = containerView.getContentViewCore();
- final AwSettings settings = getAwSettingsOnUiThread(containerView.getAwContents());
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ final AwSettings settings = getAwSettingsOnUiThread(awContents);
try {
useTestResourceContext();
settings.setAllowFileAccess(false);
- loadUrlSync(contentView,
+ loadUrlSync(awContents,
contentClient.getOnPageFinishedHelper(),
"file:///android_asset/asset_file.html");
- assertEquals(expectedTitle, getTitleOnUiThread(contentView));
+ assertEquals(expectedTitle, getTitleOnUiThread(awContents));
} finally {
resetResourceContext();
}
@@ -1640,59 +1666,51 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// below.
final String expectedTitle = "Resource File";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView containerView =
- createAwTestContainerViewOnMainSync(false, contentClient);
- final ContentViewCore contentView = containerView.getContentViewCore();
- final AwSettings settings = getAwSettingsOnUiThread(containerView.getAwContents());
+ final AwTestContainerView testContainerView =
+ createAwTestContainerViewOnMainSync(contentClient);
+ final AwContents awContents = testContainerView.getAwContents();
+ final AwSettings settings = getAwSettingsOnUiThread(awContents);
try {
useTestResourceContext();
settings.setAllowFileAccess(false);
- loadUrlSync(contentView,
+ loadUrlSync(awContents,
contentClient.getOnPageFinishedHelper(),
"file:///android_res/raw/resource_file.html");
- assertEquals(expectedTitle, getTitleOnUiThread(contentView));
+ assertEquals(expectedTitle, getTitleOnUiThread(awContents));
} finally {
resetResourceContext();
}
}
class ViewPair {
- ViewPair(AwTestContainerView container0, TestAwContentsClient client0,
- AwTestContainerView container1, TestAwContentsClient client1) {
- this.container0 = container0;
+ private final AwContents contents0;
+ private final TestAwContentsClient client0;
+ private final AwContents contents1;
+ private final TestAwContentsClient client1;
+
+ ViewPair(AwContents contents0, TestAwContentsClient client0,
+ AwContents contents1, TestAwContentsClient client1) {
+ this.contents0 = contents0;
this.client0 = client0;
- this.container1 = container1;
+ this.contents1 = contents1;
this.client1 = client1;
}
- AwTestContainerView getContainer0() {
- return container0;
- }
-
- ContentViewCore getView0() {
- return container0.getContentViewCore();
+ AwContents getContents0() {
+ return contents0;
}
TestAwContentsClient getClient0() {
return client0;
}
- AwTestContainerView getContainer1() {
- return container1;
- }
-
- ContentViewCore getView1() {
- return container1.getContentViewCore();
+ AwContents getContents1() {
+ return contents1;
}
TestAwContentsClient getClient1() {
return client1;
}
-
- private final AwTestContainerView container0;
- private final TestAwContentsClient client0;
- private final AwTestContainerView container1;
- private final TestAwContentsClient client1;
}
/**
@@ -1750,9 +1768,11 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
TestAwContentsClient client0 = new TestAwContentsClient();
TestAwContentsClient client1 = new TestAwContentsClient();
return new ViewPair(
- createAwTestContainerViewOnMainSync(firstIsIncognito, client0),
+ createAwTestContainerViewOnMainSync(
+ firstIsIncognito, client0).getAwContents(),
client0,
- createAwTestContainerViewOnMainSync(secondIsIncognito, client1),
+ createAwTestContainerViewOnMainSync(
+ secondIsIncognito, client1).getAwContents(),
client1);
}
@@ -1797,8 +1817,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
final TestAwContentsClient contentClient = new TestAwContentsClient();
final AwTestContainerView testContainer =
createAwTestContainerViewOnMainSync(false, contentClient);
- final ContentViewCore contentView = testContainer.getContentViewCore();
- final ContentSettings contentSettings = getContentSettingsOnUiThread(contentView);
+ final AwContents awContents = testContainer.getAwContents();
+ final ContentSettings contentSettings = getContentSettingsOnUiThread(awContents);
final AwSettings awSettings = getAwSettingsOnUiThread(testContainer.getAwContents());
contentSettings.setJavaScriptEnabled(true);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
@@ -1825,20 +1845,20 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
// Actual test. Blocking should trigger onerror handler.
awSettings.setBlockNetworkLoads(true);
loadUrlSync(
- contentView,
+ awContents,
contentClient.getOnPageFinishedHelper(),
"file:///" + fileName);
assertEquals(0, webServer.getRequestCount(httpPath));
- assertEquals("img_onerror_fired", getTitleOnUiThread(contentView));
+ assertEquals("img_onerror_fired", getTitleOnUiThread(awContents));
// Unblock should load normally.
awSettings.setBlockNetworkLoads(false);
loadUrlSync(
- contentView,
+ awContents,
contentClient.getOnPageFinishedHelper(),
"file:///" + fileName);
assertEquals(1, webServer.getRequestCount(httpPath));
- assertEquals("img_onload_fired", getTitleOnUiThread(contentView));
+ assertEquals("img_onload_fired", getTitleOnUiThread(awContents));
} finally {
if (fileName != null) TestFileUtil.deleteFile(fileName);
if (webServer != null) webServer.shutdown();
« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwShouldIgnoreNavigationTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698