Add horizontal scrolling to VR browser scrolling test

Adds horizontal scrolling to the VR browser scrolling test, so now both
vertical and horizontal scrolling using the Daydream controller are
tested.

This should hopefully be good enough to remove the need to manually test
basic scroll functionality.

Bug: 728779
Change-Id: I882755999485b6610fcd865953cb1b06ca47edd5
Reviewed-on: https://chromium-review.googlesource.com/567033Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486003}

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

@@ -9,6 +9,8 @@ import android.os.SystemClock;
 
 import com.google.vr.testframework.controller.ControllerTestApi;
 
+import org.junit.Assert;
+
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -21,6 +23,7 @@ import java.util.concurrent.TimeUnit;
  *   - PairedControllerAddress: "FOO"
  */
 public class EmulatedVrController {
+    public enum ScrollDirection { UP, DOWN, LEFT, RIGHT }
     private final ControllerTestApi mApi;
 
     public EmulatedVrController(Context context) {
@@ -87,31 +90,41 @@ public class EmulatedVrController {
     }
 
     /**
-     * Performs an upward swipe on the touchpad, which scrolls down in VR Shell.
+     * Performs an swipe on the touchpad in order to scroll in the specified
+     * direction while in the VR browser.
      * Note that scrolling this way is not consistent, i.e. scrolling down then
      * scrolling up at the same speed won't necessarily scroll back to the exact
      * starting position on the page.
      *
+     * @param direction the ScrollDirection to scroll with
      * @param steps the number of intermediate steps to send while scrolling
      * @param speed how long to wait between steps in the scroll, with higher
      * numbers resulting in a faster scroll
      */
-    public void scrollDown(int steps, int speed) {
-        performLinearTouchpadMovement(0.5f, 0.9f, 0.5f, 0.1f, steps, speed);
-    }
-
-    /**
-     * Performs a downward swipe on the touchpad, which scrolls up in VR Shell.
-     * Note that scrolling this way is not consistent, i.e. scrolling down then
-     * scrolling up at the same speed won't necessarily scroll back to the exact
-     * starting position on the page.
-     *
-     * @param steps the number of intermediate steps to send while scrolling
-     * @param speed how long to wait between steps in the scroll, with higher
-     * numbers resulting in a faster scroll
-     */
-    public void scrollUp(int steps, int speed) {
-        performLinearTouchpadMovement(0.5f, 0.1f, 0.5f, 0.9f, steps, speed);
+    public void scroll(ScrollDirection direction, int steps, int speed) {
+        float startX, startY, endX, endY;
+        startX = startY = endX = endY = 0.5f;
+        switch (direction) {
+            case UP:
+                startY = 0.1f;
+                endY = 0.9f;
+                break;
+            case DOWN:
+                startY = 0.9f;
+                endY = 0.1f;
+                break;
+            case LEFT:
+                startX = 0.1f;
+                endX = 0.9f;
+                break;
+            case RIGHT:
+                startX = 0.9f;
+                endX = 0.1f;
+                break;
+            default:
+                Assert.fail("Unknown scroll direction enum given");
+        }
+        performLinearTouchpadMovement(startX, startY, endX, endY, steps, speed);
     }
 
     /**

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

@@ -37,17 +37,17 @@ public class VrShellControllerInputTest {
     @Rule
     public VrTestRule mVrTestRule = new VrTestRule();
 
-    // TODO(bsheedy): Modify test to also check horizontal scrolling
     /**
-     * Verifies that swiping up/down on the Daydream controller's touchpad scrolls
-     * the webpage while in the VR browser.
+     * Verifies that swiping up/down/left/right on the Daydream controller's
+     * touchpad scrolls the webpage while in the VR browser.
      */
     @Test
     @Restriction({RESTRICTION_TYPE_DEVICE_DAYDREAM, RESTRICTION_TYPE_VIEWER_DAYDREAM})
     @MediumTest
     public void testControllerScrolling() throws InterruptedException {
         // Load page in VR and make sure the controller is pointed at the content quad
-        mVrTestRule.loadUrl("chrome://credits", PAGE_LOAD_TIMEOUT_S);
+        mVrTestRule.loadUrl(
+                mVrTestRule.getHtmlTestFile("test_controller_scrolling"), PAGE_LOAD_TIMEOUT_S);
         VrTransitionUtils.forceEnterVr();
         VrTransitionUtils.waitForVrEntry(POLL_TIMEOUT_LONG_MS);
         EmulatedVrController controller = new EmulatedVrController(mVrTestRule.getActivity());
@@ -59,23 +59,39 @@ public class VrShellControllerInputTest {
         CriteriaHelper.pollUiThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
-                return cvc.computeVerticalScrollRange() > cvc.getContainerView().getHeight();
+                return cvc.computeVerticalScrollRange() > cvc.getContainerView().getHeight()
+                        && cvc.computeHorizontalScrollRange() > cvc.getContainerView().getWidth();
             }
         }, POLL_TIMEOUT_LONG_MS, POLL_CHECK_INTERVAL_LONG_MS);
 
         // Test that scrolling down works
-        int startScrollY = cvc.getNativeScrollYForTest();
+        int startScrollPoint = cvc.getNativeScrollYForTest();
         // Arbitrary, but valid values to scroll smoothly
         int scrollSteps = 20;
         int scrollSpeed = 60;
-        controller.scrollDown(scrollSteps, scrollSpeed);
-        int endScrollY = cvc.getNativeScrollYForTest();
-        Assert.assertTrue("Controller was able to scroll down", startScrollY < endScrollY);
+        controller.scroll(EmulatedVrController.ScrollDirection.DOWN, scrollSteps, scrollSpeed);
+        // We need this second scroll down, otherwise the horizontal scrolling becomes flaky
+        // TODO(bsheedy): Figure out why this is the case
+        controller.scroll(EmulatedVrController.ScrollDirection.DOWN, scrollSteps, scrollSpeed);
+        int endScrollPoint = cvc.getNativeScrollYForTest();
+        Assert.assertTrue("Controller was able to scroll down", startScrollPoint < endScrollPoint);
 
         // Test that scrolling up works
-        startScrollY = endScrollY;
-        controller.scrollUp(scrollSteps, scrollSpeed);
-        endScrollY = cvc.getNativeScrollYForTest();
-        Assert.assertTrue("Controller was able to scroll up", startScrollY > endScrollY);
+        startScrollPoint = endScrollPoint;
+        controller.scroll(EmulatedVrController.ScrollDirection.UP, scrollSteps, scrollSpeed);
+        endScrollPoint = cvc.getNativeScrollYForTest();
+        Assert.assertTrue("Controller was able to scroll up", startScrollPoint > endScrollPoint);
+
+        // Test that scrolling right works
+        startScrollPoint = cvc.getNativeScrollXForTest();
+        controller.scroll(EmulatedVrController.ScrollDirection.RIGHT, scrollSteps, scrollSpeed);
+        endScrollPoint = cvc.getNativeScrollXForTest();
+        Assert.assertTrue("Controller was able to scroll right", startScrollPoint < endScrollPoint);
+
+        // Test that scrolling left works
+        startScrollPoint = endScrollPoint;
+        controller.scroll(EmulatedVrController.ScrollDirection.LEFT, scrollSteps, scrollSpeed);
+        endScrollPoint = cvc.getNativeScrollXForTest();
+        Assert.assertTrue("Controller was able to scroll left", startScrollPoint > endScrollPoint);
     }
 }

chrome/test/data/android/webvr_instrumentation/html/test_controller_scrolling.html

+<!DOCTYPE html>
+<!--
+Used to test that vertical and horizontal scrolling work with the Daydream
+controller.
+-->
+<html>
+  <head>
+    <style>
+      body {
+        width: 10000px;
+        height: 10000px;
+      }
+    </style>
+  </head>
+  <body>
+    This is a test page.
+  </body>
+</html>