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

Commit 90617877 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski
Browse files

bta/test: Improve gatt mock api 

Bug: 150670922
Tag: #feature
Test: Na
Sponsor: jpawlowski@

Change-Id: I6dc89d7cc10dbdbc4a32808a77fe56b6de1738d0
parent 9da430e1

system/bta/test/common/bta_gatt_api_mock.cc

+23 −4
Original line number Diff line number Diff line
@@ -26,54 +26,72 @@ void gatt::SetMockBtaGattInterface( 


void BTA_GATTC_AppRegister(tBTA_GATTC_CBACK* p_client_cb,

                           BtaAppRegisterCallback cb, bool eatt_support) {

  LOG_ASSERT(gatt_interface) << "Mock GATT interface not set!";

  gatt_interface->AppRegister(p_client_cb, cb, eatt_support);

}



void BTA_GATTC_AppDeregister(tGATT_IF client_if) {

  LOG_ASSERT(gatt_interface) << "Mock GATT interface not set!";

  gatt_interface->AppDeregister(client_if);

}



void BTA_GATTC_Open(tGATT_IF client_if, const RawAddress& remote_bda,

                    bool is_direct, tBT_TRANSPORT transport,

                    bool opportunistic) {

                    bool is_direct, tBT_TRANSPORT transport, bool opportunistic,

                    uint8_t initiating_phys) {

  LOG_ASSERT(gatt_interface) << "Mock GATT interface not set!";

  gatt_interface->Open(client_if, remote_bda, is_direct, transport,

                       opportunistic);

                       opportunistic, initiating_phys);

}



void BTA_GATTC_Open(tGATT_IF client_if, const RawAddress& remote_bda,

                    bool is_direct, bool opportunistic) {

  LOG_ASSERT(gatt_interface) << "Mock GATT interface not set!";

  gatt_interface->Open(client_if, remote_bda, is_direct, opportunistic);

}



void BTA_GATTC_CancelOpen(tGATT_IF client_if, const RawAddress& remote_bda,

                          bool is_direct) {

  LOG_ASSERT(gatt_interface) << "Mock GATT interface not set!";

  gatt_interface->CancelOpen(client_if, remote_bda, is_direct);

}



void BTA_GATTC_Close(uint16_t conn_id) { gatt_interface->Close(conn_id); }

void BTA_GATTC_Close(uint16_t conn_id) {

  LOG_ASSERT(gatt_interface) << "Mock GATT interface not set!";

  gatt_interface->Close(conn_id);

}



void BTA_GATTC_ServiceSearchRequest(uint16_t conn_id,

                                    const bluetooth::Uuid* p_srvc_uuid) {

  LOG_ASSERT(gatt_interface) << "Mock GATT interface not set!";

  gatt_interface->ServiceSearchRequest(conn_id, p_srvc_uuid);

}



void BTA_GATTC_SendIndConfirm(uint16_t conn_id, uint16_t cid) {

  LOG_ASSERT(gatt_interface) << "Mock GATT interface not set!";

  gatt_interface->SendIndConfirm(conn_id, cid);

}



const std::list<gatt::Service>* BTA_GATTC_GetServices(uint16_t conn_id) {

  LOG_ASSERT(gatt_interface) << "Mock GATT interface not set!";

  return gatt_interface->GetServices(conn_id);

}



const gatt::Characteristic* BTA_GATTC_GetCharacteristic(uint16_t conn_id,

                                                        uint16_t handle) {

  LOG_ASSERT(gatt_interface) << "Mock GATT interface not set!";

  return gatt_interface->GetCharacteristic(conn_id, handle);

}



const gatt::Service* BTA_GATTC_GetOwningService(uint16_t conn_id,

                                                uint16_t handle) {

  LOG_ASSERT(gatt_interface) << "Mock GATT interface not set!";

  return gatt_interface->GetOwningService(conn_id, handle);

}



tGATT_STATUS BTA_GATTC_RegisterForNotifications(tGATT_IF client_if,

                                                const RawAddress& remote_bda,

                                                uint16_t handle) {

  LOG_ASSERT(gatt_interface) << "Mock GATT interface not set!";

  return gatt_interface->RegisterForNotifications(client_if, remote_bda,

                                                  handle);

}
@@ -81,6 +99,7 @@ tGATT_STATUS BTA_GATTC_RegisterForNotifications(tGATT_IF client_if, 
tGATT_STATUS BTA_GATTC_DeregisterForNotifications(tGATT_IF client_if,

                                                  const RawAddress& remote_bda,

                                                  uint16_t handle) {

  LOG_ASSERT(gatt_interface) << "Mock GATT interface not set!";

  return gatt_interface->DeregisterForNotifications(client_if, remote_bda,

                                                    handle);

}

system/bta/test/common/bta_gatt_api_mock.h

+8 −3
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ class BtaGattInterface { 
                           BtaAppRegisterCallback cb, bool eatt_support) = 0;

  virtual void AppDeregister(tGATT_IF client_if) = 0;

  virtual void Open(tGATT_IF client_if, const RawAddress& remote_bda,

                    bool is_direct, tBT_TRANSPORT transport,

                    bool opportunistic) = 0;

                    bool is_direct, tBT_TRANSPORT transport, bool opportunistic,

                    uint8_t initiating_phys) = 0;

  virtual void Open(tGATT_IF client_if, const RawAddress& remote_bda,

                    bool is_direct, bool opportunistic) = 0;

  virtual void CancelOpen(tGATT_IF client_if, const RawAddress& remote_bda,
@@ -38,6 +38,7 @@ class BtaGattInterface { 
  virtual void Close(uint16_t conn_id) = 0;

  virtual void ServiceSearchRequest(uint16_t conn_id,

                                    const bluetooth::Uuid* p_srvc_uuid) = 0;

  virtual void SendIndConfirm(uint16_t conn_id, uint16_t cid) = 0;

  virtual const std::list<Service>* GetServices(uint16_t conn_id) = 0;

  virtual const Characteristic* GetCharacteristic(uint16_t conn_id,

                                                  uint16_t handle) = 0;
@@ -61,7 +62,9 @@ class MockBtaGattInterface : public BtaGattInterface { 
  MOCK_METHOD((void), AppDeregister, (tGATT_IF client_if), (override));

  MOCK_METHOD((void), Open,

              (tGATT_IF client_if, const RawAddress& remote_bda, bool is_direct,

               tBT_TRANSPORT transport, bool opportunistic));

               tBT_TRANSPORT transport, bool opportunistic,

               uint8_t initiating_phys),

              (override));

  MOCK_METHOD((void), Open,

              (tGATT_IF client_if, const RawAddress& remote_bda, bool is_direct,

               bool opportunistic));
@@ -71,6 +74,8 @@ class MockBtaGattInterface : public BtaGattInterface { 
  MOCK_METHOD((void), Close, (uint16_t conn_id));

  MOCK_METHOD((void), ServiceSearchRequest,

              (uint16_t conn_id, const bluetooth::Uuid* p_srvc_uuid));

  MOCK_METHOD((void), SendIndConfirm, (uint16_t conn_id, uint16_t cid),

              (override));

  MOCK_METHOD((std::list<Service>*), GetServices, (uint16_t conn_id));

  MOCK_METHOD((const Characteristic*), GetCharacteristic,

              (uint16_t conn_id, uint16_t handle));