From 877a95a778adfca7570403c556b75856a44d6161 Mon Sep 17 00:00:00 2001 From: Paul Szczepanek Date: Fri, 29 Jan 2021 08:46:52 +0000 Subject: [PATCH] BLE Mock: remove (void) (#14211) --- UNITTESTS/stubs/GapImpl_mock.h | 2 +- UNITTESTS/stubs/GattClientImpl_mock.h | 6 +++--- UNITTESTS/stubs/GattServerImpl_mock.h | 2 +- UNITTESTS/stubs/SecurityManagerImpl_mock.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/UNITTESTS/stubs/GapImpl_mock.h b/UNITTESTS/stubs/GapImpl_mock.h index 9c1cee70e7..b59461da14 100644 --- a/UNITTESTS/stubs/GapImpl_mock.h +++ b/UNITTESTS/stubs/GapImpl_mock.h @@ -30,6 +30,7 @@ public: GapMock& operator=(const GapMock&) = delete; virtual ~GapMock() {}; + MOCK_METHOD((ble_error_t), reset, (), (override)); MOCK_METHOD(void, setEventHandler, (EventHandler *handler), (override)); MOCK_METHOD(bool, isFeatureSupported, (controller_supported_features_t feature), (override)); MOCK_METHOD(uint8_t, getMaxAdvertisingSetNumber, (), (override)); @@ -79,7 +80,6 @@ public: MOCK_METHOD(ble_error_t, getWhitelist, (whitelist_t &whitelist), (const, override)); MOCK_METHOD(ble_error_t, setWhitelist, (const whitelist_t &whitelist), (override)); MOCK_METHOD(ble_error_t, getAddress, (own_address_type_t &typeP, address_t &address), (override)); - MOCK_METHOD(ble_error_t, reset, (), (override)); MOCK_METHOD(void, onShutdown, (const GapShutdownCallback_t &callback), (override)); MOCK_METHOD(GapShutdownCallbackChain_t&, onShutdown, (), (override)); MOCK_METHOD(ble_error_t, setRandomStaticAddress, (const ble::address_t &address), (override)); diff --git a/UNITTESTS/stubs/GattClientImpl_mock.h b/UNITTESTS/stubs/GattClientImpl_mock.h index f1f7372232..6150ad1697 100644 --- a/UNITTESTS/stubs/GattClientImpl_mock.h +++ b/UNITTESTS/stubs/GattClientImpl_mock.h @@ -30,12 +30,13 @@ public: GattClientMock& operator=(const GattClientMock&) = delete; virtual ~GattClientMock() {}; + MOCK_METHOD(ble_error_t, reset, (), (override)); MOCK_METHOD(void, setEventHandler, (EventHandler *handler), (override)); MOCK_METHOD(ble_error_t, launchServiceDiscovery, (ble::connection_handle_t connectionHandle, ServiceDiscovery::ServiceCallback_t sc, ServiceDiscovery::CharacteristicCallback_t cc, const UUID &matchingServiceUUID, const UUID &matchingCharacteristicUUIDIn), (override)); MOCK_METHOD(ble_error_t, discoverServices, (ble::connection_handle_t connectionHandle, ServiceDiscovery::ServiceCallback_t callback, const UUID &matchingServiceUUID), (override)); MOCK_METHOD(ble_error_t, discoverServices, (ble::connection_handle_t connectionHandle, ServiceDiscovery::ServiceCallback_t callback, GattAttribute::Handle_t startHandle, GattAttribute::Handle_t endHandle), (override)); - MOCK_METHOD(bool, isServiceDiscoveryActive, (void), (const, override)); - MOCK_METHOD(void, terminateServiceDiscovery, (void), (override)); + MOCK_METHOD(bool, isServiceDiscoveryActive, (), (const, override)); + MOCK_METHOD(void, terminateServiceDiscovery, (), (override)); MOCK_METHOD(ble_error_t, read, (ble::connection_handle_t connHandle, GattAttribute::Handle_t attributeHandle, uint16_t offset), (const, override)); MOCK_METHOD(ble_error_t, write, (GattClient::WriteOp_t cmd, ble::connection_handle_t connHandle, GattAttribute::Handle_t attributeHandle, size_t length, const uint8_t *value), (const, override)); MOCK_METHOD(void, onDataRead, (ReadCallback_t callback), (override)); @@ -51,7 +52,6 @@ public: MOCK_METHOD(void, onShutdown, (const GattClientShutdownCallback_t &callback), (override)); MOCK_METHOD(GattClientShutdownCallbackChain_t&, onShutdown, (), (override)); MOCK_METHOD(HVXCallbackChain_t&, onHVX, (), (override)); - MOCK_METHOD(ble_error_t, reset, (void), (override)); MOCK_METHOD(void, processReadResponse, (const GattReadCallbackParams *params), (override)); MOCK_METHOD(void, processWriteResponse, (const GattWriteCallbackParams *params), (override)); MOCK_METHOD(void, processHVXEvent, (const GattHVXCallbackParams *params), (override)); diff --git a/UNITTESTS/stubs/GattServerImpl_mock.h b/UNITTESTS/stubs/GattServerImpl_mock.h index 4d2d9198ba..7ade69615f 100644 --- a/UNITTESTS/stubs/GattServerImpl_mock.h +++ b/UNITTESTS/stubs/GattServerImpl_mock.h @@ -30,8 +30,8 @@ public: GattServerMock& operator=(const GattServerMock&) = delete; virtual ~GattServerMock() {}; - MOCK_METHOD(void, setEventHandler, (EventHandler *handler), (override)); MOCK_METHOD(ble_error_t, reset, (ble::GattServer* server), (override)); + MOCK_METHOD(void, setEventHandler, (EventHandler *handler), (override)); MOCK_METHOD(ble_error_t, addService, (GattService &service), (override)); MOCK_METHOD(ble_error_t, read, (GattAttribute::Handle_t attributeHandle, uint8_t buffer[], uint16_t *lengthP), (override)); MOCK_METHOD(ble_error_t, read, (ble::connection_handle_t connectionHandle, GattAttribute::Handle_t attributeHandle, uint8_t *buffer, uint16_t *lengthP), (override)); diff --git a/UNITTESTS/stubs/SecurityManagerImpl_mock.h b/UNITTESTS/stubs/SecurityManagerImpl_mock.h index 7d2b33ae28..3f1007e4fa 100644 --- a/UNITTESTS/stubs/SecurityManagerImpl_mock.h +++ b/UNITTESTS/stubs/SecurityManagerImpl_mock.h @@ -30,9 +30,9 @@ public: SecurityManagerMock& operator=(const GattServerMock&) = delete; virtual ~SecurityManagerMock() {}; + MOCK_METHOD(ble_error_t, reset, (), (override)); MOCK_METHOD(ble_error_t, init, (bool enableBonding, bool requireMITM, SecurityIOCapabilities_t iocaps, const Passkey_t passkey, bool signing, const char *dbFilepath), (override)); MOCK_METHOD(ble_error_t, setDatabaseFilepath, (const char *dbFilepath), (override)); - MOCK_METHOD(ble_error_t, reset, (), (override)); MOCK_METHOD(ble_error_t, preserveBondingStateOnReset, (bool enable), (override)); MOCK_METHOD(ble_error_t, purgeAllBondingState, (), (override)); MOCK_METHOD(ble_error_t, generateWhitelistFromBondTable, (::ble::whitelist_t *whitelist), (const, override));