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

Commit ae7afe1d authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "BumbleBluetoothTests: Use androidx.test.ext.junit" into main

parents 3e5dd996 2e21cf00

framework/tests/bumble/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ android_test_helper_app { 
    target_sdk_version: "current",

    libs: [

        "android.test.base",

        "android.test.runner",

        "libprotobuf-java-micro",

    ],



    static_libs: [

        "androidx.core_core",

        "androidx.test.ext.junit",

        "androidx.test.ext.truth",

        "androidx.test.rules",

        "compatibility-device-util-axt",

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

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import android.content.IntentFilter; 
import android.util.Log;



import androidx.test.core.app.ApplicationProvider;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.ext.junit.runners.AndroidJUnit4;



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

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import android.os.ParcelUuid; 
import android.os.Parcelable;



import androidx.test.core.app.ApplicationProvider;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.ext.junit.runners.AndroidJUnit4;



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