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

Commit 0ada29a6 authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "gd: Cleanup up old test sources :BluetoothHciTestSources" am:... 

Merge "gd: Cleanup up old test sources :BluetoothHciTestSources" am: 000ef819 am: 3adc3cbd am: a43a414b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2278695



Change-Id: I8d5428c02380aa09990b9bec9daacb5f6a90f814
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e5b1044 a43a414b

system/gd/common/circular_buffer_test.cc

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ TEST(CircularBufferTest, simple_drain) { 
}



TEST(CircularBufferTest, test_timestamps) {

  timestamp_ = 0;

  bluetooth::common::TimestampedCircularBuffer<std::string> buffer(10, std::make_unique<TestTimestamper>());



  buffer.Push(std::string("One"));

system/gd/hci/Android.bp

+5 −13
Original line number Diff line number Diff line
@@ -34,34 +34,26 @@ filegroup { 
filegroup {

    name: "BluetoothHciUnitTestSources",

    srcs: [

        "acl_manager/le_impl_test.cc",

        "acl_manager/classic_acl_connection_test.cc",

        "acl_builder_test.cc",

        "acl_manager_test.cc",

        "acl_manager_unittest.cc",

        "acl_manager/acl_scheduler_test.cc",

        "acl_manager/classic_acl_connection_test.cc",

        "acl_manager/le_impl_test.cc",

        "acl_manager/round_robin_scheduler_test.cc",

        "address_unittest.cc",

        "address_with_type_test.cc",

        "class_of_device_unittest.cc",

        "controller_test.cc",

        "controller_unittest.cc",

        "hci_layer_test.cc",

        "hci_layer_unittest.cc",

        "hci_packets_test.cc",

        "uuid_unittest.cc",

        "le_periodic_sync_manager_test.cc",

        "le_scanning_manager_test.cc",

        "le_advertising_manager_test.cc",

    ],

}



filegroup {

    name: "BluetoothHciTestSources",

    srcs: [

        "acl_manager/round_robin_scheduler_test.cc",

        "acl_manager_test.cc",

        "hci_layer_test.cc",

        "le_address_manager_test.cc",

        "le_advertising_manager_test.cc",

        "le_scanning_manager_test.cc",

    ],

}

system/gd/hci/acl_manager/round_robin_scheduler_test.cc

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ using ::bluetooth::os::Thread; 
namespace bluetooth {

namespace hci {

namespace acl_manager {

namespace {



class TestController : public Controller {

 public:
@@ -410,6 +411,7 @@ TEST_F(RoundRobinSchedulerTest, receive_le_credit_when_next_fragment_is_classic) 
  round_robin_scheduler_->Unregister(le_handle);

}



}  // namespace

}  // namespace acl_manager

}  // namespace hci

}  // namespace bluetooth

system/gd/hci/acl_manager_test.cc

+122 −54

File changed.

Preview size limit exceeded, changes collapsed.

system/gd/hci/controller_test.cc

+2 −2
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ constexpr uint64_t kRandomNumber = 0x123456789abcdef0; 
uint16_t feature_spec_version = 55;

constexpr char title[] = "hci_controller_test";



}  // namespace



PacketView<kLittleEndian> GetPacketView(std::unique_ptr<packet::BasePacketBuilder> packet) {

  auto bytes = std::make_shared<std::vector<uint8_t>>();

  BitInserter i(*bytes);
@@ -64,6 +62,8 @@ PacketView<kLittleEndian> GetPacketView(std::unique_ptr<packet::BasePacketBuilde 
  return packet::PacketView<packet::kLittleEndian>(bytes);

}



}  // namespace



class TestHciLayer : public HciLayer {

 public:

  void EnqueueCommand(