Commit c58af43b authored by Peter Wen's avatar Peter Wen Committed by Commit Bot

Android: Add BundleTestRule to VR tests

These VR tests do not use VrTestRuleUtils to wrap their rules. Thus they
need to use BundleTestRule explicitly.

Bug: 1031603
Change-Id: I56c369c38d84a82c7f8ba7a4f532f84fd7ba840e
Fixed: 1031603
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1958445
Auto-Submit: Peter Wen <wnwen@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#723052}
parent a7473217
...@@ -25,6 +25,7 @@ import org.junit.runner.RunWith; ...@@ -25,6 +25,7 @@ import org.junit.runner.RunWith;
import org.chromium.base.ActivityState; import org.chromium.base.ActivityState;
import org.chromium.base.ApplicationStatus; import org.chromium.base.ApplicationStatus;
import org.chromium.base.test.BundleTestRule;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.Restriction; import org.chromium.base.test.util.Restriction;
...@@ -72,6 +73,9 @@ public class VrBrowserNavigationTest { ...@@ -72,6 +73,9 @@ public class VrBrowserNavigationTest {
@Rule @Rule
public ChromeTabbedActivityVrTestRule mTestRule = new ChromeTabbedActivityVrTestRule(); public ChromeTabbedActivityVrTestRule mTestRule = new ChromeTabbedActivityVrTestRule();
@Rule
public BundleTestRule mBundleTestRule = new BundleTestRule();
@Rule @Rule
public RenderTestRule mRenderTestRule = public RenderTestRule mRenderTestRule =
new RenderTestRule("components/test/data/vr_browser_ui/render_tests"); new RenderTestRule("components/test/data/vr_browser_ui/render_tests");
......
...@@ -29,6 +29,7 @@ import org.junit.Test; ...@@ -29,6 +29,7 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.chromium.base.StrictModeContext; import org.chromium.base.StrictModeContext;
import org.chromium.base.test.BundleTestRule;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.MinAndroidSdkLevel; import org.chromium.base.test.util.MinAndroidSdkLevel;
import org.chromium.base.test.util.Restriction; import org.chromium.base.test.util.Restriction;
...@@ -71,6 +72,9 @@ public class VrBrowserTransitionTest { ...@@ -71,6 +72,9 @@ public class VrBrowserTransitionTest {
@Rule @Rule
public ChromeTabbedActivityVrTestRule mTestRule = new ChromeTabbedActivityVrTestRule(); public ChromeTabbedActivityVrTestRule mTestRule = new ChromeTabbedActivityVrTestRule();
@Rule
public BundleTestRule mBundleTestRule = new BundleTestRule();
private WebXrVrTestFramework mWebXrVrTestFramework; private WebXrVrTestFramework mWebXrVrTestFramework;
private VrBrowserTestFramework mVrBrowserTestFramework; private VrBrowserTestFramework mVrBrowserTestFramework;
......
...@@ -21,6 +21,7 @@ import org.junit.Rule; ...@@ -21,6 +21,7 @@ import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.chromium.base.test.BundleTestRule;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.Restriction; import org.chromium.base.test.util.Restriction;
...@@ -53,6 +54,9 @@ public class VrBrowserWebInputEditingTest { ...@@ -53,6 +54,9 @@ public class VrBrowserWebInputEditingTest {
@Rule @Rule
public ChromeTabbedActivityVrTestRule mVrTestRule = new ChromeTabbedActivityVrTestRule(); public ChromeTabbedActivityVrTestRule mVrTestRule = new ChromeTabbedActivityVrTestRule();
@Rule
public BundleTestRule mBundleTestRule = new BundleTestRule();
@Rule @Rule
public RenderTestRule mRenderTestRule = public RenderTestRule mRenderTestRule =
new RenderTestRule("components/test/data/vr_browser_video/render_tests"); new RenderTestRule("components/test/data/vr_browser_video/render_tests");
......
...@@ -19,6 +19,7 @@ import org.junit.Rule; ...@@ -19,6 +19,7 @@ import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.chromium.base.test.BundleTestRule;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.Restriction; import org.chromium.base.test.util.Restriction;
import org.chromium.chrome.browser.ChromeSwitches; import org.chromium.chrome.browser.ChromeSwitches;
...@@ -42,6 +43,9 @@ public class VrFeedbackInfoBarTest { ...@@ -42,6 +43,9 @@ public class VrFeedbackInfoBarTest {
@Rule @Rule
public ChromeTabbedActivityVrTestRule mTestRule = new ChromeTabbedActivityVrTestRule(); public ChromeTabbedActivityVrTestRule mTestRule = new ChromeTabbedActivityVrTestRule();
@Rule
public BundleTestRule mBundleTestRule = new BundleTestRule();
private WebXrVrTestFramework mWebXrVrTestFramework; private WebXrVrTestFramework mWebXrVrTestFramework;
private VrBrowserTestFramework mVrBrowserTestFramework; private VrBrowserTestFramework mVrBrowserTestFramework;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment