android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java - Issue 12620004: [android_webview] Fake onReceivedError callback for intercepted navigations.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12620004: [android_webview] Fake onReceivedError callback for intercepted navigations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: make findbugs happy Created 7 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

« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/AwContentsIoThreadClient.java ('k') | android_webview/native/aw_contents_io_thread_client_impl.cc » ('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/AwContentsClientShouldInterceptRequestTest.java

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

index d7fefd4bfe36183186cf68bcb3a6b4f981931e3a..4252adfd8b57e4908eb0c488650349ca080b9e46 100644

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

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

@@ -18,6 +18,7 @@ import org.chromium.base.test.util.TestFileUtil;

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

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

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

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

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

import java.io.ByteArrayInputStream;

@@ -311,6 +312,21 @@ public class AwContentsClientShouldInterceptRequestTest extends AndroidWebViewTe

assertEquals(aboutPageUrl, mContentsClient.getOnPageStartedHelper().getUrl());

}

+ @SmallTest

+ @Feature({"AndroidWebView"})

+ public void testNullInputStreamCausesErrorForMainFrame() throws Throwable {

+ final OnReceivedErrorHelper onReceivedErrorHelper =

+ mContentsClient.getOnReceivedErrorHelper();

+ mShouldInterceptRequestHelper.setReturnValue(

+ new InterceptedRequestData("text/html", "UTF-8", null));

+ final String aboutPageUrl = addAboutPageToTestServer(mWebServer);

+ final int callCount = onReceivedErrorHelper.getCallCount();

+ loadUrlAsync(mAwContents, aboutPageUrl);

+ onReceivedErrorHelper.waitForCallback(callCount);

+ assertEquals(0, mWebServer.getRequestCount("/" + CommonResources.ABOUT_FILENAME));

+ }

@SmallTest

@Feature({"AndroidWebView"})