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

Commit cffb8d1d authored by Chris Manton's avatar Chris Manton
Browse files

mock: Use proper types tBTM_STATUS 

Bug: 351026527
Test: m .
Flag: EXEMPT, Test Infrastructure

Change-Id: I1188e4370f8a2b2ba6b3a6c95ab0eef912730cd0
parent dd572237

system/test/mock/mock_stack_acl.h

+12 −8
Original line number Diff line number Diff line
@@ -324,7 +324,9 @@ extern struct acl_get_connection_from_handle acl_get_connection_from_handle; 
// Returns: tBTM_STATUS

struct BTM_GetLinkSuperTout {

  std::function<tBTM_STATUS(const RawAddress& remote_bda, uint16_t* p_timeout)> body{

          [](const RawAddress& /* remote_bda */, uint16_t* /* p_timeout */) { return 0; }};

          [](const RawAddress& /* remote_bda */, uint16_t* /* p_timeout */) {

            return BTM_SUCCESS;

          }};

  tBTM_STATUS operator()(const RawAddress& remote_bda, uint16_t* p_timeout) {

    return body(remote_bda, p_timeout);

  }
@@ -335,7 +337,9 @@ extern struct BTM_GetLinkSuperTout BTM_GetLinkSuperTout; 
// Returns: tBTM_STATUS

struct BTM_GetRole {

  std::function<tBTM_STATUS(const RawAddress& remote_bd_addr, tHCI_ROLE* p_role)> body{

          [](const RawAddress& /* remote_bd_addr */, tHCI_ROLE* /* p_role */) { return 0; }};

          [](const RawAddress& /* remote_bd_addr */, tHCI_ROLE* /* p_role */) {

            return BTM_SUCCESS;

          }};

  tBTM_STATUS operator()(const RawAddress& remote_bd_addr, tHCI_ROLE* p_role) {

    return body(remote_bd_addr, p_role);

  }
@@ -346,7 +350,7 @@ extern struct BTM_GetRole BTM_GetRole; 
// Returns: tBTM_STATUS

struct BTM_ReadFailedContactCounter {

  std::function<tBTM_STATUS(const RawAddress& remote_bda, tBTM_CMPL_CB* p_cb)> body{

          [](const RawAddress& /* remote_bda */, tBTM_CMPL_CB* /* p_cb */) { return 0; }};

          [](const RawAddress& /* remote_bda */, tBTM_CMPL_CB* /* p_cb */) { return BTM_SUCCESS; }};

  tBTM_STATUS operator()(const RawAddress& remote_bda, tBTM_CMPL_CB* p_cb) {

    return body(remote_bda, p_cb);

  }
@@ -357,7 +361,7 @@ extern struct BTM_ReadFailedContactCounter BTM_ReadFailedContactCounter; 
// Returns: tBTM_STATUS

struct BTM_ReadRSSI {

  std::function<tBTM_STATUS(const RawAddress& remote_bda, tBTM_CMPL_CB* p_cb)> body{

          [](const RawAddress& /* remote_bda */, tBTM_CMPL_CB* /* p_cb */) { return 0; }};

          [](const RawAddress& /* remote_bda */, tBTM_CMPL_CB* /* p_cb */) { return BTM_SUCCESS; }};

  tBTM_STATUS operator()(const RawAddress& remote_bda, tBTM_CMPL_CB* p_cb) {

    return body(remote_bda, p_cb);

  }
@@ -370,7 +374,7 @@ struct BTM_ReadTxPower { 
  std::function<tBTM_STATUS(const RawAddress& remote_bda, tBT_TRANSPORT transport,

                            tBTM_CMPL_CB* p_cb)>

          body{[](const RawAddress& /* remote_bda */, tBT_TRANSPORT /* transport */,

                  tBTM_CMPL_CB* /* p_cb */) { return BT_TRANSPORT_BR_EDR; }};

                  tBTM_CMPL_CB* /* p_cb */) { return BTM_SUCCESS; }};

  tBTM_STATUS operator()(const RawAddress& remote_bda, tBT_TRANSPORT transport,

                         tBTM_CMPL_CB* p_cb) {

    return body(remote_bda, transport, p_cb);
@@ -382,7 +386,7 @@ extern struct BTM_ReadTxPower BTM_ReadTxPower; 
// Returns: tBTM_STATUS

struct BTM_SetLinkSuperTout {

  std::function<tBTM_STATUS(const RawAddress& remote_bda, uint16_t timeout)> body{

          [](const RawAddress& /* remote_bda */, uint16_t /* timeout */) { return 0; }};

          [](const RawAddress& /* remote_bda */, uint16_t /* timeout */) { return BTM_SUCCESS; }};

  tBTM_STATUS operator()(const RawAddress& remote_bda, uint16_t timeout) {

    return body(remote_bda, timeout);

  }
@@ -393,7 +397,7 @@ extern struct BTM_SetLinkSuperTout BTM_SetLinkSuperTout; 
// Returns: tBTM_STATUS

struct BTM_SwitchRoleToCentral {

  std::function<tBTM_STATUS(const RawAddress& remote_bd_addr)> body{

          [](const RawAddress& /* remote_bd_addr */) { return 0; }};

          [](const RawAddress& /* remote_bd_addr */) { return BTM_SUCCESS; }};

  tBTM_STATUS operator()(const RawAddress& remote_bd_addr) { return body(remote_bd_addr); }

};

