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

Commit 262cb292 authored by Chris Manton's avatar Chris Manton
Browse files

net_test_bta: Add init_bta_dm_search_cb__conn_id 

Bug: 310711695
Test: atest net_test_bta

Change-Id: I2effe4e7524db465214140abee1aed54f9c64c94
parent 5d7d6299

system/bta/dm/bta_dm_disc.cc

+3 −0
Original line number Diff line number Diff line
@@ -2476,6 +2476,9 @@ namespace bluetooth { 
namespace legacy {

namespace testing {



void bta_dm_disc_init_search_cb(tBTA_DM_SEARCH_CB& bta_dm_search_cb) {

  ::bta_dm_disc_init_search_cb(bta_dm_search_cb);

}

tBTA_DM_SEARCH_CB bta_dm_disc_get_search_cb() {

  tBTA_DM_SEARCH_CB search_cb = {};

  ::bta_dm_disc_init_search_cb(search_cb);

system/bta/test/bta_disc_test.cc

+24 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "bta/dm/bta_dm_disc.h"

#include "bta/dm/bta_dm_int.h"

#include "stack/btm/neighbor_inquiry.h"

#include "stack/include/gatt_api.h"

#include "test/common/main_handler.h"

#include "test/fake/fake_osi.h"

#include "types/bt_transport.h"
@@ -39,6 +40,7 @@ namespace bluetooth { 
namespace legacy {

namespace testing {



void bta_dm_disc_init_search_cb(tBTA_DM_SEARCH_CB& bta_dm_search_cb);

bool bta_dm_read_remote_device_name(const RawAddress& bd_addr,

                                    tBT_TRANSPORT transport);

const tBTA_DM_SEARCH_CB& bta_dm_disc_search_cb();
@@ -270,3 +272,25 @@ TEST_F(BtaDiscTest, bta_dm_disc_stop_service_discovery__BT_TRANSPORT_BR_EDR) { 
TEST_F(BtaDiscTest, bta_dm_disc_stop_service_discovery__BT_TRANSPORT_LE) {

  bta_dm_disc_stop_service_discovery(kRawAddress, BT_TRANSPORT_LE);

}



TEST_F(BtaDiscTest, init_bta_dm_search_cb__conn_id) {

  constexpr uint16_t kConnId = 123;



  // Set the global search block target field to some non-reset value

  tBTA_DM_SEARCH_CB search_cb = {};

  search_cb.conn_id = kConnId;

  bluetooth::legacy::testing::bta_dm_disc_search_cb(search_cb);

  // Get the global search block and ensure it is still intact

  search_cb = bluetooth::legacy::testing::bta_dm_disc_search_cb();

  ASSERT_EQ(kConnId, search_cb.conn_id);



  // Initialize *this* global search block

  bluetooth::legacy::testing::bta_dm_disc_init_search_cb(search_cb);



  // Verify *this* global search block field reset value is correct

  ASSERT_EQ(search_cb.conn_id, GATT_INVALID_CONN_ID);



  // Get the global search block and ensure it is still intact

  search_cb = bluetooth::legacy::testing::bta_dm_disc_search_cb();

  ASSERT_EQ(kConnId, search_cb.conn_id);

}