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

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
+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);