Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8599)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2857583005: Convert Vr tests to JUnit4 (Closed)
Patch Set: Address John's comments Created 3 years, 7 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
Download patch
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
index b9fb03656cef2dd9807b6cc648d62ad54ab54395..69e3e67e38765f0796aeac6d7a54fb7c45c18314 100644
--- 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
@@ -10,8 +10,20 @@ import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_V
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.util.CommandLineFlags;
import org.chromium.base.test.util.Restriction;
+import org.chromium.chrome.browser.ChromeSwitches;
+import org.chromium.chrome.browser.ChromeTabbedActivity;
+import org.chromium.chrome.test.ChromeActivityTestCaseBase;
+import org.chromium.chrome.test.ChromeActivityTestRule;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
import org.chromium.chrome.test.util.ChromeTabUtils;
import org.chromium.content.browser.ContentViewCore;
import org.chromium.content.browser.test.util.DOMUtils;
@@ -24,13 +36,22 @@ import java.util.concurrent.TimeoutException;
* "VR Shell". This may require interacting with WebVR in addition to the VR browser, so inherit
* from VrTestBase for the WebVR test framework.
*/
+@RunWith(ChromeJUnit4ClassRunner.class)
+@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
+ ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG, "enable-features=VrShell"})
@Restriction(RESTRICTION_TYPE_VIEWER_DAYDREAM)
-@CommandLineFlags.Add("enable-features=VrShell")
-public class VrShellNavigationTest extends VrTestBase {
+
+public class VrShellNavigationTest {
+ @Rule
+ public VrTestRule mVrTestRule = new VrTestRule();
+
+ @Rule
+ public ChromeTabbedActivityTestRule mActivityTestRule = new ChromeTabbedActivityTestRule();
+
private static final String TEST_PAGE_2D_URL =
- VrTestBase.getHtmlTestFile("test_navigation_2d_page");
+ VrTestRule.getHtmlTestFile("test_navigation_2d_page");
private static final String TEST_PAGE_WEBVR_URL =
- VrTestBase.getHtmlTestFile("test_navigation_webvr_page");
+ VrTestRule.getHtmlTestFile("test_navigation_webvr_page");
private enum Page { PAGE_2D, PAGE_WEBVR }
private enum PresentationMode { NON_PRESENTING, PRESENTING }
@@ -53,53 +74,56 @@ public class VrShellNavigationTest extends VrTestBase {
* navigation. This is desirable since we are testing navigation transitions end-to-end.
*/
private void navigateTo(final Page to) throws InterruptedException {
- ChromeTabUtils.waitForTabPageLoaded(getActivity().getActivityTab(), new Runnable() {
- @Override
- public void run() {
- runJavaScriptOrFail("window.location.href = '" + getUrl(to) + "';",
- POLL_TIMEOUT_SHORT_MS, mWebContents);
- }
- }, POLL_TIMEOUT_LONG_MS);
+ ChromeTabUtils.waitForTabPageLoaded(
+ mActivityTestRule.getActivity().getActivityTab(), new Runnable() {
+ @Override
+ public void run() {
+ mVrTestRule.runJavaScriptOrFail(
+ "window.location.href = '" + getUrl(to) + "';",
+ POLL_TIMEOUT_SHORT_MS, mActivityTestRule.getActivity());
+ }
+ }, POLL_TIMEOUT_LONG_MS);
}
- private void enterFullscreen(ContentViewCore cvc)
- throws InterruptedException, TimeoutException {
+ private void enterFullscreen() throws InterruptedException, TimeoutException {
+ ChromeTabbedActivity activity = mActivityTestRule.getActivity();
+ ContentViewCore cvc = activity.getActivityTab().getContentViewCore();
DOMUtils.clickNode(cvc, "fullscreen");
- waitOnJavaScriptStep(cvc.getWebContents());
- assertTrue(DOMUtils.isFullscreen(cvc.getWebContents()));
+ mVrTestRule.waitOnJavaScriptStep(activity);
+ Assert.assertTrue(DOMUtils.isFullscreen(cvc.getWebContents()));
}
- private void enterPresentation(ContentViewCore cvc)
- throws InterruptedException, TimeoutException {
+ private void enterPresentation() throws InterruptedException, TimeoutException {
+ ContentViewCore cvc = mActivityTestRule.getActivity().getActivityTab().getContentViewCore();
// TODO(bsheedy): check if we could use DOMUtils.clickNode in VrTestBase#enterVrTap and
// then use VrTestBase#enterVrTap here.
DOMUtils.clickNode(cvc, "webgl-canvas");
- waitOnJavaScriptStep(mWebContents);
- assertTrue(VrShellDelegate.getVrShellForTesting().getWebVrModeEnabled());
+ mVrTestRule.waitOnJavaScriptStep(mActivityTestRule.getActivity());
+ Assert.assertTrue(VrShellDelegate.getVrShellForTesting().getWebVrModeEnabled());
}
- private void assertState(WebContents wc, Page page, PresentationMode presentationMode,
- FullscreenMode fullscreenMode) throws InterruptedException, TimeoutException {
- assertTrue("Browser is in VR", VrShellDelegate.isInVr());
- assertEquals("Browser is on correct web site", getUrl(page), wc.getVisibleUrl());
- assertEquals("Browser is in VR Presentation Mode",
+ private void assertState(ChromeTabbedActivity activity, Page page,
+ PresentationMode presentationMode, FullscreenMode fullscreenMode)
+ throws InterruptedException, TimeoutException {
+ WebContents wc = activity.getActivityTab().getWebContents();
+ Assert.assertTrue("Browser is in VR", VrShellDelegate.isInVr());
+ Assert.assertEquals("Browser is on correct web site", getUrl(page), wc.getVisibleUrl());
+ Assert.assertEquals("Browser is in VR Presentation Mode",
presentationMode == PresentationMode.PRESENTING,
VrShellDelegate.getVrShellForTesting().getWebVrModeEnabled());
- assertEquals("Browser is in fullscreen", fullscreenMode == FullscreenMode.FULLSCREENED,
- DOMUtils.isFullscreen(wc));
+ Assert.assertEquals("Browser is in fullscreen",
+ fullscreenMode == FullscreenMode.FULLSCREENED, DOMUtils.isFullscreen(wc));
}
- @Override
public int loadUrl(String url, long secondsToWait)
throws IllegalArgumentException, InterruptedException {
- int result = super.loadUrl(url, secondsToWait);
- waitOnJavaScriptStep(getActivity().getActivityTab().getWebContents());
+ int result = mActivityTestRule.loadUrl(url, secondsToWait);
+ mVrTestRule.waitOnJavaScriptStep(mActivityTestRule.getActivity());
return result;
}
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
VrUtils.forceEnterVr();
VrUtils.waitForVrSupported(POLL_TIMEOUT_LONG_MS);
}
@@ -107,138 +131,147 @@ public class VrShellNavigationTest extends VrTestBase {
/**
* Tests navigation from a 2D to a 2D page.
*/
+ @Test
@MediumTest
public void test2dTo2d() throws InterruptedException, TimeoutException {
- loadUrl(TEST_PAGE_2D_URL, PAGE_LOAD_TIMEOUT_S);
+ loadUrl(TEST_PAGE_2D_URL, VrTestRule.PAGE_LOAD_TIMEOUT_S);
navigateTo(Page.PAGE_2D);
- assertState(mWebContents, Page.PAGE_2D, PresentationMode.NON_PRESENTING,
+ assertState(mActivityTestRule.getActivity(), Page.PAGE_2D, PresentationMode.NON_PRESENTING,
FullscreenMode.NON_FULLSCREENED);
}
/**
* Tests navigation from a 2D to a WebVR page.
*/
+ @Test
@CommandLineFlags.Add("enable-webvr")
@MediumTest
public void test2dToWebVr()
throws IllegalArgumentException, InterruptedException, TimeoutException {
- loadUrl(TEST_PAGE_2D_URL, PAGE_LOAD_TIMEOUT_S);
+ loadUrl(TEST_PAGE_2D_URL, VrTestRule.PAGE_LOAD_TIMEOUT_S);
navigateTo(Page.PAGE_WEBVR);
- assertState(mWebContents, Page.PAGE_WEBVR, PresentationMode.NON_PRESENTING,
- FullscreenMode.NON_FULLSCREENED);
+ assertState(mActivityTestRule.getActivity(), Page.PAGE_WEBVR,
+ PresentationMode.NON_PRESENTING, FullscreenMode.NON_FULLSCREENED);
}
/**
* Tests navigation from a fullscreened 2D to a WebVR page.
*/
+ @Test
@CommandLineFlags.Add("enable-webvr")
@MediumTest
public void test2dFullscreenToWebVr()
throws IllegalArgumentException, InterruptedException, TimeoutException {
- loadUrl(TEST_PAGE_2D_URL, PAGE_LOAD_TIMEOUT_S);
- enterFullscreen(getActivity().getActivityTab().getContentViewCore());
+ loadUrl(TEST_PAGE_2D_URL, VrTestRule.PAGE_LOAD_TIMEOUT_S);
+ enterFullscreen();
navigateTo(Page.PAGE_WEBVR);
- assertState(mWebContents, Page.PAGE_WEBVR, PresentationMode.NON_PRESENTING,
- FullscreenMode.NON_FULLSCREENED);
+ assertState(mActivityTestRule.getActivity(), Page.PAGE_WEBVR,
+ PresentationMode.NON_PRESENTING, FullscreenMode.NON_FULLSCREENED);
}
/**
* Tests navigation from a WebVR to a 2D page.
*/
+ @Test
@CommandLineFlags.Add("enable-webvr")
@MediumTest
public void testWebVrTo2d()
throws IllegalArgumentException, InterruptedException, TimeoutException {
- loadUrl(TEST_PAGE_WEBVR_URL, PAGE_LOAD_TIMEOUT_S);
+ loadUrl(TEST_PAGE_WEBVR_URL, VrTestRule.PAGE_LOAD_TIMEOUT_S);
navigateTo(Page.PAGE_2D);
- assertState(mWebContents, Page.PAGE_2D, PresentationMode.NON_PRESENTING,
+ assertState(mActivityTestRule.getActivity(), Page.PAGE_2D, PresentationMode.NON_PRESENTING,
FullscreenMode.NON_FULLSCREENED);
}
/**
* Tests navigation from a WebVR to a WebVR page.
*/
+ @Test
@CommandLineFlags.Add("enable-webvr")
@MediumTest
public void testWebVrToWebVr()
throws IllegalArgumentException, InterruptedException, TimeoutException {
- loadUrl(TEST_PAGE_WEBVR_URL, PAGE_LOAD_TIMEOUT_S);
+ loadUrl(TEST_PAGE_WEBVR_URL, VrTestRule.PAGE_LOAD_TIMEOUT_S);
navigateTo(Page.PAGE_WEBVR);
- assertState(mWebContents, Page.PAGE_WEBVR, PresentationMode.NON_PRESENTING,
- FullscreenMode.NON_FULLSCREENED);
+ assertState(mActivityTestRule.getActivity(), Page.PAGE_WEBVR,
+ PresentationMode.NON_PRESENTING, FullscreenMode.NON_FULLSCREENED);
}
/**
* Tests navigation from a presenting WebVR to a 2D page.
*/
+ @Test
@CommandLineFlags.Add("enable-webvr")
@MediumTest
public void testWebVrPresentingTo2d()
throws IllegalArgumentException, InterruptedException, TimeoutException {
- loadUrl(TEST_PAGE_WEBVR_URL, PAGE_LOAD_TIMEOUT_S);
- enterPresentation(getActivity().getActivityTab().getContentViewCore());
+ loadUrl(TEST_PAGE_WEBVR_URL, VrTestRule.PAGE_LOAD_TIMEOUT_S);
+ enterPresentation();
navigateTo(Page.PAGE_2D);
- assertState(mWebContents, Page.PAGE_2D, PresentationMode.NON_PRESENTING,
+ assertState(mActivityTestRule.getActivity(), Page.PAGE_2D, PresentationMode.NON_PRESENTING,
FullscreenMode.NON_FULLSCREENED);
}
/**
* Tests navigation from a presenting WebVR to a WebVR page.
*/
+ @Test
@CommandLineFlags.Add("enable-webvr")
@MediumTest
public void testWebVrPresentingToWebVr()
throws IllegalArgumentException, InterruptedException, TimeoutException {
- loadUrl(TEST_PAGE_WEBVR_URL, PAGE_LOAD_TIMEOUT_S);
- enterPresentation(getActivity().getActivityTab().getContentViewCore());
+ loadUrl(TEST_PAGE_WEBVR_URL, VrTestRule.PAGE_LOAD_TIMEOUT_S);
+ enterPresentation();
navigateTo(Page.PAGE_WEBVR);
- assertState(mWebContents, Page.PAGE_WEBVR, PresentationMode.NON_PRESENTING,
- FullscreenMode.NON_FULLSCREENED);
+ assertState(mActivityTestRule.getActivity(), Page.PAGE_WEBVR,
+ PresentationMode.NON_PRESENTING, FullscreenMode.NON_FULLSCREENED);
}
/**
* Tests navigation from a fullscreened WebVR to a 2D page.
*/
+ @Test
@CommandLineFlags.Add("enable-webvr")
@MediumTest
public void testWebVrFullscreenTo2d()
throws IllegalArgumentException, InterruptedException, TimeoutException {
- loadUrl(TEST_PAGE_WEBVR_URL, PAGE_LOAD_TIMEOUT_S);
- enterFullscreen(getActivity().getActivityTab().getContentViewCore());
+ loadUrl(TEST_PAGE_WEBVR_URL, VrTestRule.PAGE_LOAD_TIMEOUT_S);
+ enterFullscreen();
navigateTo(Page.PAGE_2D);
- assertState(mWebContents, Page.PAGE_2D, PresentationMode.NON_PRESENTING,
+ assertState(mActivityTestRule.getActivity(), Page.PAGE_2D, PresentationMode.NON_PRESENTING,
FullscreenMode.NON_FULLSCREENED);
}
/**
* Tests navigation from a fullscreened WebVR to a WebVR page.
*/
+ @Test
@CommandLineFlags.Add("enable-webvr")
@MediumTest
public void testWebVrFullscreenToWebVr()
throws IllegalArgumentException, InterruptedException, TimeoutException {
- loadUrl(TEST_PAGE_WEBVR_URL, PAGE_LOAD_TIMEOUT_S);
- enterFullscreen(getActivity().getActivityTab().getContentViewCore());
+ loadUrl(TEST_PAGE_WEBVR_URL, VrTestRule.PAGE_LOAD_TIMEOUT_S);
+ enterFullscreen();
navigateTo(Page.PAGE_WEBVR);
- assertState(mWebContents, Page.PAGE_WEBVR, PresentationMode.NON_PRESENTING,
- FullscreenMode.NON_FULLSCREENED);
+ assertState(mActivityTestRule.getActivity(), Page.PAGE_WEBVR,
+ PresentationMode.NON_PRESENTING, FullscreenMode.NON_FULLSCREENED);
}
}
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698