Adds end-to-end tests for VrShell navigation transitions.

chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..02c0f5d4b183901957811e255de5affc80323568
--- /dev/null
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTest.java
@@ -0,0 +1,265 @@
+// Copyright 2017 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.chrome.browser.vr_shell;
+
+import static org.chromium.chrome.browser.vr_shell.VrUtils.POLL_TIMEOUT_LONG_MS;
+import static org.chromium.chrome.browser.vr_shell.VrUtils.POLL_TIMEOUT_SHORT_MS;
+import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_VIEWER_DAYDREAM;
+
+import android.support.test.filters.MediumTest;
+
+import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.CommandLineFlags;
+import org.chromium.base.test.util.Restriction;
+import org.chromium.chrome.test.util.ChromeTabUtils;
+import org.chromium.content.browser.test.util.DOMUtils;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * End-to-end tests for testing navigation transitions (e.g. link clicking) in VR Browser mode, aka
+ * "VR Shell". This may require interacting with WebVR in addition to the VR browser, so inherit
+ * from VrTestBase for the WebVR test framework.
+ */
+@CommandLineFlags.Add("enable-features=VrShell")

[bsheedy, 2017/05/01 21:48:17]

FYI, I think the enabling of VR Shell won't automatically enable WebVR like it
does currently (seem to remember seeing a bug to separate the two), in which
case you'll need to add the "enable-webvr" flag either here or to individual
tests that use it.

Can wait until they're split to do that, though.

[tiborg, 2017/05/01 23:09:46]

Done.

