led-layout: use common types everywhere
Rather than scattered map and set typedefs, centralize the two common
structures into 'ledlayout.hpp': ActionSet, GroupMap. Use them
everywhere where previous raw maps and sets were used.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I0ed5203146a6486a49caf4000f545ded0088dc15
diff --git a/test/utest-led-json.cpp b/test/utest-led-json.cpp
index b9b6e24..853f4d1 100644
--- a/test/utest-led-json.cpp
+++ b/test/utest-led-json.cpp
@@ -5,7 +5,7 @@
TEST(loadJsonConfig, testGoodPath)
{
static constexpr auto jsonPath = "config/led-group-config.json";
- LedMap ledMap = loadJsonConfig(jsonPath);
+ auto ledMap = loadJsonConfig(jsonPath);
std::string objPath = "/xyz/openbmc_project/led/groups";
std::string bmcBooted = objPath + "/bmc_booted";
@@ -16,9 +16,9 @@
ASSERT_EQ(ledMap.contains(powerOn), true);
ASSERT_EQ(ledMap.contains(enclosureIdentify), true);
- LedAction bmcBootedActions = ledMap.at(bmcBooted);
- LedAction powerOnActions = ledMap.at(powerOn);
- LedAction enclosureIdentifyActions = ledMap.at(enclosureIdentify);
+ auto& bmcBootedActions = ledMap.at(bmcBooted);
+ auto& powerOnActions = ledMap.at(powerOn);
+ auto& enclosureIdentifyActions = ledMap.at(enclosureIdentify);
for (const auto& group : bmcBootedActions)
{
@@ -91,4 +91,4 @@
phosphor::led::Layout::Action::On,
priorityMap),
std::runtime_error);
-}
\ No newline at end of file
+}