commit d57bd2f2b15738da1a38e3caaa193a7cc713adca
author Shawn McCarney <shawnmm@us.ibm.com> Mon Dec 02 18:40:28 2024 -0600
committer Shawn McCarney <shawnmm@us.ibm.com> Mon Dec 02 19:08:30 2024 -0600
tree 154a91716b18dcbe7dc20390d71c216865f480a3
parent cdf86de25dc52affd0161502f003eeb0e179cc3e

Rename getPSUInventoryPath to getPSUInventoryPaths

Rename the utils method/function getPSUInventoryPath() to
getPSUInventoryPaths().  The method/function returns multiple paths in a
vector, so the name should be plural.  This will make the return type
more clear.  Currently the name implies only one path will be returned.

Tested:
* Verified all automated tests build and run successfully
* Verified getPSUInventoryPaths() returns correct data

Change-Id: I7e215c37e3ce1eb27313bc51348c7f7335c8f67a
Signed-off-by: Shawn McCarney <shawnmm@us.ibm.com>

test/test_activation.cpp

diff --git a/test/test_activation.cpp b/test/test_activation.cpp
index 4beffbc..273f132 100644
--- a/test/test_activation.cpp
+++ b/test/test_activation.cpp
@@ -115,7 +115,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(
             Return(std::vector<std::string>({}))); // No PSU inventory
     activation->requestedActivation(RequestedStatus::Active);
@@ -136,7 +136,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(
             Return(std::vector<std::string>({psu0}))); // One PSU inventory
     activation->requestedActivation(RequestedStatus::Active);
@@ -165,7 +165,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(Return(
             std::vector<std::string>({psu0, psu1, psu2, psu3}))); // 4 PSUs
     activation->requestedActivation(RequestedStatus::Active);
@@ -217,7 +217,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(Return(
             std::vector<std::string>({psu0, psu1, psu2, psu3}))); // 4 PSUs
     activation->requestedActivation(RequestedStatus::Active);
@@ -249,7 +249,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(
             Return(std::vector<std::string>({psu0}))); // One PSU inventory
     ON_CALL(sdbusMock, sd_bus_call(_, _, _, _, nullptr))
@@ -266,7 +266,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(Return(std::vector<std::string>({psu0})));
     activation->requestedActivation(RequestedStatus::Active);
 
@@ -280,7 +280,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(Return(std::vector<std::string>({psu0})));
     activation->requestedActivation(RequestedStatus::Active);
 
@@ -297,7 +297,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(
             Return(std::vector<std::string>({psu0}))); // One PSU inventory
     activation->requestedActivation(RequestedStatus::Active);
@@ -325,7 +325,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(Return(
             std::vector<std::string>({psu0, psu1, psu2, psu3}))); // 4 PSUs
     activation->requestedActivation(RequestedStatus::Active);
@@ -366,7 +366,7 @@
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
 
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(
             Return(std::vector<std::string>({psu0}))); // One PSU inventory
 
@@ -389,7 +389,7 @@
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
 
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(
             Return(std::vector<std::string>({psu0}))); // One PSU inventory
 
@@ -410,7 +410,7 @@
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
 
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(
             Return(std::vector<std::string>({psu0}))); // One PSU inventory