content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java - Issue 141533006: [Android] Move the java content/ package to content_public/ to start the split.

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java

Issue 141533006: [Android] Move the java content/ package to content_public/ to start the split. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Small fixes and findbugs line update 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 | « content/public/android/javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java b/content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java

deleted file mode 100644

index a337d6f781e3d900e955284506fc619b576127a3..0000000000000000000000000000000000000000

--- a/content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java

+++ /dev/null

@@ -1,135 +0,0 @@

-// Use of this source code is governed by a BSD-style license that can be

-// found in the LICENSE file.

-package org.chromium.content.browser;

-import android.test.suitebuilder.annotation.LargeTest;

-import org.chromium.base.ThreadUtils;

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

-import org.chromium.base.test.util.UrlUtils;

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

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

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

-import org.chromium.content_shell_apk.ContentShellActivity;

-import org.chromium.content_shell_apk.ContentShellTestBase;

-import java.util.concurrent.Callable;

-import java.util.concurrent.ExecutionException;

-/**

- * Tests for interstitial pages.

- */

-public class InterstitialPageTest extends ContentShellTestBase {

- private static final String URL = UrlUtils.encodeHtmlDataUri(

- "<html><head></head><body>test</body></html>");

- private static class TestWebContentsObserverAndroid extends WebContentsObserverAndroid {

- private boolean mInterstitialShowing;

- public TestWebContentsObserverAndroid(ContentViewCore contentViewCore) {

- super(contentViewCore);

- }

- public boolean isInterstitialShowing() throws ExecutionException {

- return ThreadUtils.runOnUiThreadBlocking(new Callable<Boolean>() {

- @Override

- public Boolean call() throws Exception {

- return mInterstitialShowing;

- }

- }).booleanValue();

- }

- @Override

- public void didAttachInterstitialPage() {

- mInterstitialShowing = true;

- }

- @Override

- public void didDetachInterstitialPage() {

- mInterstitialShowing = false;

- }

- @Override

- protected void setUp() throws Exception {

- super.setUp();

- ContentShellActivity activity = launchContentShellWithUrl(URL);

- assertNotNull(activity);

- waitForActiveShellToBeDoneLoading();

- }

- private ContentViewCore getActiveContentViewCore() {

- return getActivity().getActiveContentView().getContentViewCore();

- }

- private boolean waitForInterstitial(final boolean shouldBeShown) throws InterruptedException {

- return CriteriaHelper.pollForCriteria(new Criteria() {

- @Override

- public boolean isSatisfied() {

- try {

- return ThreadUtils.runOnUiThreadBlocking(new Callable<Boolean>() {

- @Override

- public Boolean call() throws Exception {

- return shouldBeShown

- == getActiveContentViewCore().isShowingInterstitialPage();

- }

- });

- } catch (ExecutionException e) {

- return false;

- }

- });

- }

- /**

- * Tests that showing and hiding an interstitial works.

- */

- @LargeTest

- @Feature({"Navigation"})

- public void testCloseInterstitial() throws InterruptedException, ExecutionException {

- final String proceedCommand = "PROCEED";

- final String htmlContent =

- "<html>" +

- "<head>" +

- "<script>" +

- "function sendCommand(command) {" +

- "window.domAutomationController.setAutomationId(1);" +

- "window.domAutomationController.send(command);" +

- "}" +

- "</script>" +

- "</head>" +

- "<body style='background-color:#FF0000' " +

- "onclick='sendCommand(\"" + proceedCommand + "\");'>" +

- "<h1>This is a scary interstitial page</h1>" +

- "</body>" +

- "</html>";

- final InterstitialPageDelegateAndroid delegate =

- new InterstitialPageDelegateAndroid(htmlContent) {

- @Override

- protected void commandReceived(String command) {

- assertEquals(command, proceedCommand);

- proceed();

- }

- };

- TestWebContentsObserverAndroid observer = ThreadUtils.runOnUiThreadBlocking(

- new Callable<TestWebContentsObserverAndroid>() {

- @Override

- public TestWebContentsObserverAndroid call() throws Exception {

- getActiveContentViewCore().showInterstitialPage(URL, delegate);

- return new TestWebContentsObserverAndroid(getActiveContentViewCore());

- }

- });

- assertTrue("Interstitial never shown.", waitForInterstitial(true));

- assertTrue("WebContentsObserver not notified of interstitial showing",

- observer.isInterstitialShowing());

- TouchCommon touchCommon = new TouchCommon(this);

- touchCommon.singleClickViewRelative(getActivity().getActiveContentView(), 10, 10);

- assertTrue("Interstitial never hidden.", waitForInterstitial(false));

- assertTrue("WebContentsObserver not notified of interstitial hiding",

- !observer.isInterstitialShowing());

- }