chrome/android/javatests/src/org/chromium/chrome/browser/NavigateTest.java - Issue 1172503002: Deflake NavigateTest.testWindowOpenUrlSpoof

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

Issue 1172503002: Deflake NavigateTest.testWindowOpenUrlSpoof (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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

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

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

index 03edf4224189e268fddec6e9c24d09e2d1ba1002..adb34e92b91d236def166ab6b29ac9e1c7f5b50f 100644

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

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

@@ -6,7 +6,6 @@ package org.chromium.chrome.browser;

import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_TABLET;

-import android.test.FlakyTest;

import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.Smoke;

import android.text.TextUtils;

@@ -350,12 +349,8 @@ public class NavigateTest extends ChromeTabbedActivityTestBase {

}

- /*

- * Bug: crbug.com/413186

- * @MediumTest

- * @Feature({"Navigation"})

- */

- @FlakyTest

+ @MediumTest

+ @Feature({"Navigation"})

public void testWindowOpenUrlSpoof() throws Exception {

TestWebServer webServer = TestWebServer.start();

try {

@@ -378,14 +373,20 @@ public class NavigateTest extends ChromeTabbedActivityTestBase {

};

// Mock out the test URL

- final String mockedUrl = webServer.setResponseWithRunnableAction(

- "/mockme.html", "<html><body>Real</body></html>", null, checkAction);

+ final String mockedUrl = webServer.setResponseWithRunnableAction("/mockme.html",

+ "<html>"

+ + " <head>"

+ + " <meta name=\"viewport\""

+ + " content=\"initial-scale=0.75,maximum-scale=0.75,user-scalable=no\">"

+ + " </head>"

+ + " <body>Real</body>"

+ + "</html>", null, checkAction);

// Navigate to the spoofable URL

loadUrl(UrlUtils.encodeHtmlDataUri(

"<head>"

+ " <meta name=\"viewport\""

- + " content=\"initial-scale=1,maximum-scale=1,user-scalable=no\">"

+ + " content=\"initial-scale=0.5,maximum-scale=0.5,user-scalable=no\">"

+ "</head>"

+ "<script>"

+ " function spoof() {"

@@ -395,18 +396,18 @@ public class NavigateTest extends ChromeTabbedActivityTestBase {

+ " w.location = '" + mockedUrl + "'"

+ " }"

+ "</script>"

- + "<a href='JavaScript:spoof()' id='link'>Go</a>"));

- assertWaitForPageScaleFactorMatch(1.0f);

+ + "<body id='body' onclick='spoof()'></body>"));

+ assertWaitForPageScaleFactorMatch(0.5f);

- // Click the 'Go' link

- DOMUtils.clickNode(this, getActivity().getCurrentContentViewCore(), "link");

+ // Click the page, which triggers the URL load.

+ DOMUtils.clickNode(this, getActivity().getCurrentContentViewCore(), "body");

// Wait for the proper URL to be served.

assertTrue(urlServedSemaphore.tryAcquire(5, TimeUnit.SECONDS));

- final Tab tab = TabModelUtils.getCurrentTab(model);

// Wait for the url to change.

+ final Tab tab = TabModelUtils.getCurrentTab(model);

+ assertWaitForPageScaleFactorMatch(0.75f);

assertTrue("Page url didn't change",

CriteriaHelper.pollForCriteria(new Criteria() {

@Override

« no previous file with comments | « no previous file | no next file » | no next file with comments »