chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java - Issue 1391993004: WebApp splashscreen: add UMA to record how a splashscreen is constructed.

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java

Issue 1391993004: WebApp splashscreen: add UMA to record how a splashscreen is constructed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: don't assert Created 5 years, 2 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 | « chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenBackgroundColorTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java

index b7f6800924a5065c0f4dab3fc8938dd363aaed12..c19ff937adb0a594237f359961b6bc9d1031b71f 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java

@@ -26,6 +26,39 @@ import java.util.concurrent.TimeoutException;

public abstract class WebappActivityTestBase extends ChromeActivityTestCaseBase<WebappActivity0> {

static final String WEBAPP_ID = "webapp_id";

+ // Empty 192x192 image generated with:

+ // ShortcutHelper.encodeBitmapAsString(Bitmap.createBitmap(192, 192, Bitmap.Config.ARGB_4444));

+ protected static final String TEST_ICON =

+ "iVBORw0KGgoAAAANSUhEUgAAAMAAAADACAYAAABS3GwHAAAABHNCSVQICAgIfAhkiAAAAKZJREFU"

+ + "eJztwTEBAAAAwqD1T20JT6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"

+ + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"

+ + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4GQN4AAe3mX6IA"

+ + "AAAASUVORK5CYII=";

+ // Empty 512x512 image generated with:

+ // ShortcutHelper.encodeBitmapAsString(Bitmap.createBitmap(512, 512, Bitmap.Config.ARGB_4444));

+ protected static final String TEST_SPLASH_ICON =

+ "iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABHNCSVQICAgIfAhkiAAABA9JREFU"

+ + "eJztwTEBAAAAwqD1T20Hb6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"

+ + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"

+ + "AAAAAAAAAOA3AvAAAdln8YgAAAAASUVORK5CYII=";

TestWebContentsObserver mTestObserver;

public WebappActivityTestBase() {

@@ -131,4 +164,17 @@ public abstract class WebappActivityTestBase extends ChromeActivityTestCaseBase<

public void startMainActivity() throws InterruptedException {

// Do nothing

}

+ /**

+ * Waits for the splash screen to be hidden and return whether it was hidden

+ * (true) or if it timed out (false).

+ */

+ protected boolean waitUntilSplashscreenHides() throws InterruptedException {

+ return CriteriaHelper.pollForCriteria(new Criteria() {

+ @Override

+ public boolean isSatisfied() {

+ return !getActivity().isSplashScreenVisibleForTest();

+ }

+ });

+ }

}