Fix tests

sardylan · May 15, 2018 · 3fc042b · 3fc042b
1 parent 3350c0f
commit 3fc042b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/eeprom/test/eeprombytetest.cpp b/src/eeprom/test/eeprombytetest.cpp
@@ -26,6 +26,7 @@ QTEST_MAIN(EEPROMByteTest)
 #define CUSTOM_QTRY_COMPARE_NO_TIMEOUT(expr, expected) QTRY_COMPARE_WITH_TIMEOUT((expr), expected, 0)
 
 #define TEST_EEPROM_FREQ (unsigned int) 145000000
+#define TEST_EEPROM_FREQBAND FrequencyBand::B0
 #define TEST_EEPROM_FREQ_MSB (char) 0x5a
 #define TEST_EEPROM_FREQ_LSB (char) 0xa0
 
@@ -119,7 +120,7 @@ void EEPROMByteTest::testChannelRxFreq() {
         CUSTOM_QTRY_COMPARE_NO_TIMEOUT(msb, (char) 0x00);
         CUSTOM_QTRY_COMPARE_NO_TIMEOUT(lsb, (char) 0x00);
 
-        eeprom->setChannelRxFreq(i, TEST_EEPROM_FREQ);
+        eeprom->setChannelRxFreq(i, TEST_EEPROM_FREQ, TEST_EEPROM_FREQBAND);
         msb = eeprom->getData()[offset];
         lsb = eeprom->getData()[offset + 1];
         CUSTOM_QTRY_COMPARE_NO_TIMEOUT(msb, TEST_EEPROM_FREQ_MSB);
@@ -136,7 +137,7 @@ void EEPROMByteTest::testChannelTxFreq() {
         CUSTOM_QTRY_COMPARE_NO_TIMEOUT(msb, (char) 0x00);
         CUSTOM_QTRY_COMPARE_NO_TIMEOUT(lsb, (char) 0x00);
 
-        eeprom->setChannelTxFreq(i, TEST_EEPROM_FREQ);
+        eeprom->setChannelTxFreq(i, TEST_EEPROM_FREQ, TEST_EEPROM_FREQBAND);
         msb = eeprom->getData()[offset + 2];
         lsb = eeprom->getData()[offset + 3];
         CUSTOM_QTRY_COMPARE_NO_TIMEOUT(msb, TEST_EEPROM_FREQ_MSB);

diff --git a/src/eeprom/test/eepromtest.cpp b/src/eeprom/test/eepromtest.cpp
@@ -26,6 +26,7 @@ QTEST_MAIN(EEPROMTest)
 #define CUSTOM_QTRY_COMPARE_NO_TIMEOUT(expr, expected) QTRY_COMPARE_WITH_TIMEOUT((expr), expected, 0)
 
 #define TEST_EEPROM_FREQ (unsigned int) 145000000
+#define TEST_EEPROM_FREQBAND FrequencyBand::B0
 #define TEST_EEPROM_CTCSS (uint8_t) 1
 #define TEST_DEFAULT_CHANNEL 10
 #define TEST_TOT 10
@@ -55,17 +56,17 @@ void EEPROMTest::testClear() {
 
 void EEPROMTest::testChannelRxFreq() {
     for (int i = 0; i < CHANNELS_COUNT; i++) {
-        CUSTOM_QTRY_COMPARE_NO_TIMEOUT(eeprom->getChannelRxFreq(i), (unsigned int) 0);
-        eeprom->setChannelRxFreq(i, TEST_EEPROM_FREQ);
-        CUSTOM_QTRY_COMPARE_NO_TIMEOUT(eeprom->getChannelRxFreq(i), TEST_EEPROM_FREQ);
+        CUSTOM_QTRY_COMPARE_NO_TIMEOUT(eeprom->getChannelRxFreq(i, TEST_EEPROM_FREQBAND), (unsigned int) 0);
+        eeprom->setChannelRxFreq(i, TEST_EEPROM_FREQ, TEST_EEPROM_FREQBAND);
+        CUSTOM_QTRY_COMPARE_NO_TIMEOUT(eeprom->getChannelRxFreq(i, TEST_EEPROM_FREQBAND), TEST_EEPROM_FREQ);
     }
 }
 
 void EEPROMTest::testChannelTxFreq() {
     for (int i = 0; i < CHANNELS_COUNT; i++) {
-        CUSTOM_QTRY_COMPARE_NO_TIMEOUT(eeprom->getChannelTxFreq(i), (unsigned int) 0);
-        eeprom->setChannelTxFreq(i, TEST_EEPROM_FREQ);
-        CUSTOM_QTRY_COMPARE_NO_TIMEOUT(eeprom->getChannelTxFreq(i), TEST_EEPROM_FREQ);
+        CUSTOM_QTRY_COMPARE_NO_TIMEOUT(eeprom->getChannelTxFreq(i, TEST_EEPROM_FREQBAND), (unsigned int) 0);
+        eeprom->setChannelTxFreq(i, TEST_EEPROM_FREQ, TEST_EEPROM_FREQBAND);
+        CUSTOM_QTRY_COMPARE_NO_TIMEOUT(eeprom->getChannelTxFreq(i, TEST_EEPROM_FREQBAND), TEST_EEPROM_FREQ);
     }
 }