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

Commit 82628bfd authored by Wen Chang Liu's avatar Wen Chang Liu Committed by Chris Manton
Browse files

Revert "Update test/mock_stack_acl" 

Revert submission 1738738
Bug: 191431228
Tag: #refactor
Test: gd/cert/run

Reason for revert: Test Cop test checking
Reverted Changes:
I97a6d10c9:test: Fix net_test_osi
Ib514252d0:Make stack_smp_test host runnable
I77e9a079c:Update test/mock_stack_acl
Ia8a2896ca:Canonicalize include pathnames
Ibc4d03fc1:Add test/mock_btif_bluetooth
Id4733a3af:Remove unused mocks
Ifebdb31ec:Re-point stack tests to use centralized test/mock

Change-Id: I85fbbb967b17372f8f27694a717cd2676bbf01f1
parent 914a0739

system/bta/test/bta_dm_test.cc

+4 −16
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include "bta/include/bta_hf_client_api.h"

#include "bta/test/common/fake_osi.h"

#include "common/message_loop_thread.h"

#include "test/mock/mock_stack_acl.h"



std::map<std::string, int> mock_function_count_map;
@@ -75,37 +74,28 @@ TEST_F(BtaDmTest, disable_no_acl_links) { 
  ASSERT_TRUE(!bta_dm_cb.disabling);

}



extern uint16_t mock_stack_acl_num_links;

TEST_F(BtaDmTest, disable_first_pass_with_acl_links) {

  uint16_t links_up = 1;

  test::mock::stack_acl::BTM_GetNumAclLinks.body = [&links_up]() {

    return links_up;

  };

  bta_dm_cb.disabling = true;

  // ACL link is open

  bta_dm_cb.device_list.count = 1;

  mock_stack_acl_num_links = bta_dm_cb.device_list.count = 1;



  bta_dm_disable();              // Waiting for all ACL connections to drain

  mock_stack_acl_num_links = 0;  // ACL link has closed

  ASSERT_EQ(1, mock_function_count_map["alarm_set_on_mloop"]);

  ASSERT_EQ(0, mock_function_count_map["BTIF_dm_disable"]);



  links_up = 0;

  // First disable pass

  fake_osi_alarm_set_on_mloop_.cb(fake_osi_alarm_set_on_mloop_.data);

  ASSERT_EQ(1, mock_function_count_map["alarm_set_on_mloop"]);

  ASSERT_EQ(1, mock_function_count_map["BTIF_dm_disable"]);

  ASSERT_TRUE(!bta_dm_cb.disabling);



  test::mock::stack_acl::BTM_GetNumAclLinks = {};

}



TEST_F(BtaDmTest, disable_second_pass_with_acl_links) {

  uint16_t links_up = 1;

  test::mock::stack_acl::BTM_GetNumAclLinks.body = [&links_up]() {

    return links_up;

  };

  bta_dm_cb.disabling = true;

  // ACL link is open

  bta_dm_cb.device_list.count = 1;

  mock_stack_acl_num_links = bta_dm_cb.device_list.count = 1;



  bta_dm_disable();  // Waiting for all ACL connections to drain

  ASSERT_EQ(1, mock_function_count_map["alarm_set_on_mloop"]);
@@ -121,6 +111,4 @@ TEST_F(BtaDmTest, disable_second_pass_with_acl_links) { 
  fake_osi_alarm_set_on_mloop_.cb(fake_osi_alarm_set_on_mloop_.data);

  ASSERT_EQ(1, mock_function_count_map["BTIF_dm_disable"]);

  ASSERT_TRUE(!bta_dm_cb.disabling);



  test::mock::stack_acl::BTM_GetNumAclLinks = {};

}

system/test/mock/mock_stack_acl.cc

+79 −325

File changed.

Preview size limit exceeded, changes collapsed.

system/test/mock/mock_stack_acl.h

deleted100644 → 0
+0 −1293

File deleted.

Preview size limit exceeded, changes collapsed.

system/test/mock/mock_stack_btm.cc

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ tBTM_STATUS BTM_BleGetEnergyInfo(tBTM_BLE_ENERGY_INFO_CBACK* p_ener_cback) { 
  return BTM_SUCCESS;

}

void BTM_BleReadControllerFeatures(tBTM_BLE_CTRL_FEATURES_CBACK* p_vsc_cback) {}

bool BTM_is_sniff_allowed_for(const RawAddress& peer_addr) { return false; }

uint8_t BTM_GetAcceptlistSize() { return 0; }



struct btm_client_interface_s btm_client_interface = {};