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

Commit 13fe7bce authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge "Remove fakeosi in net_test_stack_btm" into main

parents ce669630 638a5601

system/stack/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -1497,7 +1497,6 @@ cc_test { 
        ":TestCommonMockFunctions",

        ":TestCommonStackConfig",

        ":TestFakeLooper",

        ":TestFakeOsi",

        ":TestFakeThread",

        ":TestMockBta",

        ":TestMockBtif",
@@ -1570,6 +1569,7 @@ cc_test { 
        "libgmock",

        "liblc3",

        "liblog",

        "libosi",

        "libprotobuf-cpp-lite",

        "libudrv-uipc",

    ],

system/stack/test/btm/sco_hci_test.cc

+0 −3
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include "stack/include/hfp_msbc_decoder.h"

#include "stack/include/hfp_msbc_encoder.h"

#include "test/common/mock_functions.h"

#include "test/fake/fake_osi.h"

#include "udrv/include/uipc.h"



extern bluetooth::core::CoreInterface* GetInterfaceToProfiles();
@@ -109,7 +108,6 @@ class ScoHciTest : public Test { 
 protected:

  void SetUp() override {

    reset_mock_function_count_map();

    fake_osi_ = std::make_unique<test::fake::FakeOsi>();

    mock_uipc_init_ret = nullptr;

    mock_uipc_read_ret = 0;

    mock_uipc_send_ret = true;
@@ -120,7 +118,6 @@ class ScoHciTest : public Test { 
    GetInterfaceToProfiles()->lc3Codec = &lc3_codec;

  }

  void TearDown() override {}

  std::unique_ptr<test::fake::FakeOsi> fake_osi_;

};



class ScoHciWithOpenCleanTest : public ScoHciTest {

system/stack/test/btm/stack_btm_test.cc

+0 −3
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
#include "stack/include/sec_hci_link_interface.h"

#include "stack/l2cap/l2c_int.h"

#include "test/common/mock_functions.h"

#include "test/fake/fake_osi.h"

#include "test/mock/mock_device_iot_config.h"

#include "test/mock/mock_main_shim_entry.h"

#include "test/mock/mock_osi_list.h"
@@ -97,10 +96,8 @@ class StackBtmTest : public Test { 
 protected:

  void SetUp() override {

    reset_mock_function_count_map();

    fake_osi_ = std::make_unique<test::fake::FakeOsi>();

  }

  void TearDown() override {}

  std::unique_ptr<test::fake::FakeOsi> fake_osi_;

};



class StackBtmWithQueuesTest : public StackBtmTest {