android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java - Issue 11028094: [android_webview] Use AwContents loadUrl method instead of ContentViewCore.

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.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/ClientAddMessageToConsoleTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java

index 9d9cc16eda1ccf590fc84f8034c2eb229937bd2b..ff9e66067fe328121bfe70d38f237e017e971f75 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java

@@ -7,9 +7,9 @@ package org.chromium.android_webview.test;

import android.test.FlakyTest;

import android.test.suitebuilder.annotation.MediumTest;

+import org.chromium.android_webview.AwContents;

import org.chromium.android_webview.test.util.TestWebServer;

import org.chromium.base.test.util.Feature;

-import org.chromium.content.browser.ContentViewCore;

import org.chromium.content.browser.test.util.TestCallbackHelperContainer;

/**

@@ -18,14 +18,15 @@ import org.chromium.content.browser.test.util.TestCallbackHelperContainer;

public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {

private TestAwContentsClient mContentsClient;

- private ContentViewCore mContentViewCore;

+ private AwContents mAwContents;

@Override

public void setUp() throws Exception {

super.setUp();

mContentsClient = new TestAwContentsClient();

- mContentViewCore =

- createAwTestContainerViewOnMainSync(mContentsClient).getContentViewCore();

+ final AwTestContainerView testContainerView =

+ createAwTestContainerViewOnMainSync(mContentsClient);

+ mAwContents = testContainerView.getAwContents();

}

@MediumTest

@@ -36,7 +37,7 @@ public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {

String html = "<html><body>Simple page.</body></html>";

int currentCallCount = onPageFinishedHelper.getCallCount();

- loadDataAsync(mContentViewCore, html, "text/html", false);

+ loadDataAsync(mAwContents, html, "text/html", false);

onPageFinishedHelper.waitForCallback(currentCallCount);

assertEquals("data:text/html," + html, onPageFinishedHelper.getUrl());

@@ -57,7 +58,7 @@ public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {

String url = "http://man.id.be.really.surprised.if.this.address.existed.blah/";

int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();

int onPageFinishedCallCount = onPageFinishedHelper.getCallCount();

- loadUrlAsync(mContentViewCore, url);

+ loadUrlAsync(mAwContents, url);

onReceivedErrorHelper.waitForCallback(onReceivedErrorCallCount);

onPageFinishedHelper.waitForCallback(onPageFinishedCallCount);

@@ -83,7 +84,7 @@ public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {

assertEquals(0, onPageFinishedHelper.getCallCount());

final int pageWithSubresourcesCallCount = onPageFinishedHelper.getCallCount();

- loadDataAsync(mContentViewCore,

+ loadDataAsync(mAwContents,

"<html><iframe src=\"" + testPath + "\" /></html>",

"text/html",

false);

@@ -95,7 +96,7 @@ public class ClientOnPageFinishedTest extends AndroidWebViewTestBase {

// we get is for the synchronizationUrl we know that the previous load did not schedule

// a callback for the iframe.

final int synchronizationPageCallCount = onPageFinishedHelper.getCallCount();

- loadUrlAsync(mContentViewCore, syncUrl);

+ loadUrlAsync(mAwContents, syncUrl);

onPageFinishedHelper.waitForCallback(synchronizationPageCallCount);

assertEquals(syncUrl, onPageFinishedHelper.getUrl());