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

Commit 65c080a5 authored by Charlie Boutier's avatar Charlie Boutier Committed by Automerger Merge Worker
Browse files

Merge "BumbleBluetoothTests: order the Rules" into main am: 25a910f4 

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



Change-Id: Ib9584073de97d049d48960b68ba3d6fd0a653f68
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f9acd10d 25a910f4

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

+6 −4
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import com.google.testing.junit.testparameterinjector.TestParameter; 
import com.google.testing.junit.testparameterinjector.TestParameterInjector;



import org.junit.Assume;

import org.junit.ClassRule;

import org.junit.Ignore;

import org.junit.Rule;

import org.junit.Test;
@@ -85,11 +84,14 @@ public class GattClientTest { 
            UUID.fromString("00000000-0000-0000-0000-00000000000");

    private static final UUID TEST_CHARACTERISTIC_UUID =

            UUID.fromString("00010001-0000-0000-0000-000000000000");

    @ClassRule public static final AdoptShellPermissionsRule PERM = new AdoptShellPermissionsRule();



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

    @Rule(order = 2)

    public final AdoptShellPermissionsRule mPermissionRule = new AdoptShellPermissionsRule();



    @Rule

    @Rule(order = 1)

    public final PandoraDevice mBumble = new PandoraDevice();



    @Rule(order = 0)

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();



    private final Context mContext = ApplicationProvider.getApplicationContext();

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

+5 −3
Original line number Diff line number Diff line
@@ -50,11 +50,13 @@ public class GattServerConnectWithoutScanTest { 
    private static final String TAG = "GattServerConnectWithoutScanTest";

    private static final int TIMEOUT_GATT_CONNECTION_MS = 2_000;



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

    @Rule(order = 2)

    public final AdoptShellPermissionsRule mPermissionRule = new AdoptShellPermissionsRule();



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

    @Rule(order = 1)

    public final PandoraDevice mBumble = new PandoraDevice();



    @Rule

    @Rule(order = 0)

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();



    private final Context mContext = ApplicationProvider.getApplicationContext();

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

+3 −2
Original line number Diff line number Diff line
@@ -45,9 +45,10 @@ import java.util.concurrent.TimeUnit; 
public class LeLegacyAdvertisingTest {

    private static final int TIMEOUT_MS = 1_000;



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

    @Rule(order = 1)

    public final AdoptShellPermissionsRule mPermissionRule = new AdoptShellPermissionsRule();



    @Rule

    @Rule(order = 0)

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();



    @RequiresFlagsEnabled(Flags.FLAG_BLE_CHECK_DATA_LENGTH_ON_LEGACY_ADVERTISING)