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

Commit 295e380f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AclManagerTest: Synchronize handlers in TearDown" am: 29fee4aa 

Change-Id: I0093e5868a49312f2a66be545b65e21e9b59834d
parents 56943384 29fee4aa

system/gd/hci/acl_manager_test.cc

+13 −16
Original line number Diff line number Diff line
@@ -441,6 +441,12 @@ class AclManagerWithConnectionTest : public AclManagerTest { 
    connection_->RegisterCallbacks(&mock_connection_management_callbacks_, client_handler_);

  }



  void TearDown() override {

    fake_registry_.SynchronizeModuleHandler(&HciLayer::Factory, std::chrono::milliseconds(20));

    fake_registry_.SynchronizeModuleHandler(&AclManager::Factory, std::chrono::milliseconds(20));

    fake_registry_.StopAll();

  }



  void sync_client_handler() {

    std::promise<void> promise;

    auto future = promise.get_future();
@@ -574,6 +580,12 @@ class AclManagerWithLeConnectionTest : public AclManagerTest { 
    connection_ = GetLastLeConnection();

  }



  void TearDown() override {

    fake_registry_.SynchronizeModuleHandler(&HciLayer::Factory, std::chrono::milliseconds(20));

    fake_registry_.SynchronizeModuleHandler(&AclManager::Factory, std::chrono::milliseconds(20));

    fake_registry_.StopAll();

  }



  void sync_client_handler() {

    std::promise<void> promise;

    auto future = promise.get_future();
@@ -671,8 +683,6 @@ TEST_F(AclManagerWithLeConnectionTest, invoke_registered_callback_le_connection_ 
              OnConnectionUpdate(connection_interval, connection_latency, supervision_timeout));

  test_hci_layer_->IncomingLeMetaEvent(LeConnectionUpdateCompleteBuilder::Create(

      ErrorCode::SUCCESS, handle_, connection_interval, connection_latency, supervision_timeout));

  fake_registry_.SynchronizeModuleHandler(&HciLayer::Factory, std::chrono::milliseconds(20));

  fake_registry_.SynchronizeModuleHandler(&AclManager::Factory, std::chrono::milliseconds(20));

}



TEST_F(AclManagerWithLeConnectionTest, invoke_registered_callback_le_disconnect) {
@@ -683,8 +693,6 @@ TEST_F(AclManagerWithLeConnectionTest, invoke_registered_callback_le_disconnect) 
  auto reason = ErrorCode::REMOTE_USER_TERMINATED_CONNECTION;

  EXPECT_CALL(mock_le_connection_management_callbacks_, OnDisconnection(reason));

  test_hci_layer_->Disconnect(handle_, reason);

  fake_registry_.SynchronizeModuleHandler(&HciLayer::Factory, std::chrono::milliseconds(20));

  fake_registry_.SynchronizeModuleHandler(&AclManager::Factory, std::chrono::milliseconds(20));

}



TEST_F(AclManagerWithLeConnectionTest, DISABLED_invoke_registered_callback_le_disconnect_data_race) {
@@ -696,8 +704,6 @@ TEST_F(AclManagerWithLeConnectionTest, DISABLED_invoke_registered_callback_le_di 
  auto reason = ErrorCode::REMOTE_USER_TERMINATED_CONNECTION;

  EXPECT_CALL(mock_le_connection_management_callbacks_, OnDisconnection(reason));

  test_hci_layer_->Disconnect(handle_, reason);

  fake_registry_.SynchronizeModuleHandler(&HciLayer::Factory, std::chrono::milliseconds(20));

  fake_registry_.SynchronizeModuleHandler(&AclManager::Factory, std::chrono::milliseconds(20));

}



TEST_F(AclManagerWithLeConnectionTest, invoke_registered_callback_le_queue_disconnect) {
@@ -708,17 +714,13 @@ TEST_F(AclManagerWithLeConnectionTest, invoke_registered_callback_le_queue_disco 


  EXPECT_CALL(mock_le_connection_management_callbacks_, OnDisconnection(reason));

  connection_->RegisterCallbacks(&mock_le_connection_management_callbacks_, client_handler_);

  fake_registry_.SynchronizeModuleHandler(&HciLayer::Factory, std::chrono::milliseconds(20));

  fake_registry_.SynchronizeModuleHandler(&AclManager::Factory, std::chrono::milliseconds(20));

  sync_client_handler();

}



TEST_F(AclManagerWithConnectionTest, invoke_registered_callback_disconnection_complete) {

  auto reason = ErrorCode::REMOTE_USER_TERMINATED_CONNECTION;

  EXPECT_CALL(mock_connection_management_callbacks_, OnDisconnection(reason));

  test_hci_layer_->Disconnect(handle_, reason);



  fake_registry_.SynchronizeModuleHandler(&HciLayer::Factory, std::chrono::milliseconds(20));

  fake_registry_.SynchronizeModuleHandler(&AclManager::Factory, std::chrono::milliseconds(20));

}



TEST_F(AclManagerWithConnectionTest, acl_send_data_one_connection) {
@@ -751,8 +753,6 @@ TEST_F(AclManagerWithConnectionTest, acl_send_data_one_connection) { 
  ASSERT(command_view.IsValid());

  ASSERT_EQ(command_view.GetConnectionHandle(), handle_);

  test_hci_layer_->Disconnect(handle_, reason);

  fake_registry_.SynchronizeModuleHandler(&HciLayer::Factory, std::chrono::milliseconds(20));

  fake_registry_.SynchronizeModuleHandler(&AclManager::Factory, std::chrono::milliseconds(20));

}



TEST_F(AclManagerWithConnectionTest, acl_send_data_credits) {
@@ -772,9 +772,6 @@ TEST_F(AclManagerWithConnectionTest, acl_send_data_credits) { 
  test_controller_->CompletePackets(handle_, 1);



  auto after_credits_sent_packet = test_hci_layer_->OutgoingAclData();



  fake_registry_.SynchronizeModuleHandler(&HciLayer::Factory, std::chrono::milliseconds(20));

  fake_registry_.SynchronizeModuleHandler(&AclManager::Factory, std::chrono::milliseconds(20));

}



TEST_F(AclManagerWithConnectionTest, send_switch_role) {