Skip to content

Commit 0b0f350

Browse files
committed
only grant permission for unit test if we are on a device that needs it
1 parent 1eaf6aa commit 0b0f350

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.Manifest;
44
import android.content.ComponentName;
5+
import android.os.Build;
56
import android.os.Looper;
67

78
import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -33,7 +34,7 @@
3334
public class TransportManagerTests {
3435

3536
@Rule
36-
public GrantPermissionRule btRuntimePermissionRule = GrantPermissionRule.grant(Manifest.permission.BLUETOOTH_CONNECT);
37+
public GrantPermissionRule btRuntimePermissionRule;
3738
MultiplexTransportConfig config;
3839
final TransportRecord defaultBtRecord = new TransportRecord(TransportType.BLUETOOTH, "12:34:56:78:90");
3940
final ComponentName routerServiceComponentName = new ComponentName("com.smartdevicelink.test", "com.smartdevicelink.test.SdlRouterService");
@@ -67,6 +68,10 @@ public boolean onLegacyModeEnabled(String info) {
6768

6869
@Before
6970
public void setUp() throws Exception {
71+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
72+
btRuntimePermissionRule =
73+
GrantPermissionRule.grant(Manifest.permission.BLUETOOTH_CONNECT);
74+
}
7075
config = new MultiplexTransportConfig(getInstrumentation().getContext(), SdlUnitTestContants.TEST_APP_ID);
7176
config.setService(routerServiceComponentName);
7277
if (Looper.myLooper() == null) {

android/sdl_android/src/androidTest/java/com/smartdevicelink/util/MediaStreamingStatusTests.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
@RunWith(AndroidJUnit4.class)
3838
public class MediaStreamingStatusTests {
3939
@Rule
40-
public GrantPermissionRule btRuntimePermissionRule = GrantPermissionRule.grant(Manifest.permission.BLUETOOTH_CONNECT);
40+
public GrantPermissionRule btRuntimePermissionRule;
4141

4242
@Mock
4343
private AudioManager audioManager = mock(AudioManager.class);
@@ -63,6 +63,9 @@ public Object answer(InvocationOnMock invocation) {
6363

6464
@Before
6565
public void setUp() throws Exception {
66+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
67+
btRuntimePermissionRule = GrantPermissionRule.grant(Manifest.permission.BLUETOOTH_CONNECT);
68+
}
6669
mockedContext = mock(Context.class);
6770
doAnswer(onGetSystemService).when(mockedContext).getSystemService(Context.AUDIO_SERVICE);
6871
defaultMediaStreamingStatus = new MediaStreamingStatus(mockedContext, mock(MediaStreamingStatus.Callback.class));

0 commit comments

Comments
 (0)