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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2853573002: Convert ChromeTabbedActivityTestCaseBase children to JUnit4 (Closed)
Patch Set: rebase Created 3 years, 7 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/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRequestTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/hardware_acceleration/ChromeTabbedActivityHWATest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java
index 85c97ca4553ab203c461ae2c6244d87226a86b48..913cd8932921471bb3b7c1198dec8ed6c2907da5 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java
@@ -11,26 +11,36 @@ import android.graphics.Rect;
import android.graphics.Region;
import android.os.Build;
import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
import android.support.test.filters.LargeTest;
import android.support.test.filters.MediumTest;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
import org.chromium.base.ThreadUtils;
import org.chromium.base.test.util.CallbackHelper;
+import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature;
-// (http://crbug/642336) import org.chromium.base.test.util.Restriction;
import org.chromium.base.test.util.RetryOnFailure;
import org.chromium.base.test.util.UrlUtils;
import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeSwitches;
import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager.FullscreenListener;
import org.chromium.chrome.browser.omnibox.UrlBar;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tab.TabStateBrowserControlsVisibilityDelegate;
import org.chromium.chrome.browser.tab.TabWebContentsDelegateAndroid;
-import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
+import org.chromium.chrome.test.ChromeActivityTestRule;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
import org.chromium.chrome.test.util.FullscreenTestUtils;
import org.chromium.chrome.test.util.OmniboxTestUtils;
import org.chromium.chrome.test.util.PrerenderTestHelper;
@@ -39,6 +49,7 @@ import org.chromium.content.browser.test.util.Criteria;
import org.chromium.content.browser.test.util.CriteriaHelper;
import org.chromium.content.browser.test.util.JavaScriptUtils;
import org.chromium.content.browser.test.util.TestTouchUtils;
+import org.chromium.content.browser.test.util.TouchCommon;
import org.chromium.content.browser.test.util.UiUtils;
import org.chromium.net.test.EmbeddedTestServer;
@@ -50,8 +61,16 @@ import java.util.concurrent.atomic.AtomicInteger;
/**
* Test suite for verifying the behavior of various fullscreen actions.
*/
+@RunWith(ChromeJUnit4ClassRunner.class)
+@CommandLineFlags.Add({
+ ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
+ ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG,
+})
@RetryOnFailure
-public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {
+public class FullscreenManagerTest {
+ @Rule
+ public ChromeTabbedActivityTestRule mActivityTestRule = new ChromeTabbedActivityTestRule();
+
private static final String LONG_HTML_WITH_AUTO_FOCUS_INPUT_TEST_PAGE =
UrlUtils.encodeHtmlDataUri("<html>"
+ "<body style='height:10000px;'>"
@@ -85,9 +104,8 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {
+ "</body>"
+ "</html>");
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
@@ -96,42 +114,47 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {
});
}
+ @Test
@MediumTest
@Feature({"Fullscreen"})
public void testTogglePersistentFullscreen() throws InterruptedException {
- startMainActivityWithURL(LONG_HTML_TEST_PAGE);
+ mActivityTestRule.startMainActivityWithURL(LONG_HTML_TEST_PAGE);
- Tab tab = getActivity().getActivityTab();
+ Tab tab = mActivityTestRule.getActivity().getActivityTab();
final TabWebContentsDelegateAndroid delegate = tab.getTabWebContentsDelegateAndroid();
- FullscreenTestUtils.waitForFullscreenFlag(tab, false, getActivity());
+ FullscreenTestUtils.waitForFullscreenFlag(tab, false, mActivityTestRule.getActivity());
FullscreenTestUtils.waitForPersistentFullscreen(delegate, false);
- FullscreenTestUtils.togglePersistentFullscreenAndAssert(tab, true, getActivity());
+ FullscreenTestUtils.togglePersistentFullscreenAndAssert(
+ tab, true, mActivityTestRule.getActivity());
- FullscreenTestUtils.togglePersistentFullscreenAndAssert(tab, false, getActivity());
+ FullscreenTestUtils.togglePersistentFullscreenAndAssert(
+ tab, false, mActivityTestRule.getActivity());
}
+ @Test
@LargeTest
@Feature({"Fullscreen"})
public void testPersistentFullscreenChangingUiFlags() throws InterruptedException {
// Exiting fullscreen via UI Flags is not supported in versions prior to MR2.
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) return;
- startMainActivityWithURL(LONG_HTML_TEST_PAGE);
+ mActivityTestRule.startMainActivityWithURL(LONG_HTML_TEST_PAGE);
- final Tab tab = getActivity().getActivityTab();
+ final Tab tab = mActivityTestRule.getActivity().getActivityTab();
final TabWebContentsDelegateAndroid delegate = tab.getTabWebContentsDelegateAndroid();
- FullscreenTestUtils.waitForFullscreenFlag(tab, false, getActivity());
+ FullscreenTestUtils.waitForFullscreenFlag(tab, false, mActivityTestRule.getActivity());
FullscreenTestUtils.waitForPersistentFullscreen(delegate, false);
- FullscreenTestUtils.togglePersistentFullscreenAndAssert(tab, true, getActivity());
+ FullscreenTestUtils.togglePersistentFullscreenAndAssert(
+ tab, true, mActivityTestRule.getActivity());
// There is a race condition in android when setting various system UI flags.
// Adding this wait to allow the animation transitions to complete before continuing
// the test (See https://b/10387660)
- UiUtils.settleDownUI(getInstrumentation());
+ UiUtils.settleDownUI(InstrumentationRegistry.getInstrumentation());
ThreadUtils.runOnUiThread(new Runnable() {
@Override
@@ -141,31 +164,33 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {
view.getSystemUiVisibility() & ~View.SYSTEM_UI_FLAG_FULLSCREEN);
}
});
- FullscreenTestUtils.waitForFullscreenFlag(tab, true, getActivity());
+ FullscreenTestUtils.waitForFullscreenFlag(tab, true, mActivityTestRule.getActivity());
FullscreenTestUtils.waitForPersistentFullscreen(delegate, true);
}
+ @Test
@LargeTest
@Feature({"Fullscreen"})
public void testExitPersistentFullscreenAllowsManualFullscreen() throws InterruptedException {
disableBrowserOverrides();
- startMainActivityWithURL(LONG_FULLSCREEN_API_HTML_TEST_PAGE);
+ mActivityTestRule.startMainActivityWithURL(LONG_FULLSCREEN_API_HTML_TEST_PAGE);
- ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();
+ ChromeFullscreenManager fullscreenManager =
+ mActivityTestRule.getActivity().getFullscreenManager();
int browserControlsHeight = fullscreenManager.getTopControlsHeight();
- Tab tab = getActivity().getActivityTab();
+ Tab tab = mActivityTestRule.getActivity().getActivityTab();
View view = tab.getView();
final TabWebContentsDelegateAndroid delegate =
tab.getTabWebContentsDelegateAndroid();
- singleClickView(view);
+ TouchCommon.singleClickView(view);
FullscreenTestUtils.waitForPersistentFullscreen(delegate, true);
waitForBrowserControlsPosition(-browserControlsHeight);
- TestTouchUtils.sleepForDoubleTapTimeout(getInstrumentation());
- singleClickView(view);
+ TestTouchUtils.sleepForDoubleTapTimeout(InstrumentationRegistry.getInstrumentation());
+ TouchCommon.singleClickView(view);
FullscreenTestUtils.waitForPersistentFullscreen(delegate, false);
waitForBrowserControlsPosition(0);
@@ -173,38 +198,45 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {
scrollBrowserControls(true);
}
+ @Test
@LargeTest
@Feature({"Fullscreen"})
public void testManualHidingShowingBrowserControls() throws InterruptedException {
disableBrowserOverrides();
- startMainActivityWithURL(LONG_HTML_TEST_PAGE);
+ mActivityTestRule.startMainActivityWithURL(LONG_HTML_TEST_PAGE);
- final ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();
+ final ChromeFullscreenManager fullscreenManager =
+ mActivityTestRule.getActivity().getFullscreenManager();
- assertEquals(fullscreenManager.getTopControlOffset(), 0f);
+ Assert.assertEquals(fullscreenManager.getTopControlOffset(), 0f, 0);
- waitForBrowserControlsToBeMoveable(getActivity().getActivityTab());
+ waitForBrowserControlsToBeMoveable(mActivityTestRule.getActivity().getActivityTab());
// Check that the URL bar has not grabbed focus (http://crbug/236365)
- UrlBar urlBar = (UrlBar) getActivity().findViewById(R.id.url_bar);
- assertFalse("Url bar grabbed focus", urlBar.hasFocus());
+ UrlBar urlBar = (UrlBar) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
+ Assert.assertFalse("Url bar grabbed focus", urlBar.hasFocus());
}
+ @Test
@LargeTest
@Feature({"Fullscreen"})
public void testHidingBrowserControlsRemovesSurfaceFlingerOverlay()
throws InterruptedException {
disableBrowserOverrides();
- startMainActivityWithURL(LONG_HTML_TEST_PAGE);
+ mActivityTestRule.startMainActivityWithURL(LONG_HTML_TEST_PAGE);
- final ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();
+ final ChromeFullscreenManager fullscreenManager =
+ mActivityTestRule.getActivity().getFullscreenManager();
- assertEquals(fullscreenManager.getTopControlOffset(), 0f);
+ Assert.assertEquals(fullscreenManager.getTopControlOffset(), 0f, 0);
// Detect layouts. Note this doesn't actually need to be atomic (just final).
final AtomicInteger layoutCount = new AtomicInteger();
- getActivity().getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(
- new ViewTreeObserver.OnGlobalLayoutListener() {
+ mActivityTestRule.getActivity()
+ .getWindow()
+ .getDecorView()
+ .getViewTreeObserver()
+ .addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@Override
public void onGlobalLayout() {
layoutCount.incrementAndGet();
@@ -229,10 +261,11 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {
// in the transparent region of the app.
Rect visibleDisplayFrame = new Rect();
Region transparentRegion = new Region();
- ViewGroup decorView = (ViewGroup) getActivity().getWindow().getDecorView();
+ ViewGroup decorView =
+ (ViewGroup) mActivityTestRule.getActivity().getWindow().getDecorView();
decorView.getWindowVisibleDisplayFrame(visibleDisplayFrame);
decorView.gatherTransparentRegion(transparentRegion);
- assertTrue(transparentRegion.quickContains(visibleDisplayFrame));
+ Assert.assertTrue(transparentRegion.quickContains(visibleDisplayFrame));
}
});
@@ -241,43 +274,48 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {
// - Observe that there is no 'Chrome' related overlay listed, only 'Surfaceview'.
}
+ @Test
@LargeTest
@Feature({"Fullscreen"})
public void testManualFullscreenDisabledForChromePages() throws InterruptedException {
disableBrowserOverrides();
// The credits page was chosen as it is a chrome:// page that is long and would support
// manual fullscreen if it were supported.
- startMainActivityWithURL("chrome://credits");
+ mActivityTestRule.startMainActivityWithURL("chrome://credits");
- final ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();
+ final ChromeFullscreenManager fullscreenManager =
+ mActivityTestRule.getActivity().getFullscreenManager();
int browserControlsHeight = fullscreenManager.getTopControlsHeight();
- assertEquals(fullscreenManager.getTopControlOffset(), 0f);
+ Assert.assertEquals(fullscreenManager.getTopControlOffset(), 0f, 0);
float dragX = 50f;
float dragStartY = browserControlsHeight * 2;
float dragFullY = dragStartY - browserControlsHeight;
long downTime = SystemClock.uptimeMillis();
- dragStart(dragX, dragStartY, downTime);
- dragTo(dragX, dragX, dragStartY, dragFullY, 100, downTime);
+ TouchCommon.dragStart(mActivityTestRule.getActivity(), dragX, dragStartY, downTime);
+ TouchCommon.dragTo(mActivityTestRule.getActivity(), dragX, dragX, dragStartY, dragFullY,
+ 100, downTime);
waitForBrowserControlsPosition(0f);
- dragEnd(dragX, dragFullY, downTime);
+ TouchCommon.dragEnd(mActivityTestRule.getActivity(), dragX, dragFullY, downTime);
waitForBrowserControlsPosition(0f);
}
+ @Test
@LargeTest
@Feature({"Fullscreen"})
public void testControlsShownOnUnresponsiveRenderer() throws InterruptedException {
disableBrowserOverrides();
- startMainActivityWithURL(LONG_HTML_TEST_PAGE);
+ mActivityTestRule.startMainActivityWithURL(LONG_HTML_TEST_PAGE);
- ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();
- assertEquals(fullscreenManager.getTopControlOffset(), 0f);
+ ChromeFullscreenManager fullscreenManager =
+ mActivityTestRule.getActivity().getFullscreenManager();
+ Assert.assertEquals(fullscreenManager.getTopControlOffset(), 0f, 0);
scrollBrowserControls(false);
- Tab tab = getActivity().getActivityTab();
+ Tab tab = mActivityTestRule.getActivity().getActivityTab();
final TabWebContentsDelegateAndroid delegate =
tab.getTabWebContentsDelegateAndroid();
ThreadUtils.runOnUiThread(new Runnable() {
@@ -304,22 +342,24 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {
@Feature({"Fullscreen"})
@Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
*/
+ @Test
@DisabledTest(message = "crbug.com/642336")
public void testPrerenderedPageSupportsManualHiding() throws InterruptedException {
disableBrowserOverrides();
- startMainActivityOnBlankPage();
+ mActivityTestRule.startMainActivityOnBlankPage();
EmbeddedTestServer testServer = EmbeddedTestServer.createAndStartServer(
- getInstrumentation().getContext());
+ InstrumentationRegistry.getInstrumentation().getContext());
try {
- final Tab tab = getActivity().getActivityTab();
+ final Tab tab = mActivityTestRule.getActivity().getActivityTab();
final String testUrl = testServer.getURL(
"/chrome/test/data/android/very_long_google.html");
PrerenderTestHelper.prerenderUrl(testUrl, tab);
- assertTrue("loadUrl did not use pre-rendered page.",
- PrerenderTestHelper.isLoadUrlResultPrerendered(loadUrl(testUrl)));
+ Assert.assertTrue("loadUrl did not use pre-rendered page.",
+ PrerenderTestHelper.isLoadUrlResultPrerendered(
+ mActivityTestRule.loadUrl(testUrl)));
- UrlBar urlBar = (UrlBar) getActivity().findViewById(R.id.url_bar);
+ UrlBar urlBar = (UrlBar) mActivityTestRule.getActivity().findViewById(R.id.url_bar);
OmniboxTestUtils.toggleUrlBarFocus(urlBar, false);
OmniboxTestUtils.waitForFocusAndKeyboardActive(urlBar, false);
@@ -332,39 +372,43 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {
/* @LargeTest
* @Feature({"Fullscreen"})
*/
+ @Test
@DisabledTest(message = "crbug.com/698413")
public void testBrowserControlsShownWhenInputIsFocused()
throws InterruptedException, TimeoutException {
disableBrowserOverrides();
- startMainActivityWithURL(LONG_HTML_WITH_AUTO_FOCUS_INPUT_TEST_PAGE);
+ mActivityTestRule.startMainActivityWithURL(LONG_HTML_WITH_AUTO_FOCUS_INPUT_TEST_PAGE);
- ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();
- assertEquals(fullscreenManager.getTopControlOffset(), 0f);
+ ChromeFullscreenManager fullscreenManager =
+ mActivityTestRule.getActivity().getFullscreenManager();
+ Assert.assertEquals(fullscreenManager.getTopControlOffset(), 0f, 0);
int browserControlsHeight = fullscreenManager.getTopControlsHeight();
float dragX = 50f;
float dragStartY = browserControlsHeight * 3;
float dragEndY = dragStartY - browserControlsHeight * 2;
long downTime = SystemClock.uptimeMillis();
- dragStart(dragX, dragStartY, downTime);
- dragTo(dragX, dragX, dragStartY, dragEndY, 100, downTime);
- dragEnd(dragX, dragEndY, downTime);
- assertEquals(fullscreenManager.getTopControlOffset(), 0f);
-
- Tab tab = getActivity().getActivityTab();
- singleClickView(tab.getView());
+ TouchCommon.dragStart(mActivityTestRule.getActivity(), dragX, dragStartY, downTime);
+ TouchCommon.dragTo(
+ mActivityTestRule.getActivity(), dragX, dragX, dragStartY, dragEndY, 100, downTime);
+ TouchCommon.dragEnd(mActivityTestRule.getActivity(), dragX, dragEndY, downTime);
+ Assert.assertEquals(fullscreenManager.getTopControlOffset(), 0f, 0);
+
+ Tab tab = mActivityTestRule.getActivity().getActivityTab();
+ TouchCommon.singleClickView(tab.getView());
JavaScriptUtils.executeJavaScriptAndWaitForResult(tab.getWebContents(),
"document.getElementById('input_text').blur();");
waitForEditableNodeToLoseFocus(tab);
- waitForBrowserControlsToBeMoveable(getActivity().getActivityTab());
+ waitForBrowserControlsToBeMoveable(mActivityTestRule.getActivity().getActivityTab());
}
- private void scrollBrowserControls(boolean show) throws InterruptedException {
- ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();
+ private void scrollBrowserControls(boolean show) {
+ ChromeFullscreenManager fullscreenManager =
+ mActivityTestRule.getActivity().getFullscreenManager();
int browserControlsHeight = fullscreenManager.getTopControlsHeight();
- waitForPageToBeScrollable(getActivity().getActivityTab());
+ waitForPageToBeScrollable(mActivityTestRule.getActivity().getActivityTab());
float dragX = 50f;
// Use a larger scroll range than the height of the browser controls to ensure we overcome
@@ -379,14 +423,16 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {
dragEndY = tempDragStartY;
}
long downTime = SystemClock.uptimeMillis();
- dragStart(dragX, dragStartY, downTime);
- dragTo(dragX, dragX, dragStartY, dragEndY, 100, downTime);
- dragEnd(dragX, dragEndY, downTime);
+ TouchCommon.dragStart(mActivityTestRule.getActivity(), dragX, dragStartY, downTime);
+ TouchCommon.dragTo(
+ mActivityTestRule.getActivity(), dragX, dragX, dragStartY, dragEndY, 100, downTime);
+ TouchCommon.dragEnd(mActivityTestRule.getActivity(), dragX, dragEndY, downTime);
waitForBrowserControlsPosition(expectedPosition);
}
- private void waitForBrowserControlsPosition(float position) throws InterruptedException {
- final ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();
+ private void waitForBrowserControlsPosition(float position) {
+ final ChromeFullscreenManager fullscreenManager =
+ mActivityTestRule.getActivity().getFullscreenManager();
CriteriaHelper.pollUiThread(Criteria.equals(position, new Callable<Float>() {
@Override
public Float call() {
@@ -395,7 +441,7 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {
}));
}
- private void waitForPageToBeScrollable(final Tab tab) throws InterruptedException {
+ private void waitForPageToBeScrollable(final Tab tab) {
CriteriaHelper.pollUiThread(new Criteria() {
@Override
public boolean isSatisfied() {
@@ -417,7 +463,8 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {
waitForBrowserControlsPosition(0f);
final CallbackHelper contentMovedCallback = new CallbackHelper();
- final ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();
+ final ChromeFullscreenManager fullscreenManager =
+ mActivityTestRule.getActivity().getFullscreenManager();
final float initialVisibleContentOffset = fullscreenManager.getTopVisibleContentOffset();
fullscreenManager.addListener(new FullscreenListener() {
@@ -450,9 +497,10 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {
float dragEndY = dragStartY - fullscreenManager.getTopControlsHeight();
long downTime = SystemClock.uptimeMillis();
- dragStart(dragX, dragStartY, downTime);
- dragTo(dragX, dragX, dragStartY, dragEndY, 100, downTime);
- dragEnd(dragX, dragEndY, downTime);
+ TouchCommon.dragStart(mActivityTestRule.getActivity(), dragX, dragStartY, downTime);
+ TouchCommon.dragTo(mActivityTestRule.getActivity(), dragX, dragX, dragStartY, dragEndY,
+ 100, downTime);
+ TouchCommon.dragEnd(mActivityTestRule.getActivity(), dragX, dragEndY, downTime);
try {
contentMovedCallback.waitForCallback(0, 1, 500, TimeUnit.MILLISECONDS);
@@ -466,10 +514,10 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {
}
}
- fail("Visible content never moved as expected.");
+ Assert.fail("Visible content never moved as expected.");
}
- private void waitForEditableNodeToLoseFocus(final Tab tab) throws InterruptedException {
+ private void waitForEditableNodeToLoseFocus(final Tab tab) {
CriteriaHelper.pollUiThread(new Criteria() {
@Override
public boolean isSatisfied() {
@@ -487,9 +535,4 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {
}
});
}
-
- @Override
- public void startMainActivity() throws InterruptedException {
- // Each test will start itself with the appropriate test page.
- }
}
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRequestTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/hardware_acceleration/ChromeTabbedActivityHWATest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698