Skip to content

GitLab

T
tangled
Commit beb10501 authored by Scott Violet's avatar Scott Violet Committed by Commit Bot
Browse files
Options

weblayer: merge browser control related tests 

This renames BottomControlsTest to BrowserControlsTest and
adds the top-control ones. Given how finicky these are it seems
best to conslidate them and share as much code as possible.

BUG=1074438,1077825
TEST=test only changes

Change-Id: I4f6544e93921688da78028e212c9ed3f530082b4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2216383Reviewed-by: default avatarBo <boliu@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771967}
parent ea1c1a76
Expand all Show whitespace changes
Inline Side-by-side
Showing with 111 additions and 180 deletions
weblayer/browser/android/javatests/BUILD.gn
View file @ beb10501
...@@ -61,7 +61,7 @@ android_library("weblayer_java_tests") { ...@@ -61,7 +61,7 @@ android_library("weblayer_java_tests") {
android_library("weblayer_private_java_tests") { android_library("weblayer_private_java_tests") {
testonly = true testonly = true
sources = [ sources = [
"src/org/chromium/weblayer/test/BottomControlsTest.java", "src/org/chromium/weblayer/test/BrowserControlsTest.java",
"src/org/chromium/weblayer/test/GeolocationTest.java", "src/org/chromium/weblayer/test/GeolocationTest.java",
"src/org/chromium/weblayer/test/MediaCaptureTest.java", "src/org/chromium/weblayer/test/MediaCaptureTest.java",
"src/org/chromium/weblayer/test/NetworkChangeNotifierTest.java", "src/org/chromium/weblayer/test/NetworkChangeNotifierTest.java",
......
weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TopControlsTest.java
View file @ beb10501
...@@ -4,25 +4,18 @@ ...@@ -4,25 +4,18 @@
package org.chromium.weblayer.test; package org.chromium.weblayer.test;
import android.os.Build;
import android.support.test.filters.SmallTest; import android.support.test.filters.SmallTest;
import android.view.View;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import org.junit.Assert;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.chromium.base.test.util.CallbackHelper; import org.chromium.base.test.util.CallbackHelper;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.FlakyTest;
import org.chromium.base.test.util.MinAndroidSdkLevel;
import org.chromium.base.test.util.UrlUtils; import org.chromium.base.test.util.UrlUtils;
import org.chromium.content_public.browser.test.util.Criteria;
import org.chromium.content_public.browser.test.util.CriteriaHelper;
import org.chromium.content_public.browser.test.util.TestThreadUtils; import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.weblayer.Browser; import org.chromium.weblayer.Browser;
import org.chromium.weblayer.Tab; import org.chromium.weblayer.Tab;
...@@ -39,19 +32,9 @@ public class TopControlsTest { ...@@ -39,19 +32,9 @@ public class TopControlsTest {
public InstrumentationActivityTestRule mActivityTestRule = public InstrumentationActivityTestRule mActivityTestRule =
new InstrumentationActivityTestRule(); new InstrumentationActivityTestRule();
private int mTopControlsHeight;
private int mInitialVisiblePageHeight;
private Tab mTab; private Tab mTab;
private Browser mBrowser; private Browser mBrowser;
/**
* Returns the visible height of the page as determined by JS. The returned value is in CSS
* pixels (which are most likely not the same as device pixels).
*/
private int getVisiblePageHeight() {
return mActivityTestRule.executeScriptAndExtractInt("window.innerHeight");
}
@Test @Test
@SmallTest @SmallTest
public void testZeroHeight() throws Exception { public void testZeroHeight() throws Exception {
...@@ -77,92 +60,4 @@ public class TopControlsTest { ...@@ -77,92 +60,4 @@ public class TopControlsTest {
helper.waitForCallback(0); helper.waitForCallback(0);
} }
// Disabled on L bots due to unexplained flakes. See crbug.com/1035894.
@FlakyTest(message = "https://crbug.com/1074438")
@MinAndroidSdkLevel(Build.VERSION_CODES.M)
@Test
@SmallTest
public void testBasic() throws Exception {
final String url = UrlUtils.encodeHtmlDataUri("<body><p style='height:5000px'>");
InstrumentationActivity activity = mActivityTestRule.launchShellWithUrl(url);
// Poll until the top view becomes visible.
CriteriaHelper.pollUiThread(Criteria.equals(
View.VISIBLE, () -> activity.getTopContentsContainer().getVisibility()));
TestThreadUtils.runOnUiThreadBlocking(() -> {
mTopControlsHeight = activity.getTopContentsContainer().getHeight();
Assert.assertTrue(mTopControlsHeight > 0);
});
// Get the size of the page.
mInitialVisiblePageHeight = getVisiblePageHeight();
Assert.assertTrue(mInitialVisiblePageHeight > 0);
// Move by the size of the top-controls.
EventUtils.simulateDragFromCenterOfView(
activity.getWindow().getDecorView(), 0, -mTopControlsHeight);
// Moving should change the size of the page. Don't attempt to correlate the size as the
// page doesn't see pixels, and to attempt to compare may result in rounding errors. Poll
// for this value as there is no good way to detect when done.
CriteriaHelper.pollInstrumentationThread(
() -> Assert.assertNotEquals(mInitialVisiblePageHeight, getVisiblePageHeight()));
// Moving should also hide the top-controls View.
TestThreadUtils.runOnUiThreadBlocking(() -> {
Assert.assertEquals(View.INVISIBLE, activity.getTopContentsContainer().getVisibility());
});
// Move so top-controls are shown again.
EventUtils.simulateDragFromCenterOfView(
activity.getWindow().getDecorView(), 0, mTopControlsHeight);
// Wait for the page height to match initial height.
CriteriaHelper.pollInstrumentationThread(
Criteria.equals(mInitialVisiblePageHeight, this::getVisiblePageHeight));
// top-controls are shown async.
CriteriaHelper.pollUiThread(Criteria.equals(
View.VISIBLE, () -> activity.getTopContentsContainer().getVisibility()));
}
/**
* Makes sure that the top controls are shown when a js dialog is shown.
*
* Regression test for https://crbug.com/1078181.
*
* Disabled on L bots due to unexplained flakes. See crbug.com/1035894.
*/
@FlakyTest(message = "https://crbug.com/1074438")
@MinAndroidSdkLevel(Build.VERSION_CODES.M)
@Test
@SmallTest
public void testAlertShowsTopControls() throws Exception {
final String url = UrlUtils.encodeHtmlDataUri("<body><p style='height:5000px'>");
InstrumentationActivity activity = mActivityTestRule.launchShellWithUrl(url);
// Poll until the top view becomes visible.
CriteriaHelper.pollUiThread(Criteria.equals(
View.VISIBLE, () -> activity.getTopContentsContainer().getVisibility()));
TestThreadUtils.runOnUiThreadBlocking(() -> {
mTopControlsHeight = activity.getTopContentsContainer().getHeight();
Assert.assertTrue(mTopControlsHeight > 0);
});
// Move by the size of the top-controls.
EventUtils.simulateDragFromCenterOfView(
activity.getWindow().getDecorView(), 0, -mTopControlsHeight);
// Wait till top controls are invisible.
CriteriaHelper.pollUiThread(Criteria.equals(
View.INVISIBLE, () -> activity.getTopContentsContainer().getVisibility()));
// Trigger an alert dialog.
mActivityTestRule.executeScriptSync(
"window.setTimeout(function() { alert('alert'); }, 1);", false);
// Top controls are shown.
CriteriaHelper.pollUiThread(Criteria.equals(
View.VISIBLE, () -> activity.getTopContentsContainer().getVisibility()));
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment