android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java - Issue 2803853006: WebView: prefer ContentUrlConstants over literals

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/LoadDataWithBaseUrlTest.java

Issue 2803853006: WebView: prefer ContentUrlConstants over literals (Closed)

Patch Set: Revert changes to system webview shell Created 3 years, 8 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/GeolocationTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/crash/VisualStateCallbackTest.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/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 728652cce42f40da37c0ff43919e50b411961af6..8788e1a60cab6bce75eee9eaf2811d911d08ac00 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

@@ -15,6 +15,7 @@ import org.chromium.base.test.util.Restriction;

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

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

import org.chromium.content_public.browser.WebContents;

+import org.chromium.content_public.common.ContentUrlConstants;

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

import java.io.File;

@@ -167,7 +168,7 @@ public class LoadDataWithBaseUrlTest extends AwTestBase {

final String pageHtml = "<html><body onload='document.title=document.location.href'>"

+ "</body></html>";

loadDataWithBaseUrlSync(pageHtml, "text/html", false, null, null);

- assertEquals("about:blank", getTitleOnUiThread(mAwContents));

+ assertEquals(ContentUrlConstants.ABOUT_BLANK_DISPLAY_URL, getTitleOnUiThread(mAwContents));

}

@SmallTest

@@ -189,7 +190,7 @@ public class LoadDataWithBaseUrlTest extends AwTestBase {

mContentsClient.getOnPageStartedHelper();

final int callCount = onPageStartedHelper.getCallCount();

loadDataWithBaseUrlAsync(mAwContents, CommonResources.ABOUT_HTML, "text/html", false,

- baseUrl, "about:blank");

+ baseUrl, ContentUrlConstants.ABOUT_BLANK_DISPLAY_URL);

onPageStartedHelper.waitForCallback(callCount);

assertEquals(baseUrl, onPageStartedHelper.getUrl());

}

@@ -208,8 +209,8 @@ public class LoadDataWithBaseUrlTest extends AwTestBase {

getInstrumentation(), mWebContents));

loadDataWithBaseUrlSync(pageHtml, "text/html", false, baseUrl, null);

- assertEquals("about:blank", HistoryUtils.getUrlOnUiThread(

- getInstrumentation(), mWebContents));

+ assertEquals(ContentUrlConstants.ABOUT_BLANK_DISPLAY_URL,

+ HistoryUtils.getUrlOnUiThread(getInstrumentation(), mWebContents));

}

@SmallTest