piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

chore(tests): use gtest boolean macros, match expected value types to struct fields (#6558)

Browse Source
This commit is contained in:
fpenard
2025-09-02 10:07:06 +10:00
committed by GitHub
parent ac0acbec97
commit 6c1af5a343
4 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/tests/frsky.cpp
+5 -5
View File
@@ -148,10 +148,10 @@ TEST(FrSkySPORT, checkCrc)
{
// Packet downstream
uint8_t pkt1[] = { 0x7E, 0x98, 0x10, 0x10, 0x00, 0x7E, 0x02, 0x00, 0x00, 0x5F };
EXPECT_EQ(checkSportPacket(pkt1+1), true);
EXPECT_TRUE(checkSportPacket(pkt1+1));
// Packet upstream
uint8_t pkt2[] = { 0x7E, 0x1C, 0x31, 0x00, 0x10, 0x85, 0x64, 0x00, 0x00, 0xD4 };
EXPECT_EQ(checkSportPacket(pkt2+1), true);
EXPECT_TRUE(checkSportPacket(pkt2+1));
}
void setSportPacketCrc(uint8_t * packet)
@@ -190,13 +190,13 @@ TEST(FrSkySPORT, FrSkyDCells)
allowNewSensors = true;
uint8_t pkt1[] = { 0x7E, 0x98, 0x10, 0x06, 0x00, 0x07, 0xD0, 0x00, 0x00, 0x12 };
EXPECT_EQ(checkSportPacket(pkt1+1), true);
EXPECT_TRUE(checkSportPacket(pkt1+1));
sportProcessTelemetryPacket(0, pkt1+1, sizeof(pkt1) - 1);
uint8_t pkt2[] = { 0x7E, 0x98, 0x10, 0x06, 0x00, 0x17, 0xD0, 0x00, 0x00, 0x02 };
EXPECT_EQ(checkSportPacket(pkt2+1), true);
EXPECT_TRUE(checkSportPacket(pkt2+1));
sportProcessTelemetryPacket(0, pkt2+1, sizeof(pkt2) - 1);
uint8_t pkt3[] = { 0x7E, 0x98, 0x10, 0x06, 0x00, 0x27, 0xD0, 0x00, 0x00, 0xF1 };
EXPECT_EQ(checkSportPacket(pkt3+1), true);
EXPECT_TRUE(checkSportPacket(pkt3+1));
sportProcessTelemetryPacket(0, pkt3+1, sizeof(pkt3) - 1);
sportProcessTelemetryPacket(0, pkt1+1, sizeof(pkt1) - 1);
sportProcessTelemetryPacket(0, pkt2+1, sizeof(pkt2) - 1);
radio/src/tests/functions.cpp
+5 -5
View File
@@ -51,23 +51,23 @@ TEST_F(SpecialFunctionsTest, FlightReset)
mainRequestFlags = 0;
simuSetSwitch(sw, 0);
EXPECT_EQ(false, getSwitch(swPos));
EXPECT_FALSE(getSwitch(swPos));
evalFunctions(g_model.customFn, modelFunctionsContext);
EXPECT_EQ((bool)(mainRequestFlags & (1 << REQUEST_FLIGHT_RESET)), false);
EXPECT_FALSE((bool)(mainRequestFlags & (1 << REQUEST_FLIGHT_RESET)));
// now trigger SA0
simuSetSwitch(sw, -1);
EXPECT_EQ(true, getSwitch(swPos));
EXPECT_TRUE(getSwitch(swPos));
// flightReset() should be called
evalFunctions(g_model.customFn, modelFunctionsContext);
EXPECT_EQ((bool)(mainRequestFlags & (1 << REQUEST_FLIGHT_RESET)), true);
EXPECT_TRUE((bool)(mainRequestFlags & (1 << REQUEST_FLIGHT_RESET)));
// now reset mainRequestFlags, and it should stay reset (flightReset() should not be called again)
mainRequestFlags = 0;
evalFunctions(g_model.customFn, modelFunctionsContext);
EXPECT_EQ((bool)(mainRequestFlags & (1 << REQUEST_FLIGHT_RESET)), false);
EXPECT_FALSE((bool)(mainRequestFlags & (1 << REQUEST_FLIGHT_RESET)));
}
#if defined(GVARS)
radio/src/tests/lua.cpp
+6 -6
View File
@@ -120,7 +120,7 @@ TEST(Lua, testModelInputs)
#else
luaExecStr("model.insertInput(3, 0, {name='test1', source=MIXSRC_Thr, weight=56, offset=3, switch=2})");
#endif
EXPECT_EQ(3, (int)g_model.expoData[0].chn);
EXPECT_EQ(3u, g_model.expoData[0].chn);
EXPECT_STRNEQ("test1", g_model.expoData[0].name);
EXPECT_EQ(MIXSRC_THR, g_model.expoData[0].srcRaw);
EXPECT_EQ(56u, g_model.expoData[0].weight);
@@ -133,7 +133,7 @@ TEST(Lua, testModelInputs)
#else
luaExecStr("model.insertInput(3, 0, {name='test2', source=MIXSRC_Rud, weight=-56})");
#endif
EXPECT_EQ(3, (int)g_model.expoData[0].chn);
EXPECT_EQ(3u, g_model.expoData[0].chn);
EXPECT_STRNEQ("test2", g_model.expoData[0].name);
EXPECT_EQ((short int)MIXSRC_FIRST_STICK, g_model.expoData[0].srcRaw);
SourceNumVal v;
@@ -142,7 +142,7 @@ TEST(Lua, testModelInputs)
EXPECT_EQ(0u, g_model.expoData[0].offset);
EXPECT_EQ(0, g_model.expoData[0].swtch);
EXPECT_EQ(3, (int)g_model.expoData[1].chn);
EXPECT_EQ(3u, g_model.expoData[1].chn);
EXPECT_STRNEQ("test1", g_model.expoData[1].name);
EXPECT_EQ(MIXSRC_THR, g_model.expoData[1].srcRaw);
EXPECT_EQ(56u, g_model.expoData[1].weight);
@@ -156,7 +156,7 @@ TEST(Lua, testModelInputs)
#else
luaExecStr("model.insertInput(3, model.getInputsCount(3), {name='test3', source=MIXSRC_Ail, weight=100})");
#endif
EXPECT_EQ(3, (int)g_model.expoData[0].chn);
EXPECT_EQ(3u, g_model.expoData[0].chn);
EXPECT_STRNEQ("test2", g_model.expoData[0].name);
EXPECT_EQ(MIXSRC_FIRST_STICK, g_model.expoData[0].srcRaw);
v.rawValue = g_model.expoData[0].weight;
@@ -164,14 +164,14 @@ TEST(Lua, testModelInputs)
EXPECT_EQ(0u, g_model.expoData[0].offset);
EXPECT_EQ(0, g_model.expoData[0].swtch);
EXPECT_EQ(3, (int)g_model.expoData[1].chn);
EXPECT_EQ(3u, g_model.expoData[1].chn);
EXPECT_STRNEQ("test1", g_model.expoData[1].name);
EXPECT_EQ(MIXSRC_THR, g_model.expoData[1].srcRaw);
EXPECT_EQ(56u, g_model.expoData[1].weight);
EXPECT_EQ(3u, g_model.expoData[1].offset);
EXPECT_EQ(2, g_model.expoData[1].swtch);
EXPECT_EQ(3, (int)g_model.expoData[2].chn);
EXPECT_EQ(3u, g_model.expoData[2].chn);
EXPECT_STRNEQ("test3", g_model.expoData[2].name);
#if defined(SURFACE_RADIO)
EXPECT_EQ(MIXSRC_THR, g_model.expoData[2].srcRaw);
radio/src/tests/switches.cpp
+64 -64
View File
@@ -58,33 +58,33 @@ TEST(getSwitch, OldTypeStickyCSW)
simuSetSwitch(sw, 0);
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
// now trigger SA0, both switches should become true
simuSetSwitch(sw, -1);
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), true);
EXPECT_EQ(getSwitch(SWSRC_SW2), true);
EXPECT_TRUE(getSwitch(SWSRC_SW1));
EXPECT_TRUE(getSwitch(SWSRC_SW2));
// now release SA0 and SW2 should stay true
simuSetSwitch(sw, 0);
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), true);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
EXPECT_TRUE(getSwitch(SWSRC_SW2));
// now reset logical switches
logicalSwitchesReset();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
}
#endif
TEST(getSwitch, nullSW)
{
MODEL_RESET();
EXPECT_EQ(getSwitch(0), true);
EXPECT_TRUE(getSwitch(0));
}
@@ -100,12 +100,12 @@ TEST(getSwitch, inputWithTrim)
evalMixes(1);
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
setTrimValue(0, 0, 32);
evalMixes(1);
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), true);
EXPECT_TRUE(getSwitch(SWSRC_SW1));
}
#endif
@@ -135,8 +135,8 @@ TEST(evalLogicalSwitches, playFile)
isAudioFileReferenced((LOGICAL_SWITCH_AUDIO_CATEGORY << 24) + (31 << 16) + AUDIO_EVENT_ON, filename);
EXPECT_EQ(strcmp(filename, "/SOUNDS/en/" MODELNAME "/L32-on.wav"), 0);
EXPECT_EQ(isAudioFileReferenced((LOGICAL_SWITCH_AUDIO_CATEGORY << 24) + (31 << 16) + AUDIO_EVENT_ON, filename), true);
EXPECT_EQ(isAudioFileReferenced((LOGICAL_SWITCH_AUDIO_CATEGORY << 24) + (32 << 16) + AUDIO_EVENT_ON, filename), false);
EXPECT_TRUE(isAudioFileReferenced((LOGICAL_SWITCH_AUDIO_CATEGORY << 24) + (31 << 16) + AUDIO_EVENT_ON, filename));
EXPECT_FALSE(isAudioFileReferenced((LOGICAL_SWITCH_AUDIO_CATEGORY << 24) + (32 << 16) + AUDIO_EVENT_ON, filename));
#undef MODELNAME
}
@@ -164,29 +164,29 @@ TEST(getSwitch, edgeInstant)
simuSetSwitch(sw2, 0); //SD mid
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
// now trigger SD donw, LS1 should become true
simuSetSwitch(sw2, 1); //SD down
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), true);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_TRUE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
// now release SD and LS1 should become false
simuSetSwitch(sw2, 0); //SD mid
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
// now reset logical switches
logicalSwitchesReset();
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
// second part with SA down
@@ -194,29 +194,29 @@ TEST(getSwitch, edgeInstant)
simuSetSwitch(sw2, 0); //SD mid
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
// now trigger SD down, LS1 & LS2 should become true
simuSetSwitch(sw2, 1); //SD down
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), true);
EXPECT_EQ(getSwitch(SWSRC_SW2), true);
EXPECT_TRUE(getSwitch(SWSRC_SW1));
EXPECT_TRUE(getSwitch(SWSRC_SW2));
// now release SA and LS1 & LS2 should stay false
simuSetSwitch(sw2, 0); //SD mid
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
// now reset logical switches
logicalSwitchesReset();
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
// now bug #2939
// SD is kept down and SA is toggled
@@ -224,22 +224,22 @@ TEST(getSwitch, edgeInstant)
simuSetSwitch(sw2, 1); //SD down
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), true);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_TRUE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
simuSetSwitch(sw1, 1); //SA down
simuSetSwitch(sw2, 1); //SD down
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
simuSetSwitch(sw1, -1); //SA up
simuSetSwitch(sw2, 1); //SD down
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
//test what happens when EDGE condition is true and
//logical switches are reset - the switch should fire again
@@ -248,19 +248,19 @@ TEST(getSwitch, edgeInstant)
simuSetSwitch(sw2, 1); //SD down
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false); //switch will not trigger, because SF was already up
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1)); //switch will not trigger, because SF was already up
EXPECT_FALSE(getSwitch(SWSRC_SW2));
logicalSwitchesReset();
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), true);
EXPECT_EQ(getSwitch(SWSRC_SW2), true);
EXPECT_TRUE(getSwitch(SWSRC_SW1));
EXPECT_TRUE(getSwitch(SWSRC_SW2));
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
}
TEST(getSwitch, edgeRelease)
@@ -287,20 +287,20 @@ TEST(getSwitch, edgeRelease)
simuSetSwitch(sw2, 0); //SD down
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
simuSetSwitch(sw2, 1); //SD up
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
simuSetSwitch(sw2, 0); //SD down
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), true);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_TRUE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
// second part with SAup
@@ -308,27 +308,27 @@ TEST(getSwitch, edgeRelease)
simuSetSwitch(sw2, 0); //SD down
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
simuSetSwitch(sw2, 1); //SD up
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
simuSetSwitch(sw2, 0); //SD down
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), true);
EXPECT_EQ(getSwitch(SWSRC_SW2), true);
EXPECT_TRUE(getSwitch(SWSRC_SW1));
EXPECT_TRUE(getSwitch(SWSRC_SW2));
// with switches reset both should remain false
logicalSwitchesReset();
logicalSwitchesTimerTick();
evalLogicalSwitches();
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
EXPECT_FALSE(getSwitch(SWSRC_SW1));
EXPECT_FALSE(getSwitch(SWSRC_SW2));
}
@@ -414,17 +414,17 @@ TEST(FlexSwitches, getSwitch)
auto offset = adcGetInputOffset(ADC_INPUT_FLEX);
anaSetFiltered(offset, -1024);
EXPECT_EQ(true, getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3));
EXPECT_EQ(false, getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3 + 1));
EXPECT_EQ(false, getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3 + 2));
EXPECT_TRUE(getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3));
EXPECT_FALSE(getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3 + 1));
EXPECT_FALSE(getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3 + 2));
anaSetFiltered(offset, 0);
EXPECT_EQ(false, getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3));
EXPECT_EQ(true, getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3 + 1));
EXPECT_EQ(false, getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3 + 2));
EXPECT_FALSE(getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3));
EXPECT_TRUE(getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3 + 1));
EXPECT_FALSE(getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3 + 2));
anaSetFiltered(offset, +1024);
EXPECT_EQ(false, getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3));
EXPECT_EQ(false, getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3 + 1));
EXPECT_EQ(true, getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3 + 2));
EXPECT_FALSE(getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3));
EXPECT_FALSE(getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3 + 1));
EXPECT_TRUE(getSwitch(SWSRC_FIRST_SWITCH + sw_idx * 3 + 2));
}