content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationIntegrationTest.java - Issue 431103002: Add integration tests for window.orientation.

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

Issue 431103002: Add integration tests for window.orientation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@screen_orientation_integration

Patch Set: rebase Created 6 years, 4 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/browser/screen_orientation/screen_orientation_browsertest.cc ('k') | content/test/data/screen_orientation/screen_orientation_orientationchange.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationIntegrationTest.java

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationIntegrationTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationIntegrationTest.java

deleted file mode 100644

index 43507256db0126ed272d0b6fd47cd063943d735a..0000000000000000000000000000000000000000

--- a/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationIntegrationTest.java

+++ /dev/null

@@ -1,124 +0,0 @@

-// 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 org.chromium.base.test.util.DisabledTest;

-import org.chromium.base.test.util.Feature;

-import org.chromium.base.test.util.UrlUtils;

-import org.chromium.content.browser.test.util.JavaScriptUtils;

-import org.chromium.content_shell_apk.ContentShellActivity;

-import org.chromium.content_shell_apk.ContentShellTestBase;

-import java.util.concurrent.TimeoutException;

-/**

- * Integration tests for Screen Orientation API (and legacy API).

- */

-public class ScreenOrientationIntegrationTest extends ContentShellTestBase {

- private static final String DEFAULT_URL = UrlUtils.encodeHtmlDataUri(

- "<html><script>var changes=0;</script>" +

- "<body onorientationchange='changes++;'>foo</body>" +

- "</html>");

- private ContentViewCore mContentViewCore;

- /**

- * Returns the screen orientation as seen by |window.orientation|.

- */

- private int getWindowOrientation()

- throws InterruptedException, TimeoutException {

- return Integer.parseInt(

- JavaScriptUtils.executeJavaScriptAndWaitForResult(

- mContentViewCore,

- "window.orientation"));

- }

- /**

- * Returns the number of times the web content received a orientationchange

- * event.

- */

- private int getWindowOrientationChangeCount()

- throws InterruptedException, TimeoutException {

- return Integer.parseInt(

- JavaScriptUtils.executeJavaScriptAndWaitForResult(

- mContentViewCore,

- "changes"));

- }

- /**

- * Simulate a screen orientation change for the web content.

- */

- private void updateScreenOrientationForContent(int orientation) {

- mContentViewCore.sendOrientationChangeEvent(orientation);

- }

- @Override

- public void setUp() throws Exception {

- super.setUp();

- ContentShellActivity activity = launchContentShellWithUrl(DEFAULT_URL);

- waitForActiveShellToBeDoneLoading();

- mContentViewCore = activity.getActiveContentViewCore();

- }

- /*

- * Broken by http://src.chromium.org/viewvc/blink?revision=173532&view=revision

- * crbug.com/371144

- * @SmallTest

- */

- @DisabledTest

- @Feature({"ScreenOrientation"})

- public void testNoOp() throws Throwable {

- assertEquals(0, getWindowOrientationChangeCount());

- }

- /*

- * Broken by http://src.chromium.org/viewvc/blink?revision=173532&view=revision

- * crbug.com/371144

- * @SmallTest

- */

- @DisabledTest

- @Feature({"ScreenOrientation"})

- public void testExpectedValues() throws Throwable {

- int[] values = { 90, -90, 180, 0, 90 };

- // The first value should depend on the current orientation.

- values[0] = getWindowOrientation() == 0 ? 90 : 0;

- for (int i = 0; i < values.length; ++i) {

- updateScreenOrientationForContent(values[i]);

- assertEquals(values[i], getWindowOrientation());

- assertEquals(i + 1, getWindowOrientationChangeCount());

- }

- // We can't test unexpected value because it is branching to a NOTREACHED().

- /*

- * Broken by http://src.chromium.org/viewvc/blink?revision=173532&view=revision

- * crbug.com/371144

- * @SmallTest

- */

- @DisabledTest

- @Feature({"ScreenOrientation"})

- public void testNoChange() throws Throwable {

- // The target angle for that test should depend on the current orientation.

- int angle = getWindowOrientation() == 0 ? 90 : 0;

- updateScreenOrientationForContent(angle);

- assertEquals(angle, getWindowOrientation());

- assertEquals(1, getWindowOrientationChangeCount());

- updateScreenOrientationForContent(angle);

- assertEquals(angle, getWindowOrientation());

- assertEquals(1, getWindowOrientationChangeCount());

- updateScreenOrientationForContent(angle);

- assertEquals(angle, getWindowOrientation());

- assertEquals(1, getWindowOrientationChangeCount());

- }