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

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsRenderTest.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/AwContentsClientShouldOverrideUrlLoadingTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.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/AwContentsRenderTest.java

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

index f211d75d3190c36691999f7a05155468d64e9cf1..a5fd0a9bff298d201cebbe13973eafc7826b749a 100644

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

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

@@ -11,8 +11,6 @@ import android.test.suitebuilder.annotation.SmallTest;

import org.chromium.android_webview.AwContents;

import org.chromium.base.ThreadUtils;

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

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

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

import java.util.concurrent.Callable;

@@ -48,7 +46,7 @@ public class AwContentsRenderTest extends AwTestBase {

return result;

}

- int sampleBackgroundColorOnUiThread() throws Throwable {

+ int sampleBackgroundColorOnUiThread() throws Exception {

return ThreadUtils.runOnUiThreadBlocking(new Callable<Integer>() {

@Override

public Integer call() throws Exception {

@@ -57,15 +55,11 @@ public class AwContentsRenderTest extends AwTestBase {

});

}

- boolean waitForBackgroundColor(final int c) throws Throwable {

- return CriteriaHelper.pollForCriteria(new Criteria() {

+ void pollForBackgroundColor(final int c) throws Throwable {

+ poll(new Callable<Boolean>() {

@Override

- public boolean isSatisfied() {

- try {

- return sampleBackgroundColorOnUiThread() == c;

- } catch (Throwable e) {

- throw new RuntimeException(e);

- }

+ public Boolean call() throws Exception {

+ return sampleBackgroundColorOnUiThread() == c;

}

});

}

@@ -74,21 +68,21 @@ public class AwContentsRenderTest extends AwTestBase {

@Feature({"AndroidWebView"})

public void testSetGetBackgroundColor() throws Throwable {

setBackgroundColorOnUiThread(Color.MAGENTA);

- assertTrue(waitForBackgroundColor(Color.MAGENTA));

+ pollForBackgroundColor(Color.MAGENTA);

setBackgroundColorOnUiThread(Color.CYAN);

- assertTrue(waitForBackgroundColor(Color.CYAN));

+ pollForBackgroundColor(Color.CYAN);

loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), "about:blank");

assertEquals(Color.CYAN, sampleBackgroundColorOnUiThread());

setBackgroundColorOnUiThread(Color.YELLOW);

- assertTrue(waitForBackgroundColor(Color.YELLOW));

+ pollForBackgroundColor(Color.YELLOW);

loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),

"data:text/html,<html><head><style>body {background-color:#227788}</style></head>" +

"<body><br>HelloWorld</body></html>");

- assertTrue(waitForBackgroundColor(Color.rgb(0x22, 0x77, 0x88)));

+ pollForBackgroundColor(Color.rgb(0x22, 0x77, 0x88));

// Changing the base background should not override CSS background.

setBackgroundColorOnUiThread(Color.MAGENTA);