zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace direct invocation of ShadowApplication.getApplicationContext()

Browse Source 
with call to RuntimeEnvironment.application which provides the same instance.

Bug: None
Change-Id: I4e318955086dff990cb572a09c116d28a1023a34
Reviewed-on: https://webrtc-review.googlesource.com/73244
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23064}
This commit is contained in:
Oleh Prypin
2018-04-27 19:25:35 +02:00
committed by Commit Bot
parent 9546f37c03
commit 28899d0791
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/androidjunit/src/org/appspot/apprtc/BluetoothManagerTest.java
View File

@ -11,11 +11,8 @@
package org.appspot.apprtc; package org.appspot.apprtc;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.doCallRealMethod;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
@ -39,8 +36,8 @@ import org.chromium.testing.local.LocalRobolectricTestRunner;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.shadows.ShadowLog; import org.robolectric.shadows.ShadowLog;
/** /**
@ -68,7 +65,7 @@ public class BluetoothManagerTest {
@Before @Before
public void setUp() { public void setUp() {
ShadowLog.stream = System.out; ShadowLog.stream = System.out;
context = ShadowApplication.getInstance().getApplicationContext(); context = RuntimeEnvironment.application;
mockedAppRtcAudioManager = mock(AppRTCAudioManager.class); mockedAppRtcAudioManager = mock(AppRTCAudioManager.class);
mockedAudioManager = mock(AudioManager.class); mockedAudioManager = mock(AudioManager.class);
mockedBluetoothHeadset = mock(BluetoothHeadset.class); mockedBluetoothHeadset = mock(BluetoothHeadset.class);