commit e6b48f10b5ace9ac74d3111b8e8a154dac41c37f
author Matt Spinler <spinler@us.ibm.com> Thu Apr 02 09:51:39 2020 -0500
committer Matt Spinler <spinler@us.ibm.com> Tue Apr 14 11:08:35 2020 -0500
tree f75b1997a5fe956e82623d1adc28beecc4044aac
parent 104e9360e169e52941b296f1579858521fae61c6

PEL: Use mocks in PEL Manager testcase

Use the mock versions of sdbusplus::bus::bus and DataInterface since it
isn't expected that D-Bus will actually work in testcases.

Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I19f997982e092747fc22573b31f7bb59e57ddae1

test/openpower-pels/pel_manager_test.cpp

diff --git a/test/openpower-pels/pel_manager_test.cpp b/test/openpower-pels/pel_manager_test.cpp
index b020d9d..530dfd5 100644
--- a/test/openpower-pels/pel_manager_test.cpp
+++ b/test/openpower-pels/pel_manager_test.cpp
@@ -15,10 +15,12 @@
  */
 #include "extensions/openpower-pels/manager.hpp"
 #include "log_manager.hpp"
+#include "mocks.hpp"
 #include "pel_utils.hpp"
 
 #include <fstream>
 #include <regex>
+#include <sdbusplus/test/sdbus_mock.hpp>
 #include <xyz/openbmc_project/Common/error.hpp>
 
 #include <gtest/gtest.h>
@@ -26,6 +28,8 @@
 using namespace openpower::pels;
 namespace fs = std::filesystem;
 
+using ::testing::NiceMock;
+
 class TestLogger
 {
   public:
@@ -45,10 +49,11 @@
 class ManagerTest : public CleanPELFiles
 {
   public:
-    ManagerTest() : logManager(bus, "logging_path")
+    ManagerTest() :
+        bus(sdbusplus::get_mocked_new(&sdbusInterface)),
+        logManager(bus, "logging_path")
     {
         sd_event_default(&sdEvent);
-        bus.attach_event(sdEvent, SD_EVENT_PRIORITY_NORMAL);
     }
 
     ~ManagerTest()
@@ -56,7 +61,8 @@
         sd_event_unref(sdEvent);
     }
 
-    sdbusplus::bus::bus bus = sdbusplus::bus::new_default();
+    NiceMock<sdbusplus::SdBusMock> sdbusInterface;
+    sdbusplus::bus::bus bus;
     phosphor::logging::internal::Manager logManager;
     sd_event* sdEvent;
     TestLogger logger;
@@ -89,7 +95,7 @@
 TEST_F(ManagerTest, TestCreateWithPEL)
 {
     std::unique_ptr<DataInterfaceBase> dataIface =
-        std::make_unique<DataInterface>(bus);
+        std::make_unique<MockDataInterface>();
 
     openpower::pels::Manager manager{
         logManager, std::move(dataIface),
@@ -131,7 +137,7 @@
 TEST_F(ManagerTest, TestCreateWithInvalidPEL)
 {
     std::unique_ptr<DataInterfaceBase> dataIface =
-        std::make_unique<DataInterface>(bus);
+        std::make_unique<MockDataInterface>();
 
     openpower::pels::Manager manager{
         logManager, std::move(dataIface),
@@ -207,7 +213,7 @@
     registryFile.close();
 
     std::unique_ptr<DataInterfaceBase> dataIface =
-        std::make_unique<DataInterface>(logManager.getBus());
+        std::make_unique<MockDataInterface>();
 
     openpower::pels::Manager manager{
         logManager, std::move(dataIface),
@@ -254,7 +260,7 @@
 TEST_F(ManagerTest, TestDBusMethods)
 {
     std::unique_ptr<DataInterfaceBase> dataIface =
-        std::make_unique<DataInterface>(bus);
+        std::make_unique<MockDataInterface>();
 
     Manager manager{logManager, std::move(dataIface),
                     std::bind(std::mem_fn(&TestLogger::log), &logger,
@@ -465,7 +471,7 @@
 TEST_F(ManagerTest, TestCreateWithESEL)
 {
     std::unique_ptr<DataInterfaceBase> dataIface =
-        std::make_unique<DataInterface>(bus);
+        std::make_unique<MockDataInterface>();
 
     openpower::pels::Manager manager{
         logManager, std::move(dataIface),