fw-update : Optimize passing infra parameters
Refactor UpdateManager and DeviceUpdater to optimize passing the D-Bus event
loop handle, handler for requester and instance ID requester.
Signed-off-by: Tom Joseph <rushtotom@gmail.com>
Change-Id: I1860ffc49513d941af372423a197b1d42eda6e36
diff --git a/fw-update/test/device_updater_test.cpp b/fw-update/test/device_updater_test.cpp
index 24f85e2..1469516 100644
--- a/fw-update/test/device_updater_test.cpp
+++ b/fw-update/test/device_updater_test.cpp
@@ -10,18 +10,12 @@
#include <gtest/gtest.h>
using namespace pldm;
-using namespace std::chrono;
using namespace pldm::fw_update;
class DeviceUpdaterTest : public testing::Test
{
protected:
DeviceUpdaterTest() :
- event(sdeventplus::Event::get_default()),
- requester(pldm::utils::DBusHandler::getBus(),
- "/xyz/openbmc_project/pldm"),
- reqHandler(fd, event, requester, false, seconds(1), 2,
- milliseconds(100)),
package("./test_pkg", std::ios::binary | std::ios::in | std::ios::ate)
{
fwDeviceIDRecord = {
@@ -39,9 +33,6 @@
}
int fd = -1;
- sdeventplus::Event event;
- pldm::dbus_api::Requester requester;
- requester::Handler<requester::Request> reqHandler;
std::ifstream package;
FirmwareDeviceIDRecord fwDeviceIDRecord;
ComponentImageInfos compImageInfos;
@@ -90,9 +81,8 @@
TEST_F(DeviceUpdaterTest, ReadPackage512B)
{
- DeviceUpdater deviceUpdater(0, event, requester, reqHandler, package,
- fwDeviceIDRecord, compImageInfos, compInfo, 512,
- nullptr);
+ DeviceUpdater deviceUpdater(0, package, fwDeviceIDRecord, compImageInfos,
+ compInfo, 512, nullptr);
constexpr std::array<uint8_t, sizeof(pldm_msg_hdr) +
sizeof(pldm_request_firmware_data_req)>