extern struct BTM_SwitchRoleToCentral BTM_SwitchRoleToCentral;
@@ -403,7 +407,7 @@ extern struct BTM_SwitchRoleToCentral BTM_SwitchRoleToCentral; 
struct btm_remove_acl {

  std::function<tBTM_STATUS(const RawAddress& bd_addr, tBT_TRANSPORT transport)> body{

          [](const RawAddress& /* bd_addr */, tBT_TRANSPORT /* transport */) {

            return BT_TRANSPORT_BR_EDR;

            return BTM_SUCCESS;

          }};

  tBTM_STATUS operator()(const RawAddress& bd_addr, tBT_TRANSPORT transport) {

    return body(bd_addr, transport);

system/test/mock/mock_stack_btm_ble.cc

+4 −4
Original line number Diff line number Diff line
@@ -105,16 +105,16 @@ const Octet16 BTM_GetDeviceEncRoot::return_value{0xd5, 0xcb, 0x84, 0x54, 0xd1, 0 
const Octet16 BTM_GetDeviceIDRoot::return_value{0xd5, 0xcb, 0x84, 0x54, 0xd1, 0x77, 0x73, 0x3e,

                                                0xff, 0xff, 0xb2, 0xec, 0x71, 0x2b, 0xae, 0xab};

bool BTM_ReadConnectedTransportAddress::return_value = false;

tBTM_STATUS BTM_SetBleDataLength::return_value = 0;

tBTM_STATUS BTM_SetBleDataLength::return_value = BTM_SUCCESS;

bool BTM_UseLeLink::return_value = false;

bool btm_ble_get_acl_remote_addr::return_value = false;

bool btm_ble_get_enc_key_type::return_value = false;

uint8_t btm_ble_read_sec_key_size::return_value = 0;

tBTM_STATUS btm_ble_set_encryption::return_value = 0;

tBTM_STATUS btm_ble_start_encrypt::return_value = 0;

tBTM_STATUS btm_ble_set_encryption::return_value = BTM_SUCCESS;

tBTM_STATUS btm_ble_start_encrypt::return_value = BTM_SUCCESS;

tBTM_STATUS btm_ble_start_sec_check::return_value = BTM_SUCCESS;

bool btm_get_local_div::return_value = false;

tBTM_STATUS btm_proc_smp_cback::return_value = 0;

tBTM_STATUS btm_proc_smp_cback::return_value = BTM_SUCCESS;



}  // namespace stack_btm_ble

}  // namespace mock

system/test/mock/mock_stack_btm_ble_privacy.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ extern struct btm_ble_read_resolving_list_entry_complete btm_ble_read_resolving_ 
// Returns: tBTM_STATUS

struct btm_ble_remove_resolving_list_entry {

  std::function<tBTM_STATUS(tBTM_SEC_DEV_REC* p_dev_rec)> body{

          [](tBTM_SEC_DEV_REC* /* p_dev_rec */) { return 0; }};

          [](tBTM_SEC_DEV_REC* /* p_dev_rec */) { return BTM_SUCCESS; }};

  tBTM_STATUS operator()(tBTM_SEC_DEV_REC* p_dev_rec) { return body(p_dev_rec); }

};

extern struct btm_ble_remove_resolving_list_entry btm_ble_remove_resolving_list_entry;

system/test/mock/mock_stack_btm_inq.cc

