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

Commit 06340d93 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Mock static initialization order 04 am: 7c242acf 

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



Change-Id: I325450e94940f557e5b2f97faf97088ffca18921
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b8fa7d9a 7c242acf

system/bta/csis/csis_client_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ class CsisClientTest : public ::testing::Test { 


 protected:

  void SetUp(void) override {

    mock_function_count_map.clear();

    reset_mock_function_count_map();

    bluetooth::manager::SetMockBtmInterface(&btm_interface);

    dm::SetMockBtaDmInterface(&dm_interface);

    gatt::SetMockBtaGattInterface(&gatt_interface);

system/bta/groups/groups_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ class MockGroupsCallbacks : public DeviceGroupsCallbacks { 
class GroupsTest : public ::testing::Test {

 protected:

  void SetUp() override {

    mock_function_count_map.clear();

    reset_mock_function_count_map();

    callbacks.reset(new MockGroupsCallbacks());

  }

system/bta/le_audio/broadcaster/broadcaster_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ class BroadcasterTest : public Test { 
  void SetUp() override {

    init_message_loop_thread();



    mock_function_count_map.clear();

    reset_mock_function_count_map();

    ON_CALL(controller_interface_, SupportsBleIsochronousBroadcaster)

        .WillByDefault(Return(true));

system/bta/le_audio/broadcaster/state_machine_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ class MockBroadcastStatMachineCallbacks 
class StateMachineTest : public Test {

 protected:

  void SetUp() override {

    mock_function_count_map.clear();

    reset_mock_function_count_map();

    BleAdvertisingManager::Initialize(nullptr);



    ble_advertising_manager_ = BleAdvertisingManager::Get();

system/bta/le_audio/state_machine_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ class StateMachineTest : public Test { 


  void SetUp() override {

    bluetooth::common::InitFlags::Load(test_flags);

    mock_function_count_map.clear();

    reset_mock_function_count_map();

    controller::SetMockControllerInterface(&mock_controller_);

    bluetooth::manager::SetMockBtmInterface(&btm_interface);

    gatt::SetMockBtaGattInterface(&gatt_interface);