From ebc563e927b0ea1db816021e83b20150c116e573 Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Wed, 17 Feb 2021 11:56:28 +0100 Subject: [PATCH] Update the call to RuntimeEnvironment.application MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6eb6182fdba8a2f8a6af1bdaa3d181329de42669 Bug: None Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/208024 Reviewed-by: Mirko Bonadei Reviewed-by: Sami Kalliomäki Commit-Queue: Artem Titov Cr-Commit-Position: refs/heads/master@{#33287} --- examples/BUILD.gn | 1 + .../src/org/appspot/apprtc/BluetoothManagerTest.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/BUILD.gn b/examples/BUILD.gn index a08ab465d1..704afc5467 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -900,6 +900,7 @@ if (is_android) { ":AppRTCMobile_javalib", "../sdk/android:peerconnection_java", "//base:base_java_test_support", + "//third_party/androidx:androidx_test_core_java", "//third_party/google-truth:google_truth_java", ] diff --git a/examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java b/examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java index b97f1f0bf6..3060bd7a56 100644 --- a/examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java +++ b/examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java @@ -29,6 +29,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.media.AudioManager; import android.util.Log; +import androidx.test.core.app.ApplicationProvider; import java.util.ArrayList; import java.util.List; import org.appspot.apprtc.AppRTCBluetoothManager.State; @@ -36,7 +37,6 @@ import org.chromium.testing.local.LocalRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; @@ -65,7 +65,7 @@ public class BluetoothManagerTest { @Before public void setUp() { ShadowLog.stream = System.out; - context = RuntimeEnvironment.application; + context = ApplicationProvider.getApplicationContext(); mockedAppRtcAudioManager = mock(AppRTCAudioManager.class); mockedAudioManager = mock(AudioManager.class); mockedBluetoothHeadset = mock(BluetoothHeadset.class);