+8 −8
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ namespace test { 
namespace mock {

namespace stack_btm_inq {



tBTM_STATUS BTM_CancelRemoteDeviceName::return_value = 0;

tBTM_STATUS BTM_ClearInqDb::return_value = 0;

tBTM_STATUS BTM_CancelRemoteDeviceName::return_value = BTM_SUCCESS;

tBTM_STATUS BTM_ClearInqDb::return_value = BTM_SUCCESS;

uint8_t BTM_GetEirSupportedServices::return_value = 0;

uint8_t BTM_GetEirUuidList::return_value = 0;

bool BTM_HasEirService::return_value = false;
@@ -87,12 +87,12 @@ tBTM_INQ_INFO* BTM_InqDbFirst::return_value = nullptr; 
tBTM_INQ_INFO* BTM_InqDbNext::return_value = nullptr;

tBTM_INQ_INFO* BTM_InqDbRead::return_value = nullptr;

uint16_t BTM_IsInquiryActive::return_value = 0;

tBTM_STATUS BTM_ReadRemoteDeviceName::return_value = 0;

tBTM_STATUS BTM_SetConnectability::return_value = 0;

tBTM_STATUS BTM_SetDiscoverability::return_value = 0;

tBTM_STATUS BTM_SetInquiryMode::return_value = 0;

tBTM_STATUS BTM_StartInquiry::return_value = 0;

tBTM_STATUS BTM_WriteEIR::return_value = 0;

tBTM_STATUS BTM_ReadRemoteDeviceName::return_value = BTM_SUCCESS;

tBTM_STATUS BTM_SetConnectability::return_value = BTM_SUCCESS;

tBTM_STATUS BTM_SetDiscoverability::return_value = BTM_SUCCESS;

tBTM_STATUS BTM_SetInquiryMode::return_value = BTM_SUCCESS;

tBTM_STATUS BTM_StartInquiry::return_value = BTM_SUCCESS;

tBTM_STATUS BTM_WriteEIR::return_value = BTM_SUCCESS;

tINQ_DB_ENT* btm_inq_db_find::return_value = nullptr;

tINQ_DB_ENT* btm_inq_db_new::return_value = nullptr;

bool btm_inq_find_bdaddr::return_value = false;

system/test/mock/mock_stack_btm_sec.cc

+8 −8
Original line number Diff line number Diff line
@@ -120,23 +120,23 @@ bool BTM_IsLinkKeyAuthed::return_value = false; 
bool BTM_IsLinkKeyKnown::return_value = false;

bool BTM_PeerSupportsSecureConnections::return_value = false;

bool BTM_SecAddRmtNameNotifyCallback::return_value = false;

tBTM_STATUS BTM_SecBond::return_value = 0;

tBTM_STATUS BTM_SecBondCancel::return_value = 0;

tBTM_STATUS BTM_SecBond::return_value = BTM_SUCCESS;

tBTM_STATUS BTM_SecBondCancel::return_value = BTM_SUCCESS;

uint8_t BTM_SecClrService::return_value = 0;

uint8_t BTM_SecClrServiceByPsm::return_value = 0;

bool BTM_SecDeleteRmtNameNotifyCallback::return_value = false;

tBTM_LINK_KEY_TYPE BTM_SecGetDeviceLinkKeyType::return_value = 0;

bool BTM_SecIsSecurityPending::return_value = false;

bool BTM_SecRegister::return_value = false;

tBTM_STATUS BTM_SetEncryption::return_value = 0;

tBTM_STATUS BTM_SetEncryption::return_value = BTM_SUCCESS;

bool BTM_SetSecurityLevel::return_value = false;

const DEV_CLASS btm_get_dev_class::return_value = kDevClassEmpty;

tBTM_STATUS btm_sec_bond_by_transport::return_value = 0;

tBTM_STATUS btm_sec_disconnect::return_value = 0;

tBTM_STATUS btm_sec_bond_by_transport::return_value = BTM_SUCCESS;

tBTM_STATUS btm_sec_disconnect::return_value = BTM_SUCCESS;

bool btm_sec_is_a_bonded_dev::return_value = false;

tBTM_STATUS btm_sec_l2cap_access_req::return_value = 0;

tBTM_STATUS btm_sec_l2cap_access_req_by_requirement::return_value = 0;

tBTM_STATUS btm_sec_mx_access_request::return_value = 0;

tBTM_STATUS btm_sec_l2cap_access_req::return_value = BTM_SUCCESS;

tBTM_STATUS btm_sec_l2cap_access_req_by_requirement::return_value = BTM_SUCCESS;

tBTM_STATUS btm_sec_mx_access_request::return_value = BTM_SUCCESS;



bool BTM_IsRemoteNameKnown::return_value = false;