chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java - Issue 2443613002: Rename classes related to top controls

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

Issue 2443613002: Rename classes related to top controls (Closed)

Patch Set: fix test Created 4 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

« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/MockLayoutHost.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/media/remote/CastTestBase.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/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 dab90d6b14cc8b98f6396789c5c50a5b0a5f3e44..6b11b97a8f978b78eafed983eb4d8218e888ebb8 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

@@ -52,12 +52,11 @@ import java.util.concurrent.atomic.AtomicInteger;

@RetryOnFailure

public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

private static final String LONG_HTML_WITH_AUTO_FOCUS_INPUT_TEST_PAGE =

UrlUtils.encodeHtmlDataUri("<html>"

+ "<body style='height:10000px;'>"

+ "The text input is focused automatically on load."

- + " The top controls should not hide when page is scrolled. "

+ + " The browser controls should not hide when page is scrolled. "

+ "<input id=\"input_text\" type=\"text\" autofocus/>"

+ "</body>"

+ "</html>");

@@ -142,7 +141,7 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();

fullscreenManager.setAnimationDurationsForTest(1, 1);

- int topControlsHeight = fullscreenManager.getTopControlsHeight();

+ int browserControlsHeight = fullscreenManager.getBrowserControlsHeight();

Tab tab = getActivity().getActivityTab();

View view = tab.getView();

@@ -152,21 +151,21 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

singleClickView(view);

FullscreenTestUtils.waitForPersistentFullscreen(delegate, true);

- waitForTopControlsPosition(-topControlsHeight);

+ waitForBrowserControlsPosition(-browserControlsHeight);

TestTouchUtils.sleepForDoubleTapTimeout(getInstrumentation());

singleClickView(view);

FullscreenTestUtils.waitForPersistentFullscreen(delegate, false);

- waitForNoBrowserTopControlsOffset();

- waitForTopControlsPosition(0);

+ waitForNoBrowserBrowserControlsOffset();

+ waitForBrowserControlsPosition(0);

- scrollTopControls(false);

- scrollTopControls(true);

+ scrollBrowserControls(false);

+ scrollBrowserControls(true);

}

@LargeTest

@Feature({"Fullscreen"})

- public void testManualHidingShowingTopControls() throws InterruptedException {

+ public void testManualHidingShowingBrowserControls() throws InterruptedException {

startMainActivityWithURL(LONG_HTML_TEST_PAGE);

final ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();

@@ -174,7 +173,7 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

assertEquals(fullscreenManager.getControlOffset(), 0f);

- waitForTopControlsToBeMoveable(getActivity().getActivityTab());

+ waitForBrowserControlsToBeMoveable(getActivity().getActivityTab());

// Check that the URL bar has not grabbed focus (http://crbug/236365)

UrlBar urlBar = (UrlBar) getActivity().findViewById(R.id.url_bar);

@@ -183,7 +182,8 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

@LargeTest

@Feature({"Fullscreen"})

- public void testHidingTopControlsRemovesSurfaceFlingerOverlay() throws InterruptedException {

+ public void testHidingBrowserControlsRemovesSurfaceFlingerOverlay()

+ throws InterruptedException {

startMainActivityWithURL(LONG_HTML_TEST_PAGE);

final ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();

@@ -203,7 +203,7 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

// When the top-controls are removed, we need a layout to trigger the

// transparent region for the app to be updated.

- scrollTopControls(false);

+ scrollBrowserControls(false);

CriteriaHelper.pollUiThread(

new Criteria() {

@Override

@@ -215,7 +215,7 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

- // Check that when the top controls are gone, the entire decorView is contained

+ // Check that when the browser controls are gone, the entire decorView is contained

// in the transparent region of the app.

Rect visibleDisplayFrame = new Rect();

Region transparentRegion = new Region();

@@ -240,20 +240,20 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

final ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();

disableBrowserOverrides();

- int topControlsHeight = fullscreenManager.getTopControlsHeight();

+ int browserControlsHeight = fullscreenManager.getBrowserControlsHeight();

assertEquals(fullscreenManager.getControlOffset(), 0f);

float dragX = 50f;

- float dragStartY = topControlsHeight * 2;

- float dragFullY = dragStartY - topControlsHeight;

+ float dragStartY = browserControlsHeight * 2;

+ float dragFullY = dragStartY - browserControlsHeight;

long downTime = SystemClock.uptimeMillis();

dragStart(dragX, dragStartY, downTime);

dragTo(dragX, dragX, dragStartY, dragFullY, 100, downTime);

- waitForTopControlsPosition(0f);

+ waitForBrowserControlsPosition(0f);

dragEnd(dragX, dragFullY, downTime);

- waitForTopControlsPosition(0f);

+ waitForBrowserControlsPosition(0f);

}

@LargeTest

@@ -263,10 +263,10 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();

fullscreenManager.setAnimationDurationsForTest(1, 1);

- waitForNoBrowserTopControlsOffset();

+ waitForNoBrowserBrowserControlsOffset();

assertEquals(fullscreenManager.getControlOffset(), 0f);

- scrollTopControls(false);

+ scrollBrowserControls(false);

Tab tab = getActivity().getActivityTab();

final TabWebContentsDelegateAndroid delegate =

@@ -277,7 +277,7 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

delegate.rendererUnresponsive();

}

});

- waitForTopControlsPosition(0f);

+ waitForBrowserControlsPosition(0f);

ThreadUtils.runOnUiThread(new Runnable() {

@Override

@@ -285,7 +285,7 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

delegate.rendererResponsive();

}

});

- waitForNoBrowserTopControlsOffset();

+ waitForNoBrowserBrowserControlsOffset();

}