+public class VrShellNavigationTest extends VrTestBase {
+    private static final String TEST_PAGE_2D_URL =
+            VrTestBase.getHtmlTestFile("test_navigation_2d_page");
+    private static final String TEST_PAGE_WEBVR_URL =
+            VrTestBase.getHtmlTestFile("test_navigation_webvr_page");
+
+    private enum Page { PAGE_2D, PAGE_WEBVR }
+
+    private enum PresentationMode { NON_PRESENTING, PRESENTING }
+
+    private enum FullscreenMode { NON_FULLSCREENED, FULLSCREENED }
+
+    private void navigateTo(Page to) throws InterruptedException {
+        // Trigger navigation to new page.
+        String testPageUrl;
+        switch (to) {
+            case PAGE_2D:
+                testPageUrl = TEST_PAGE_2D_URL + "?id=0";
+                break;
+            case PAGE_WEBVR:
+                testPageUrl = TEST_PAGE_WEBVR_URL + "?id=0";
+                break;
+            default:
+                throw new UnsupportedOperationException();
+        }
+        runJavaScriptOrFail("window.location.href = '" + testPageUrl + "';", POLL_TIMEOUT_SHORT_MS,

[bsheedy, 2017/05/01 21:48:16]

Was there an issue using loadUrl() for this? It seemed to work while in VR when
I tested it, and it should handle waiting for the page to load, etc.

[tiborg, 2017/05/01 23:09:45]

I was not sure how many steps of the transition loadUrl skips. And since these
are navigation e2e tests I wanted to make sure that the page initiates the
transition. 

[bsheedy, 2017/05/01 23:36:31]

Makes sense, although I'd add a comment explaining why you're doing it this way
instead of using loadUrl.

[tiborg, 2017/05/02 14:15:02]

Done.

+                mWebContents);
+        // Wait until new page is loaded.
+        final CountDownLatch pageLoadedLatch = new CountDownLatch(1);
+        ChromeTabUtils.waitForTabPageLoaded(getActivity().getActivityTab(), new Runnable() {
+            @Override
+            public void run() {
+                ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+                    @Override
+                    public void run() {
+                        pageLoadedLatch.countDown();
+                    }
+                });
+            }
+        }, POLL_TIMEOUT_LONG_MS);
+        assertTrue(
+                "Page loaded", pageLoadedLatch.await(POLL_TIMEOUT_LONG_MS, TimeUnit.MILLISECONDS));
+    }
+
+    private void goFullscreened() throws InterruptedException, TimeoutException {

[bsheedy, 2017/05/01 21:48:16]

nit: goFullscreened sounds a little odd to me - maybe enterFullscreen instead?

[tiborg, 2017/05/01 23:09:45]

Done.

+        DOMUtils.clickNode(getActivity().getActivityTab().getContentViewCore(), "fullscreen");

[bsheedy, 2017/05/01 21:48:16]

I would suggest changing goFullscreened() to goFullscreened(ContentViewCore
cvc), then:

DomUtils.clickNode(cvc, "fullscreen");
waitOnJavaScriptStep(cvc.getWebContents());
assertTrue(DOMUtils.isFullscreen(cvc.getWebContents()));

Simplifies code a bit, and makes the function usable in any tab (current use of
mWebContents means it'd only work in the tab that's first opened when Chrome
starts).

As a note to myself, I should probably change the name of mWebContents to be
more descriptive, e.g. mFirstTabWebContents.

[tiborg, 2017/05/01 23:09:46]

Done.

+        waitOnJavaScriptStep(mWebContents);
+        assertTrue(DOMUtils.isFullscreen(
+                getActivity().getActivityTab().getContentViewCore().getWebContents()));
+    }
+
+    private void present() throws InterruptedException, TimeoutException {

[bsheedy, 2017/05/01 21:48:16]

There's already a function to do this in VrTestBase (enterVrTap), although I
didn't know that clickNode existed when I wrote it. It might be better to use
clickNode instead of the current implementation (might solve some of the
flakiness I've seen with it). Leave this as-is for now, but can you add a TODO
for me here to investigate which solution is better?

[tiborg, 2017/05/01 23:09:45]

I considered changing enterVrTap. However, then
WebVrTest#testScreenTapsNotRegisteredOnDaydream failed since this is using the
function to tap on the screen. clickNode does not tap on the screen as far as I
know but rather triggers the click handler of a DOM node. Might be wrong though.
In any case, added a TODO for you.

+        DOMUtils.clickNode(getActivity().getActivityTab().getContentViewCore(), "webgl-canvas");

[bsheedy, 2017/05/01 21:48:16]

Same comment as above - pass in a CVC and use that.

[tiborg, 2017/05/01 23:09:46]

Done.

+        waitOnJavaScriptStep(mWebContents);
+        assertTrue(VrShellDelegate.getVrShellForTesting().getWebVrModeEnabled());
+    }
+
+    private void assertState(Page page, PresentationMode presentationMode,
+            FullscreenMode fullscreenMode) throws InterruptedException, TimeoutException {
+        String url;
+        switch (page) {
+            case PAGE_2D:
+                url = TEST_PAGE_2D_URL + "?id=0";
+                break;
+            case PAGE_WEBVR:
+                url = TEST_PAGE_WEBVR_URL + "?id=0";
+                break;
+            default:
+                throw new UnsupportedOperationException();
+        }
+        assertTrue("Browser is in VR", VrShellDelegate.isInVr());
+        assertEquals(
+                "Browser is on correct web site", url, getActivity().getActivityTab().getUrl());

[bsheedy, 2017/05/01 21:48:17]

Consider making assertState take a WebContents object, then using its
getVisibleUrl() for the URL comparison and pass it directly to
DOMUtils.isFullscreen().

[tiborg, 2017/05/01 23:09:45]

Done.

+        assertEquals("Browser is in VR Presentation Mode",
+                presentationMode == PresentationMode.PRESENTING,
+                VrShellDelegate.getVrShellForTesting().getWebVrModeEnabled());
+        assertEquals("Browser is in fullscreen", fullscreenMode == FullscreenMode.FULLSCREENED,
+                DOMUtils.isFullscreen(
+                        getActivity().getActivityTab().getContentViewCore().getWebContents()));
+    }
+
+    @Override
+    public int loadUrl(String url, long secondsToWait)

[bsheedy, 2017/05/01 21:48:16]

I think the base loadUrl blocks until the page is fully loaded, in which case
this override looks unnecessary.

[tiborg, 2017/05/01 23:09:46]

I'm not sure if loadUrl waits until all resources are loaded as well. I had
problems with not being able to use function from navigation_e2e.js or
webvr_e2e.js.

[bsheedy, 2017/05/01 23:36:31]

In that case, I'll consider moving this into VrTestBase at some point - I
haven't had issues in WebVrTest.java yet since I was always explicitly waiting
on the synchronization booleans to be set during a test, but it'd be good to not
have to rely on that.

Leave this as-is for now.

[tiborg, 2017/05/02 14:15:02]

Sounds good.

+            throws IllegalArgumentException, InterruptedException {
+        int result = super.loadUrl(url, secondsToWait);
+        waitOnJavaScriptStep(mWebContents);
+        return result;
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        VrUtils.forceEnterVr();
+        VrUtils.waitForVrSupported(POLL_TIMEOUT_LONG_MS);
+        assertTrue(VrShellDelegate.isInVr());

[bsheedy, 2017/05/01 21:48:16]

nit: This assert doesn't really do anything since VrUtils.waitForVrSupported
will throw an assertion error if VrShellDelegate.isInVr() is not true within the
given timeout.

[tiborg, 2017/05/01 23:09:46]

Done.

+    }
+
+    @Override
+    public void startMainActivity() throws InterruptedException {

[bsheedy, 2017/05/01 21:48:17]

Unnecessary override since VrTestBase's startMainActivity does the same thing.

[tiborg, 2017/05/01 23:09:45]

Done.

+        startMainActivityOnBlankPage();
+    }
+
+    @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM)

[bsheedy, 2017/05/01 21:48:16]

Since every test here seems to have the same restriction of using Daydream View,
you can put the restriction at the class level.

[tiborg, 2017/05/01 23:09:46]

Done.

