commit 2c6570043ebe476d10679c8a2e55d66bf416e18a
author Shawn McCarney <shawnmm@us.ibm.com> Thu Feb 20 11:00:37 2020 -0600
committer Shawn McCarney <shawnmm@us.ibm.com> Wed Feb 26 22:16:54 2020 +0000
tree b3f9319c320bce3836ddcdd31fee5d6dc822d0d5
parent 5ad53945a2b69361ae628174b595675af1a35a4f

regulators: Improve gmock EXPECT_CALL() usage

Improve usage of gmock EXPECT_CALL() to specify the expected input
parameter values when useful.

The expected input parameter values to the mocked I2C interface are
important as they contain information like the register to read and the
number of bytes to read.

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

phosphor-regulators/test/actions/i2c_compare_bit_action_tests.cpp

diff --git a/phosphor-regulators/test/actions/i2c_compare_bit_action_tests.cpp b/phosphor-regulators/test/actions/i2c_compare_bit_action_tests.cpp
index 818c800..08f48bf 100644
--- a/phosphor-regulators/test/actions/i2c_compare_bit_action_tests.cpp
+++ b/phosphor-regulators/test/actions/i2c_compare_bit_action_tests.cpp
@@ -92,7 +92,7 @@
         std::unique_ptr<i2c::MockedI2CInterface> i2cInterface =
             std::make_unique<i2c::MockedI2CInterface>();
         EXPECT_CALL(*i2cInterface, isOpen).WillRepeatedly(Return(true));
-        EXPECT_CALL(*i2cInterface, read(A<uint8_t>(), A<uint8_t&>()))
+        EXPECT_CALL(*i2cInterface, read(0x7C, A<uint8_t&>()))
             .WillRepeatedly(SetArgReferee<1>(0x96));
 
         // Create Device, IDMap, and ActionEnvironment
@@ -168,7 +168,7 @@
         std::unique_ptr<i2c::MockedI2CInterface> i2cInterface =
             std::make_unique<i2c::MockedI2CInterface>();
         EXPECT_CALL(*i2cInterface, isOpen).Times(1).WillOnce(Return(true));
-        EXPECT_CALL(*i2cInterface, read(A<uint8_t>(), A<uint8_t&>()))
+        EXPECT_CALL(*i2cInterface, read(0x7C, A<uint8_t&>()))
             .Times(1)
             .WillOnce(Throw(
                 i2c::I2CException{"Failed to read byte", "/dev/i2c-1", 0x70}));

phosphor-regulators/test/actions/i2c_compare_byte_action_tests.cpp

diff --git a/phosphor-regulators/test/actions/i2c_compare_byte_action_tests.cpp b/phosphor-regulators/test/actions/i2c_compare_byte_action_tests.cpp
index b721898..436d987 100644
--- a/phosphor-regulators/test/actions/i2c_compare_byte_action_tests.cpp
+++ b/phosphor-regulators/test/actions/i2c_compare_byte_action_tests.cpp
@@ -65,7 +65,7 @@
         std::unique_ptr<i2c::MockedI2CInterface> i2cInterface =
             std::make_unique<i2c::MockedI2CInterface>();
         EXPECT_CALL(*i2cInterface, isOpen).Times(1).WillOnce(Return(true));
-        EXPECT_CALL(*i2cInterface, read(A<uint8_t>(), A<uint8_t&>()))
+        EXPECT_CALL(*i2cInterface, read(0xA0, A<uint8_t&>()))
             .Times(1)
             .WillOnce(SetArgReferee<1>(0xD7));
 
@@ -94,7 +94,7 @@
         std::unique_ptr<i2c::MockedI2CInterface> i2cInterface =
             std::make_unique<i2c::MockedI2CInterface>();
         EXPECT_CALL(*i2cInterface, isOpen).Times(1).WillOnce(Return(true));
-        EXPECT_CALL(*i2cInterface, read(A<uint8_t>(), A<uint8_t&>()))
+        EXPECT_CALL(*i2cInterface, read(0xA0, A<uint8_t&>()))
             .Times(1)
             .WillOnce(SetArgReferee<1>(0xD7));
 
@@ -120,7 +120,7 @@
         std::unique_ptr<i2c::MockedI2CInterface> i2cInterface =
             std::make_unique<i2c::MockedI2CInterface>();
         EXPECT_CALL(*i2cInterface, isOpen).Times(1).WillOnce(Return(true));
-        EXPECT_CALL(*i2cInterface, read(A<uint8_t>(), A<uint8_t&>()))
+        EXPECT_CALL(*i2cInterface, read(0xA0, A<uint8_t&>()))
             .Times(1)
             .WillOnce(SetArgReferee<1>(0xD7));
 
@@ -149,7 +149,7 @@
         std::unique_ptr<i2c::MockedI2CInterface> i2cInterface =
             std::make_unique<i2c::MockedI2CInterface>();
         EXPECT_CALL(*i2cInterface, isOpen).Times(1).WillOnce(Return(true));
-        EXPECT_CALL(*i2cInterface, read(A<uint8_t>(), A<uint8_t&>()))
+        EXPECT_CALL(*i2cInterface, read(0xA0, A<uint8_t&>()))
             .Times(1)
             .WillOnce(SetArgReferee<1>(0xD7));
 
@@ -195,7 +195,7 @@
         std::unique_ptr<i2c::MockedI2CInterface> i2cInterface =
             std::make_unique<i2c::MockedI2CInterface>();
         EXPECT_CALL(*i2cInterface, isOpen).Times(1).WillOnce(Return(true));
-        EXPECT_CALL(*i2cInterface, read(A<uint8_t>(), A<uint8_t&>()))
+        EXPECT_CALL(*i2cInterface, read(0xA0, A<uint8_t&>()))
             .Times(1)
             .WillOnce(Throw(
                 i2c::I2CException{"Failed to read byte", "/dev/i2c-1", 0x70}));