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

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/VibrationManagerImplTest.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/JavaBridgeBasicsTest.java ('K') | « content/public/android/javatests/src/org/chromium/content/browser/VSyncMonitorTest.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/ViewportTest.java » ('j') | content/public/android/javatests/src/org/chromium/content/browser/webcontents/WebContentsTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index dcfb0a21f543920ceddd1689e8fc7c4e9870880a..e4458ee6ae155f40daa4c5795b1219c8d73baf14 100644

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

+++ b/content/public/android/javatests/src/org/chromium/content/browser/VibrationManagerImplTest.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.

@@ -7,18 +7,29 @@ package org.chromium.content.browser;

import android.os.Vibrator;

import android.support.test.filters.MediumTest;

+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.BaseJUnit4ClassRunner;

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.Criteria;

import org.chromium.content.browser.test.util.CriteriaHelper;

-import org.chromium.content_shell_apk.ContentShellTestBase;

+import org.chromium.content_shell_apk.ContentShellActivityTestRule;

import org.chromium.device.vibration.VibrationManagerImpl;

/**

* Tests java implementation of VibrationManager mojo service on android.

-public class VibrationManagerImplTest extends ContentShellTestBase {

+@RunWith(BaseJUnit4ClassRunner.class)

+public class VibrationManagerImplTest {

+ @Rule

+ public ContentShellActivityTestRule mActivityTestRule = new ContentShellActivityTestRule();

private static final String URL_VIBRATOR_VIBRATE = UrlUtils.encodeHtmlDataUri("<html><body>"

+ " <script type=\"text/javascript\">"

+ " navigator.vibrate(3000);"

@@ -57,16 +68,15 @@ public class VibrationManagerImplTest extends ContentShellTestBase {

}

- @Override

- protected void setUp() throws Exception {

- super.setUp();

- launchContentShellWithUrl("about:blank");

- waitForActiveShellToBeDoneLoading();

+ @Before

+ public void setUp() throws Exception {

+ mActivityTestRule.launchContentShellWithUrl("about:blank");

+ mActivityTestRule.waitForActiveShellToBeDoneLoading();

mFakeWrapper = new FakeAndroidVibratorWrapper();

VibrationManagerImpl.setVibratorWrapperForTesting(mFakeWrapper);

- assertEquals(-1, mFakeWrapper.mMilliSeconds);

- assertFalse(mFakeWrapper.mCancelled);

+ Assert.assertEquals(-1, mFakeWrapper.mMilliSeconds);

+ Assert.assertFalse(mFakeWrapper.mCancelled);

}

/**

@@ -77,9 +87,10 @@ public class VibrationManagerImplTest extends ContentShellTestBase {

// @MediumTest

// @Feature({"Vibration"})

+ @Test

@DisabledTest

public void testVibrate() throws Throwable {

- loadNewShell(URL_VIBRATOR_VIBRATE);

+ mActivityTestRule.loadNewShell(URL_VIBRATOR_VIBRATE);

// Waits until VibrationManagerImpl.Vibrate() got called.

CriteriaHelper.pollUiThread(new Criteria() {

@@ -89,7 +100,7 @@ public class VibrationManagerImplTest extends ContentShellTestBase {

}

});

- assertEquals(

+ Assert.assertEquals(

"Did not get vibrate mMilliSeconds correctly", 3000, mFakeWrapper.mMilliSeconds);

}

@@ -98,10 +109,11 @@ public class VibrationManagerImplTest extends ContentShellTestBase {

* load the webpage which will request vibrate and then request cancel,

* the fake wrapper cancel() should be called.

+ @Test

@MediumTest

@Feature({"Vibration"})

public void testCancel() throws Throwable {

- loadNewShell(URL_VIBRATOR_CANCEL);

+ mActivityTestRule.loadNewShell(URL_VIBRATOR_CANCEL);

// Waits until VibrationManagerImpl.Cancel() got called.

CriteriaHelper.pollUiThread(new Criteria() {

@@ -111,6 +123,6 @@ public class VibrationManagerImplTest extends ContentShellTestBase {

}

});

- assertTrue("Did not get cancelled", mFakeWrapper.mCancelled);

+ Assert.assertTrue("Did not get cancelled", mFakeWrapper.mCancelled);

}