Refactor the platform event message handler code
This commit makes slight code change to use some functions both
in BMC requester and responder flow.
Tested : Using pldmtool platformEventMessage is sent and D-Bus
property is verified.
Change-Id: Id433f136ad4c7be0d94817deed1d6b60df36b3e4
Signed-off-by: Pavithra Barithaya <pavithra.b@ibm.com>
diff --git a/test/libpldmresponder_platform_test.cpp b/test/libpldmresponder_platform_test.cpp
index 1c561ea..71fec26 100644
--- a/test/libpldmresponder_platform_test.cpp
+++ b/test/libpldmresponder_platform_test.cpp
@@ -39,8 +39,8 @@
.WillRepeatedly(Return("foo.bar"));
auto pdrRepo = pldm_pdr_init();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good",
- "./event_jsons/good", pdrRepo, nullptr, nullptr, nullptr);
+ Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", pdrRepo,
+ nullptr, nullptr, nullptr);
Repo repo(pdrRepo);
ASSERT_EQ(repo.empty(), false);
auto response = handler.getPDR(req, requestPayloadLength);
@@ -76,8 +76,8 @@
.WillRepeatedly(Return("foo.bar"));
auto pdrRepo = pldm_pdr_init();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good",
- "./event_jsons/good", pdrRepo, nullptr, nullptr, nullptr);
+ Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", pdrRepo,
+ nullptr, nullptr, nullptr);
Repo repo(pdrRepo);
ASSERT_EQ(repo.empty(), false);
auto response = handler.getPDR(req, requestPayloadLength);
@@ -107,8 +107,8 @@
.WillRepeatedly(Return("foo.bar"));
auto pdrRepo = pldm_pdr_init();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good",
- "./event_jsons/good", pdrRepo, nullptr, nullptr, nullptr);
+ Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", pdrRepo,
+ nullptr, nullptr, nullptr);
Repo repo(pdrRepo);
ASSERT_EQ(repo.empty(), false);
auto response = handler.getPDR(req, requestPayloadLength);
@@ -136,8 +136,8 @@
.WillRepeatedly(Return("foo.bar"));
auto pdrRepo = pldm_pdr_init();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good",
- "./event_jsons/good", pdrRepo, nullptr, nullptr, nullptr);
+ Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", pdrRepo,
+ nullptr, nullptr, nullptr);
Repo repo(pdrRepo);
ASSERT_EQ(repo.empty(), false);
auto response = handler.getPDR(req, requestPayloadLength);
@@ -167,8 +167,8 @@
.WillRepeatedly(Return("foo.bar"));
auto pdrRepo = pldm_pdr_init();
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good",
- "./event_jsons/good", pdrRepo, nullptr, nullptr, nullptr);
+ Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", pdrRepo,
+ nullptr, nullptr, nullptr);
Repo repo(pdrRepo);
ASSERT_EQ(repo.empty(), false);
auto response = handler.getPDR(req, requestPayloadLength);
@@ -229,8 +229,8 @@
auto inPDRRepo = pldm_pdr_init();
auto outPDRRepo = pldm_pdr_init();
Repo outRepo(outPDRRepo);
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good",
- "./event_jsons/good", inPDRRepo, nullptr, nullptr, nullptr);
+ Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", inPDRRepo,
+ nullptr, nullptr, nullptr);
handler.getPDR(req, requestPayloadLength);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, outRepo, PLDM_STATE_EFFECTER_PDR);
@@ -275,8 +275,8 @@
auto inPDRRepo = pldm_pdr_init();
auto outPDRRepo = pldm_pdr_init();
Repo outRepo(outPDRRepo);
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good",
- "./event_jsons/good", inPDRRepo, nullptr, nullptr, nullptr);
+ Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", inPDRRepo,
+ nullptr, nullptr, nullptr);
handler.getPDR(req, requestPayloadLength);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, outRepo, PLDM_STATE_EFFECTER_PDR);
@@ -320,8 +320,8 @@
auto inPDRRepo = pldm_pdr_init();
auto numericEffecterPdrRepo = pldm_pdr_init();
Repo numericEffecterPDRs(numericEffecterPdrRepo);
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", "",
- inPDRRepo, nullptr, nullptr, nullptr);
+ Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", inPDRRepo,
+ nullptr, nullptr, nullptr);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, numericEffecterPDRs, PLDM_NUMERIC_EFFECTER_PDR);
@@ -362,8 +362,8 @@
auto inPDRRepo = pldm_pdr_init();
auto numericEffecterPdrRepo = pldm_pdr_init();
Repo numericEffecterPDRs(numericEffecterPdrRepo);
- Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", "",
- inPDRRepo, nullptr, nullptr, nullptr);
+ Handler handler(&mockedUtils, "./pdr_jsons/state_effecter/good", inPDRRepo,
+ nullptr, nullptr, nullptr);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, numericEffecterPDRs, PLDM_NUMERIC_EFFECTER_PDR);
@@ -535,7 +535,7 @@
auto outPDRRepo = pldm_pdr_init();
Repo outRepo(outPDRRepo);
MockdBusHandler mockedUtils;
- Handler handler(&mockedUtils, "", "", inPDRRepo, nullptr, nullptr, nullptr);
+ Handler handler(&mockedUtils, "", inPDRRepo, nullptr, nullptr, nullptr);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, outRepo, PLDM_TERMINUS_LOCATOR_PDR);
@@ -578,8 +578,8 @@
auto inPDRRepo = pldm_pdr_init();
auto outPDRRepo = pldm_pdr_init();
Repo outRepo(outPDRRepo);
- Handler handler(&mockedUtils, "./pdr_jsons/state_sensor/good", "",
- inPDRRepo, nullptr, nullptr, nullptr);
+ Handler handler(&mockedUtils, "./pdr_jsons/state_sensor/good", inPDRRepo,
+ nullptr, nullptr, nullptr);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, outRepo, PLDM_STATE_SENSOR_PDR);
pdr_utils::PdrEntry e;
@@ -624,8 +624,8 @@
auto inPDRRepo = pldm_pdr_init();
auto outPDRRepo = pldm_pdr_init();
Repo outRepo(outPDRRepo);
- Handler handler(&mockedUtils, "./pdr_jsons/state_sensor/good", "",
- inPDRRepo, nullptr, nullptr, nullptr);
+ Handler handler(&mockedUtils, "./pdr_jsons/state_sensor/good", inPDRRepo,
+ nullptr, nullptr, nullptr);
Repo inRepo(inPDRRepo);
getRepoByType(inRepo, outRepo, PLDM_STATE_SENSOR_PDR);
pdr_utils::PdrEntry e;