android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java - Issue 131743020: [android_webivew] Refactor polling checks in test code.

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 131743020: [android_webivew] Refactor polling checks in test code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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/NavigationHistoryTest.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 1b75c12925b02bbc7f4e8dd1267fb9f161783300..4163d76691b9b2745ebbcd3696ae509d12088d8c 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

@@ -14,14 +14,13 @@ import org.chromium.base.test.util.DisabledTest;

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

import org.chromium.content.browser.ContentViewCore;

import org.chromium.content.browser.LoadUrlParams;

-import org.chromium.content.browser.test.util.Criteria;

-import org.chromium.content.browser.test.util.CriteriaHelper;

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

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

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

import java.io.File;

import java.io.FileOutputStream;

+import java.util.concurrent.Callable;

import java.util.concurrent.TimeUnit;

/**

@@ -303,15 +302,11 @@ public class LoadDataWithBaseUrlTest extends AwTestBase {

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

- CriteriaHelper.pollForCriteria(new Criteria() {

+ poll(new Callable<Boolean>() {

@Override

- public boolean isSatisfied() {

- try {

- String title = getTitleOnUiThread(mAwContents);

- return IMAGE_LOADED.equals(title) || IMAGE_NOT_LOADED.equals(title);

- } catch (Throwable t) {

- return false;

- }

+ public Boolean call() throws Exception {

+ String title = getTitleOnUiThread(mAwContents);

+ return IMAGE_LOADED.equals(title) || IMAGE_NOT_LOADED.equals(title);

}

});