content/public/android/javatests/src/org/chromium/content/browser/ContentViewZoomingTest.java - Issue 2708243004: Auto convert content shell tests to JUnit4

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

Issue 2708243004: Auto convert content shell tests to JUnit4 (Closed)

Patch Set: New test added from WebContentsTest Created 3 years, 9 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

« content/public/android/javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java ('K') | « content/public/android/javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/EncodeHtmlDataUriTest.java » ('j') | content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 0b54c26b94f1f2433cd7249eeddce7f53ef60883..84c2317e726339255fe9d4f28d5a05df97e33a93 100644

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

+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewZoomingTest.java

@@ -1,4 +1,4 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

@@ -9,16 +9,26 @@ import android.support.test.filters.SmallTest;

import android.view.InputDevice;

import android.view.MotionEvent;

+import org.junit.Before;

+import org.junit.Rule;

+import org.junit.Test;

+import org.junit.runner.RunWith;

+import org.chromium.base.test.BaseJUnit4ClassRunner;

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

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

import org.chromium.content.browser.input.AnimationIntervalProvider;

import org.chromium.content.browser.input.JoystickZoomProvider;

-import org.chromium.content_shell_apk.ContentShellTestBase;

+import org.chromium.content_shell_apk.ContentShellActivityTestRule;

/**

* Tests that ContentView running inside ContentShell can be zoomed using gamepad joystick.

-public class ContentViewZoomingTest extends ContentShellTestBase {

+@RunWith(BaseJUnit4ClassRunner.class)

+public class ContentViewZoomingTest {

+ @Rule

+ public ContentShellActivityTestRule mActivityTestRule = new ContentShellActivityTestRule();

private static final String LARGE_PAGE = UrlUtils.encodeHtmlDataUri("<html><head>"

+ "<meta name=\"viewport\" content=\"width=device-width, "

+ "initial-scale=2.0, minimum-scale=2.0, maximum-scale=5.0\" />"

@@ -48,7 +58,7 @@ public class ContentViewZoomingTest extends ContentShellTestBase {

public void animateZoomTest(final MotionEvent joystickZoomEvent, final long animationTicks)

throws Throwable {

- runTestOnUiThread(new Runnable() {

+ mActivityTestRule.runOnUiThread(new Runnable() {

@Override

public void run() {

onMotion(joystickZoomEvent);

@@ -77,67 +87,68 @@ public class ContentViewZoomingTest extends ContentShellTestBase {

return joystickMotionEvent;

}

- @Override

- protected void setUp() throws Exception {

- super.setUp();

- launchContentShellWithUrl(LARGE_PAGE);

- waitForActiveShellToBeDoneLoading();

- assertWaitForPageScaleFactorMatch(2.0f);

+ @Before

+ public void setUp() throws Exception {

+ mActivityTestRule.launchContentShellWithUrl(LARGE_PAGE);

+ mActivityTestRule.waitForActiveShellToBeDoneLoading();

+ mActivityTestRule.assertWaitForPageScaleFactorMatch(2.0f);

}

+ @Test

@SmallTest

@Feature({"JoystickZoom"})

public void testJoystickZoomIn() throws Throwable {

MotionEvent rTriggerEvent;

AnimationIntervalProvider intervalProvider = new TestAnimationIntervalProvider();

- TestJoystickZoomProvider rtJoystickZoomProvider =

- new TestJoystickZoomProvider(getContentViewCore(), intervalProvider);

+ TestJoystickZoomProvider rtJoystickZoomProvider = new TestJoystickZoomProvider(

+ mActivityTestRule.getContentViewCore(), intervalProvider);

// Verify page does not zoom-in if trigger motion falls in deadzone.

rTriggerEvent = simulateJoystickEvent(0.1f, true);

rtJoystickZoomProvider.animateZoomTest(rTriggerEvent, 20);

- assertWaitForPageScaleFactorMatch(2.0f);

+ mActivityTestRule.assertWaitForPageScaleFactorMatch(2.0f);

rTriggerEvent = simulateJoystickEvent(0.3f, true);

rtJoystickZoomProvider.animateZoomTest(rTriggerEvent, 20);

- assertWaitForPageScaleFactorMatch(2.2018466f);

+ mActivityTestRule.assertWaitForPageScaleFactorMatch(2.2018466f);

rTriggerEvent = simulateJoystickEvent(0.5f, true);

rtJoystickZoomProvider.animateZoomTest(rTriggerEvent, 40);

- assertWaitForPageScaleFactorMatch(3.033731f);

+ mActivityTestRule.assertWaitForPageScaleFactorMatch(3.033731f);

rTriggerEvent = simulateJoystickEvent(0.75f, true);

rtJoystickZoomProvider.animateZoomTest(rTriggerEvent, 50);

- assertWaitForPageScaleFactorMatch(5.0f);

+ mActivityTestRule.assertWaitForPageScaleFactorMatch(5.0f);

}

+ @Test

@SmallTest

@Feature({"JoystickZoom"})

public void testJoystickZoomOut() throws Throwable {

MotionEvent lTriggerEvent;

AnimationIntervalProvider intervalProvider = new TestAnimationIntervalProvider();

- TestJoystickZoomProvider ltJoystickZoomProvider =

- new TestJoystickZoomProvider(getContentViewCore(), intervalProvider);

+ TestJoystickZoomProvider ltJoystickZoomProvider = new TestJoystickZoomProvider(

+ mActivityTestRule.getContentViewCore(), intervalProvider);

// Zoom page to max size.

lTriggerEvent = simulateJoystickEvent(1.0f, true);

ltJoystickZoomProvider.animateZoomTest(lTriggerEvent, 60);

- assertWaitForPageScaleFactorMatch(5.0f);

+ mActivityTestRule.assertWaitForPageScaleFactorMatch(5.0f);

// Verify page does not zoom-out if trigger motion falls in deadzone.

lTriggerEvent = simulateJoystickEvent(0.1f, false);

ltJoystickZoomProvider.animateZoomTest(lTriggerEvent, 20);

- assertWaitForPageScaleFactorMatch(5.0f);

+ mActivityTestRule.assertWaitForPageScaleFactorMatch(5.0f);

lTriggerEvent = simulateJoystickEvent(0.3f, false);

ltJoystickZoomProvider.animateZoomTest(lTriggerEvent, 40);

- assertWaitForPageScaleFactorMatch(4.125306f);

+ mActivityTestRule.assertWaitForPageScaleFactorMatch(4.125306f);

lTriggerEvent = simulateJoystickEvent(0.5f, false);

ltJoystickZoomProvider.animateZoomTest(lTriggerEvent, 50);

- assertWaitForPageScaleFactorMatch(2.7635581f);

+ mActivityTestRule.assertWaitForPageScaleFactorMatch(2.7635581f);

lTriggerEvent = simulateJoystickEvent(0.75f, false);

ltJoystickZoomProvider.animateZoomTest(lTriggerEvent, 60);

- assertWaitForPageScaleFactorMatch(2.0f);

+ mActivityTestRule.assertWaitForPageScaleFactorMatch(2.0f);

}