android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java - Issue 1779363004: Store and use last base URL between DidStart / DidStopLoading

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

Issue 1779363004: Store and use last base URL between DidStart / DidStopLoading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed tests Created 4 years, 9 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

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

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

index 177f8c73e89ded668dae4aaa92e089c85ad3dbca..7a0746b54655f6966c636c250b34c843fedc4593 100644

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

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

@@ -373,4 +373,34 @@ public class LoadDataWithBaseUrlTest extends AwTestBase {

assertEquals("true", executeJavaScriptAndWaitForResult(mAwContents, mContentsClient,

"window.gotToEndOfBody"));

}

+ // See b/275348709.

boliu 2016/03/14 18:34:04 Use crbug in source code. Also should put this int

mnaganov (inactive) 2016/03/14 20:10:57 Done.

+ @SmallTest

+ @Feature({"AndroidWebView"})

+ public void testOnPageFinishedWhenInterrupted() throws Throwable {

+ final String pageHtml = "<html><body>Hello, world!</body></html>";

+ final String baseUrl = "http://example.com/";

+ final TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =

+ mContentsClient.getOnPageFinishedHelper();

+ final int callCount = onPageFinishedHelper.getCallCount();

+ loadDataWithBaseUrlAsync(mAwContents, pageHtml, "text/html", false, baseUrl, null);

+ loadUrlAsync(mAwContents, "javascript:42");

+ onPageFinishedHelper.waitForCallback(callCount);

+ assertEquals(baseUrl, onPageFinishedHelper.getUrl());

+ }

+ @SmallTest

+ @Feature({"AndroidWebView"})

+ public void testOnPageFinishedWithInvalidBaseUrlWhenInterrupted() throws Throwable {

+ final String pageHtml = "<html><body>Hello, world!</body></html>";

+ final String invalidBaseUrl = "http://";

+ final String fixedBaseUrl = "http:";

boliu 2016/03/14 18:34:04 The fixed url is still not a valid url? (I though

mnaganov (inactive) 2016/03/14 20:10:57 This is what happens in the case when there is no

+ final TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =

+ mContentsClient.getOnPageFinishedHelper();

+ final int callCount = onPageFinishedHelper.getCallCount();

+ loadDataWithBaseUrlAsync(mAwContents, pageHtml, "text/html", false, invalidBaseUrl, null);

+ loadUrlAsync(mAwContents, "javascript:42");

+ onPageFinishedHelper.waitForCallback(callCount);

+ assertEquals(fixedBaseUrl, onPageFinishedHelper.getUrl());

+ }

}

« no previous file with comments | « no previous file | content/browser/android/web_contents_observer_proxy.h » ('j') | content/browser/android/web_contents_observer_proxy.cc » ('J')