Changes after sync up with Oguzcan

philips-software · Dec 19, 2024 · 132c841 · 132c841
1 parent e7c9126
commit 132c841
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/services/ble/Gap.cpp b/services/ble/Gap.cpp
@@ -183,7 +183,7 @@ namespace services
         GapCentralObserver::Subject().StopDeviceDiscovery();
     }
 
-    hal::MacAddress GapCentralDecorator::ResolveDeviceAddress(hal::MacAddress deviceAddress) const
+    infra::Optional<hal::MacAddress> GapCentralDecorator::ResolveDeviceAddress(hal::MacAddress deviceAddress) const
     {
         return GapCentralObserver::Subject().ResolveDeviceAddress(deviceAddress);
     }

diff --git a/services/ble/Gap.hpp b/services/ble/Gap.hpp
@@ -5,6 +5,7 @@
 #include "infra/timer/Timer.hpp"
 #include "infra/util/EnumCast.hpp"
 #include "infra/util/Observer.hpp"
+#include "infra/util/Optional.hpp"
 
 namespace services
 {
@@ -319,7 +320,7 @@ namespace services
         virtual void SetAddress(hal::MacAddress macAddress, GapDeviceAddressType addressType) = 0;
         virtual void StartDeviceDiscovery() = 0;
         virtual void StopDeviceDiscovery() = 0;
-        virtual hal::MacAddress ResolveDeviceAddress(hal::MacAddress deviceAddress) const = 0;
+        virtual infra::Optional<hal::MacAddress> ResolveDeviceAddress(hal::MacAddress deviceAddress) const = 0;
     };
 
     class GapCentralDecorator
@@ -340,7 +341,7 @@ namespace services
         void SetAddress(hal::MacAddress macAddress, GapDeviceAddressType addressType) override;
         void StartDeviceDiscovery() override;
         void StopDeviceDiscovery() override;
-        hal::MacAddress ResolveDeviceAddress(hal::MacAddress deviceAddress) const override;
+        infra::Optional<hal::MacAddress> ResolveDeviceAddress(hal::MacAddress deviceAddress) const override;
     };
 }
 

diff --git a/services/ble/test/TestGapCentral.cpp b/services/ble/test/TestGapCentral.cpp
@@ -81,8 +81,11 @@ namespace services
         decorator.StopDeviceDiscovery();
 
         hal::MacAddress mac = { 0x00, 0x1A, 0x7D, 0xDA, 0x71, 0x13 };
-        EXPECT_CALL(gap, ResolveDeviceAddress(mac));
-        decorator.ResolveDeviceAddress(mac);
+        EXPECT_CALL(gap, ResolveDeviceAddress(mac)).WillOnce(testing::Return(infra::none));
+        EXPECT_EQ(decorator.ResolveDeviceAddress(mac), infra::none);
+
+        EXPECT_CALL(gap, ResolveDeviceAddress(mac)).WillOnce(testing::Return(infra::MakeOptional(mac)));
+        EXPECT_EQ(decorator.ResolveDeviceAddress(mac), mac);
     }
 
     TEST(GapAdvertisingDataParserTest, payload_too_small)

diff --git a/services/ble/test_doubles/GapCentralMock.hpp b/services/ble/test_doubles/GapCentralMock.hpp
@@ -16,7 +16,7 @@ namespace services
         MOCK_METHOD(void, SetAddress, (hal::MacAddress macAddress, GapDeviceAddressType addressType));
         MOCK_METHOD(void, StartDeviceDiscovery, ());
         MOCK_METHOD(void, StopDeviceDiscovery, ());
-        MOCK_METHOD(hal::MacAddress, ResolveDeviceAddress, (hal::MacAddress deviceAddress), (const));
+        MOCK_METHOD(infra::Optional<hal::MacAddress>, ResolveDeviceAddress, (hal::MacAddress deviceAddress), (const));
     };
 }