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

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

net_test_btif_hh: Remove dynamic allocation in test 

Bug: 336582958
Test: atest net_test_btif_stack
Flag: EXEMPT, Test Infrastructure

Change-Id: I7dae69cfa56c80c7e2a50f145ec5eaa970892daf
parent 1eec9fee

system/btif/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -636,9 +636,6 @@ cc_test { 
        "libprotobuf-cpp-lite",

        "libstatslog_bt",

    ],

    cflags: [

        "-Wno-unused-parameter",

    ],

    target: {

        android: {

            static_libs: [

system/btif/test/btif_hh_test.cc

+12 −13
Original line number Diff line number Diff line
@@ -28,10 +28,8 @@ 
#include "btcore/include/module.h"

#include "common/init_flags.h"

#include "include/hardware/bt_hh.h"

#include "osi/include/allocator.h"

#include "test/common/core_interface.h"

#include "test/common/mock_functions.h"

#include "test/mock/mock_osi_allocator.h"



using namespace std::chrono_literals;
@@ -162,7 +160,7 @@ class BtifHhWithHalCallbacksTest : public BtifHhWithMockTest { 
    ASSERT_EQ(std::future_status::ready, future.wait_for(2s));

    ASSERT_EQ(ASSOCIATE_JVM, future.get());



    bt_callbacks.thread_evt_cb = [](bt_cb_thread_evt evt) {};

    bt_callbacks.thread_evt_cb = [](bt_cb_thread_evt /* evt */) {};

  }



  void TearDown() override {
@@ -175,7 +173,7 @@ class BtifHhWithHalCallbacksTest : public BtifHhWithMockTest { 
    ASSERT_EQ(std::future_status::ready, future.wait_for(2s));

    ASSERT_EQ(DISASSOCIATE_JVM, future.get());



    bt_callbacks.thread_evt_cb = [](bt_cb_thread_evt evt) {};

    bt_callbacks.thread_evt_cb = [](bt_cb_thread_evt /* evt */) {};

    BtifHhWithMockTest::TearDown();

  }

};
@@ -213,6 +211,8 @@ class BtifHhWithDevice : public BtifHhAdapterReady { 


TEST_F(BtifHhAdapterReady, lifecycle) {}



static uint8_t report_data[sizeof(BT_HDR) + data32.size()];



TEST_F(BtifHhWithDevice, BTA_HH_GET_RPT_EVT) {

  tBTA_HH data = {

      .hs_data =
@@ -221,8 +221,7 @@ TEST_F(BtifHhWithDevice, BTA_HH_GET_RPT_EVT) { 
              .handle = kHhHandle,

              .rsp_data =

                  {

                      .p_rpt_data = static_cast<BT_HDR*>(

                          osi_calloc(data32.size() + sizeof(BT_HDR))),

                      .p_rpt_data = reinterpret_cast<BT_HDR*>(report_data),

                  },

          },

  };
@@ -235,8 +234,8 @@ TEST_F(BtifHhWithDevice, BTA_HH_GET_RPT_EVT) { 
  g_bthh_callbacks_get_report_promise = std::promise<get_report_cb_t>();

  auto future = g_bthh_callbacks_get_report_promise.get_future();

  bthh_callbacks.get_report_cb = [](RawAddress* bd_addr,

                                    tBLE_ADDR_TYPE addr_type,

                                    tBT_TRANSPORT transport,

                                    tBLE_ADDR_TYPE /* addr_type */,

                                    tBT_TRANSPORT /* transport */,

                                    bthh_status_t hh_status, uint8_t* rpt_data,

                                    int rpt_size) {

    get_report_cb_t report = {
@@ -249,7 +248,6 @@ TEST_F(BtifHhWithDevice, BTA_HH_GET_RPT_EVT) { 
  };



  bluetooth::legacy::testing::bte_hh_evt(BTA_HH_GET_RPT_EVT, &data);

  osi_free(data.hs_data.rsp_data.p_rpt_data);



  ASSERT_EQ(std::future_status::ready, future.wait_for(2s));

  auto report = future.get();
@@ -269,8 +267,8 @@ class BtifHHVirtualUnplugTest : public BtifHhAdapterReady { 
  void SetUp() override {

    BtifHhAdapterReady::SetUp();

    bthh_callbacks.connection_state_cb = [](RawAddress* bd_addr,

                                            tBLE_ADDR_TYPE addr_type,

                                            tBT_TRANSPORT transport,

                                            tBLE_ADDR_TYPE /* addr_type */,

                                            tBT_TRANSPORT /* transport */,

                                            bthh_connection_state_t state) {

      connection_state_cb_t connection_state = {

        .raw_address = *bd_addr,
@@ -282,8 +280,9 @@ class BtifHHVirtualUnplugTest : public BtifHhAdapterReady { 


  void TearDown() override {

    bthh_callbacks.connection_state_cb =

        [](RawAddress* bd_addr, tBLE_ADDR_TYPE addr_type,

           tBT_TRANSPORT transport, bthh_connection_state_t state) {};

        [](RawAddress* /* bd_addr */, tBLE_ADDR_TYPE /* addr_type */,

           tBT_TRANSPORT /* transport */,

           bthh_connection_state_t /* state */) {};

    BtifHhAdapterReady::TearDown();

  }

};