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

Commit b57af11d authored by Chris Manton's avatar Chris Manton Committed by Gerrit Code Review
Browse files

Merge changes I286c6c27,Iaea65d0a,If1702be4,I6b980856,I75400d59 into main 

* changes:
  mock: [5/63] Remove btm_ble_init
  mock: [4/63] Remove btm_ble_free
  mock: [3/63] Remove BTM_AddEirService
  mock: [2/63] Remove ACL_UnregisterClient
  mock: [1/63] Remove ACL_RegisterClient
parents ec294128 f9847487

system/test/mock/mock_stack_acl.cc

+0 −10
Original line number Diff line number Diff line
@@ -87,8 +87,6 @@ struct BTM_GetPeerSCA BTM_GetPeerSCA; 
struct acl_link_role_from_handle acl_link_role_from_handle;

struct btm_handle_to_acl_index btm_handle_to_acl_index;

struct BTM_ReadRemoteFeatures BTM_ReadRemoteFeatures;

struct ACL_RegisterClient ACL_RegisterClient;

struct ACL_UnregisterClient ACL_UnregisterClient;

struct BTM_ReadConnectionAddr BTM_ReadConnectionAddr;

struct BTM_RequestPeerSCA BTM_RequestPeerSCA;

struct BTM_acl_after_controller_started BTM_acl_after_controller_started;
@@ -341,14 +339,6 @@ uint8_t* BTM_ReadRemoteFeatures(const RawAddress& addr) { 
  inc_func_call_count(__func__);

  return test::mock::stack_acl::BTM_ReadRemoteFeatures(addr);

}

void ACL_RegisterClient(struct acl_client_callback_s* callbacks) {

  inc_func_call_count(__func__);

  test::mock::stack_acl::ACL_RegisterClient(callbacks);

}

void ACL_UnregisterClient(struct acl_client_callback_s* callbacks) {

  inc_func_call_count(__func__);

  test::mock::stack_acl::ACL_UnregisterClient(callbacks);

}

void BTM_ReadConnectionAddr(const RawAddress& remote_bda, RawAddress& local_conn_addr,

                            tBLE_ADDR_TYPE* p_addr_type, bool ota_address) {

  inc_func_call_count(__func__);

system/test/mock/mock_stack_acl.h

+0 −18
Original line number Diff line number Diff line
@@ -506,24 +506,6 @@ struct BTM_ReadRemoteFeatures { 
  uint8_t* operator()(const RawAddress& addr) { return body(addr); }

};

extern struct BTM_ReadRemoteFeatures BTM_ReadRemoteFeatures;

// Name: ACL_RegisterClient

// Params: struct acl_client_callback_s* callbacks

// Returns: void

struct ACL_RegisterClient {

  std::function<void(struct acl_client_callback_s* callbacks)> body{

          [](struct acl_client_callback_s* /* callbacks */) { ; }};

  void operator()(struct acl_client_callback_s* callbacks) { body(callbacks); }

};

extern struct ACL_RegisterClient ACL_RegisterClient;

// Name: ACL_UnregisterClient

// Params: struct acl_client_callback_s* callbacks

// Returns: void

struct ACL_UnregisterClient {

  std::function<void(struct acl_client_callback_s* callbacks)> body{

          [](struct acl_client_callback_s* /* callbacks */) { ; }};

  void operator()(struct acl_client_callback_s* callbacks) { body(callbacks); }

};

extern struct ACL_UnregisterClient ACL_UnregisterClient;

// Name: BTM_ReadConnectionAddr

// Params: const RawAddress& remote_bda, RawAddress& local_conn_addr, bool

// ota_address tBLE_ADDR_TYPE* p_addr_type Returns: void

system/test/mock/mock_stack_btm_ble_addr.cc

+0 −5
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ namespace mock { 
namespace stack_btm_ble_addr {



// Function state capture and return values, if needed

struct btm_ble_init_pseudo_addr btm_ble_init_pseudo_addr;

struct btm_ble_addr_resolvable btm_ble_addr_resolvable;

struct btm_ble_resolve_random_addr btm_ble_resolve_random_addr;

struct btm_identity_addr_to_random_pseudo btm_identity_addr_to_random_pseudo;
@@ -51,10 +50,6 @@ struct btm_ble_refresh_peer_resolvable_private_addr btm_ble_refresh_peer_resolva 
}  // namespace test



// Mocked functions, if any

bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec, const RawAddress& new_pseudo_addr) {

  inc_func_call_count(__func__);

  return test::mock::stack_btm_ble_addr::btm_ble_init_pseudo_addr(p_dev_rec, new_pseudo_addr);

}

bool btm_ble_addr_resolvable(const RawAddress& rpa, tBTM_SEC_DEV_REC* p_dev_rec) {

  inc_func_call_count(__func__);

  return test::mock::stack_btm_ble_addr::btm_ble_addr_resolvable(rpa, p_dev_rec);

system/test/mock/mock_stack_btm_ble_addr.h

+0 −14
Original line number Diff line number Diff line
@@ -35,20 +35,6 @@ namespace test { 
namespace mock {

namespace stack_btm_ble_addr {



// Shared state between mocked functions and tests

// Name: btm_ble_init_pseudo_addr

// Params: tBTM_SEC_DEV_REC* p_dev_rec, const RawAddress& new_pseudo_addr

// Returns: bool

struct btm_ble_init_pseudo_addr {

  std::function<bool(tBTM_SEC_DEV_REC* p_dev_rec, const RawAddress& new_pseudo_addr)> body{

          [](tBTM_SEC_DEV_REC* /* p_dev_rec */, const RawAddress& /* new_pseudo_addr */) {

            return false;

          }};

  bool operator()(tBTM_SEC_DEV_REC* p_dev_rec, const RawAddress& new_pseudo_addr) {

    return body(p_dev_rec, new_pseudo_addr);

  }

};

extern struct btm_ble_init_pseudo_addr btm_ble_init_pseudo_addr;

// Name: btm_ble_addr_resolvable

// Params: const RawAddress& rpa, tBTM_SEC_DEV_REC* p_dev_rec

// Returns: bool

system/test/mock/mock_stack_btm_ble_gap.cc

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ void BTM_BleSetScanParams(uint32_t /* scan_interval */, uint32_t /* scan_window 
void btm_ble_decrement_link_topology_mask(uint8_t /* link_role */) {

  inc_func_call_count(__func__);

}

void btm_ble_free() { inc_func_call_count(__func__); }

void btm_ble_increment_link_topology_mask(uint8_t /* link_role */) {

  inc_func_call_count(__func__);

}