commit 5cfe51037ae9a2686b7782788805c1382485fd39
author Bob King <Bob_King@wistron.com> Thu Jul 30 16:26:18 2020 +0800
committer Bob King <Bob_King@wistron.com> Tue Sep 15 09:27:58 2020 +0800
tree 2939ba1aa58fcbbfecba4a0b0a883668c7f2e60c
parent 23243f84ec93f082abbaaa7f2774ce3f8deb5669

regulators: Modify Configuration to use Journal

Modify Configuration::execute() to log messages using
the new Journal interface.

Signed-off-by: Bob King <Bob_King@wistron.com>
Change-Id: If7dee12ca064147386fc076223474f004281d7ec

phosphor-regulators/test/system_tests.cpp

diff --git a/phosphor-regulators/test/system_tests.cpp b/phosphor-regulators/test/system_tests.cpp
index daa2084..7adc5d8 100644
--- a/phosphor-regulators/test/system_tests.cpp
+++ b/phosphor-regulators/test/system_tests.cpp
@@ -23,6 +23,7 @@
 #include "pmbus_read_sensor_action.hpp"
 #include "rail.hpp"
 #include "rule.hpp"
+#include "services.hpp"
 #include "system.hpp"
 #include "test_utils.hpp"
 
@@ -91,8 +92,13 @@
 
 TEST(SystemTests, Configure)
 {
-    // Create mock services.
+    // Create mock services.  Expect logInfo() to be called.
     MockServices services{};
+    MockJournal& journal = services.getMockJournal();
+    EXPECT_CALL(journal, logInfo("Configuring chassis 1")).Times(1);
+    EXPECT_CALL(journal, logInfo("Configuring chassis 3")).Times(1);
+    EXPECT_CALL(journal, logDebug(A<const std::string&>())).Times(0);
+    EXPECT_CALL(journal, logError(A<const std::string&>())).Times(0);
 
     // Specify an empty rules vector
     std::vector<std::unique_ptr<Rule>> rules{};
@@ -106,13 +112,7 @@
     System system{std::move(rules), std::move(chassis)};
 
     // Call configure()
-    journal::clear();
     system.configure(services);
-    EXPECT_EQ(journal::getDebugMessages().size(), 0);
-    EXPECT_EQ(journal::getErrMessages().size(), 0);
-    std::vector<std::string> expectedInfoMessages{"Configuring chassis 1",
-                                                  "Configuring chassis 3"};
-    EXPECT_EQ(journal::getInfoMessages(), expectedInfoMessages);
 }
 
 TEST(SystemTests, GetChassis)