Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 14:25:20 +03:00
Code Issues Wiki Activity

Fixed broken tests after #10080.

Browse source
This commit is contained in:
mikeller 2020-08-25 01:17:16 +12:00
parent b1a3699753
commit d79dcbb388
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/unit/link_quality_unittest.cc
View file

@ -350,7 +350,7 @@ TEST(LQTest, TestLQAlarm)
// and
// using the metric unit system
osdConfigMutable()->units = OSD_UNIT_METRIC;
osdConfigMutable()->units = UNIT_METRIC;
// when
// the craft is armed

20
src/test/unit/osd_unittest.cc
View file

@ -480,7 +480,7 @@ TEST_F(OsdTest, TestStatsImperial)
// and
// using imperial unit system
osdConfigMutable()->units = OSD_UNIT_IMPERIAL;
osdConfigMutable()->units = UNIT_IMPERIAL;
// and
// a GPS fix is present
@ -520,7 +520,7 @@ TEST_F(OsdTest, TestStatsMetric)
// and
// using metric unit system
osdConfigMutable()->units = OSD_UNIT_METRIC;
osdConfigMutable()->units = UNIT_METRIC;
// when
// the craft is armed
@ -556,7 +556,7 @@ TEST_F(OsdTest, TestStatsMetricDistanceUnits)
// and
// using metric unit system
osdConfigMutable()->units = OSD_UNIT_METRIC;
osdConfigMutable()->units = UNIT_METRIC;
// when
// the craft is armed
@ -622,7 +622,7 @@ TEST_F(OsdTest, TestAlarms)
// and
// using the metric unit system
osdConfigMutable()->units = OSD_UNIT_METRIC;
osdConfigMutable()->units = UNIT_METRIC;
// when
// time is passing by
@ -884,7 +884,7 @@ TEST_F(OsdTest, TestElementAltitude)
osdAnalyzeActiveElements();
// and
osdConfigMutable()->units = OSD_UNIT_METRIC;
osdConfigMutable()->units = UNIT_METRIC;
sensorsClear(SENSOR_GPS);
// when
@ -948,7 +948,7 @@ TEST_F(OsdTest, TestElementCoreTemperature)
osdAnalyzeActiveElements();
// and
osdConfigMutable()->units = OSD_UNIT_METRIC;
osdConfigMutable()->units = UNIT_METRIC;
// and
simulationCoreTemperature = 0;
@ -971,7 +971,7 @@ TEST_F(OsdTest, TestElementCoreTemperature)
displayPortTestBufferSubstring(1, 8, "C%c 33%c", SYM_TEMPERATURE, SYM_C);
// given
osdConfigMutable()->units = OSD_UNIT_IMPERIAL;
osdConfigMutable()->units = UNIT_IMPERIAL;
// when
displayClearScreen(&testDisplayPort);
@ -1120,15 +1120,15 @@ TEST_F(OsdTest, TestFormatTimeString)
TEST_F(OsdTest, TestConvertTemperatureUnits)
{
/* In Celsius */
osdConfigMutable()->units = OSD_UNIT_METRIC;
osdConfigMutable()->units = UNIT_METRIC;
EXPECT_EQ(osdConvertTemperatureToSelectedUnit(40), 40);
/* In Fahrenheit */
osdConfigMutable()->units = OSD_UNIT_IMPERIAL;
osdConfigMutable()->units = UNIT_IMPERIAL;
EXPECT_EQ(osdConvertTemperatureToSelectedUnit(40), 104);
/* In Fahrenheit with rounding */
osdConfigMutable()->units = OSD_UNIT_IMPERIAL;
osdConfigMutable()->units = UNIT_IMPERIAL;
EXPECT_EQ(osdConvertTemperatureToSelectedUnit(41), 106);
}