Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2732)

Unified Diff: android_webview/tools/automated_ui_tests/javatests/src/org/chromium/webview_ui_test/test/util/WebViewSyncWrapper.java

Issue 2154023002: adding action mode tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix merge conflict Created 4 years, 1 month 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
Index: android_webview/tools/automated_ui_tests/javatests/src/org/chromium/webview_ui_test/test/util/WebViewSyncWrapper.java
diff --git a/android_webview/tools/automated_ui_tests/javatests/src/org/chromium/webview_ui_test/test/util/WebViewSyncWrapper.java b/android_webview/tools/automated_ui_tests/javatests/src/org/chromium/webview_ui_test/test/util/WebViewSyncWrapper.java
index f45902a11d0cfcb09209efa1bcb99f5a4da7bd45..eeec33016ba8aed2839b3764ccc5e6cf6a44b669 100644
--- a/android_webview/tools/automated_ui_tests/javatests/src/org/chromium/webview_ui_test/test/util/WebViewSyncWrapper.java
+++ b/android_webview/tools/automated_ui_tests/javatests/src/org/chromium/webview_ui_test/test/util/WebViewSyncWrapper.java
@@ -117,6 +117,27 @@ public class WebViewSyncWrapper {
});
}
+ public void loadDataSync(final String data, final String mimeType, final String encoding,
+ boolean confirmByJavaScript) throws InterruptedException {
+ mErrorMessageList.clear();
+ int currentPageCount = mPageCallback.getCallCount();
+ int currentJsCount = mJsCallback.getCallCount();
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mWebView.loadData(data, mimeType, encoding);
+ }
+ });
+ try {
+ if (confirmByJavaScript) {
+ mJsCallback.waitForCallback(currentJsCount);
+ }
+ mPageCallback.waitForCallback(currentPageCount);
+ } catch (TimeoutException e) {
+ Assert.fail(e.getMessage());
+ }
+ }
+
public void loadFileSync(final String html, boolean confirmByJavaScript)
throws InterruptedException {
mErrorMessageList.clear();

Powered by Google App Engine
This is Rietveld 408576698