diff options
| author | timvolodine <timvolodine@chromium.org> | 2015-09-18 08:57:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-18 15:57:40 +0000 |
| commit | 5355513170eca41aab1e1efc49f37ea700f38876 (patch) | |
| tree | 7fd5d7128cfa6a40382f8356e6a2356554442f81 /android_webview | |
| parent | 4aca55694bd66975932fa09c723707b44f6c719b (diff) | |
| download | chromium_src-5355513170eca41aab1e1efc49f37ea700f38876.zip chromium_src-5355513170eca41aab1e1efc49f37ea700f38876.tar.gz chromium_src-5355513170eca41aab1e1efc49f37ea700f38876.tar.bz2 | |
[AndroidWebViewShell] Add better error reporting to WebViewLayoutTestActivity.
Make sure to properly finish (and fail) the test in cases when WebView
fails to load the test url (e.g. file not found). The patch makes sure
the test fails with error description, instead of silently timing out
as it does without this patch.
BUG=529383
Review URL: https://codereview.chromium.org/1309383004
Cr-Commit-Position: refs/heads/master@{#349678}
Diffstat (limited to 'android_webview')
2 files changed, 9 insertions, 1 deletions
diff --git a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewBrowserActivity.java b/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewBrowserActivity.java index e39f529..ce6bac4 100644 --- a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewBrowserActivity.java +++ b/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewBrowserActivity.java @@ -53,7 +53,7 @@ public class WebViewBrowserActivity extends Activity implements PopupMenu.OnMenu private static final Pattern WEBVIEW_VERSION_PATTERN = Pattern.compile("(Chrome/)([\\d\\.]+)\\s"); - // TODO(michaelbai) : Replace "android.webkit.resoruce.MIDI_SYSEX" with + // TODO(michaelbai) : Replace "android.webkit.resource.MIDI_SYSEX" with // PermissionRequest.RESOURCE_MIDI_SYSEX once Android M SDK is used. private static final String[] AUTOMATICALLY_GRANT = { PermissionRequest.RESOURCE_VIDEO_CAPTURE, PermissionRequest.RESOURCE_AUDIO_CAPTURE, diff --git a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewLayoutTestActivity.java b/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewLayoutTestActivity.java index f964007..d28a5ae 100644 --- a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewLayoutTestActivity.java +++ b/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewLayoutTestActivity.java @@ -51,6 +51,14 @@ public class WebViewLayoutTestActivity extends Activity { public boolean shouldOverrideUrlLoading(WebView webView, String url) { return false; } + + @Override + public void onReceivedError(WebView view, int errorCode, String description, + String failingUrl) { + mConsoleLog.append("WebView error: " + description + ", " + failingUrl + "\n"); + mConsoleLog.append(TEST_FINISHED_SENTINEL + "\n"); + finishTest(); + } }); mWebView.setWebChromeClient(new WebChromeClient() { |