Convert chrome compositor test's InstrumentationTestCases

chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelEventFilterTest.java

 // Copyright 2016 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.compositor.bottombar;
 
 import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
 import android.support.test.filters.SmallTest;
-import android.test.InstrumentationTestCase;
+import android.support.test.rule.UiThreadTestRule;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.compositor.layouts.eventfilter.EventFilterHost;
 import org.chromium.chrome.browser.compositor.layouts.eventfilter.OverlayPanelEventFilter;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.content.browser.ContentViewCore;
 
 /**
  * Class responsible for testing the OverlayPanelEventFilter.
  */
-public class OverlayPanelEventFilterTest extends InstrumentationTestCase {
-
+@RunWith(ChromeJUnit4ClassRunner.class)
+public class OverlayPanelEventFilterTest {
     private static final float PANEL_ALMOST_MAXIMIZED_OFFSET_Y_DP = 50.f;
     private static final float BAR_HEIGHT_DP = 100.f;
 
     private static final float LAYOUT_WIDTH_DP = 600.f;
     private static final float LAYOUT_HEIGHT_DP = 800.f;
 
     // A small value used to check whether two floats are almost equal.
     private static final float EPSILON = 1e-04f;
 
     private float mTouchSlopDp;
@@ skipping 12 matching lines @@
 
     private boolean mShouldLockHorizontalMotionInContent;
     private MotionEvent mEventPropagatedToContent;
     private boolean mEventWasScroll;
     private boolean mEventWasTap;
 
     // --------------------------------------------------------------------------------------------
     // OverlayPanelEventFilterWrapper
     // --------------------------------------------------------------------------------------------
 
+    @Rule
+    public UiThreadTestRule mRule = new UiThreadTestRule();

[Ted C, 2017/03/22 16:32:51]

Same comment

+
     /**
      * Wrapper around OverlayPanelEventFilter used by tests.
      */
     public final class OverlayPanelEventFilterWrapper extends OverlayPanelEventFilter {
         public OverlayPanelEventFilterWrapper(Context context, EventFilterHost host,
                 OverlayPanel panel) {
             super(context, host, panel);
         }
 
         @Override
@@ skipping 27 matching lines @@
     // StubbedContentViewCore
     // --------------------------------------------------------------------------------------------
 
     private final class StubbedContentViewCore extends ContentViewCore {
         public StubbedContentViewCore(Context context) {
             super(context, "");
         }
 
         @Override
         public ViewGroup getContainerView() {
-            return new ViewGroup(getContext()) {
+            return new ViewGroup(InstrumentationRegistry.getContext()) {
                 @Override
                 public boolean dispatchTouchEvent(MotionEvent e) {
                     if (e.getActionMasked() != MotionEvent.ACTION_CANCEL) {
                         mWasScrollDetectedOnContent = mEventWasScroll;
                         mWasTapDetectedOnContent = mEventWasTap;
 
                         // Check that the event offset is correct.
                         if (!mShouldLockHorizontalMotionInContent) {
                             float propagatedEventY = mEventPropagatedToContent.getY();
                             float offsetY = mPanel.getContentY() * mDpToPx;
-                            assertEquals(propagatedEventY - offsetY, e.getY(), EPSILON);
+                            Assert.assertEquals(propagatedEventY - offsetY, e.getY(), EPSILON);
                         }
                     } else {
                         mWasScrollDetectedOnContent = false;
                         mWasTapDetectedOnContent = false;
                     }
                     return super.dispatchTouchEvent(e);
                 }
 
                 @Override
                 public void onLayout(boolean changed, int l, int t, int r, int b) {}
@@ skipping 76 matching lines @@
         public void onLongPress(float x, float y) {}
 
         @Override
         public void onPinch(float x0, float y0, float x1, float y1, boolean firstEvent) {}
     }
 
     // --------------------------------------------------------------------------------------------
     // Test Suite
     // --------------------------------------------------------------------------------------------
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        Context context = getInstrumentation().getTargetContext();
+    @Before
+    public void setUp() throws Exception {
+        Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
         mDpToPx = context.getResources().getDisplayMetrics().density;
         mTouchSlopDp = ViewConfiguration.get(context).getScaledTouchSlop() / mDpToPx;
 
         mPanel = new MockOverlayPanel(context, new OverlayPanelManager());
         mEventFilter = new OverlayPanelEventFilterWrapper(context, null, mPanel);
 
         mPanel.setSearchBarHeightForTesting(BAR_HEIGHT_DP);
         mPanel.setHeightForTesting(LAYOUT_HEIGHT_DP);
         mPanel.setIsFullWidthSizePanelForTesting(true);
 
         // NOTE(pedrosimonetti): This should be called after calling the method
         // setIsFullWidthSizePanelForTesting(), otherwise it will crash the test.
         mPanel.onSizeChanged(LAYOUT_WIDTH_DP, LAYOUT_HEIGHT_DP, 0, 0);
 
         setContentViewVerticalScroll(0);
 
         mAlmostMaximizedContentOffsetYDp =
                 PANEL_ALMOST_MAXIMIZED_OFFSET_Y_DP + BAR_HEIGHT_DP;
         mMaximizedContentOffsetYDp = BAR_HEIGHT_DP;
 
         mWasTapDetectedOnContent = false;
         mWasScrollDetectedOnContent = false;
 
         mShouldLockHorizontalMotionInContent = false;
     }
 
+    @Test
     @SmallTest
     @Feature({"OverlayPanel"})
+    @UiThreadTest
     public void testTapContentView() {
         positionPanelInAlmostMaximizedState();
 
         // Simulate tap.
         simulateActionDownEvent(0.f, mAlmostMaximizedContentOffsetYDp + 1.f);
         simulateActionUpEvent(0.f, mAlmostMaximizedContentOffsetYDp + 1.f);
 
-        assertFalse(mPanel.getWasScrollDetected());
-        assertFalse(mPanel.getWasTapDetected());
+        Assert.assertFalse(mPanel.getWasScrollDetected());
+        Assert.assertFalse(mPanel.getWasTapDetected());
 
-        assertTrue(mWasTapDetectedOnContent);
-        assertFalse(mWasScrollDetectedOnContent);
+        Assert.assertTrue(mWasTapDetectedOnContent);
+        Assert.assertFalse(mWasScrollDetectedOnContent);
     }
 
+    @Test
     @SmallTest
     @Feature({"OverlayPanel"})
+    @UiThreadTest
     public void testScrollingContentViewDragsPanel() {
         positionPanelInAlmostMaximizedState();
 
         // Simulate swipe up sequence.
         simulateActionDownEvent(0.f, mAlmostMaximizedContentOffsetYDp + 1.f);
         simulateActionMoveEvent(0.f, mMaximizedContentOffsetYDp);
         simulateActionUpEvent(0.f, mMaximizedContentOffsetYDp);
 
-        assertTrue(mPanel.getWasScrollDetected());
-        assertFalse(mPanel.getWasTapDetected());
+        Assert.assertTrue(mPanel.getWasScrollDetected());
+        Assert.assertFalse(mPanel.getWasTapDetected());
 
-        assertFalse(mWasScrollDetectedOnContent);
-        assertFalse(mWasTapDetectedOnContent);
+        Assert.assertFalse(mWasScrollDetectedOnContent);
+        Assert.assertFalse(mWasTapDetectedOnContent);
     }
 
+    @Test
     @SmallTest
     @Feature({"OverlayPanel"})
+    @UiThreadTest
     public void testScrollUpContentView() {
         positionPanelInMaximizedState();
 
         // Simulate swipe up sequence.
         simulateActionDownEvent(0.f, mAlmostMaximizedContentOffsetYDp + 1.f);
         simulateActionMoveEvent(0.f, mMaximizedContentOffsetYDp);
         simulateActionUpEvent(0.f, mMaximizedContentOffsetYDp);
 
-        assertFalse(mPanel.getWasScrollDetected());
-        assertFalse(mPanel.getWasTapDetected());
+        Assert.assertFalse(mPanel.getWasScrollDetected());
+        Assert.assertFalse(mPanel.getWasTapDetected());
 
-        assertTrue(mWasScrollDetectedOnContent);
-        assertFalse(mWasTapDetectedOnContent);
+        Assert.assertTrue(mWasScrollDetectedOnContent);
+        Assert.assertFalse(mWasTapDetectedOnContent);
     }
 
+    @Test
     @SmallTest
     @Feature({"OverlayPanel"})
+    @UiThreadTest
     public void testScrollDownContentView() {
         positionPanelInMaximizedState();
 
         // When the Panel is maximized and the scroll position is greater than zero, a swipe down
         // on the ContentView should trigger a scroll on it.
         setContentViewVerticalScroll(100.f);
 
         // Simulate swipe down sequence.
         simulateActionDownEvent(0.f, mMaximizedContentOffsetYDp + 1.f);
         simulateActionMoveEvent(0.f, mAlmostMaximizedContentOffsetYDp);
         simulateActionUpEvent(0.f, mAlmostMaximizedContentOffsetYDp);
 
-        assertFalse(mPanel.getWasScrollDetected());
-        assertFalse(mPanel.getWasTapDetected());
+        Assert.assertFalse(mPanel.getWasScrollDetected());
+        Assert.assertFalse(mPanel.getWasTapDetected());
 
-        assertTrue(mWasScrollDetectedOnContent);
-        assertFalse(mWasTapDetectedOnContent);
+        Assert.assertTrue(mWasScrollDetectedOnContent);
+        Assert.assertFalse(mWasTapDetectedOnContent);
     }
 
+    @Test
     @SmallTest
     @Feature({"OverlayPanel"})
+    @UiThreadTest
     public void testDragByOverscrollingContentView() {
         positionPanelInMaximizedState();
 
         // When the Panel is maximized and the scroll position is zero, a swipe down on the
         // ContentView should trigger a swipe on the Panel.
         setContentViewVerticalScroll(0.f);
 
         // Simulate swipe down sequence.
         simulateActionDownEvent(0.f, mMaximizedContentOffsetYDp + 1.f);
         simulateActionMoveEvent(0.f, mAlmostMaximizedContentOffsetYDp);
         simulateActionUpEvent(0.f, mAlmostMaximizedContentOffsetYDp);
 
-        assertTrue(mPanel.getWasScrollDetected());
-        assertFalse(mPanel.getWasTapDetected());
+        Assert.assertTrue(mPanel.getWasScrollDetected());
+        Assert.assertFalse(mPanel.getWasTapDetected());
 
-        assertFalse(mWasScrollDetectedOnContent);
-        assertFalse(mWasTapDetectedOnContent);
+        Assert.assertFalse(mWasScrollDetectedOnContent);
+        Assert.assertFalse(mWasTapDetectedOnContent);
     }
 
+    @Test
     @SmallTest
     @Feature({"OverlayPanel"})
+    @UiThreadTest
     public void testUnwantedScrollDoesNotHappenInContentView() {
         positionPanelInAlmostMaximizedState();
 
         float contentViewOffsetYStart = mAlmostMaximizedContentOffsetYDp + 1.f;
         float contentViewOffsetYEnd = mMaximizedContentOffsetYDp - 1.f;
 
         // Simulate swipe up to maximized position.
         simulateActionDownEvent(0.f, contentViewOffsetYStart);
         simulateActionMoveEvent(0.f, mMaximizedContentOffsetYDp);
         positionPanelInMaximizedState();
 
         // Confirm that the Panel got a scroll event.
-        assertTrue(mPanel.getWasScrollDetected());
+        Assert.assertTrue(mPanel.getWasScrollDetected());
 
         // Continue the swipe up for one more dp. From now on, the events might be forwarded
         // to the ContentView.
         simulateActionMoveEvent(0.f, contentViewOffsetYEnd);
         simulateActionUpEvent(0.f, contentViewOffsetYEnd);
 
         // But 1 dp is not enough to trigger a scroll in the ContentView, and in this
         // particular case, it should also not trigger a tap because the total displacement
         // of the touch gesture is greater than the touch slop.
         float contentViewOffsetDelta =
                 contentViewOffsetYStart - contentViewOffsetYEnd;
-        assertTrue(Math.abs(contentViewOffsetDelta) > mTouchSlopDp);
+        Assert.assertTrue(Math.abs(contentViewOffsetDelta) > mTouchSlopDp);
 
-        assertFalse(mPanel.getWasTapDetected());
+        Assert.assertFalse(mPanel.getWasTapDetected());
 
-        assertFalse(mWasScrollDetectedOnContent);
-        assertFalse(mWasTapDetectedOnContent);
+        Assert.assertFalse(mWasScrollDetectedOnContent);
+        Assert.assertFalse(mWasTapDetectedOnContent);
     }
 
+    @Test
     @SmallTest
     @Feature({"OverlayPanel"})
+    @UiThreadTest
     public void testDragPanelThenContinuouslyScrollContentView() {
         positionPanelInAlmostMaximizedState();
 
         // Simulate swipe up to maximized position.
         simulateActionDownEvent(0.f, mAlmostMaximizedContentOffsetYDp + 1.f);
         simulateActionMoveEvent(0.f, mMaximizedContentOffsetYDp);
         positionPanelInMaximizedState();
 
         // Confirm that the Panel got a scroll event.
-        assertTrue(mPanel.getWasScrollDetected());
+        Assert.assertTrue(mPanel.getWasScrollDetected());
 
         // Continue the swipe up for one more dp. From now on, the events might be forwarded
         // to the ContentView.
         simulateActionMoveEvent(0.f, mMaximizedContentOffsetYDp - 1.f);
 
         // Now keep swiping up an amount greater than the touch slop. In this case a scroll
         // should be triggered in the ContentView.
         simulateActionMoveEvent(0.f, mMaximizedContentOffsetYDp - 2 * mTouchSlopDp);
         simulateActionUpEvent(0.f, mMaximizedContentOffsetYDp - 2 * mTouchSlopDp);
 
-        assertFalse(mPanel.getWasTapDetected());
+        Assert.assertFalse(mPanel.getWasTapDetected());
 
-        assertTrue(mWasScrollDetectedOnContent);
-        assertFalse(mWasTapDetectedOnContent);
+        Assert.assertTrue(mWasScrollDetectedOnContent);
+        Assert.assertFalse(mWasTapDetectedOnContent);
     }
 
+    @Test
     @SmallTest
     @Feature({"OverlayPanel"})
+    @UiThreadTest
     public void testTapPanel() {
         positionPanelInAlmostMaximizedState();
 
         // Simulate tap.
         simulateActionDownEvent(0.f, mAlmostMaximizedContentOffsetYDp - 1.f);
         simulateActionUpEvent(0.f, mAlmostMaximizedContentOffsetYDp - 1.f);
 
-        assertFalse(mPanel.getWasScrollDetected());
-        assertTrue(mPanel.getWasTapDetected());
+        Assert.assertFalse(mPanel.getWasScrollDetected());
+        Assert.assertTrue(mPanel.getWasTapDetected());
 
-        assertFalse(mWasScrollDetectedOnContent);
-        assertFalse(mWasTapDetectedOnContent);
+        Assert.assertFalse(mWasScrollDetectedOnContent);
+        Assert.assertFalse(mWasTapDetectedOnContent);
     }
 
+    @Test
     @SmallTest
     @Feature({"OverlayPanel"})
+    @UiThreadTest
     public void testScrollPanel() {
         positionPanelInAlmostMaximizedState();
 
         // Simulate swipe up sequence.
         simulateActionDownEvent(0.f, mAlmostMaximizedContentOffsetYDp - 1.f);
         simulateActionMoveEvent(0.f, mMaximizedContentOffsetYDp);
         simulateActionUpEvent(0.f, mMaximizedContentOffsetYDp);
 
-        assertTrue(mPanel.getWasScrollDetected());
-        assertFalse(mPanel.getWasTapDetected());
+        Assert.assertTrue(mPanel.getWasScrollDetected());
+        Assert.assertFalse(mPanel.getWasTapDetected());
 
-        assertFalse(mWasScrollDetectedOnContent);
-        assertFalse(mWasTapDetectedOnContent);
+        Assert.assertFalse(mWasScrollDetectedOnContent);
+        Assert.assertFalse(mWasTapDetectedOnContent);
     }
 
     // --------------------------------------------------------------------------------------------
     // Helpers
     // --------------------------------------------------------------------------------------------
 
     /**
      * Positions the Panel in the almost maximized state.
      */
     private void positionPanelInAlmostMaximizedState() {
@@ skipping 50 matching lines @@
 
     /**
      * Simulates a MotionEvent.ACTION_UP in the OverlayPanelEventFilter.
      * @param x The event's x coordinate in dps.
      * @param y The event's y coordinate in dps.
      */
     private void simulateActionUpEvent(float x, float y) {
         simulateEvent(MotionEvent.ACTION_UP, x, y);
     }
 }