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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.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 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/ClearHistoryTest.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
===================================================================
--- android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java (revision 160963)
+++ android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java (working copy)
@@ -51,16 +51,16 @@
* In this case, requiresJsEnabled constructor argument must be set to true.
*/
abstract class AwSettingsTestHelper<T> {
- protected final AwContents mAwContents;
+ protected final ContentViewCore mContentViewCore;
protected final TestAwContentsClient mContentViewClient;
protected final ContentSettings mContentSettings;
- AwSettingsTestHelper(AwContents awContents,
+ AwSettingsTestHelper(ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient,
boolean requiresJsEnabled) throws Throwable {
- mAwContents = awContents;
+ mContentViewCore = contentViewCore;
mContentViewClient = contentViewClient;
- mContentSettings = getContentSettingsOnUiThread(mAwContents);
+ mContentSettings = getContentSettingsOnUiThread(mContentViewCore);
if (requiresJsEnabled) {
mContentSettings.setJavaScriptEnabled(true);
}
@@ -93,12 +93,12 @@
protected abstract void doEnsureSettingHasValue(T value) throws Throwable;
protected String getTitleOnUiThread() throws Throwable {
- return AwSettingsTest.this.getTitleOnUiThread(mAwContents);
+ return AwSettingsTest.this.getTitleOnUiThread(mContentViewCore);
}
protected void loadDataSync(String data) throws Throwable {
AwSettingsTest.this.loadDataSync(
- mAwContents,
+ mContentViewCore,
mContentViewClient.getOnPageFinishedHelper(),
data,
"text/html",
@@ -107,7 +107,7 @@
protected void loadUrlSync(String url) throws Throwable {
AwSettingsTest.this.loadUrlSync(
- mAwContents,
+ mContentViewCore,
mContentViewClient.getOnPageFinishedHelper(),
url);
}
@@ -122,9 +122,9 @@
private static final String JS_ENABLED_STRING = "JS Enabled";
private static final String JS_DISABLED_STRING = "JS Disabled";
- AwSettingsJavaScriptTestHelper(AwContents awContents,
+ AwSettingsJavaScriptTestHelper(ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, false);
+ super(contentViewCore, contentViewClient, false);
}
@Override
@@ -166,9 +166,9 @@
// JavaScript state.
class AwSettingsJavaScriptDynamicTestHelper extends AwSettingsJavaScriptTestHelper {
AwSettingsJavaScriptDynamicTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient);
+ super(contentViewCore, contentViewClient);
// Load the page.
super.doEnsureSettingHasValue(getInitialValue());
}
@@ -178,7 +178,7 @@
String oldTitle = getTitleOnUiThread();
String newTitle = oldTitle + "_modified";
executeJavaScriptAndWaitForResult(
- mAwContents, mContentViewClient, getScript(newTitle));
+ mContentViewCore, mContentViewClient, getScript(newTitle));
assertEquals(value == ENABLED ? newTitle : oldTitle, getTitleOnUiThread());
}
@@ -191,9 +191,9 @@
private static final String PLUGINS_ENABLED_STRING = "Embed";
private static final String PLUGINS_DISABLED_STRING = "NoEmbed";
- AwSettingsPluginsTestHelper(AwContents awContents,
+ AwSettingsPluginsTestHelper(ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
}
@Override
@@ -232,9 +232,9 @@
class AwSettingsStandardFontFamilyTestHelper extends AwSettingsTestHelper<String> {
AwSettingsStandardFontFamilyTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
}
@Override
@@ -272,9 +272,9 @@
class AwSettingsDefaultFontSizeTestHelper extends AwSettingsTestHelper<Integer> {
AwSettingsDefaultFontSizeTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
}
@Override
@@ -314,10 +314,10 @@
private ImagePageGenerator mGenerator;
AwSettingsLoadImagesAutomaticallyTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient,
ImagePageGenerator generator) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
mGenerator = generator;
}
@@ -353,9 +353,9 @@
class AwSettingsDefaultTextEncodingTestHelper extends AwSettingsTestHelper<String> {
AwSettingsDefaultTextEncodingTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
}
@Override
@@ -395,9 +395,9 @@
private static final String CUSTOM_UA = "ChromeViewTest";
AwSettingsUserAgentStringTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
mDefaultUa = mContentSettings.getUserAgentString();
}
@@ -445,9 +445,9 @@
private static final String HAS_LOCAL_STORAGE = "Has localStorage";
AwSettingsDomStorageEnabledTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
}
@Override
@@ -487,9 +487,9 @@
private static final String ACCESS_DENIED_TITLE = "undefined";
AwSettingsUniversalAccessFromFilesTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, 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.
@@ -538,9 +538,9 @@
private static final String ACCESS_DENIED_TITLE = "undefined";
AwSettingsFileAccessFromFilesIframeTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
mIframeContainerUrl = UrlUtils.getTestFileUrl("webview/iframe_access.html");
mIframeUrl = UrlUtils.getTestFileUrl("webview/hello_world.html");
mContentSettings.setAllowUniversalAccessFromFileURLs(false);
@@ -585,9 +585,9 @@
private static final String ACCESS_DENIED_TITLE = "Exception";
AwSettingsFileAccessFromFilesXhrTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
mXhrContainerUrl = UrlUtils.getTestFileUrl("webview/xhr_access.html");
mContentSettings.setAllowUniversalAccessFromFileURLs(false);
// The value of the setting depends on the SDK version.
@@ -630,10 +630,10 @@
private static final String ACCESS_DENIED_TITLE = "about:blank";
AwSettingsFileUrlAccessTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient,
int startIndex) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
mIndex = startIndex;
}
@@ -675,10 +675,10 @@
private final String mTarget;
AwSettingsContentUrlAccessTestHelper(
- AwContents awContents,
+ ContentViewCore contentViewCore,
TestAwContentsClient contentViewClient,
int index) throws Throwable {
- super(awContents, contentViewClient, true);
+ super(contentViewCore, contentViewClient, true);
mTarget = "content_access_" + index;
}
@@ -706,7 +706,7 @@
protected void doEnsureSettingHasValue(Boolean value) throws Throwable {
AwSettingsTest.this.resetResourceRequestCountInContentProvider(mTarget);
AwSettingsTest.this.loadUrlSync(
- mAwContents,
+ mContentViewCore,
mContentViewClient.getOnPageFinishedHelper(),
AwSettingsTest.this.createContentUrl(mTarget));
if (value == ENABLED) {
@@ -733,16 +733,15 @@
+ "</head><body onload=\"document.title='" + JS_ENABLED_STRING
+ "';\"></body></html>";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
loadDataSync(
- awContents,
+ contentView,
contentClient.getOnPageFinishedHelper(),
TEST_PAGE_HTML,
"text/html",
false);
- assertEquals(JS_DISABLED_STRING, getTitleOnUiThread(awContents));
+ assertEquals(JS_DISABLED_STRING, getTitleOnUiThread(contentView));
}
@SmallTest
@@ -750,8 +749,8 @@
public void testJavaScriptEnabledNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsJavaScriptTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsJavaScriptTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -759,8 +758,8 @@
public void testJavaScriptEnabledIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsJavaScriptTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsJavaScriptTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -768,8 +767,8 @@
public void testJavaScriptEnabledBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsJavaScriptTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsJavaScriptTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -777,8 +776,8 @@
public void testJavaScriptEnabledDynamicNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsJavaScriptDynamicTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsJavaScriptDynamicTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -786,8 +785,8 @@
public void testJavaScriptEnabledDynamicIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsJavaScriptDynamicTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsJavaScriptDynamicTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -795,8 +794,8 @@
public void testJavaScriptEnabledDynamicBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsJavaScriptDynamicTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsJavaScriptDynamicTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -804,8 +803,8 @@
public void testPluginsEnabledNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsPluginsTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsPluginsTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -813,8 +812,8 @@
public void testPluginsEnabledIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsPluginsTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsPluginsTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -822,8 +821,8 @@
public void testPluginsEnabledBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsPluginsTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsPluginsTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -831,8 +830,8 @@
public void testStandardFontFamilyNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsStandardFontFamilyTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsStandardFontFamilyTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -840,8 +839,8 @@
public void testStandardFontFamilyIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsStandardFontFamilyTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsStandardFontFamilyTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -849,8 +848,8 @@
public void testStandardFontFamilyBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsStandardFontFamilyTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsStandardFontFamilyTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -858,8 +857,8 @@
public void testDefaultFontSizeNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDefaultFontSizeTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDefaultFontSizeTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -867,8 +866,8 @@
public void testDefaultFontSizeIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDefaultFontSizeTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDefaultFontSizeTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -876,8 +875,8 @@
public void testDefaultFontSizeBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDefaultFontSizeTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDefaultFontSizeTestHelper(views.getView1(), views.getClient1()));
}
// The test verifies that disabling images loading by setting
@@ -888,67 +887,63 @@
@SmallTest
public void testLoadsImagesAutomaticallyWithCachedImage() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
- ContentSettings settings0 = getContentSettingsOnUiThread(views.getContents0());
+ ContentSettings settings0 = getContentSettingsOnUiThread(views.getView0());
settings0.setJavaScriptEnabled(true);
- ContentSettings settings1 = getContentSettingsOnUiThread(views.getContents1());
+ ContentSettings settings1 = getContentSettingsOnUiThread(views.getView1());
settings1.setJavaScriptEnabled(true);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
// First disable images loading and verify it.
settings0.setLoadsImagesAutomatically(false);
settings1.setLoadsImagesAutomatically(false);
- loadDataSync(views.getContents0(),
+ loadDataSync(views.getView0(),
views.getClient0().getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
- loadDataSync(views.getContents1(),
+ loadDataSync(views.getView1(),
views.getClient1().getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(views.getContents0()));
+ getTitleOnUiThread(views.getView0()));
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(views.getContents1()));
+ getTitleOnUiThread(views.getView1()));
// Now enable images loading only for view 0.
settings0.setLoadsImagesAutomatically(true);
- loadDataSync(views.getContents0(),
+ loadDataSync(views.getView0(),
views.getClient0().getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
- loadDataSync(views.getContents1(),
+ loadDataSync(views.getView1(),
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.getContents0()));
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING,
- getTitleOnUiThread(views.getContents1()));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView0()));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView1()));
ImagePageGenerator generator1 = new ImagePageGenerator(1, false);
// This is a new image. view 1 can't load it.
- loadDataSync(views.getContents1(),
+ loadDataSync(views.getView1(),
views.getClient1().getOnPageFinishedHelper(),
generator1.getPageSource(),
"text/html", false);
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(views.getContents1()));
- loadDataSync(views.getContents0(),
+ getTitleOnUiThread(views.getView1()));
+ loadDataSync(views.getView0(),
views.getClient0().getOnPageFinishedHelper(),
generator1.getPageSource(),
"text/html", false);
- loadDataSync(views.getContents1(),
+ loadDataSync(views.getView1(),
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.getContents0()));
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING,
- getTitleOnUiThread(views.getContents1()));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView0()));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView1()));
}
// The test verifies that after changing the LoadsImagesAutomatically
@@ -958,27 +953,26 @@
@Feature({"Android-WebView", "Preferences"})
public void testLoadsImagesAutomaticallyNoPageReload() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
CallbackHelper onPageFinishedHelper = contentClient.getOnPageFinishedHelper();
- ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ ContentSettings settings = getContentSettingsOnUiThread(contentView);
settings.setJavaScriptEnabled(true);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
settings.setLoadsImagesAutomatically(false);
- loadDataSync(awContents,
+ loadDataSync(contentView,
contentClient.getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html", false);
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(awContents));
+ getTitleOnUiThread(contentView));
settings.setLoadsImagesAutomatically(true);
assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
@Override
public boolean isSatisfied() {
try {
return !ImagePageGenerator.IMAGE_NOT_LOADED_STRING.equals(
- getTitleOnUiThread(awContents));
+ getTitleOnUiThread(contentView));
} catch (Throwable t) {
t.printStackTrace();
fail("Failed to getTitleOnUiThread: " + t.toString());
@@ -986,7 +980,7 @@
}
}
}, TEST_TIMEOUT, CHECK_INTERVAL));
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(awContents));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(contentView));
}
@SmallTest
@@ -995,9 +989,9 @@
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
+ views.getView0(), views.getClient0(), new ImagePageGenerator(0, true)),
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getContents1(), views.getClient1(), new ImagePageGenerator(1, true)));
+ views.getView1(), views.getClient1(), new ImagePageGenerator(1, true)));
}
@SmallTest
@@ -1006,9 +1000,9 @@
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
+ views.getView0(), views.getClient0(), new ImagePageGenerator(0, true)),
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getContents1(), views.getClient1(), new ImagePageGenerator(1, true)));
+ views.getView1(), views.getClient1(), new ImagePageGenerator(1, true)));
}
@SmallTest
@@ -1017,9 +1011,9 @@
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
+ views.getView0(), views.getClient0(), new ImagePageGenerator(0, true)),
new AwSettingsLoadImagesAutomaticallyTestHelper(
- views.getContents1(), views.getClient1(), new ImagePageGenerator(1, true)));
+ views.getView1(), views.getClient1(), new ImagePageGenerator(1, true)));
}
@SmallTest
@@ -1027,8 +1021,8 @@
public void testDefaultTextEncodingNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDefaultTextEncodingTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDefaultTextEncodingTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1036,8 +1030,8 @@
public void testDefaultTextEncodingIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDefaultTextEncodingTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDefaultTextEncodingTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1045,8 +1039,8 @@
public void testDefaultTextEncodingBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDefaultTextEncodingTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDefaultTextEncodingTestHelper(views.getView1(), views.getClient1()));
}
// The test verifies that the default user agent string follows the format
@@ -1059,10 +1053,9 @@
@Feature({"Android-WebView", "Preferences"})
public void testUserAgentStringDefault() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
- ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ ContentSettings settings = getContentSettingsOnUiThread(contentView);
final String actualUserAgentString = settings.getUserAgentString();
final String patternString =
"Mozilla/5\\.0 \\(Linux;( U;)? Android ([^;]+);( (\\w+)-(\\w+);)?" +
@@ -1088,10 +1081,9 @@
@Feature({"Android-WebView", "Preferences"})
public void testUserAgentStringOverride() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
- ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ ContentSettings settings = getContentSettingsOnUiThread(contentView);
final String defaultUserAgentString = settings.getUserAgentString();
// Check that an attempt to reset the default UA string has no effect.
@@ -1118,12 +1110,10 @@
@Feature({"Android-WebView", "Preferences"})
public void testUserAgentStringOverrideForHistory() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
- final ContentViewCore contentView = testContainerView.getContentViewCore();
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
CallbackHelper onPageFinishedHelper = contentClient.getOnPageFinishedHelper();
- ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ ContentSettings settings = getContentSettingsOnUiThread(contentView);
settings.setJavaScriptEnabled(true);
final String defaultUserAgentString = settings.getUserAgentString();
final String customUserAgentString = "ContentSettingsTest";
@@ -1139,19 +1129,19 @@
final String page2 = String.format(pageTemplate, page2Title);
settings.setUserAgentString(customUserAgentString);
loadDataSync(
- awContents, contentClient.getOnPageFinishedHelper(), page1, "text/html", false);
- assertEquals(page1Title + customUserAgentString, getTitleOnUiThread(awContents));
+ contentView, contentClient.getOnPageFinishedHelper(), page1, "text/html", false);
+ assertEquals(page1Title + customUserAgentString, getTitleOnUiThread(contentView));
loadDataSync(
- awContents, contentClient.getOnPageFinishedHelper(), page2, "text/html", false);
- assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(awContents));
+ contentView, contentClient.getOnPageFinishedHelper(), page2, "text/html", false);
+ assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(contentView));
settings.setUserAgentString(null);
// Must not cause any changes until the next page loading.
- assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(awContents));
+ assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(contentView));
HistoryUtils.goBackSync(getInstrumentation(), contentView, onPageFinishedHelper);
- assertEquals(page1Title + defaultUserAgentString, getTitleOnUiThread(awContents));
+ assertEquals(page1Title + defaultUserAgentString, getTitleOnUiThread(contentView));
HistoryUtils.goForwardSync(getInstrumentation(), contentView,
onPageFinishedHelper);
- assertEquals(page2Title + defaultUserAgentString, getTitleOnUiThread(awContents));
+ assertEquals(page2Title + defaultUserAgentString, getTitleOnUiThread(contentView));
}
@SmallTest
@@ -1159,8 +1149,8 @@
public void testUserAgentStringNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsUserAgentStringTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsUserAgentStringTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1168,8 +1158,8 @@
public void testUserAgentStringIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsUserAgentStringTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsUserAgentStringTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1177,8 +1167,8 @@
public void testUserAgentStringBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsUserAgentStringTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsUserAgentStringTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1186,8 +1176,8 @@
public void testDomStorageEnabledNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDomStorageEnabledTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDomStorageEnabledTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1195,8 +1185,8 @@
public void testDomStorageEnabledIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDomStorageEnabledTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDomStorageEnabledTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1204,8 +1194,8 @@
public void testDomStorageEnabledBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
- new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
+ new AwSettingsDomStorageEnabledTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsDomStorageEnabledTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1213,10 +1203,8 @@
public void testUniversalAccessFromFilesNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
- views.getClient0()),
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents1(),
- views.getClient1()));
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1224,10 +1212,8 @@
public void testUniversalAccessFromFilesIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
- views.getClient0()),
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents1(),
- views.getClient1()));
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1235,10 +1221,8 @@
public void testUniversalAccessFromFilesBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
- views.getClient0()),
- new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents1(),
- views.getClient1()));
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsUniversalAccessFromFilesTestHelper(views.getView1(), views.getClient1()));
}
// This test verifies that local image resources can be loaded from file:
@@ -1249,15 +1233,14 @@
final String imageContainerUrl = UrlUtils.getTestFileUrl("webview/image_access.html");
final String imageHeight = "16";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
- ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ ContentSettings settings = getContentSettingsOnUiThread(contentView);
settings.setJavaScriptEnabled(true);
settings.setAllowUniversalAccessFromFileURLs(false);
settings.setAllowFileAccessFromFileURLs(false);
- loadUrlSync(awContents, contentClient.getOnPageFinishedHelper(), imageContainerUrl);
- assertEquals(imageHeight, getTitleOnUiThread(awContents));
+ loadUrlSync(contentView, contentClient.getOnPageFinishedHelper(), imageContainerUrl);
+ assertEquals(imageHeight, getTitleOnUiThread(contentView));
}
@SmallTest
@@ -1266,9 +1249,9 @@
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getContents0(), views.getClient0()),
+ views.getView0(), views.getClient0()),
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getContents1(), views.getClient1()));
+ views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1277,9 +1260,9 @@
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getContents0(), views.getClient0()),
+ views.getView0(), views.getClient0()),
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getContents1(), views.getClient1()));
+ views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1288,9 +1271,9 @@
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getContents0(), views.getClient0()),
+ views.getView0(), views.getClient0()),
new AwSettingsFileAccessFromFilesIframeTestHelper(
- views.getContents1(), views.getClient1()));
+ views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1298,10 +1281,8 @@
public void testFileAccessFromFilesXhrNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
- views.getClient0()),
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents1(),
- views.getClient1()));
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1309,10 +1290,8 @@
public void testFileAccessFromFilesXhrIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
- views.getClient0()),
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents1(),
- views.getClient1()));
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView1(), views.getClient1()));
}
@SmallTest
@@ -1320,10 +1299,8 @@
public void testFileAccessFromFilesXhrBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
- views.getClient0()),
- new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents1(),
- views.getClient1()));
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView0(), views.getClient0()),
+ new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView1(), views.getClient1()));
}
/**
@@ -1335,8 +1312,8 @@
public void testFileUrlAccessNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
- new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
+ new AwSettingsFileUrlAccessTestHelper(views.getView0(), views.getClient0(), 0),
+ new AwSettingsFileUrlAccessTestHelper(views.getView1(), views.getClient1(), 1));
}
/**
@@ -1348,8 +1325,8 @@
public void testFileUrlAccessIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
- new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
+ new AwSettingsFileUrlAccessTestHelper(views.getView0(), views.getClient0(), 0),
+ new AwSettingsFileUrlAccessTestHelper(views.getView1(), views.getClient1(), 1));
}
/**
@@ -1361,8 +1338,8 @@
public void testFileUrlAccessBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
- new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
+ new AwSettingsFileUrlAccessTestHelper(views.getView0(), views.getClient0(), 0),
+ new AwSettingsFileUrlAccessTestHelper(views.getView1(), views.getClient1(), 1));
}
/**
@@ -1374,8 +1351,8 @@
public void testContentUrlAccessNormal() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
runPerViewSettingsTest(
- new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
- new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
+ new AwSettingsContentUrlAccessTestHelper(views.getView0(), views.getClient0(), 0),
+ new AwSettingsContentUrlAccessTestHelper(views.getView1(), views.getClient1(), 1));
}
/**
@@ -1387,8 +1364,8 @@
public void testContentUrlAccessIncognito() throws Throwable {
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
- new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
+ new AwSettingsContentUrlAccessTestHelper(views.getView0(), views.getClient0(), 0),
+ new AwSettingsContentUrlAccessTestHelper(views.getView1(), views.getClient1(), 1));
}
/**
@@ -1400,17 +1377,16 @@
public void testContentUrlAccessBoth() throws Throwable {
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
runPerViewSettingsTest(
- new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
- new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
+ new AwSettingsContentUrlAccessTestHelper(views.getView0(), views.getClient0(), 0),
+ new AwSettingsContentUrlAccessTestHelper(views.getView1(), views.getClient1(), 1));
}
@SmallTest
@Feature({"Android-WebView", "Preferences", "Navigation"})
public void testBlockingContentUrlsFromDataUrls() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
final String target = "content_from_data";
final String page = "<html><body>" +
"<img src=\"" +
@@ -1418,7 +1394,7 @@
"</body></html>";
resetResourceRequestCountInContentProvider(target);
loadDataSync(
- awContents,
+ contentView,
contentClient.getOnPageFinishedHelper(),
page,
"text/html",
@@ -1428,9 +1404,8 @@
private void doTestContentUrlFromFile(boolean addQueryParameters) throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
final String target = "content_from_file_" + addQueryParameters;
Context context = getInstrumentation().getTargetContext();
final String fileName = context.getCacheDir() + "/" + target + ".html";
@@ -1443,7 +1418,7 @@
(addQueryParameters ? "?weather=sunny&life=good" : "") +
"\">");
loadUrlSync(
- awContents,
+ contentView,
contentClient.getOnPageFinishedHelper(),
"file:///" + fileName);
ensureResourceRequestCountInContentProvider(target, 1);
@@ -1477,30 +1452,28 @@
@Feature({"Android-WebView", "Preferences"})
public void testBlockNetworkImagesDoesNotBlockDataUrlImage() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
- final ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final ContentSettings settings = getContentSettingsOnUiThread(contentView);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
settings.setJavaScriptEnabled(true);
settings.setImagesEnabled(false);
- loadDataSync(awContents,
+ loadDataSync(contentView,
contentClient.getOnPageFinishedHelper(),
generator.getPageSource(),
"text/html",
false);
- assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(awContents));
+ assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(contentView));
}
@SmallTest
@Feature({"Android-WebView", "Preferences"})
public void testBlockNetworkImagesBlocksNetworkImageAndReloadInPlace() throws Throwable {
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
- final ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final ContentSettings settings = getContentSettingsOnUiThread(contentView);
settings.setJavaScriptEnabled(true);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
@@ -1516,9 +1489,9 @@
final String httpImageUrl = webServer.setResponse(pagePath, httpUrlImageHtml, null);
settings.setImagesEnabled(false);
- loadUrlSync(awContents, contentClient.getOnPageFinishedHelper(), httpImageUrl);
+ loadUrlSync(contentView, contentClient.getOnPageFinishedHelper(), httpImageUrl);
assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
- getTitleOnUiThread(awContents));
+ getTitleOnUiThread(contentView));
settings.setImagesEnabled(true);
assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
@@ -1526,7 +1499,7 @@
public boolean isSatisfied() {
try {
return ImagePageGenerator.IMAGE_NOT_LOADED_STRING.equals(
- getTitleOnUiThread(awContents));
+ getTitleOnUiThread(contentView));
} catch (Throwable t) {
t.printStackTrace();
fail("Failed to getTitleOnUIThread: " + t.toString());
@@ -1547,15 +1520,14 @@
// below.
final String expectedTitle = "Asset File";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
try {
useTestResourceContext();
- loadUrlSync(awContents,
+ loadUrlSync(contentView,
contentClient.getOnPageFinishedHelper(),
"file:///android_asset/asset_file.html");
- assertEquals(expectedTitle, getTitleOnUiThread(awContents));
+ assertEquals(expectedTitle, getTitleOnUiThread(contentView));
} finally {
resetResourceContext();
}
@@ -1569,15 +1541,14 @@
// below.
final String expectedTitle = "Resource File";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
try {
useTestResourceContext();
- loadUrlSync(awContents,
+ loadUrlSync(contentView,
contentClient.getOnPageFinishedHelper(),
"file:///android_res/raw/resource_file.html");
- assertEquals(expectedTitle, getTitleOnUiThread(awContents));
+ assertEquals(expectedTitle, getTitleOnUiThread(contentView));
} finally {
resetResourceContext();
}
@@ -1591,17 +1562,16 @@
// below.
final String expectedTitle = "Asset File";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
- final ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final ContentSettings settings = getContentSettingsOnUiThread(contentView);
try {
useTestResourceContext();
settings.setAllowFileAccess(false);
- loadUrlSync(awContents,
+ loadUrlSync(contentView,
contentClient.getOnPageFinishedHelper(),
"file:///android_asset/asset_file.html");
- assertEquals(expectedTitle, getTitleOnUiThread(awContents));
+ assertEquals(expectedTitle, getTitleOnUiThread(contentView));
} finally {
resetResourceContext();
}
@@ -1615,46 +1585,45 @@
// below.
final String expectedTitle = "Resource File";
final TestAwContentsClient contentClient = new TestAwContentsClient();
- final AwTestContainerView testContainerView =
- createAwTestContainerViewOnMainSync(contentClient);
- final AwContents awContents = testContainerView.getAwContents();
- final ContentSettings settings = getContentSettingsOnUiThread(awContents);
+ final ContentViewCore contentView =
+ createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+ final ContentSettings settings = getContentSettingsOnUiThread(contentView);
try {
useTestResourceContext();
settings.setAllowFileAccess(false);
- loadUrlSync(awContents,
+ loadUrlSync(contentView,
contentClient.getOnPageFinishedHelper(),
"file:///android_res/raw/resource_file.html");
- assertEquals(expectedTitle, getTitleOnUiThread(awContents));
+ assertEquals(expectedTitle, getTitleOnUiThread(contentView));
} finally {
resetResourceContext();
}
}
class ViewPair {
- private final AwContents contents0;
+ private final ContentViewCore view0;
private final TestAwContentsClient client0;
- private final AwContents contents1;
+ private final ContentViewCore view1;
private final TestAwContentsClient client1;
- ViewPair(AwContents contents0, TestAwContentsClient client0,
- AwContents contents1, TestAwContentsClient client1) {
- this.contents0 = contents0;
+ ViewPair(ContentViewCore view0, TestAwContentsClient client0,
+ ContentViewCore view1, TestAwContentsClient client1) {
+ this.view0 = view0;
this.client0 = client0;
- this.contents1 = contents1;
+ this.view1 = view1;
this.client1 = client1;
}
- AwContents getContents0() {
- return contents0;
+ ContentViewCore getView0() {
+ return view0;
}
TestAwContentsClient getClient0() {
return client0;
}
- AwContents getContents1() {
- return contents1;
+ ContentViewCore getView1() {
+ return view1;
}
TestAwContentsClient getClient1() {
@@ -1715,10 +1684,10 @@
TestAwContentsClient client1 = new TestAwContentsClient();
return new ViewPair(
createAwTestContainerViewOnMainSync(
- firstIsIncognito, client0).getAwContents(),
+ firstIsIncognito, client0).getContentViewCore(),
client0,
createAwTestContainerViewOnMainSync(
- secondIsIncognito, client1).getAwContents(),
+ secondIsIncognito, client1).getContentViewCore(),
client1);
}
@@ -1763,8 +1732,8 @@
final TestAwContentsClient contentClient = new TestAwContentsClient();
final AwTestContainerView testContainer =
createAwTestContainerViewOnMainSync(false, contentClient);
- final AwContents awContents = testContainer.getAwContents();
- final ContentSettings contentSettings = getContentSettingsOnUiThread(awContents);
+ final ContentViewCore contentView = testContainer.getContentViewCore();
+ final ContentSettings contentSettings = getContentSettingsOnUiThread(contentView);
final AwSettings awSettings = getAwSettingsOnUiThread(testContainer.getAwContents());
contentSettings.setJavaScriptEnabled(true);
ImagePageGenerator generator = new ImagePageGenerator(0, false);
@@ -1791,20 +1760,20 @@
// Actual test. Blocking should trigger onerror handler.
awSettings.setBlockNetworkLoads(true);
loadUrlSync(
- awContents,
+ contentView,
contentClient.getOnPageFinishedHelper(),
"file:///" + fileName);
assertEquals(0, webServer.getRequestCount(httpPath));
- assertEquals("img_onerror_fired", getTitleOnUiThread(awContents));
+ assertEquals("img_onerror_fired", getTitleOnUiThread(contentView));
// Unblock should load normally.
awSettings.setBlockNetworkLoads(false);
loadUrlSync(
- awContents,
+ contentView,
contentClient.getOnPageFinishedHelper(),
"file:///" + fileName);
assertEquals(1, webServer.getRequestCount(httpPath));
- assertEquals("img_onload_fired", getTitleOnUiThread(awContents));
+ assertEquals("img_onload_fired", getTitleOnUiThread(contentView));
} finally {
if (fileName != null) TestFileUtil.deleteFile(fileName);
if (webServer != null) webServer.shutdown();
Property changes on: android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
___________________________________________________________________
Deleted: svn:mergeinfo
« 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/ClearHistoryTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698