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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2361633002: android: Introduce DisplayAndroid (Closed)
Patch Set: test comments 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
Download patch
« no previous file with comments | « content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java ('k') | content/public/test/android/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java
deleted file mode 100644
index 829d01c2d07d5f9ee23b3ad44de3d14dd999ad2b..0000000000000000000000000000000000000000
--- a/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// 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.app.Activity;
-import android.content.pm.ActivityInfo;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.util.DisableIf;
-import org.chromium.base.test.util.Feature;
-import org.chromium.base.test.util.RetryOnFailure;
-import org.chromium.base.test.util.UrlUtils;
-import org.chromium.content.browser.test.util.CriteriaHelper;
-import org.chromium.content.browser.test.util.MockOrientationObserver;
-import org.chromium.content.browser.test.util.OrientationChangeObserverCriteria;
-import org.chromium.content_public.common.ScreenOrientationValues;
-import org.chromium.content_shell_apk.ContentShellActivity;
-import org.chromium.content_shell_apk.ContentShellTestBase;
-import org.chromium.ui.gfx.DeviceDisplayInfo;
-
-/**
- * Tests for ScreenOrientationListener and its implementations.
- */
-@DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/646155")
-@RetryOnFailure
-public class ScreenOrientationProviderTest extends ContentShellTestBase {
-
- // For some reasons build bots are not able to lock to 180 degrees. This
- // boolean is here to make the false negative go away in that situation.
- private static final boolean ALLOW_0_FOR_180 = true;
-
- private static final String DEFAULT_URL =
- UrlUtils.encodeHtmlDataUri("<html><body>foo</body></html>");
-
- private MockOrientationObserver mObserver;
-
- private int mNaturalOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
-
- private boolean checkOrientationForLock(int orientations) {
- if (mNaturalOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
- switch (orientations) {
- case ScreenOrientationValues.PORTRAIT_PRIMARY:
- return mObserver.mOrientation == 0;
- case ScreenOrientationValues.PORTRAIT_SECONDARY:
- return mObserver.mOrientation == 180
- || (ALLOW_0_FOR_180 && mObserver.mOrientation == 0);
- case ScreenOrientationValues.LANDSCAPE_PRIMARY:
- return mObserver.mOrientation == 90;
- case ScreenOrientationValues.LANDSCAPE_SECONDARY:
- return mObserver.mOrientation == -90;
- case ScreenOrientationValues.PORTRAIT:
- return mObserver.mOrientation == 0 || mObserver.mOrientation == 180;
- case ScreenOrientationValues.LANDSCAPE:
- return mObserver.mOrientation == 90 || mObserver.mOrientation == -90;
- case ScreenOrientationValues.ANY:
- // The orientation should not change but might and the value could be anything.
- return true;
- default:
- return !mObserver.mHasChanged;
- }
- } else { // mNaturalOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
- switch (orientations) {
- case ScreenOrientationValues.PORTRAIT_PRIMARY:
- return mObserver.mOrientation == -90;
- case ScreenOrientationValues.PORTRAIT_SECONDARY:
- return mObserver.mOrientation == 90;
- case ScreenOrientationValues.LANDSCAPE_PRIMARY:
- return mObserver.mOrientation == 0;
- case ScreenOrientationValues.LANDSCAPE_SECONDARY:
- return mObserver.mOrientation == 180
- || (ALLOW_0_FOR_180 && mObserver.mOrientation == 0);
- case ScreenOrientationValues.PORTRAIT:
- return mObserver.mOrientation == 90 || mObserver.mOrientation == -90;
- case ScreenOrientationValues.LANDSCAPE:
- return mObserver.mOrientation == 0 || mObserver.mOrientation == 180;
- case ScreenOrientationValues.ANY:
- // The orientation should not change but might and the value could be anything.
- return true;
- default:
- return !mObserver.mHasChanged;
- }
- }
- }
-
- /**
- * Retrieves device natural orientation.
- */
- private int getNaturalOrientation(Activity activity) {
- DeviceDisplayInfo displayInfo = DeviceDisplayInfo.create(activity);
- int rotation = displayInfo.getRotationDegrees();
- if (rotation == 0 || rotation == 180) {
- if (displayInfo.getDisplayHeight() >= displayInfo.getDisplayWidth()) {
- return ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
- }
- return ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
- } else {
- if (displayInfo.getDisplayHeight() < displayInfo.getDisplayWidth()) {
- return ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
- }
- return ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
- }
- }
-
- /**
- * Call |lockOrientation| and wait for an orientation change.
- */
- private void lockOrientationAndWait(final int orientations) throws InterruptedException {
- OrientationChangeObserverCriteria criteria =
- new OrientationChangeObserverCriteria(mObserver);
-
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- ScreenOrientationProvider.lockOrientation((byte) orientations);
- }
- });
- getInstrumentation().waitForIdleSync();
-
- try {
- CriteriaHelper.pollInstrumentationThread(criteria);
- } catch (AssertionError e) {
- // This should not be here but the Criteria does not support cases where the orientation
- // is not being changed (i.e. where the Natural orientation matches the one you are
- // locking to). crbug.com/565587
- }
- }
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
-
- mObserver = new MockOrientationObserver();
- OrientationChangeObserverCriteria criteria =
- new OrientationChangeObserverCriteria(mObserver);
-
- final ContentShellActivity activity = launchContentShellWithUrl(DEFAULT_URL);
- waitForActiveShellToBeDoneLoading();
-
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- ScreenOrientationListener.getInstance().addObserver(mObserver, activity);
- ScreenOrientationProvider.startAccurateListening();
- }
- });
-
- // Calculate device natural orientation, as mObserver.mOrientation
- // is difference between current and natural orientation in degrees.
- mNaturalOrientation = getNaturalOrientation(activity);
-
- // Make sure we start all the tests with the same orientation.
- lockOrientationAndWait(ScreenOrientationValues.PORTRAIT_PRIMARY);
-
- // Make sure mObserver is updated before we start the tests.
- try {
- CriteriaHelper.pollInstrumentationThread(criteria);
- } catch (AssertionError e) {
- // This should not be here but the Criteria does not support cases where the orientation
- // is not being changed (i.e. where the Natural orientation matches the one you are
- // locking to). crbug.com/565587
- }
- }
-
- @Override
- public void tearDown() throws Exception {
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- ScreenOrientationProvider.unlockOrientation();
- ScreenOrientationProvider.startAccurateListening();
- }
- });
-
- mObserver = null;
- super.tearDown();
- }
-
- @MediumTest
- @Feature({"ScreenOrientation"})
- public void testBasicValues() throws Exception {
- lockOrientationAndWait(ScreenOrientationValues.PORTRAIT_PRIMARY);
- assertTrue(checkOrientationForLock(ScreenOrientationValues.PORTRAIT_PRIMARY));
-
- lockOrientationAndWait(ScreenOrientationValues.LANDSCAPE_PRIMARY);
- assertTrue(checkOrientationForLock(ScreenOrientationValues.LANDSCAPE_PRIMARY));
-
- lockOrientationAndWait(ScreenOrientationValues.PORTRAIT_SECONDARY);
- assertTrue(checkOrientationForLock(ScreenOrientationValues.PORTRAIT_SECONDARY));
-
- lockOrientationAndWait(ScreenOrientationValues.LANDSCAPE_SECONDARY);
- assertTrue(checkOrientationForLock(ScreenOrientationValues.LANDSCAPE_SECONDARY));
- }
-
- @MediumTest
- @Feature({"ScreenOrientation"})
- public void testPortrait() throws Exception {
- lockOrientationAndWait(ScreenOrientationValues.PORTRAIT_PRIMARY);
- assertTrue(checkOrientationForLock(ScreenOrientationValues.PORTRAIT_PRIMARY));
-
- lockOrientationAndWait(ScreenOrientationValues.PORTRAIT_PRIMARY
- | ScreenOrientationValues.PORTRAIT_SECONDARY);
- assertTrue(checkOrientationForLock(ScreenOrientationValues.PORTRAIT_PRIMARY
- | ScreenOrientationValues.PORTRAIT_SECONDARY));
-
- lockOrientationAndWait(ScreenOrientationValues.PORTRAIT_SECONDARY);
- assertTrue(checkOrientationForLock(ScreenOrientationValues.PORTRAIT_SECONDARY));
-
- lockOrientationAndWait(ScreenOrientationValues.PORTRAIT_PRIMARY
- | ScreenOrientationValues.PORTRAIT_SECONDARY);
- assertTrue(checkOrientationForLock(ScreenOrientationValues.PORTRAIT_PRIMARY
- | ScreenOrientationValues.PORTRAIT_SECONDARY));
- }
-
- @MediumTest
- @Feature({"ScreenOrientation"})
- public void testLandscape() throws Exception {
- lockOrientationAndWait(ScreenOrientationValues.LANDSCAPE_PRIMARY);
- assertTrue(checkOrientationForLock(ScreenOrientationValues.LANDSCAPE_PRIMARY));
-
- lockOrientationAndWait(ScreenOrientationValues.LANDSCAPE_PRIMARY
- | ScreenOrientationValues.LANDSCAPE_SECONDARY);
- assertTrue(checkOrientationForLock(ScreenOrientationValues.LANDSCAPE_PRIMARY
- | ScreenOrientationValues.LANDSCAPE_SECONDARY));
-
- lockOrientationAndWait(ScreenOrientationValues.LANDSCAPE_SECONDARY);
- assertTrue(checkOrientationForLock(ScreenOrientationValues.LANDSCAPE_SECONDARY));
-
- lockOrientationAndWait(ScreenOrientationValues.LANDSCAPE_PRIMARY
- | ScreenOrientationValues.LANDSCAPE_SECONDARY);
- assertTrue(checkOrientationForLock(ScreenOrientationValues.LANDSCAPE_PRIMARY
- | ScreenOrientationValues.LANDSCAPE_SECONDARY));
- }
-
- // There is no point in testing the case where we try to lock to
- // PORTRAIT_PRIMARY | PORTRAIT_SECONDARY | LANDSCAPE_PRIMARY | LANDSCAPE_SECONDARY
- // because with the device being likely flat during the test, locking to that
- // will be a no-op.
-
- // We can't test unlock because the device is likely flat during the test
- // and in that situation unlocking is a no-op.
-}
« no previous file with comments | « content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java ('k') | content/public/test/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698