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

Commit 3121b79a authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "Use proper sync handler instead of BindOnce futur"

parents 6e589f27 48917746

system/gd/hci/acl_manager/classic_acl_connection_test.cc

+2 −7
Original line number Diff line number Diff line
@@ -251,13 +251,8 @@ class ClassicAclConnectionTest : public ::testing::Test { 
  }



  void sync_handler() {

    ASSERT(handler_ != nullptr);



    auto promise = std::promise<void>();

    auto future = promise.get_future();

    handler_->BindOnceOn(&promise, &std::promise<void>::set_value).Invoke();

    auto status = future.wait_for(2s);

    ASSERT_EQ(status, std::future_status::ready);

    ASSERT(thread_ != nullptr);

    ASSERT(thread_->GetReactor()->WaitForIdle(2s));

  }



  Address address_;

system/gd/hci/acl_manager/le_impl_test.cc

+2 −5
Original line number Diff line number Diff line
@@ -501,11 +501,8 @@ class LeImplTest : public ::testing::Test { 
  }



  void sync_handler() {

    std::promise<void> promise;

    auto future = promise.get_future();

    handler_->BindOnceOn(&promise, &std::promise<void>::set_value).Invoke();

    auto status = future.wait_for(2s);

    ASSERT_EQ(status, std::future_status::ready);

    ASSERT(thread_ != nullptr);

    ASSERT(thread_->GetReactor()->WaitForIdle(2s));

  }



  void HciDownEndDequeue() {

system/gd/hci/acl_manager/round_robin_scheduler_test.cc

+4 −5
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ using ::bluetooth::common::Callback; 
using ::bluetooth::os::Handler;

using ::bluetooth::os::Thread;



using namespace std::chrono_literals;



namespace bluetooth {

namespace hci {

namespace acl_manager {
@@ -96,11 +98,8 @@ class RoundRobinSchedulerTest : public ::testing::Test { 
  }



  void sync_handler() {

    std::promise<void> promise;

    auto future = promise.get_future();

    handler_->BindOnceOn(&promise, &std::promise<void>::set_value).Invoke();

    auto status = future.wait_for(std::chrono::milliseconds(3));

    EXPECT_EQ(status, std::future_status::ready);

    ASSERT(thread_ != nullptr);

    ASSERT(thread_->GetReactor()->WaitForIdle(2s));

  }



  void EnqueueAclUpEnd(AclConnection::QueueUpEnd* queue_up_end, std::vector<uint8_t> packet) {

system/gd/hci/le_periodic_sync_manager_test.cc

+4 −5
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#include "hci/le_scanning_manager_mock.h"

#include "os/handler.h"



using namespace std::chrono_literals;



namespace bluetooth {

namespace hci {

namespace {
@@ -146,11 +148,8 @@ class PeriodicSyncManagerTest : public ::testing::Test { 
  }



  void sync_handler() {

    std::promise<void> promise;

    auto future = promise.get_future();

    handler_->Call(common::BindOnce(&std::promise<void>::set_value, common::Unretained(&promise)));

    auto future_status = future.wait_for(std::chrono::seconds(1));

    ASSERT_EQ(future_status, std::future_status::ready);

    ASSERT(thread_ != nullptr);

    ASSERT(thread_->GetReactor()->WaitForIdle(2s));

  }



  class MockCallbacks : public bluetooth::hci::ScanningCallback {