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

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

Issue 12047068: Add apk for running content_browsertests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.content.browser; 5 package org.chromium.content.browser;
6 6
7 import android.test.suitebuilder.annotation.LargeTest; 7 import android.test.suitebuilder.annotation.LargeTest;
8 8
9 import org.chromium.base.ThreadUtils; 9 import org.chromium.base.ThreadUtils;
10 import org.chromium.base.test.util.Feature; 10 import org.chromium.base.test.util.Feature;
11 import org.chromium.content.browser.test.util.Criteria; 11 import org.chromium.content.browser.test.util.Criteria;
12 import org.chromium.content.browser.test.util.CriteriaHelper; 12 import org.chromium.content.browser.test.util.CriteriaHelper;
13 import org.chromium.content.browser.test.util.TouchCommon; 13 import org.chromium.content.browser.test.util.TouchCommon;
14 import org.chromium.content.browser.test.util.UiUtils; 14 import org.chromium.content.browser.test.util.UiUtils;
15 import org.chromium.content_shell.ContentShellActivity;
16 import org.chromium.content_shell.ContentShellTestBase; 15 import org.chromium.content_shell.ContentShellTestBase;
16 import org.chromium.content_shell_apk.ContentShellActivity;
17 17
18 import java.util.concurrent.Callable; 18 import java.util.concurrent.Callable;
19 import java.util.concurrent.ExecutionException; 19 import java.util.concurrent.ExecutionException;
20 20
21 /** 21 /**
22 * Tests for interstitial pages. 22 * Tests for interstitial pages.
23 */ 23 */
24 public class InterstitialPageTest extends ContentShellTestBase { 24 public class InterstitialPageTest extends ContentShellTestBase {
25 25
26 private static final String URL = 26 private static final String URL =
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 public void run() { 92 public void run() {
93 getActiveContentViewCore().showInterstitialPage(URL, delegate); 93 getActiveContentViewCore().showInterstitialPage(URL, delegate);
94 } 94 }
95 }); 95 });
96 assertTrue("Interstitial never shown.", waitForInterstitial(true)); 96 assertTrue("Interstitial never shown.", waitForInterstitial(true));
97 TouchCommon touchCommon = new TouchCommon(this); 97 TouchCommon touchCommon = new TouchCommon(this);
98 touchCommon.singleClickViewRelative(getActivity().getActiveContentView() , 10, 10); 98 touchCommon.singleClickViewRelative(getActivity().getActiveContentView() , 10, 10);
99 assertTrue("Interstitial never hidden.", waitForInterstitial(false)); 99 assertTrue("Interstitial never hidden.", waitForInterstitial(false));
100 } 100 }
101 } 101 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698