Merge "floss: use delete ctor and remove all base/macros.h includes" (ed699dc3) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/csis/csis_client_test.cc

+6 −6

Original line number	Diff line number	Diff line
		@@ -75,12 +75,12 @@ RawAddress GetTestAddress(int index) {
		class MockCsisLockCallback {
		public:
		MockCsisLockCallback() = default;
		MockCsisLockCallback(const MockCsisLockCallback&) = delete;
		MockCsisLockCallback& operator=(const MockCsisLockCallback&) = delete;

		~MockCsisLockCallback() = default;
		MOCK_METHOD((void), CsisGroupLockCb,
		(int group_id, bool locked, CsisGroupLockStatus status));

		private:
		DISALLOW_COPY_AND_ASSIGN(MockCsisLockCallback);
		};

		static MockCsisLockCallback* csis_lock_callback_mock;
		@@ -93,6 +93,9 @@ void SetMockCsisLockCallback(MockCsisLockCallback* mock) {
		class MockCsisCallbacks : public CsisClientCallbacks {
		public:
		MockCsisCallbacks() = default;
		MockCsisCallbacks(const MockCsisCallbacks&) = delete;
		MockCsisCallbacks& operator=(const MockCsisCallbacks&) = delete;

		~MockCsisCallbacks() override = default;

		MOCK_METHOD((void), OnConnectionState,
		@@ -110,9 +113,6 @@ class MockCsisCallbacks : public CsisClientCallbacks {
		MOCK_METHOD((void), OnGattCsisWriteLockRsp,
		(uint16_t conn_id, tGATT_STATUS status, uint16_t handle,
		void* data));

		private:
		DISALLOW_COPY_AND_ASSIGN(MockCsisCallbacks);
		};

		class CsisClientTest : public ::testing::Test {

+3 −3

Original line number	Diff line number	Diff line
		@@ -52,6 +52,9 @@ RawAddress GetTestAddress(int index) {
		class MockGroupsCallbacks : public DeviceGroupsCallbacks {
		public:
		MockGroupsCallbacks() = default;
		MockGroupsCallbacks(const MockGroupsCallbacks&) = delete;
		MockGroupsCallbacks& operator=(const MockGroupsCallbacks&) = delete;

		~MockGroupsCallbacks() override = default;

		MOCK_METHOD((void), OnGroupAdded,
		@@ -69,9 +72,6 @@ class MockGroupsCallbacks : public DeviceGroupsCallbacks {
		(const RawAddress& address, const bluetooth::Uuid& uuid,
		int group_id),
		(override));

		private:
		DISALLOW_COPY_AND_ASSIGN(MockGroupsCallbacks);
		};

		class GroupsTest : public ::testing::Test {

+3 −3

Original line number	Diff line number	Diff line
		@@ -104,6 +104,9 @@ static uint16_t GetTestConnId(const RawAddress& address) {
		class MockHasCallbacks : public HasClientCallbacks {
		public:
		MockHasCallbacks() = default;
		MockHasCallbacks(const MockHasCallbacks&) = delete;
		MockHasCallbacks& operator=(const MockHasCallbacks&) = delete;

		~MockHasCallbacks() override = default;

		MOCK_METHOD((void), OnConnectionState,
		@@ -133,9 +136,6 @@ class MockHasCallbacks : public HasClientCallbacks {
		((std::variant<RawAddress, int> addr_or_group_id),
		uint8_t preset_index, ErrorCode error_code),
		(override));

		private:
		DISALLOW_COPY_AND_ASSIGN(MockHasCallbacks);
		};

		class HasClientTestBase : public ::testing::Test {

+4 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,10 @@
		class MockBleAdvertisingManager : public BleAdvertisingManager {
		public:
		MockBleAdvertisingManager() = default;
		MockBleAdvertisingManager(const MockBleAdvertisingManager&) = delete;
		MockBleAdvertisingManager& operator=(const MockBleAdvertisingManager&) =
		delete;

		~MockBleAdvertisingManager() override = default;

		/* Allows getting and setting BleAdvertiserHciInterface dependency */
		@@ -99,7 +103,6 @@ class MockBleAdvertisingManager : public BleAdvertisingManager {
		(override));

		private:
		DISALLOW_COPY_AND_ASSIGN(MockBleAdvertisingManager);
		base::WeakPtrFactory<MockBleAdvertisingManager> weak_factory_{this};
		BleAdvertiserHciInterface* ble_adv_hci_interface_;
		};

+5 −3

Original line number	Diff line number	Diff line
		@@ -53,6 +53,11 @@ class MockBroadcastStatMachineCallbacks
		: public IBroadcastStateMachineCallbacks {
		public:
		MockBroadcastStatMachineCallbacks() = default;
		MockBroadcastStatMachineCallbacks(const MockBroadcastStatMachineCallbacks&) =
		delete;
		MockBroadcastStatMachineCallbacks& operator=(
		const MockBroadcastStatMachineCallbacks&) = delete;

		~MockBroadcastStatMachineCallbacks() override = default;

		MOCK_METHOD((void), OnStateMachineCreateStatus,
		@@ -70,9 +75,6 @@ class MockBroadcastStatMachineCallbacks
		MOCK_METHOD((uint32_t), GetSduItv, (uint8_t instance_id), (override));
		MOCK_METHOD((uint16_t), GetMaxTransportLatency, (uint8_t instance_id),
		(override));

		private:
		DISALLOW_COPY_AND_ASSIGN(MockBroadcastStatMachineCallbacks);
		};

		class StateMachineTest : public Test {