From abeabc39110e62b48b27a127164209b23a8bb5e4 Mon Sep 17 00:00:00 2001 From: Anay Wadhera Date: Wed, 22 Mar 2023 13:01:47 -0700 Subject: [PATCH] Add PresenceAction vector to PresenceDevice PiperOrigin-RevId: 518650656 --- presence/presence_device.h | 4 ++++ presence/presence_device_test.cc | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/presence/presence_device.h b/presence/presence_device.h index a1621543..181ce6c8 100644 --- a/presence/presence_device.h +++ b/presence/presence_device.h @@ -25,6 +25,7 @@ #include "internal/proto/metadata.pb.h" #include "presence/data_element.h" #include "presence/device_motion.h" +#include "presence/presence_action.h" namespace nearby { namespace presence { @@ -52,6 +53,8 @@ class PresenceDevice : public nearby::NearbyDevice { std::vector GetExtendedProperties() const { return extended_properties_; } + void AddAction(const PresenceAction& action) { actions_.push_back(action); } + std::vector GetActions() const { return actions_; } absl::string_view GetEndpointInfo() const override { return endpoint_info_; } NearbyDevice::Type GetType() const override { return NearbyDevice::Type::kPresenceDevice; @@ -68,6 +71,7 @@ class PresenceDevice : public nearby::NearbyDevice { const DeviceMotion device_motion_; const Metadata metadata_; std::vector extended_properties_; + std::vector actions_; std::string endpoint_id_; std::string endpoint_info_; }; diff --git a/presence/presence_device_test.cc b/presence/presence_device_test.cc index 91c8d39c..a0f5f6ba 100644 --- a/presence/presence_device_test.cc +++ b/presence/presence_device_test.cc @@ -23,6 +23,7 @@ #include "internal/platform/ble_connection_info.h" #include "internal/platform/logging.h" #include "presence/data_element.h" +#include "presence/presence_action.h" namespace nearby { namespace presence { @@ -37,6 +38,7 @@ constexpr float kTestConfidence = 0.1; constexpr absl::string_view kMacAddr = "\x4C\x8B\x1D\xCE\xBA\xD1"; constexpr int kDataElementType = DataElement::kBatteryFieldType; constexpr absl::string_view kDataElementValue = "15"; +constexpr int kTestAction = 3; Metadata CreateTestMetadata() { Metadata metadata; @@ -100,6 +102,14 @@ TEST(PresenceDevicetest, TestGetAddExtendedPropertiesVector) { DataElement(kDataElementType, kDataElementValue)); } +TEST(PresenceDeviceTest, TestAddGetActions) { + Metadata metadata = CreateTestMetadata(); + PresenceDevice device = PresenceDevice({kDefaultMotionType}, metadata); + device.AddAction({kTestAction}); + ASSERT_EQ(device.GetActions().size(), 1); + EXPECT_EQ(device.GetActions()[0], PresenceAction(kTestAction)); +} + TEST(PresenceDeviceTest, TestEndpointIdIsCorrectLength) { Metadata metadata = CreateTestMetadata(); PresenceDevice device = PresenceDevice({kDefaultMotionType}, metadata);