Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62c25a15 authored by Charlie Boutier's avatar Charlie Boutier Committed by Automerger Merge Worker
Browse files

Merge "BumbleBluetoothTests: Use AdoptShellPermissionsRule" into main am: 018b0ba5 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2747278



Change-Id: Ia2743d5671ad8721d8abd8b8bb766d56d5e45b74
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b3580d41 018b0ba5

framework/tests/bumble/src/android/bluetooth/LeAdvertisingTest.java

+4 −9
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ import android.util.Log; 


import androidx.core.util.Pair;

import androidx.test.core.app.ApplicationProvider;

import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import com.android.compatibility.common.util.AdoptShellPermissionsRule;



import io.grpc.Deadline;



import org.junit.BeforeClass;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -51,14 +51,9 @@ public class LeAdvertisingTest { 


    private static final int TIMEOUT_ADVERTISING_MS = 1000;



    @Rule public final PandoraDevice mBumble = new PandoraDevice();

    @Rule public final AdoptShellPermissionsRule mPermissionRule = new AdoptShellPermissionsRule();



    @BeforeClass

    public static void setUpClass() throws Exception {

        InstrumentationRegistry.getInstrumentation()

                .getUiAutomation()

                .adoptShellPermissionIdentity();

    }

    @Rule public final PandoraDevice mBumble = new PandoraDevice();



    @Test

    public void advertisingSet() throws Exception {

framework/tests/bumble/src/android/bluetooth/LeScanningTest.java

+3 −17
Original line number Diff line number Diff line
@@ -27,12 +27,10 @@ import android.os.ParcelUuid; 
import android.util.Log;



import androidx.test.core.app.ApplicationProvider;

import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import com.android.compatibility.common.util.AdoptShellPermissionsRule;



import org.junit.AfterClass;

import org.junit.BeforeClass;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -51,24 +49,12 @@ public class LeScanningTest { 
    private static final String TAG = "LeScanningTest";

    private static final int TIMEOUT_SCANNING_MS = 2000;



    @Rule public final AdoptShellPermissionsRule mPermissionRule = new AdoptShellPermissionsRule();



    @Rule public final PandoraDevice mBumble = new PandoraDevice();



    private final String TEST_UUID_STRING = "00001805-0000-1000-8000-00805f9b34fb";



    @BeforeClass

    public static void setUpClass() throws Exception {

        InstrumentationRegistry.getInstrumentation()

                .getUiAutomation()

                .adoptShellPermissionIdentity();

    }



    @AfterClass

    public static void tearDownClass() throws Exception {

        InstrumentationRegistry.getInstrumentation()

                .getUiAutomation()

                .dropShellPermissionIdentity();

    }



    @Test

    public void startBleScan_withCallbackTypeAllMatches() {

        advertiseWithBumble(TEST_UUID_STRING);