Commit 2e75f078 authored by bttk's avatar bttk Committed by Commit Bot

Replace robolectric RuntimeEnvironment with androidx ApplicationProvider

Documentation of RuntimeEnvironment#application says:
  Deprecated. Please migrate to
  androidx.test.core.app.ApplicationProvider#getApplicationContext

Change-Id: I5f5b71e29edf99f4b6ee692247ea6910a0eb692c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2305369Reviewed-by: default avatarGang Wu <gangwu@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: who/bttk <bttk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789951}
parent 91fdc9ab
...@@ -3788,6 +3788,7 @@ if (is_android) { ...@@ -3788,6 +3788,7 @@ if (is_android) {
deps = [ deps = [
":base_java", ":base_java",
"//testing/android/junit:junit_test_support", "//testing/android/junit:junit_test_support",
"//third_party/android_deps:androidx_test_core_java",
"//third_party/android_deps:androidx_test_monitor_java", "//third_party/android_deps:androidx_test_monitor_java",
"//third_party/android_deps:androidx_test_uiautomator_uiautomator_java", "//third_party/android_deps:androidx_test_uiautomator_uiautomator_java",
"//third_party/android_deps:robolectric_all_java", "//third_party/android_deps:robolectric_all_java",
......
...@@ -4,9 +4,10 @@ ...@@ -4,9 +4,10 @@
package org.chromium.base.test; package org.chromium.base.test;
import androidx.test.core.app.ApplicationProvider;
import org.junit.runners.model.InitializationError; import org.junit.runners.model.InitializationError;
import org.robolectric.DefaultTestLifecycle; import org.robolectric.DefaultTestLifecycle;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.TestLifecycle; import org.robolectric.TestLifecycle;
import org.chromium.base.ApplicationStatus; import org.chromium.base.ApplicationStatus;
...@@ -28,8 +29,9 @@ public class BaseRobolectricTestRunner extends LocalRobolectricTestRunner { ...@@ -28,8 +29,9 @@ public class BaseRobolectricTestRunner extends LocalRobolectricTestRunner {
public static class BaseTestLifecycle extends DefaultTestLifecycle { public static class BaseTestLifecycle extends DefaultTestLifecycle {
@Override @Override
public void beforeTest(Method method) { public void beforeTest(Method method) {
ContextUtils.initApplicationContextForTests(RuntimeEnvironment.application); ContextUtils.initApplicationContextForTests(
ApplicationStatus.initialize(RuntimeEnvironment.application); ApplicationProvider.getApplicationContext());
ApplicationStatus.initialize(ApplicationProvider.getApplicationContext());
CommandLine.init(null); CommandLine.init(null);
super.beforeTest(method); super.beforeTest(method);
} }
......
...@@ -12,6 +12,8 @@ import android.content.Context; ...@@ -12,6 +12,8 @@ import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.support.test.InstrumentationRegistry; import android.support.test.InstrumentationRegistry;
import androidx.test.core.app.ApplicationProvider;
import org.junit.Assert; import org.junit.Assert;
import org.junit.rules.ExternalResource; import org.junit.rules.ExternalResource;
import org.junit.runner.Description; import org.junit.runner.Description;
...@@ -21,7 +23,6 @@ import org.junit.runner.notification.RunListener; ...@@ -21,7 +23,6 @@ import org.junit.runner.notification.RunListener;
import org.junit.runner.notification.RunNotifier; import org.junit.runner.notification.RunNotifier;
import org.junit.runners.BlockJUnit4ClassRunner; import org.junit.runners.BlockJUnit4ClassRunner;
import org.junit.runners.model.InitializationError; import org.junit.runners.model.InitializationError;
import org.robolectric.RuntimeEnvironment;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -49,7 +50,7 @@ class TestRunnerTestRule extends ExternalResource { ...@@ -49,7 +50,7 @@ class TestRunnerTestRule extends ExternalResource {
Instrumentation instrumentation = new Instrumentation() { Instrumentation instrumentation = new Instrumentation() {
@Override @Override
public Context getTargetContext() { public Context getTargetContext() {
return RuntimeEnvironment.application; return ApplicationProvider.getApplicationContext();
} }
}; };
InstrumentationRegistry.registerInstance(instrumentation, new Bundle()); InstrumentationRegistry.registerInstance(instrumentation, new Bundle());
......
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