@@ -319,7 +319,7 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

}

});

- waitForTopControlsToBeMoveable(tab);

+ waitForBrowserControlsToBeMoveable(tab);

} finally {

testServer.stopAndDestroyServer();

}

@@ -327,7 +327,7 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

@LargeTest

@Feature({"Fullscreen"})

- public void testTopControlsShownWhenInputIsFocused()

+ public void testBrowserControlsShownWhenInputIsFocused()

throws InterruptedException, TimeoutException {

startMainActivityWithURL(LONG_HTML_WITH_AUTO_FOCUS_INPUT_TEST_PAGE);

@@ -336,15 +336,15 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

fullscreenManager.setAnimationDurationsForTest(1, 1);

- int topControlsHeight = fullscreenManager.getTopControlsHeight();

+ int browserControlsHeight = fullscreenManager.getBrowserControlsHeight();

float dragX = 50f;

- float dragStartY = topControlsHeight * 3;

- float dragEndY = dragStartY - topControlsHeight * 2;

+ 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);

- waitForNoBrowserTopControlsOffset();

+ waitForNoBrowserBrowserControlsOffset();

assertEquals(fullscreenManager.getControlOffset(), 0f);

Tab tab = getActivity().getActivityTab();

@@ -353,21 +353,21 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

"document.getElementById('input_text').blur();");

waitForEditableNodeToLoseFocus(tab);

- waitForTopControlsToBeMoveable(getActivity().getActivityTab());

+ waitForBrowserControlsToBeMoveable(getActivity().getActivityTab());

}

- private void scrollTopControls(boolean show) throws InterruptedException {

+ private void scrollBrowserControls(boolean show) throws InterruptedException {

ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();

- int topControlsHeight = fullscreenManager.getTopControlsHeight();

+ int browserControlsHeight = fullscreenManager.getBrowserControlsHeight();

waitForPageToBeScrollable(getActivity().getActivityTab());

float dragX = 50f;

- // Use a larger scroll range than the height of the top controls to ensure we overcome

+ // Use a larger scroll range than the height of the browser controls to ensure we overcome

// the delay in a scroll start being sent.

- float dragStartY = topControlsHeight * 3;

- float dragEndY = dragStartY - topControlsHeight * 2;

- float expectedPosition = -topControlsHeight;

+ float dragStartY = browserControlsHeight * 3;

+ float dragEndY = dragStartY - browserControlsHeight * 2;

+ float expectedPosition = -browserControlsHeight;

if (show) {

expectedPosition = 0f;

float tempDragStartY = dragStartY;

@@ -378,10 +378,10 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

dragStart(dragX, dragStartY, downTime);

dragTo(dragX, dragX, dragStartY, dragEndY, 100, downTime);

dragEnd(dragX, dragEndY, downTime);

- waitForTopControlsPosition(expectedPosition);

+ waitForBrowserControlsPosition(expectedPosition);

}

- private void waitForTopControlsPosition(float position) throws InterruptedException {

+ private void waitForBrowserControlsPosition(float position) throws InterruptedException {

final ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();

CriteriaHelper.pollUiThread(Criteria.equals(position, new Callable<Float>() {

@Override

@@ -391,7 +391,7 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

}));

}

- private void waitForNoBrowserTopControlsOffset() throws InterruptedException {

+ private void waitForNoBrowserBrowserControlsOffset() throws InterruptedException {

final ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();

CriteriaHelper.pollUiThread(new Criteria() {

@Override

@@ -413,14 +413,14 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

}

/**

- * Waits for the top controls to be moveable by user gesture.

+ * Waits for the browser controls to be moveable by user gesture.

*

- * This function requires the top controls to start fully visible. It till then ensure that at

- * some point the controls can be moved by user gesture. It will then fully cycle the top

+ * This function requires the browser controls to start fully visible. It till then ensure that

+ * at some point the controls can be moved by user gesture. It will then fully cycle the top

* controls to entirely hidden and back to fully shown.

- private void waitForTopControlsToBeMoveable(final Tab tab) throws InterruptedException {

- waitForTopControlsPosition(0f);

+ private void waitForBrowserControlsToBeMoveable(final Tab tab) throws InterruptedException {

+ waitForBrowserControlsPosition(0f);

final CallbackHelper contentMovedCallback = new CallbackHelper();

final ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();

@@ -448,7 +448,7 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

float dragStartY = tab.getView().getHeight() - 50f;

for (int i = 0; i < 10; i++) {

- float dragEndY = dragStartY - fullscreenManager.getTopControlsHeight();

+ float dragEndY = dragStartY - fullscreenManager.getBrowserControlsHeight();

long downTime = SystemClock.uptimeMillis();

dragStart(dragX, dragStartY, downTime);

@@ -458,8 +458,8 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

try {

contentMovedCallback.waitForCallback(0, 1, 500, TimeUnit.MILLISECONDS);

- scrollTopControls(false);

- scrollTopControls(true);

+ scrollBrowserControls(false);

+ scrollBrowserControls(true);

return;

} catch (TimeoutException e) {