Commit 2de2a02d authored by Jinsuk Kim's avatar Jinsuk Kim Committed by Commit Bot

Convert MediaSessionTest to JUnit4

- The test needs to run with ContentJUnit4ClassRunner to initialize
  command line switch that allows for programmatic media play as expected.
- There are SkipChecks that expects CommandLine instance be ready.
  Called CommandLine.init() with an empty value in ContentJUnit4ClassRunner
  before skip check process gets started.

Bug: 640116
Change-Id: Ic2142a98646ae45d30e37f30633a97267b557b92
Reviewed-on: https://chromium-review.googlesource.com/671167Reviewed-by: default avatarAlexandre Elias <aelias@chromium.org>
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#503588}
parent 7717cc57
...@@ -9,6 +9,7 @@ import android.support.test.InstrumentationRegistry; ...@@ -9,6 +9,7 @@ import android.support.test.InstrumentationRegistry;
import org.junit.runners.model.InitializationError; import org.junit.runners.model.InitializationError;
import org.chromium.base.CollectionUtil; import org.chromium.base.CollectionUtil;
import org.chromium.base.CommandLine;
import org.chromium.base.test.BaseJUnit4ClassRunner; import org.chromium.base.test.BaseJUnit4ClassRunner;
import org.chromium.base.test.BaseTestResult.PreTestHook; import org.chromium.base.test.BaseTestResult.PreTestHook;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
...@@ -33,6 +34,7 @@ public class ContentJUnit4ClassRunner extends BaseJUnit4ClassRunner { ...@@ -33,6 +34,7 @@ public class ContentJUnit4ClassRunner extends BaseJUnit4ClassRunner {
} }
private static List<SkipCheck> defaultSkipChecks() { private static List<SkipCheck> defaultSkipChecks() {
CommandLine.init(null);
return CollectionUtil.newArrayList( return CollectionUtil.newArrayList(
new UiRestrictionSkipCheck(InstrumentationRegistry.getTargetContext()), new UiRestrictionSkipCheck(InstrumentationRegistry.getTargetContext()),
new UiDisableIfSkipCheck(InstrumentationRegistry.getTargetContext())); new UiDisableIfSkipCheck(InstrumentationRegistry.getTargetContext()));
......
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