+    @MediumTest
+    public void test2dTo2d() throws InterruptedException, TimeoutException {

[bsheedy, 2017/05/01 21:48:17]

I think test cases are supposed to have comments before them even if the names
are self-explanatory.

[tiborg, 2017/05/01 23:09:45]

Done.

+        // Arrange.

[bsheedy, 2017/05/01 21:48:17]

nit: The arrange/act/assert comments seem unnecessary since the test cases are
pretty self-documenting.

[tiborg, 2017/05/01 23:09:45]

Done.

+        loadUrl(TEST_PAGE_2D_URL, PAGE_LOAD_TIMEOUT_S);
+
+        // Act.
+        navigateTo(Page.PAGE_2D);
+
+        // Assert.
+        assertState(Page.PAGE_2D, PresentationMode.NON_PRESENTING, FullscreenMode.NON_FULLSCREENED);
+    }
+
+    @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM)
+    @MediumTest
+    public void test2dToWebVr()
+            throws IllegalArgumentException, InterruptedException, TimeoutException {
+        // Arrange.
+        loadUrl(TEST_PAGE_2D_URL, PAGE_LOAD_TIMEOUT_S);
+
+        // Act.
+        navigateTo(Page.PAGE_WEBVR);
+
+        // Assert.
+        assertState(
+                Page.PAGE_WEBVR, PresentationMode.NON_PRESENTING, FullscreenMode.NON_FULLSCREENED);
+    }
+
+    @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM)
+    @MediumTest
+    public void test2dFullscreenToWebVr()
+            throws IllegalArgumentException, InterruptedException, TimeoutException {
+        // Arrange.
+        loadUrl(TEST_PAGE_2D_URL, PAGE_LOAD_TIMEOUT_S);
+        goFullscreened();
+
+        // Act.
+        navigateTo(Page.PAGE_WEBVR);
+
+        // Assert.
+        assertState(
+                Page.PAGE_WEBVR, PresentationMode.NON_PRESENTING, FullscreenMode.NON_FULLSCREENED);
+    }
+
+    @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM)
+    @MediumTest
+    public void testWebVrTo2d()
+            throws IllegalArgumentException, InterruptedException, TimeoutException {
+        // Arrange.
+        loadUrl(TEST_PAGE_WEBVR_URL, PAGE_LOAD_TIMEOUT_S);
+
+        // Act.
+        navigateTo(Page.PAGE_2D);
+
+        // Assert.
+        assertState(Page.PAGE_2D, PresentationMode.NON_PRESENTING, FullscreenMode.NON_FULLSCREENED);
+    }
+
+    @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM)
+    @MediumTest
+    public void testWebVrToWebVr()
+            throws IllegalArgumentException, InterruptedException, TimeoutException {
+        // Arrange.
+        loadUrl(TEST_PAGE_WEBVR_URL, PAGE_LOAD_TIMEOUT_S);
+
+        // Act.
+        navigateTo(Page.PAGE_WEBVR);
+
+        // Assert.
+        assertState(
+                Page.PAGE_WEBVR, PresentationMode.NON_PRESENTING, FullscreenMode.NON_FULLSCREENED);
+    }
+
+    @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM)
+    @MediumTest
+    public void testWebVrPresentingTo2d()
+            throws IllegalArgumentException, InterruptedException, TimeoutException {
+        // Arrange.
+        loadUrl(TEST_PAGE_WEBVR_URL, PAGE_LOAD_TIMEOUT_S);
+        present();
+
+        // Act.
+        navigateTo(Page.PAGE_2D);
+
+        // Assert.
+        assertState(Page.PAGE_2D, PresentationMode.NON_PRESENTING, FullscreenMode.NON_FULLSCREENED);
+    }
+
+    @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM)
+    @MediumTest
+    public void testWebVrPresentingToWebVr()
+            throws IllegalArgumentException, InterruptedException, TimeoutException {
+        // Arrange.
+        loadUrl(TEST_PAGE_WEBVR_URL, PAGE_LOAD_TIMEOUT_S);
+        present();
+
+        // Act.
+        navigateTo(Page.PAGE_WEBVR);
+
+        // Assert.
+        assertState(
+                Page.PAGE_WEBVR, PresentationMode.NON_PRESENTING, FullscreenMode.NON_FULLSCREENED);
+    }
+
+    @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM)
+    @MediumTest
+    public void testWebVrFullscreenTo2d()
+            throws IllegalArgumentException, InterruptedException, TimeoutException {
+        // Arrange.
+        loadUrl(TEST_PAGE_WEBVR_URL, PAGE_LOAD_TIMEOUT_S);
+        goFullscreened();
+
+        // Act.
+        navigateTo(Page.PAGE_2D);
+
+        // Assert.
+        assertState(Page.PAGE_2D, PresentationMode.NON_PRESENTING, FullscreenMode.NON_FULLSCREENED);
+    }
+
+    @Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM)
+    @MediumTest
+    public void testWebVrFullscreenToWebVr()
+            throws IllegalArgumentException, InterruptedException, TimeoutException {
+        // Arrange.
+        loadUrl(TEST_PAGE_WEBVR_URL, PAGE_LOAD_TIMEOUT_S);
+        goFullscreened();
+
+        // Act.
+        navigateTo(Page.PAGE_WEBVR);
+
+        // Assert.
+        assertState(
+                Page.PAGE_WEBVR, PresentationMode.NON_PRESENTING, FullscreenMode.NON_FULLSCREENED);
+    }
+}