Tests refactoring: use standard Google Mocks for mocking PICO library calls

Author: slavaz

src/rgb_led.cpp

@@ -102,9 +102,10 @@ void RgbLed::lowlevel_setClockdiv(pio_sm_config *const config)
 
 void RgbLed::lowlevel_init(const PIO pio, const uint pin)
 {
-    uint offset = pio_add_program(pio, &rgbLedProgram);
     pio_sm_config config;
 
+    uint offset = pio_add_program(pio, &rgbLedProgram);
+
     pio_gpio_init(pio, pin);
     pio_sm_set_consecutive_pindirs(pio, RGB_LED__PIO_SM, pin, 1, true);
 

tests/event_controller__test.cpp

@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "event_controller.h"
 
-using ::testing::AtLeast;
 using ::testing::Return;
 using ::testing::StrictMock;
 

tests/mocklib/CMakeLists.txt

@@ -1,6 +1,7 @@
 add_library(mocklib SHARED
         clocks.cpp
         gpio.cpp
+        mocklib.cpp
         pio.cpp
         time.cpp
         )

tests/mocklib/base_mock.h

@@ -17,16 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "hardware/clocks.h"
+#include "mocklib.h"
 
-#include "mock_clocks.h"
-
-MockClocks mockClocks;
-
-uint32_t
-clock_get_hz(enum clock_index clk_index)
+uint32_t clock_get_hz(enum clock_index clk_index)
 {
-    mockClocks.methodWasCalled(MockClocksMethod__clock_get_hz);
-    mockClocks.setParameter(MockClocksMethodParameter__clock_get_hz__clk_index, clk_index);
-
-    return mockClocks.getMethodReturnValue(MockClocksMethod__clock_get_hz);
+    return mockPicoSdkApi.mockPicoSdk->clock_get_hz(clk_index);
 }

tests/mocklib/clocks.cpp

@@ -17,46 +17,35 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "hardware/gpio.h"
-
-#include "mock_gpio.h"
-
-MockGpio mockGpio;
+#include "mocklib.h"
 
 void gpio_init(uint gpio)
 {
-    mockGpio.methodWasCalled(MockGpioMethod__gpio_init);
-    mockGpio.setParameter(MockGpioMethodParameter__gpio_init__gpio, gpio);
+    mockPicoSdkApi.mockPicoSdk->gpio_init(gpio);
 }
 
 bool gpio_get(uint gpio)
 {
-    mockGpio.methodWasCalled(MockGpioMethod__gpio_get);
-    return mockGpio.getMethodReturnValue(MockGpioMethod__gpio_get);
+    return mockPicoSdkApi.mockPicoSdk->gpio_get(gpio);
 }
 
 void gpio_set_dir(uint gpio, bool out)
 {
-    mockGpio.methodWasCalled(MockGpioMethod__gpio_set_dir);
-    mockGpio.setParameter(MockGpioMethodParameter__gpio_set_dir__gpio, gpio);
-    mockGpio.setParameter(MockGpioMethodParameter__gpio_set_dir__out, out);
+    mockPicoSdkApi.mockPicoSdk->gpio_set_dir(gpio, out);
 }
 
 void gpio_pull_down(uint gpio)
 {
-    mockGpio.methodWasCalled(MockGpioMethod__gpio_pull_down);
+    mockPicoSdkApi.mockPicoSdk->gpio_pull_down(gpio);
 }
 
 void gpio_set_slew_rate(uint gpio, enum gpio_slew_rate slew)
 {
-    mockGpio.methodWasCalled(MockGpioMethod__gpio_set_slew_rate);
-    mockGpio.setParameter(MockGpioMethodParameter__gpio_set_slew_rate__gpio, gpio);
-    mockGpio.setParameter(MockGpioMethodParameter__gpio_set_slew_rate__slew, slew);
+
+    mockPicoSdkApi.mockPicoSdk->gpio_set_slew_rate(gpio, slew);
 }
 
 void gpio_put(uint gpio, bool value)
 {
-    mockGpio.methodWasCalled(MockGpioMethod__gpio_put);
-    mockGpio.setParameter(MockGpioMethodParameter__gpio_put__gpio, gpio);
-    mockGpio.setParameter(MockGpioMethodParameter__gpio_put__value, value);
+    mockPicoSdkApi.mockPicoSdk->gpio_put(gpio, value);
 }

tests/mocklib/gpio.cpp

@@ -40,6 +40,6 @@ void gpio_pull_down(uint);
 
 void gpio_set_slew_rate(uint, enum gpio_slew_rate);
 
-void gpio_put(uint gpio, bool value);
+void gpio_put(uint, bool);
 
 #endif

tests/mocklib/hardware/gpio.h

@@ -70,7 +70,7 @@ void sm_config_set_out_shift(pio_sm_config *c, bool shift_right, bool autopull,
 
 void sm_config_set_fifo_join(pio_sm_config *c, enum pio_fifo_join join);
 
-void pio_sm_init(PIO pio, uint sm, uint initial_pc, const pio_sm_config *config);
+void pio_sm_init(PIO pio, uint sm, uint initial_pc, pio_sm_config *config);
 
 void pio_sm_set_enabled(PIO pio, uint sm, bool enabled);