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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/util/CommonResources.java

Issue 1026723002: [Android WebView] Deflake new OnReceived*Error tests that simulate tap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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/ClientOnReceivedHttpErrorTest.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/javatests/src/org/chromium/android_webview/test/util/CommonResources.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/util/CommonResources.java b/android_webview/javatests/src/org/chromium/android_webview/test/util/CommonResources.java
index ad87db0e99fac1bf2bdf6800718428cfeda68018..d0165437d709871d96daeb0d8a0043258349842b 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/util/CommonResources.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/util/CommonResources.java
@@ -4,6 +4,7 @@
package org.chromium.android_webview.test.util;
+import android.graphics.Color;
import android.util.Pair;
import java.util.ArrayList;
@@ -39,18 +40,18 @@ public class CommonResources {
// Returns the HTML code used to verify if an image has been successfully loaded.
public static String getOnImageLoadedHtml(String imageSrc) {
- return "<html>" +
- " <head>" +
- " <script>" +
- " function updateTitle() {" +
- " document.title=document.getElementById('img').naturalHeight" +
- " }" +
- " </script>" +
- " </head>" +
- " <body onload='updateTitle();'>" +
- " <img id='img' onload='updateTitle();' src='" + imageSrc + "'>" +
- " </body>" +
- "</html>";
+ return "<html>"
+ + " <head>"
+ + " <script>"
+ + " function updateTitle() {"
+ + " document.title=document.getElementById('img').naturalHeight"
+ + " }"
+ + " </script>"
+ + " </head>"
+ + " <body onload='updateTitle();'>"
+ + " <img id='img' onload='updateTitle();' src='" + imageSrc + "'>"
+ + " </body>"
+ + "</html>";
}
// Default name for the favicon image.
@@ -61,37 +62,37 @@ public class CommonResources {
// HTML code of a static simple page with a favicon.
public static final String FAVICON_STATIC_HTML =
- "<html><head><link rel=\"icon\" type=\"image/png\" href=\"" + FAVICON_FILENAME + "\">" +
- "</head><body>Favicon example</body></html>";
+ "<html><head><link rel=\"icon\" type=\"image/png\" href=\"" + FAVICON_FILENAME + "\">"
+ + "</head><body>Favicon example</body></html>";
// Base64 data of a 256x256 png with all pixels having colour value 0x0000ff
public static final String BLUE_PNG_BASE64 =
- "iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAIAAADTED8xAAACvUlEQVR4nO3TMQEA" +
- "IAzAsIF/zyBjRxMFfXpm3kDV3Q6ATQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCk" +
- "GYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5Bm" +
- "ANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoB" +
- "SDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYg" +
- "zQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0" +
- "A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIM" +
- "QJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMA" +
- "aQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCk" +
- "GYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5Bm" +
- "ANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoB" +
- "SDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYg" +
- "zQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0" +
- "A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIM" +
- "QJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMA" +
- "aQYgzQCkGYA0A5BmANIMQNoHVyEC/zTGc0UAAAAASUVORK5CYII=";
+ "iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAIAAADTED8xAAACvUlEQVR4nO3TMQEA"
+ + "IAzAsIF/zyBjRxMFfXpm3kDV3Q6ATQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCk"
+ + "GYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5Bm"
+ + "ANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoB"
+ + "SDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYg"
+ + "zQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0"
+ + "A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIM"
+ + "QJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMA"
+ + "aQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCk"
+ + "GYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5Bm"
+ + "ANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoB"
+ + "SDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYg"
+ + "zQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0"
+ + "A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIM"
+ + "QJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMAaQYgzQCkGYA0A5BmANIMQJoBSDMA"
+ + "aQYgzQCkGYA0A5BmANIMQNoHVyEC/zTGc0UAAAAASUVORK5CYII=";
// Base64 data of a favicon image resource.
public static final String FAVICON_DATA_BASE64 =
- "iVBORw0KGgoAAAANSUhEUgAAABAAAAAFCAYAAABM6GxJAAAABHNCSVQICAgIfAhkiAAAASJJREFU" +
- "GJU9yDtLQnEYwOHfOZ40L3gZDJKgJCKaamvpGzS09wUaormh7xA0S5C0ZDTkZJsNUltkkpAUZkIX" +
- "L3g9FzzH/9vm9vAgoqRUGUu20JHTXFfafUdERJSIKJnOPFUTERHpqIYclY5nb2QKFumky95OlO+W" +
- "TSgATqOO5k3xr6ZxelXmDFDhdaqfLkPRWQglULaN/V5DPzl3iIb9xCI+Eskog/wdyhowLlb4vThE" +
- "giF8zRsurx55beg8lMfMezZW9hqz20M/Owhwe2/yUrPI5Ds8//mRehN7JYWxvIX6eWJkbLK9laL8" +
- "ZrKxFETzxTBNB5SOJjKV/mhCq+uSjGvE4hHc4QA9YGAEwnhWF1ePkCtOWFv0+PiasL8bR3QDr93h" +
- "HyFup9LWUksHAAAAAElFTkSuQmCC";
+ "iVBORw0KGgoAAAANSUhEUgAAABAAAAAFCAYAAABM6GxJAAAABHNCSVQICAgIfAhkiAAAASJJREFU"
+ + "GJU9yDtLQnEYwOHfOZ40L3gZDJKgJCKaamvpGzS09wUaormh7xA0S5C0ZDTkZJsNUltkkpAUZkIX"
+ + "L3g9FzzH/9vm9vAgoqRUGUu20JHTXFfafUdERJSIKJnOPFUTERHpqIYclY5nb2QKFumky95OlO+W"
+ + "TSgATqOO5k3xr6ZxelXmDFDhdaqfLkPRWQglULaN/V5DPzl3iIb9xCI+Eskog/wdyhowLlb4vThE"
+ + "giF8zRsurx55beg8lMfMezZW9hqz20M/Owhwe2/yUrPI5Ds8//mRehN7JYWxvIX6eWJkbLK9laL8"
+ + "ZrKxFETzxTBNB5SOJjKV/mhCq+uSjGvE4hHc4QA9YGAEwnhWF1ePkCtOWFv0+PiasL8bR3QDr93h"
+ + "HyFup9LWUksHAAAAAElFTkSuQmCC";
// Default name for an example 'about' HTML page.
public static final String ABOUT_FILENAME = "about.html";
@@ -101,38 +102,41 @@ public class CommonResources {
// HTML code of an 'about' example.
public static final String ABOUT_HTML =
- "<html>" +
- " <head>" +
- " <title>" + ABOUT_TITLE + "</title>" +
- " </head>" +
- " <body>" +
- " This is the Google!" +
- " </body>" +
- "</html>";
+ "<html>"
+ + " <head>"
+ + " <title>" + ABOUT_TITLE + "</title>"
+ + " </head>"
+ + " <body>"
+ + " This is the Google!"
+ + " </body>"
+ + "</html>";
public static String makeHtmlPageFrom(String headers, String body) {
- return "<html>" +
- " <head>" +
- " <style type=\"text/css\">" +
+ return "<html>"
+ + " <head>"
+ + " <style type=\"text/css\">"
// Make the image take up all of the page so that we don't have to do
// any fancy hit target calculations when synthesizing the touch event
// to click it.
- " img.big { width:100%; height:100%; background-color:blue; }" +
- " .full_view { height:100%; width:100%; position:absolute; }" +
- " </style>" +
- headers +
- " </head>" +
- " <body>" +
- body +
- " </body>" +
- "</html>";
+ + " img.big { width:100%; height:100%; background-color:blue; }"
+ + " .full_view { height:100%; width:100%; position:absolute; }"
+ + " </style>"
+ + headers
+ + " </head>"
+ + " <body>"
+ + body
+ + " </body>"
+ + "</html>";
}
+ // The color must match the background color of 'img.big' CSS class.
+ public static final int LINK_COLOR = Color.BLUE;
+
public static String makeHtmlPageWithSimpleLinkTo(String headers, String destination) {
return makeHtmlPageFrom(headers,
- "<a href=\"" + destination + "\" id=\"link\">" +
- " <img class=\"big\" />" +
- "</a>");
+ "<a href=\"" + destination + "\" id=\"link\">"
+ + " <img class=\"big\" />"
+ + "</a>");
}
public static String makeHtmlPageWithSimpleLinkTo(String destination) {
@@ -141,8 +145,8 @@ public class CommonResources {
public static String makeHtmlPageWithSimplePostFormTo(String destination) {
return makeHtmlPageFrom("",
- "<form action=\"" + destination + "\" method=\"post\">" +
- " <input type=\"submit\" value=\"post\" id=\"link\">" +
- "</form>");
+ "<form action=\"" + destination + "\" method=\"post\">"
+ + " <input type=\"submit\" value=\"post\" id=\"link\">"
+ + "</form>");
}
}
« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/ClientOnReceivedHttpErrorTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698