Move remaining mock methods in asserts.h/c into mock_comm module

rhargreaves · Feb 19, 2025 · 611c097 · 611c097
1 parent be7bd4a
commit 611c097
Show file tree

Hide file tree

Showing 19 changed files with 35 additions and 36 deletions.
diff --git a/tests/asserts.h b/tests/asserts.h
diff --git a/tests/cmocka_inc.h b/tests/cmocka_inc.h
@@ -1,9 +1,15 @@
 #include "genesis.h"
 #include <setjmp.h>
 #include <cmocka.h>
-#include "asserts.h"
 #include "wraps.h"
 
 #define INT_PTR(val) (&((int) { val }))
 
 #define UNUSED __attribute__((unused))
+
+#define expect_value_with_pos(function, parameter, value, file, line)                              \
+    _expect_value(#function, #parameter, file, line, cast_to_largest_integral_type(value), 1)
+#define expect_any_with_pos(function, parameter, file, line)                                       \
+    _expect_any(#function, #parameter, file, line, 1)
+#define will_return_with_pos(function, value, file, line)                                          \
+    _will_return(#function, file, line, cast_to_largest_integral_type(value), 1)
diff --git a/tests/asserts.c → tests/mocks/mock_comm.c b/tests/asserts.c → tests/mocks/mock_comm.c
@@ -1,5 +1,5 @@
 #include "cmocka_inc.h"
-#include "asserts.h"
+#include "mocks/mock_comm.h"
 #include "comm/comm.h"
 
 void stub_megawifi_as_not_present(void)

diff --git a/tests/mocks/mock_comm.h b/tests/mocks/mock_comm.h
@@ -0,0 +1,15 @@
+#pragma once
+#include "genesis.h"
+#include "cmocka.h"
+
+void stub_megawifi_as_not_present(void);
+void stub_everdrive_as_present(void);
+void expect_usb_sent_byte(u8 value);
+void stub_usb_receive_nothing(void);
+void stub_usb_receive_byte(u8 value);
+void stub_usb_receive_program(u8 chan, u8 program);
+void stub_usb_receive_cc(u8 chan, u8 cc, u8 value);
+void stub_usb_receive_note_on(u8 chan, u8 key, u8 velocity);
+void stub_usb_receive_note_off(u8 chan, u8 key);
+void stub_usb_receive_pitch_bend(u8 chan, u16 bend);
+void stub_comm_read_returns_midi_event(u8 status, u8 data, u8 data2);
diff --git a/tests/mocks/mock_midi.c b/tests/mocks/mock_midi.c
@@ -1,5 +1,5 @@
 #include "cmocka_inc.h"
-#include "asserts.h"
+#include "mocks/mock_comm.h"
 #include "mocks/mock_midi.h"
 
 void __wrap_midi_note_off(u8 chan, u8 pitch)

diff --git a/tests/mocks/mock_psg.c b/tests/mocks/mock_psg.c
@@ -1,5 +1,5 @@
 #include "cmocka_inc.h"
-#include "asserts.h"
+#include "mocks/mock_comm.h"
 #include "mocks/mock_psg.h"
 
 static bool disableChecks = false;

diff --git a/tests/mocks/mock_synth.c b/tests/mocks/mock_synth.c
@@ -1,5 +1,4 @@
 #include "cmocka_inc.h"
-#include "asserts.h"
 #include "mocks/mock_synth.h"
 
 static bool disableChecks = false;

diff --git a/tests/mocks/mock_ym2612.c b/tests/mocks/mock_ym2612.c
@@ -1,5 +1,4 @@
 #include "cmocka_inc.h"
-#include "asserts.h"
 #include "mocks/mock_ym2612.h"
 
 static bool disableChecks = false;

diff --git a/tests/system/test_e2e.c b/tests/system/test_e2e.c
@@ -1,5 +1,4 @@
 #include "test_e2e.h"
-#include "asserts.h"
 #include "comm/comm.h"
 #include "envelopes.h"
 #include "midi.h"
@@ -9,6 +8,7 @@
 #include "scheduler.h"
 #include "mocks/mock_ym2612.h"
 #include "mocks/mock_synth.h"
+#include "mocks/mock_comm.h"
 
 static const u8 TEST_CC_PAN = 10;
 static const u8 TEST_CC_PORTAMENTO_TIME = 5;

diff --git a/tests/unit/test_comm_demo.c b/tests/unit/test_comm_demo.c
@@ -1,6 +1,7 @@
 #include "test_comm_demo.h"
 #include "comm/comm_demo.h"
 #include "joy.h"
+#include "mocks/mock_comm.h"
 
 #define DEFAULT_PITCH 69
 

diff --git a/tests/unit/test_midi.h b/tests/unit/test_midi.h
@@ -9,6 +9,8 @@
 #include "mocks/mock_midi.h"
 #include "mocks/mock_synth.h"
 #include "mocks/mock_log.h"
+#include "mocks/mock_comm.h"
+#include "mocks/mock_psg.h"
 
 #define MIDI_PITCH_A2 45
 #define MIDI_PITCH_C3 48

diff --git a/tests/unit/test_midi_dac.c b/tests/unit/test_midi_dac.c
@@ -1,5 +1,6 @@
 #include "test_midi_dac.h"
 #include "test_midi.h"
+#include "mocks/mock_midi.h"
 #include "snd/sound.h"
 #include "snd/pcm/snd_pcm.h"
 

diff --git a/tests/unit/test_midi_finetune.c b/tests/unit/test_midi_finetune.c
@@ -1,5 +1,6 @@
 #include "test_midi_finetune.h"
 #include "test_midi.h"
+#include "mocks/mock_midi.h"
 
 void test_midi_finetune_max(UNUSED void** state)
 {

diff --git a/tests/unit/test_midi_fm.c b/tests/unit/test_midi_fm.c
@@ -1,5 +1,6 @@
 #include "test_midi_fm.h"
 #include "test_midi.h"
+#include "mocks/mock_midi.h"
 #include "debug.h"
 
 void test_midi_triggers_synth_note_on(UNUSED void** state)

diff --git a/tests/unit/test_midi_polyphony.c b/tests/unit/test_midi_polyphony.c
@@ -1,6 +1,5 @@
 #include "test_midi_polyphony.h"
 #include "test_midi.h"
-#include "mocks/mock_psg.h"
 
 void test_midi_polyphonic_mode_sends_CCs_to_all_FM_channels(UNUSED void** state)
 {

diff --git a/tests/unit/test_midi_portamento.c b/tests/unit/test_midi_portamento.c
@@ -1,6 +1,5 @@
 #include "test_midi_portamento.h"
 #include "test_midi.h"
-#include "mocks/mock_psg.h"
 
 int test_midi_portamento_setup(UNUSED void** state)
 {

diff --git a/tests/unit/test_midi_receiver.c b/tests/unit/test_midi_receiver.c
@@ -2,6 +2,7 @@
 #include "midi.h"
 #include "midi_receiver.h"
 #include "comm/comm.h"
+#include "mocks/mock_comm.h"
 #include "mocks/mock_midi.h"
 #include "mocks/mock_log.h"
 

diff --git a/tests/unit/test_midi_sysex.c b/tests/unit/test_midi_sysex.c
@@ -1,6 +1,5 @@
 #include "test_midi_sysex.h"
 #include "test_midi.h"
-#include "mocks/mock_psg.h"
 
 static void remapChannel(u8 midiChannel, u8 deviceChannel)
 {

diff --git a/tests/unit/test_synth.c b/tests/unit/test_synth.c
@@ -1,5 +1,7 @@
 #include "test_synth.h"
 #include "synth.h"
+#include "mocks/mock_comm.h"
+#include "mocks/mock_synth.h"
 #include "test_midi.h"
 #include "z80_ctrl.h"
 #include "mocks/mock_ym2612.h"