diff --git a/src/test/unit/blackbox_unittest.cc b/src/test/unit/blackbox_unittest.cc index 63928107c4..408b543fea 100644 --- a/src/test/unit/blackbox_unittest.cc +++ b/src/test/unit/blackbox_unittest.cc @@ -125,16 +125,16 @@ TEST(BlackboxTest, Test_500Hz) // 500Hz PIDloop targetPidLooptime = 2000; blackboxInit(); - EXPECT_EQ(true, blackboxShouldLogIFrame()); - EXPECT_EQ(true, blackboxShouldLogPFrame()); + EXPECT_TRUE(blackboxShouldLogIFrame()); + EXPECT_TRUE(blackboxShouldLogPFrame()); for (int ii = 0; ii < 15; ++ii) { blackboxAdvanceIterationTimers(); - EXPECT_EQ(false, blackboxShouldLogIFrame()); - EXPECT_EQ(true, blackboxShouldLogPFrame()); + EXPECT_FALSE(blackboxShouldLogIFrame()); + EXPECT_TRUE(blackboxShouldLogPFrame()); } blackboxAdvanceIterationTimers(); - EXPECT_EQ(true, blackboxShouldLogIFrame()); - EXPECT_EQ(true, blackboxShouldLogPFrame()); + EXPECT_TRUE(blackboxShouldLogIFrame()); + EXPECT_TRUE(blackboxShouldLogPFrame()); } TEST(BlackboxTest, Test_1kHz) @@ -143,24 +143,24 @@ TEST(BlackboxTest, Test_1kHz) // 1kHz PIDloop targetPidLooptime = 1000; blackboxInit(); - EXPECT_EQ(true, blackboxShouldLogIFrame()); - EXPECT_EQ(true, blackboxShouldLogPFrame()); + EXPECT_TRUE(blackboxShouldLogIFrame()); + EXPECT_TRUE(blackboxShouldLogPFrame()); EXPECT_EQ(0, blackboxSlowFrameIterationTimer); - EXPECT_EQ(false, blackboxSlowFrameIterationTimer >= blackboxSInterval); + EXPECT_FALSE(blackboxSlowFrameIterationTimer >= blackboxSInterval); blackboxSlowFrameIterationTimer = blackboxSInterval; - EXPECT_EQ(true, writeSlowFrameIfNeeded()); + EXPECT_TRUE(writeSlowFrameIfNeeded()); EXPECT_EQ(0, blackboxSlowFrameIterationTimer); for (int ii = 0; ii < 31; ++ii) { blackboxAdvanceIterationTimers(); - EXPECT_EQ(false, blackboxShouldLogIFrame()); - EXPECT_EQ(true, blackboxShouldLogPFrame()); + EXPECT_FALSE(blackboxShouldLogIFrame()); + EXPECT_TRUE(blackboxShouldLogPFrame()); EXPECT_EQ(ii + 1, blackboxSlowFrameIterationTimer); - EXPECT_EQ(false, writeSlowFrameIfNeeded()); + EXPECT_FALSE(writeSlowFrameIfNeeded()); } blackboxAdvanceIterationTimers(); - EXPECT_EQ(true, blackboxShouldLogIFrame()); - EXPECT_EQ(true, blackboxShouldLogPFrame()); + EXPECT_TRUE(blackboxShouldLogIFrame()); + EXPECT_TRUE(blackboxShouldLogPFrame()); } TEST(BlackboxTest, Test_2kHz) @@ -171,29 +171,29 @@ TEST(BlackboxTest, Test_2kHz) blackboxInit(); EXPECT_EQ(64, blackboxIInterval); EXPECT_EQ(2, blackboxPInterval); - EXPECT_EQ(true, blackboxShouldLogIFrame()); - EXPECT_EQ(true, blackboxShouldLogPFrame()); + EXPECT_TRUE(blackboxShouldLogIFrame()); + EXPECT_TRUE(blackboxShouldLogPFrame()); blackboxAdvanceIterationTimers(); - EXPECT_EQ(false, blackboxShouldLogIFrame()); - EXPECT_EQ(false, blackboxShouldLogPFrame()); + EXPECT_FALSE(blackboxShouldLogIFrame()); + EXPECT_FALSE(blackboxShouldLogPFrame()); for (int ii = 0; ii < 31; ++ii) { blackboxAdvanceIterationTimers(); - EXPECT_EQ(false, blackboxShouldLogIFrame()); - EXPECT_EQ(true, blackboxShouldLogPFrame()); + EXPECT_FALSE(blackboxShouldLogIFrame()); + EXPECT_TRUE(blackboxShouldLogPFrame()); blackboxAdvanceIterationTimers(); - EXPECT_EQ(false, blackboxShouldLogIFrame()); - EXPECT_EQ(false, blackboxShouldLogPFrame()); + EXPECT_FALSE(blackboxShouldLogIFrame()); + EXPECT_FALSE(blackboxShouldLogPFrame()); } blackboxAdvanceIterationTimers(); - EXPECT_EQ(true, blackboxShouldLogIFrame()); - EXPECT_EQ(true, blackboxShouldLogPFrame()); + EXPECT_TRUE(blackboxShouldLogIFrame()); + EXPECT_TRUE(blackboxShouldLogPFrame()); blackboxAdvanceIterationTimers(); - EXPECT_EQ(false, blackboxShouldLogIFrame()); - EXPECT_EQ(false, blackboxShouldLogPFrame()); + EXPECT_FALSE(blackboxShouldLogIFrame()); + EXPECT_FALSE(blackboxShouldLogPFrame()); } TEST(BlackboxTest, Test_8kHz) @@ -202,23 +202,23 @@ TEST(BlackboxTest, Test_8kHz) // 8kHz PIDloop targetPidLooptime = 125; blackboxInit(); - EXPECT_EQ(true, blackboxShouldLogIFrame()); - EXPECT_EQ(true, blackboxShouldLogPFrame()); + EXPECT_TRUE(blackboxShouldLogIFrame()); + EXPECT_TRUE(blackboxShouldLogPFrame()); EXPECT_EQ(0, blackboxSlowFrameIterationTimer); - EXPECT_EQ(false, blackboxSlowFrameIterationTimer >= blackboxSInterval); + EXPECT_FALSE(blackboxSlowFrameIterationTimer >= blackboxSInterval); blackboxSlowFrameIterationTimer = blackboxSInterval; - EXPECT_EQ(true, writeSlowFrameIfNeeded()); + EXPECT_TRUE(writeSlowFrameIfNeeded()); EXPECT_EQ(0, blackboxSlowFrameIterationTimer); for (int ii = 0; ii < 255; ++ii) { blackboxAdvanceIterationTimers(); - EXPECT_EQ(false, blackboxShouldLogIFrame()); + EXPECT_FALSE(blackboxShouldLogIFrame()); EXPECT_EQ(ii + 1, blackboxSlowFrameIterationTimer); - EXPECT_EQ(false, writeSlowFrameIfNeeded()); + EXPECT_FALSE(writeSlowFrameIfNeeded()); } blackboxAdvanceIterationTimers(); - EXPECT_EQ(true, blackboxShouldLogIFrame()); - EXPECT_EQ(true, blackboxShouldLogPFrame()); + EXPECT_TRUE(blackboxShouldLogIFrame()); + EXPECT_TRUE(blackboxShouldLogPFrame()); } TEST(BlackboxTest, Test_zero_p_ratio) @@ -229,17 +229,17 @@ TEST(BlackboxTest, Test_zero_p_ratio) blackboxInit(); EXPECT_EQ(32, blackboxIInterval); EXPECT_EQ(0, blackboxPInterval); - EXPECT_EQ(true, blackboxShouldLogIFrame()); - EXPECT_EQ(false, blackboxShouldLogPFrame()); + EXPECT_TRUE(blackboxShouldLogIFrame()); + EXPECT_FALSE(blackboxShouldLogPFrame()); for (int ii = 0; ii < 31; ++ii) { blackboxAdvanceIterationTimers(); - EXPECT_EQ(false, blackboxShouldLogIFrame()); - EXPECT_EQ(false, blackboxShouldLogPFrame()); + EXPECT_FALSE(blackboxShouldLogIFrame()); + EXPECT_FALSE(blackboxShouldLogPFrame()); } blackboxAdvanceIterationTimers(); - EXPECT_EQ(true, blackboxShouldLogIFrame()); - EXPECT_EQ(false, blackboxShouldLogPFrame()); + EXPECT_TRUE(blackboxShouldLogIFrame()); + EXPECT_FALSE(blackboxShouldLogPFrame()); } TEST(BlackboxTest, Test_CalculatePDenom) diff --git a/src/test/unit/cli_unittest.cc b/src/test/unit/cli_unittest.cc index c59415e57d..04e9dc8c53 100644 --- a/src/test/unit/cli_unittest.cc +++ b/src/test/unit/cli_unittest.cc @@ -113,10 +113,6 @@ TEST(CLIUnittest, TestCliSetArray) EXPECT_EQ(123, data[0]); EXPECT_EQ( -3, data[1]); EXPECT_EQ( 1, data[2]); - - - //cliGet((char *)"osd_item_vbat"); - //EXPECT_EQ(false, false); } TEST(CLIUnittest, TestCliSetStringNoFlags) diff --git a/src/test/unit/cms_unittest.cc b/src/test/unit/cms_unittest.cc index c2547aa88f..95213ce3a7 100644 --- a/src/test/unit/cms_unittest.cc +++ b/src/test/unit/cms_unittest.cc @@ -48,10 +48,10 @@ TEST(CMSUnittest, TestCmsDisplayPortRegister) displayPort_t *displayPort = displayPortTestInit(); for (int ii = 0; ii < CMS_MAX_DEVICE; ++ii) { const bool registered = cmsDisplayPortRegister(displayPort); - EXPECT_EQ(true, registered); + EXPECT_TRUE(registered); } const bool registered = cmsDisplayPortRegister(displayPort); - EXPECT_EQ(false, registered); + EXPECT_FALSE(registered); } TEST(CMSUnittest, TestCmsMenuOpen) diff --git a/src/test/unit/flight_failsafe_unittest.cc b/src/test/unit/flight_failsafe_unittest.cc index b8c1609656..25048af04f 100644 --- a/src/test/unit/flight_failsafe_unittest.cc +++ b/src/test/unit/flight_failsafe_unittest.cc @@ -118,8 +118,8 @@ TEST(FlightFailsafeTest, TestFailsafeInitialState) failsafeReset(); // then - EXPECT_EQ(false, failsafeIsMonitoring()); - EXPECT_EQ(false, failsafeIsActive()); + EXPECT_FALSE(failsafeIsMonitoring()); + EXPECT_FALSE(failsafeIsActive()); EXPECT_EQ(FAILSAFE_IDLE, failsafePhase()); } @@ -130,8 +130,8 @@ TEST(FlightFailsafeTest, TestFailsafeStartMonitoring) failsafeStartMonitoring(); // then - EXPECT_EQ(true, failsafeIsMonitoring()); - EXPECT_EQ(false, failsafeIsActive()); + EXPECT_TRUE(failsafeIsMonitoring()); + EXPECT_FALSE(failsafeIsActive()); EXPECT_EQ(FAILSAFE_IDLE, failsafePhase()); } @@ -150,7 +150,7 @@ TEST(FlightFailsafeTest, TestFailsafeFirstArmedCycle) failsafeUpdateState(); // then - EXPECT_EQ(false, failsafeIsActive()); + EXPECT_FALSE(failsafeIsActive()); EXPECT_EQ(FAILSAFE_IDLE, failsafePhase()); } @@ -164,7 +164,7 @@ TEST(FlightFailsafeTest, TestFailsafeNotActivatedWhenReceivingData) failsafeUpdateState(); // then - EXPECT_EQ(false, failsafeIsActive()); + EXPECT_FALSE(failsafeIsActive()); EXPECT_EQ(FAILSAFE_IDLE, failsafePhase()); } } @@ -188,7 +188,7 @@ TEST(FlightFailsafeTest, TestFailsafeDetectsRxLossAndStartsLanding) failsafeUpdateState(); // then - EXPECT_EQ(false, failsafeIsActive()); + EXPECT_FALSE(failsafeIsActive()); EXPECT_EQ(FAILSAFE_IDLE, failsafePhase()); } @@ -201,7 +201,7 @@ TEST(FlightFailsafeTest, TestFailsafeDetectsRxLossAndStartsLanding) // then EXPECT_EQ(FAILSAFE_LANDING, failsafePhase()); - EXPECT_EQ(true, failsafeIsActive()); + EXPECT_TRUE(failsafeIsActive()); } /****************************************************************************************/ @@ -216,7 +216,7 @@ TEST(FlightFailsafeTest, TestFailsafeCausesLanding) failsafeUpdateState(); // then - EXPECT_EQ(true, failsafeIsActive()); + EXPECT_TRUE(failsafeIsActive()); EXPECT_EQ(FAILSAFE_RX_LOSS_MONITORING, failsafePhase()); EXPECT_EQ(1, CALL_COUNTER(COUNTER_MW_DISARM)); EXPECT_TRUE(isArmingDisabled()); @@ -230,7 +230,7 @@ TEST(FlightFailsafeTest, TestFailsafeCausesLanding) failsafeUpdateState(); // then - EXPECT_EQ(true, failsafeIsActive()); + EXPECT_TRUE(failsafeIsActive()); EXPECT_EQ(FAILSAFE_RX_LOSS_MONITORING, failsafePhase()); EXPECT_EQ(1, CALL_COUNTER(COUNTER_MW_DISARM)); EXPECT_TRUE(isArmingDisabled()); @@ -243,7 +243,7 @@ TEST(FlightFailsafeTest, TestFailsafeCausesLanding) failsafeUpdateState(); // then - EXPECT_EQ(false, failsafeIsActive()); + EXPECT_FALSE(failsafeIsActive()); EXPECT_EQ(FAILSAFE_IDLE, failsafePhase()); EXPECT_EQ(1, CALL_COUNTER(COUNTER_MW_DISARM)); // disarm not called repeatedly. EXPECT_FALSE(isArmingDisabled()); @@ -269,7 +269,7 @@ TEST(FlightFailsafeTest, TestFailsafeDetectsRxLossAndJustDisarms) failsafeUpdateState(); // then - EXPECT_EQ(false, failsafeIsActive()); + EXPECT_FALSE(failsafeIsActive()); EXPECT_EQ(FAILSAFE_IDLE, failsafePhase()); } @@ -282,7 +282,7 @@ TEST(FlightFailsafeTest, TestFailsafeDetectsRxLossAndJustDisarms) failsafeUpdateState(); // then - EXPECT_EQ(true, failsafeIsActive()); + EXPECT_TRUE(failsafeIsActive()); EXPECT_EQ(FAILSAFE_RX_LOSS_MONITORING, failsafePhase()); EXPECT_EQ(1, CALL_COUNTER(COUNTER_MW_DISARM)); EXPECT_TRUE(isArmingDisabled()); @@ -296,7 +296,7 @@ TEST(FlightFailsafeTest, TestFailsafeDetectsRxLossAndJustDisarms) failsafeUpdateState(); // then - EXPECT_EQ(true, failsafeIsActive()); + EXPECT_TRUE(failsafeIsActive()); EXPECT_EQ(FAILSAFE_RX_LOSS_MONITORING, failsafePhase()); EXPECT_EQ(1, CALL_COUNTER(COUNTER_MW_DISARM)); EXPECT_TRUE(isArmingDisabled()); @@ -309,7 +309,7 @@ TEST(FlightFailsafeTest, TestFailsafeDetectsRxLossAndJustDisarms) failsafeUpdateState(); // then - EXPECT_EQ(false, failsafeIsActive()); + EXPECT_FALSE(failsafeIsActive()); EXPECT_EQ(FAILSAFE_IDLE, failsafePhase()); EXPECT_EQ(1, CALL_COUNTER(COUNTER_MW_DISARM)); // disarm not called repeatedly. EXPECT_FALSE(isArmingDisabled()); @@ -338,7 +338,7 @@ TEST(FlightFailsafeTest, TestFailsafeSwitchModeKill) failsafeUpdateState(); // kill switch handling should come first // then - EXPECT_EQ(true, failsafeIsActive()); + EXPECT_TRUE(failsafeIsActive()); EXPECT_TRUE(isArmingDisabled()); EXPECT_EQ(1, CALL_COUNTER(COUNTER_MW_DISARM)); EXPECT_EQ(FAILSAFE_RX_LOSS_MONITORING, failsafePhase()); @@ -354,7 +354,7 @@ TEST(FlightFailsafeTest, TestFailsafeSwitchModeKill) failsafeUpdateState(); // then - EXPECT_EQ(true, failsafeIsActive()); + EXPECT_TRUE(failsafeIsActive()); EXPECT_TRUE(isArmingDisabled()); EXPECT_EQ(1, CALL_COUNTER(COUNTER_MW_DISARM)); EXPECT_EQ(FAILSAFE_RX_LOSS_MONITORING, failsafePhase()); @@ -367,7 +367,7 @@ TEST(FlightFailsafeTest, TestFailsafeSwitchModeKill) failsafeUpdateState(); // then - EXPECT_EQ(false, failsafeIsActive()); + EXPECT_FALSE(failsafeIsActive()); EXPECT_EQ(FAILSAFE_IDLE, failsafePhase()); EXPECT_EQ(1, CALL_COUNTER(COUNTER_MW_DISARM)); // disarm not called repeatedly. EXPECT_FALSE(isArmingDisabled()); @@ -394,7 +394,7 @@ TEST(FlightFailsafeTest, TestFailsafeSwitchModeStage2Drop) failsafeUpdateState(); // should activate stage2 immediately // then - EXPECT_EQ(true, failsafeIsActive()); + EXPECT_TRUE(failsafeIsActive()); EXPECT_TRUE(isArmingDisabled()); EXPECT_EQ(1, CALL_COUNTER(COUNTER_MW_DISARM)); EXPECT_EQ(FAILSAFE_RX_LOSS_MONITORING, failsafePhase()); @@ -408,7 +408,7 @@ TEST(FlightFailsafeTest, TestFailsafeSwitchModeStage2Drop) failsafeUpdateState(); // then - EXPECT_EQ(false, failsafeIsActive()); + EXPECT_FALSE(failsafeIsActive()); EXPECT_EQ(FAILSAFE_IDLE, failsafePhase()); EXPECT_EQ(1, CALL_COUNTER(COUNTER_MW_DISARM)); // disarm not called repeatedly. EXPECT_FALSE(isArmingDisabled()); @@ -434,7 +434,7 @@ TEST(FlightFailsafeTest, TestFailsafeSwitchModeStage2Land) failsafeUpdateState(); // should activate stage2 immediately // then - EXPECT_EQ(true, failsafeIsActive()); + EXPECT_TRUE(failsafeIsActive()); EXPECT_TRUE(isArmingDisabled()); EXPECT_EQ(0, CALL_COUNTER(COUNTER_MW_DISARM)); EXPECT_EQ(FAILSAFE_LANDING, failsafePhase()); @@ -449,7 +449,7 @@ TEST(FlightFailsafeTest, TestFailsafeSwitchModeStage2Land) failsafeUpdateState(); // then - EXPECT_EQ(true, failsafeIsActive()); + EXPECT_TRUE(failsafeIsActive()); EXPECT_TRUE(isArmingDisabled()); EXPECT_EQ(1, CALL_COUNTER(COUNTER_MW_DISARM)); EXPECT_EQ(FAILSAFE_RX_LOSS_MONITORING, failsafePhase()); @@ -465,7 +465,7 @@ TEST(FlightFailsafeTest, TestFailsafeSwitchModeStage2Land) failsafeUpdateState(); // then - EXPECT_EQ(false, failsafeIsActive()); + EXPECT_FALSE(failsafeIsActive()); EXPECT_EQ(FAILSAFE_IDLE, failsafePhase()); EXPECT_EQ(1, CALL_COUNTER(COUNTER_MW_DISARM)); // disarm not called repeatedly. EXPECT_FALSE(isArmingDisabled()); @@ -503,7 +503,7 @@ TEST(FlightFailsafeTest, TestFailsafeNotActivatedWhenDisarmedAndRXLossIsDetected failsafeUpdateState(); // then - EXPECT_EQ(false, failsafeIsActive()); + EXPECT_FALSE(failsafeIsActive()); EXPECT_EQ(FAILSAFE_IDLE, failsafePhase()); } @@ -515,8 +515,8 @@ TEST(FlightFailsafeTest, TestFailsafeNotActivatedWhenDisarmedAndRXLossIsDetected failsafeUpdateState(); // then - EXPECT_EQ(true, failsafeIsMonitoring()); - EXPECT_EQ(false, failsafeIsActive()); + EXPECT_TRUE(failsafeIsMonitoring()); + EXPECT_FALSE(failsafeIsActive()); EXPECT_EQ(FAILSAFE_IDLE, failsafePhase()); EXPECT_EQ(0, CALL_COUNTER(COUNTER_MW_DISARM)); EXPECT_TRUE(isArmingDisabled()); diff --git a/src/test/unit/flight_imu_unittest.cc b/src/test/unit/flight_imu_unittest.cc index 6ff358983f..d5ea484951 100644 --- a/src/test/unit/flight_imu_unittest.cc +++ b/src/test/unit/flight_imu_unittest.cc @@ -175,7 +175,7 @@ TEST(FlightImuTest, TestSmallAngle) imuComputeRotationMatrix(); // expect - EXPECT_EQ(false, isUpright()); + EXPECT_FALSE(isUpright()); // given rMat[0][0] = r1; @@ -187,7 +187,7 @@ TEST(FlightImuTest, TestSmallAngle) imuComputeRotationMatrix(); // expect - EXPECT_EQ(false, isUpright()); + EXPECT_FALSE(isUpright()); // given memset(rMat, 0.0, sizeof(float) * 9); @@ -196,7 +196,7 @@ TEST(FlightImuTest, TestSmallAngle) imuComputeRotationMatrix(); // expect - EXPECT_EQ(false, isUpright()); + EXPECT_FALSE(isUpright()); } // STUBS diff --git a/src/test/unit/ledstrip_unittest.cc b/src/test/unit/ledstrip_unittest.cc index 6afd0b4f8b..260a0835ba 100644 --- a/src/test/unit/ledstrip_unittest.cc +++ b/src/test/unit/ledstrip_unittest.cc @@ -166,7 +166,7 @@ TEST(LedStripTest, parseLedStripConfig) // when for (uint8_t index = 0; index < (sizeof(ledStripConfigCommands) / sizeof(ledStripConfigCommands[0])); index++) { - EXPECT_EQ(true, parseLedStripConfig(index, ledStripConfigCommands[index])); + EXPECT_TRUE(parseLedStripConfig(index, ledStripConfigCommands[index])); } // then diff --git a/src/test/unit/rc_controls_unittest.cc b/src/test/unit/rc_controls_unittest.cc index 158126b8eb..60f69b8f96 100644 --- a/src/test/unit/rc_controls_unittest.cc +++ b/src/test/unit/rc_controls_unittest.cc @@ -95,7 +95,7 @@ TEST_F(RcControlsModesTest, updateActivatedModesWithAllInputsAtMidde) #ifdef DEBUG_RC_CONTROLS printf("iteration: %d\n", index); #endif - EXPECT_EQ(false, IS_RC_MODE_ACTIVE((boxId_e)index)); + EXPECT_FALSE(IS_RC_MODE_ACTIVE((boxId_e)index)); } } @@ -351,7 +351,7 @@ TEST_F(RcControlsAdjustmentsTest, processRcAdjustmentsSticksInMiddle) EXPECT_EQ(90, controlRateConfig.rcRates[FD_ROLL]); EXPECT_EQ(90, controlRateConfig.rcRates[FD_PITCH]); EXPECT_EQ(0, CALL_COUNTER(COUNTER_QUEUE_CONFIRMATION_BEEP)); - EXPECT_EQ(true, adjustmentState->ready); + EXPECT_TRUE(adjustmentState->ready); } TEST_F(RcControlsAdjustmentsTest, processRcAdjustmentsWithRcRateFunctionSwitchUp) @@ -401,7 +401,7 @@ TEST_F(RcControlsAdjustmentsTest, processRcAdjustmentsWithRcRateFunctionSwitchUp EXPECT_EQ(91, controlRateConfig.rcRates[FD_ROLL]); EXPECT_EQ(91, controlRateConfig.rcRates[FD_PITCH]); EXPECT_EQ(1, CALL_COUNTER(COUNTER_QUEUE_CONFIRMATION_BEEP)); - EXPECT_EQ(false, adjustmentState->ready); + EXPECT_FALSE(adjustmentState->ready); // // now pretend a short amount of time has passed, but not enough time to allow the value to have been increased @@ -415,7 +415,7 @@ TEST_F(RcControlsAdjustmentsTest, processRcAdjustmentsWithRcRateFunctionSwitchUp EXPECT_EQ(91, controlRateConfig.rcRates[FD_ROLL]); EXPECT_EQ(91, controlRateConfig.rcRates[FD_PITCH]); - EXPECT_EQ(false, adjustmentState->ready); + EXPECT_FALSE(adjustmentState->ready); // @@ -434,7 +434,7 @@ TEST_F(RcControlsAdjustmentsTest, processRcAdjustmentsWithRcRateFunctionSwitchUp EXPECT_EQ(91, controlRateConfig.rcRates[FD_ROLL]); EXPECT_EQ(91, controlRateConfig.rcRates[FD_PITCH]); - EXPECT_EQ(true, adjustmentState->ready); + EXPECT_TRUE(adjustmentState->ready); // @@ -453,7 +453,7 @@ TEST_F(RcControlsAdjustmentsTest, processRcAdjustmentsWithRcRateFunctionSwitchUp EXPECT_EQ(92, controlRateConfig.rcRates[FD_ROLL]); EXPECT_EQ(92, controlRateConfig.rcRates[FD_PITCH]); EXPECT_EQ(2, CALL_COUNTER(COUNTER_QUEUE_CONFIRMATION_BEEP)); - EXPECT_EQ(false, adjustmentState->ready); + EXPECT_FALSE(adjustmentState->ready); // // leaving the switch up, after the original timer would have reset the state should now NOT cause @@ -469,7 +469,7 @@ TEST_F(RcControlsAdjustmentsTest, processRcAdjustmentsWithRcRateFunctionSwitchUp // then EXPECT_EQ(92, controlRateConfig.rcRates[FD_ROLL]); EXPECT_EQ(92, controlRateConfig.rcRates[FD_PITCH]); - EXPECT_EQ(false, adjustmentState->ready); + EXPECT_FALSE(adjustmentState->ready); // // should still not be able to be increased @@ -484,7 +484,7 @@ TEST_F(RcControlsAdjustmentsTest, processRcAdjustmentsWithRcRateFunctionSwitchUp // then EXPECT_EQ(92, controlRateConfig.rcRates[FD_ROLL]); EXPECT_EQ(92, controlRateConfig.rcRates[FD_PITCH]); - EXPECT_EQ(false, adjustmentState->ready); + EXPECT_FALSE(adjustmentState->ready); // // 500ms has now passed since the switch was returned to the middle, now that @@ -502,7 +502,7 @@ TEST_F(RcControlsAdjustmentsTest, processRcAdjustmentsWithRcRateFunctionSwitchUp EXPECT_EQ(93, controlRateConfig.rcRates[FD_ROLL]); EXPECT_EQ(93, controlRateConfig.rcRates[FD_PITCH]); EXPECT_EQ(3, CALL_COUNTER(COUNTER_QUEUE_CONFIRMATION_BEEP)); - EXPECT_EQ(false, adjustmentState->ready); + EXPECT_FALSE(adjustmentState->ready); } #define ADJUSTMENT_RATE_PROFILE_INDEX 12 @@ -585,12 +585,12 @@ TEST_F(RcControlsAdjustmentsTest, processPIDIncreasePidController0) // then EXPECT_EQ(6, CALL_COUNTER(COUNTER_QUEUE_CONFIRMATION_BEEP)); - EXPECT_EQ(false, adjustmentState1->ready); - EXPECT_EQ(false, adjustmentState2->ready); - EXPECT_EQ(false, adjustmentState3->ready); - EXPECT_EQ(false, adjustmentState4->ready); - EXPECT_EQ(false, adjustmentState5->ready); - EXPECT_EQ(false, adjustmentState6->ready); + EXPECT_FALSE(adjustmentState1->ready); + EXPECT_FALSE(adjustmentState2->ready); + EXPECT_FALSE(adjustmentState3->ready); + EXPECT_FALSE(adjustmentState4->ready); + EXPECT_FALSE(adjustmentState5->ready); + EXPECT_FALSE(adjustmentState6->ready); // and EXPECT_EQ(1, pidProfile.pid[PID_PITCH].P); diff --git a/src/test/unit/rcdevice_unittest.cc b/src/test/unit/rcdevice_unittest.cc index 2f8c7abbf0..89f800d2b9 100644 --- a/src/test/unit/rcdevice_unittest.cc +++ b/src/test/unit/rcdevice_unittest.cc @@ -146,7 +146,7 @@ TEST(RCDeviceTest, TestRCSplitInitWithoutPortConfigurated) waitingResponseQueue.itemCount = 0; memset(&testData, 0, sizeof(testData)); runcamDeviceInit(&device); - EXPECT_EQ(false, device.isReady); + EXPECT_FALSE(device.isReady); } TEST(RCDeviceTest, TestRCSplitInitWithoutOpenPortConfigurated) @@ -163,7 +163,7 @@ TEST(RCDeviceTest, TestRCSplitInitWithoutOpenPortConfigurated) testData.isRunCamSplitPortConfigurated = true; runcamDeviceInit(&device); - EXPECT_EQ(false, device.isReady); + EXPECT_FALSE(device.isReady); } TEST(RCDeviceTest, TestInitDevice) @@ -194,7 +194,7 @@ TEST(RCDeviceTest, TestInitDevice) rcdeviceReceive(millis() * 1000); rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(device.isReady, true); + EXPECT_TRUE(device.isReady); } TEST(RCDeviceTest, TestInitDeviceWithInvalidResponse) @@ -221,7 +221,7 @@ TEST(RCDeviceTest, TestInitDeviceWithInvalidResponse) testData.responseDataReadPos = 0; testData.indexOfCurrentRespBuf = 0; rcdeviceReceive(millis() * 1000); - EXPECT_EQ(device.isReady, true); + EXPECT_TRUE(device.isReady); clearResponseBuff(); testData.millis += minTimeout; @@ -235,7 +235,7 @@ TEST(RCDeviceTest, TestInitDeviceWithInvalidResponse) testData.responseDataReadPos = 0; testData.indexOfCurrentRespBuf = 0; rcdeviceReceive(millis() * 1000); - EXPECT_EQ(device.isReady, false); + EXPECT_FALSE(device.isReady); clearResponseBuff(); testData.millis += minTimeout; @@ -250,7 +250,7 @@ TEST(RCDeviceTest, TestInitDeviceWithInvalidResponse) testData.indexOfCurrentRespBuf = 0; rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(device.isReady, false); + EXPECT_FALSE(device.isReady); clearResponseBuff(); testData.millis += minTimeout; @@ -266,7 +266,7 @@ TEST(RCDeviceTest, TestInitDeviceWithInvalidResponse) testData.responseDataReadPos = 0; testData.indexOfCurrentRespBuf = 0; rcdeviceReceive(millis() * 1000); - EXPECT_EQ(device.isReady, false); + EXPECT_FALSE(device.isReady); clearResponseBuff(); testData.millis += minTimeout; } @@ -294,7 +294,7 @@ TEST(RCDeviceTest, TestWifiModeChangeWithDeviceUnready) testData.indexOfCurrentRespBuf = 0; rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(camDevice->isReady, false); + EXPECT_FALSE(camDevice->isReady); // bind aux1, aux2, aux3 channel to wifi button, power button and change mode for (uint8_t i = 0; i <= (BOXCAMERA3 - BOXCAMERA1); i++) { @@ -337,9 +337,9 @@ TEST(RCDeviceTest, TestWifiModeChangeWithDeviceUnready) rcdeviceReceive(millis()); } - EXPECT_EQ(false, unitTestIsSwitchActivited(BOXCAMERA1)); - EXPECT_EQ(false, unitTestIsSwitchActivited(BOXCAMERA2)); - EXPECT_EQ(false, unitTestIsSwitchActivited(BOXCAMERA3)); + EXPECT_FALSE(unitTestIsSwitchActivited(BOXCAMERA1)); + EXPECT_FALSE(unitTestIsSwitchActivited(BOXCAMERA2)); + EXPECT_FALSE(unitTestIsSwitchActivited(BOXCAMERA3)); } TEST(RCDeviceTest, TestWifiModeChangeWithDeviceReady) @@ -366,7 +366,7 @@ TEST(RCDeviceTest, TestWifiModeChangeWithDeviceReady) rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(camDevice->isReady, true); + EXPECT_TRUE(camDevice->isReady); // bind aux1, aux2, aux3 channel to wifi button, power button and change mode for (uint8_t i = 0; i <= BOXCAMERA3 - BOXCAMERA1; i++) { @@ -405,9 +405,9 @@ TEST(RCDeviceTest, TestWifiModeChangeWithDeviceReady) testData.maxTimesOfRespDataAvailable = randNum; rcdeviceUpdate((timeUs_t)0); - EXPECT_EQ(false, unitTestIsSwitchActivited(BOXCAMERA1)); - EXPECT_EQ(true, unitTestIsSwitchActivited(BOXCAMERA2)); - EXPECT_EQ(false, unitTestIsSwitchActivited(BOXCAMERA3)); + EXPECT_FALSE(unitTestIsSwitchActivited(BOXCAMERA1)); + EXPECT_TRUE(unitTestIsSwitchActivited(BOXCAMERA2)); + EXPECT_FALSE(unitTestIsSwitchActivited(BOXCAMERA3)); // remove all request from queue for (int i = 0; i < 10; i++) { @@ -435,7 +435,7 @@ TEST(RCDeviceTest, TestWifiModeChangeCombine) testData.indexOfCurrentRespBuf = 0; rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(true, camDevice->isReady); + EXPECT_TRUE(camDevice->isReady); // bind aux1, aux2, aux3 channel to wifi button, power button and change mode for (uint8_t i = 0; i <= BOXCAMERA3 - BOXCAMERA1; i++) { @@ -474,9 +474,9 @@ TEST(RCDeviceTest, TestWifiModeChangeCombine) testData.maxTimesOfRespDataAvailable = randNum; rcdeviceUpdate((timeUs_t)0); - EXPECT_EQ(false, unitTestIsSwitchActivited(BOXCAMERA1)); - EXPECT_EQ(true, unitTestIsSwitchActivited(BOXCAMERA2)); - EXPECT_EQ(false, unitTestIsSwitchActivited(BOXCAMERA3)); + EXPECT_FALSE(unitTestIsSwitchActivited(BOXCAMERA1)); + EXPECT_TRUE(unitTestIsSwitchActivited(BOXCAMERA2)); + EXPECT_FALSE(unitTestIsSwitchActivited(BOXCAMERA3)); // // make the binded mode inactive @@ -485,22 +485,22 @@ TEST(RCDeviceTest, TestWifiModeChangeCombine) rcData[modeActivationConditions(2)->auxChannelIndex + NON_AUX_CHANNEL_COUNT] = 1900; updateActivatedModes(); rcdeviceUpdate((timeUs_t)0); - EXPECT_EQ(true, unitTestIsSwitchActivited(BOXCAMERA1)); - EXPECT_EQ(false, unitTestIsSwitchActivited(BOXCAMERA2)); - EXPECT_EQ(true, unitTestIsSwitchActivited(BOXCAMERA3)); + EXPECT_TRUE(unitTestIsSwitchActivited(BOXCAMERA1)); + EXPECT_FALSE(unitTestIsSwitchActivited(BOXCAMERA2)); + EXPECT_TRUE(unitTestIsSwitchActivited(BOXCAMERA3)); rcData[modeActivationConditions(2)->auxChannelIndex + NON_AUX_CHANNEL_COUNT] = 1899; updateActivatedModes(); rcdeviceUpdate((timeUs_t)0); - EXPECT_EQ(false, unitTestIsSwitchActivited(BOXCAMERA3)); + EXPECT_FALSE(unitTestIsSwitchActivited(BOXCAMERA3)); rcData[modeActivationConditions(1)->auxChannelIndex + NON_AUX_CHANNEL_COUNT] = 2001; updateActivatedModes(); rcdeviceUpdate((timeUs_t)0); - EXPECT_EQ(true, unitTestIsSwitchActivited(BOXCAMERA1)); - EXPECT_EQ(true, unitTestIsSwitchActivited(BOXCAMERA2)); - EXPECT_EQ(false, unitTestIsSwitchActivited(BOXCAMERA3)); + EXPECT_TRUE(unitTestIsSwitchActivited(BOXCAMERA1)); + EXPECT_TRUE(unitTestIsSwitchActivited(BOXCAMERA2)); + EXPECT_FALSE(unitTestIsSwitchActivited(BOXCAMERA3)); // remove all request from queue for (int i = 0; i < 10; i++) { @@ -528,7 +528,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) testData.indexOfCurrentRespBuf = 0; rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(true, camDevice->isReady); + EXPECT_TRUE(camDevice->isReady); clearResponseBuff(); // test timeout of open connection @@ -537,7 +537,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) testData.millis += 3000; rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(false, rcdeviceInMenu); + EXPECT_FALSE(rcdeviceInMenu); clearResponseBuff(); // open connection with correct response @@ -546,7 +546,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) rcdeviceSend5KeyOSDCableSimualtionEvent(RCDEVICE_CAM_KEY_CONNECTION_OPEN); rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(true, rcdeviceInMenu); + EXPECT_TRUE(rcdeviceInMenu); clearResponseBuff(); // open connection with correct response but wrong data length @@ -555,7 +555,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) rcdeviceSend5KeyOSDCableSimualtionEvent(RCDEVICE_CAM_KEY_CONNECTION_OPEN); rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(true, rcdeviceInMenu); + EXPECT_TRUE(rcdeviceInMenu); clearResponseBuff(); // open connection with invalid crc @@ -564,7 +564,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) rcdeviceSend5KeyOSDCableSimualtionEvent(RCDEVICE_CAM_KEY_CONNECTION_OPEN); rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(true, rcdeviceInMenu); // when crc wrong won't change the menu state + EXPECT_TRUE(rcdeviceInMenu); // when crc wrong won't change the menu state clearResponseBuff(); // test timeout of close connection @@ -573,7 +573,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) testData.millis += 3000; rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(true, rcdeviceInMenu); // close menu timeout won't change the menu state + EXPECT_TRUE(rcdeviceInMenu); // close menu timeout won't change the menu state clearResponseBuff(); // close connection with correct response @@ -582,7 +582,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) rcdeviceSend5KeyOSDCableSimualtionEvent(RCDEVICE_CAM_KEY_CONNECTION_CLOSE); rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(false, rcdeviceInMenu); + EXPECT_FALSE(rcdeviceInMenu); clearResponseBuff(); // close connection with correct response but wrong data length @@ -590,7 +590,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) rcdeviceSend5KeyOSDCableSimualtionEvent(RCDEVICE_CAM_KEY_CONNECTION_OPEN); // open menu again rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(true, rcdeviceInMenu); + EXPECT_TRUE(rcdeviceInMenu); clearResponseBuff(); uint8_t responseDataOfCloseConnection1[] = { 0xCC, 0x21, 0x11, 0xC1 }; @@ -598,7 +598,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) rcdeviceSend5KeyOSDCableSimualtionEvent(RCDEVICE_CAM_KEY_CONNECTION_CLOSE); rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(false, rcdeviceInMenu); + EXPECT_FALSE(rcdeviceInMenu); clearResponseBuff(); // close connection with response that invalid crc @@ -606,7 +606,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) rcdeviceSend5KeyOSDCableSimualtionEvent(RCDEVICE_CAM_KEY_CONNECTION_OPEN); // open menu again rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(true, rcdeviceInMenu); + EXPECT_TRUE(rcdeviceInMenu); clearResponseBuff(); uint8_t responseDataOfCloseConnection2[] = { 0xCC, 0x21, 0xA1 }; @@ -614,7 +614,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) rcdeviceSend5KeyOSDCableSimualtionEvent(RCDEVICE_CAM_KEY_CONNECTION_CLOSE); rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(true, rcdeviceInMenu); + EXPECT_TRUE(rcdeviceInMenu); clearResponseBuff(); // release button first @@ -623,7 +623,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) rcdeviceSend5KeyOSDCableSimualtionEvent(RCDEVICE_CAM_KEY_RELEASE); rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(false, isButtonPressed); + EXPECT_FALSE(isButtonPressed); clearResponseBuff(); // simulate press button with no response @@ -631,7 +631,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) testData.millis += 2000; rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(false, isButtonPressed); + EXPECT_FALSE(isButtonPressed); clearResponseBuff(); // simulate press button with correct response @@ -640,7 +640,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) rcdeviceSend5KeyOSDCableSimualtionEvent(RCDEVICE_CAM_KEY_ENTER); rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(true, isButtonPressed); + EXPECT_TRUE(isButtonPressed); clearResponseBuff(); // simulate press button with correct response but wrong data length @@ -648,7 +648,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) rcdeviceSend5KeyOSDCableSimualtionEvent(RCDEVICE_CAM_KEY_RELEASE); rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(false, isButtonPressed); + EXPECT_FALSE(isButtonPressed); clearResponseBuff(); uint8_t responseDataOfSimulation2[] = { 0xCC, 0xA5, 0x22 }; @@ -656,7 +656,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) rcdeviceSend5KeyOSDCableSimualtionEvent(RCDEVICE_CAM_KEY_ENTER); rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(true, isButtonPressed); + EXPECT_TRUE(isButtonPressed); clearResponseBuff(); // simulate press button event with incorrect response @@ -665,7 +665,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) rcdeviceSend5KeyOSDCableSimualtionEvent(RCDEVICE_CAM_KEY_ENTER); rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(true, isButtonPressed); + EXPECT_TRUE(isButtonPressed); clearResponseBuff(); // simulate release button with correct response @@ -673,7 +673,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) rcdeviceSend5KeyOSDCableSimualtionEvent(RCDEVICE_CAM_KEY_RELEASE); rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(false, isButtonPressed); + EXPECT_FALSE(isButtonPressed); clearResponseBuff(); // simulate release button with correct response but wrong data length @@ -681,7 +681,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) rcdeviceSend5KeyOSDCableSimualtionEvent(RCDEVICE_CAM_KEY_ENTER); rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(true, isButtonPressed); + EXPECT_TRUE(isButtonPressed); clearResponseBuff(); uint8_t responseDataOfSimulation5[] = { 0xCC, 0xA5, 0xFF }; @@ -689,7 +689,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) rcdeviceSend5KeyOSDCableSimualtionEvent(RCDEVICE_CAM_KEY_RELEASE); rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(false, isButtonPressed); + EXPECT_FALSE(isButtonPressed); clearResponseBuff(); // simulate release button with incorrect response @@ -698,7 +698,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationProtocol) rcdeviceSend5KeyOSDCableSimualtionEvent(RCDEVICE_CAM_KEY_RELEASE); rcdeviceReceive(millis() * 1000); testData.millis += minTimeout; - EXPECT_EQ(false, isButtonPressed); + EXPECT_FALSE(isButtonPressed); clearResponseBuff(); // remove all request from queue @@ -718,7 +718,7 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationWithout5KeyFeatureSupport) rcData[PITCH] = FIVE_KEY_JOYSTICK_MID; // PITCH Mid rcData[YAW] = FIVE_KEY_JOYSTICK_MAX; // Yaw High rcdeviceUpdate(millis() * 1000); - EXPECT_EQ(false, rcdeviceInMenu); + EXPECT_FALSE(rcdeviceInMenu); // remove all request from queue for (int i = 0; i < 10; i++) { testData.millis += 500000; @@ -742,14 +742,14 @@ TEST(RCDeviceTest, Test5KeyOSDCableSimulationWithout5KeyFeatureSupport) addResponseData(responseData, sizeof(responseData), true); rcdeviceReceive(millis() * 1000); testData.millis += 200; - EXPECT_EQ(camDevice->isReady, true); + EXPECT_TRUE(camDevice->isReady); clearResponseBuff(); // open connection, rcdeviceInMenu will be false if the codes is right uint8_t responseDataOfOpenConnection[] = { 0xCC, 0x11, 0xe7 }; addResponseData(responseDataOfOpenConnection, sizeof(responseDataOfOpenConnection), false); rcdeviceUpdate(millis() * 1000); - EXPECT_EQ(false, rcdeviceInMenu); + EXPECT_FALSE(rcdeviceInMenu); clearResponseBuff(); // remove all request from queue diff --git a/src/test/unit/rx_crsf_unittest.cc b/src/test/unit/rx_crsf_unittest.cc index ba4cd54e41..8d4d430ddd 100644 --- a/src/test/unit/rx_crsf_unittest.cc +++ b/src/test/unit/rx_crsf_unittest.cc @@ -131,7 +131,7 @@ TEST(CrossFireTest, TestCrsfFrameStatus) const uint8_t status = crsfFrameStatus(); EXPECT_EQ(RX_FRAME_COMPLETE, status); - EXPECT_EQ(false, crsfFrameDone); + EXPECT_FALSE(crsfFrameDone); EXPECT_EQ(CRSF_ADDRESS_CRSF_RECEIVER, crsfFrame.frame.deviceAddress); EXPECT_EQ(CRSF_FRAMETYPE_RC_CHANNELS_PACKED, crsfFrame.frame.type); @@ -182,7 +182,7 @@ TEST(CrossFireTest, TestCrsfFrameStatusUnpacking) memcpy(&crsfChannelDataFrame, &crsfFrame, sizeof(crsfFrame)); const uint8_t status = crsfFrameStatus(); EXPECT_EQ(RX_FRAME_COMPLETE, status); - EXPECT_EQ(false, crsfFrameDone); + EXPECT_FALSE(crsfFrameDone); EXPECT_EQ(CRSF_ADDRESS_CRSF_RECEIVER, crsfFrame.frame.deviceAddress); EXPECT_EQ(CRSF_FRAME_RC_CHANNELS_PAYLOAD_SIZE + CRSF_FRAME_LENGTH_TYPE_CRC, crsfFrame.frame.frameLength); @@ -227,9 +227,9 @@ TEST(CrossFireTest, TestCapturedData) memcpy(&crsfChannelDataFrame, &crsfFrame, sizeof(crsfFrame)); uint8_t status = crsfFrameStatus(); EXPECT_EQ(RX_FRAME_COMPLETE, status); - EXPECT_EQ(false, crsfFrameDone); + EXPECT_FALSE(crsfFrameDone); EXPECT_EQ(RX_FRAME_COMPLETE, status); - EXPECT_EQ(false, crsfFrameDone); + EXPECT_FALSE(crsfFrameDone); EXPECT_EQ(CRSF_ADDRESS_BROADCAST, crsfFrame.frame.deviceAddress); EXPECT_EQ(CRSF_FRAME_RC_CHANNELS_PAYLOAD_SIZE + CRSF_FRAME_LENGTH_TYPE_CRC, crsfFrame.frame.frameLength); EXPECT_EQ(CRSF_FRAMETYPE_RC_CHANNELS_PACKED, crsfFrame.frame.type); @@ -250,9 +250,9 @@ TEST(CrossFireTest, TestCapturedData) memcpy(&crsfChannelDataFrame, &crsfFrame, sizeof(crsfFrame)); status = crsfFrameStatus(); EXPECT_EQ(RX_FRAME_COMPLETE, status); - EXPECT_EQ(false, crsfFrameDone); + EXPECT_FALSE(crsfFrameDone); EXPECT_EQ(RX_FRAME_COMPLETE, status); - EXPECT_EQ(false, crsfFrameDone); + EXPECT_FALSE(crsfFrameDone); EXPECT_EQ(CRSF_ADDRESS_BROADCAST, crsfFrame.frame.deviceAddress); EXPECT_EQ(CRSF_FRAME_RC_CHANNELS_PAYLOAD_SIZE + CRSF_FRAME_LENGTH_TYPE_CRC, crsfFrame.frame.frameLength); EXPECT_EQ(CRSF_FRAMETYPE_RC_CHANNELS_PACKED, crsfFrame.frame.type); @@ -272,7 +272,7 @@ TEST(CrossFireTest, TestCrsfDataReceive) for (unsigned int ii = 0; ii < sizeof(crsfRcChannelsFrame_t); ++ii) { crsfDataReceive(*pData++); } - EXPECT_EQ(false, crsfFrameDone); // data is not a valid rc channels frame so don't expect crsfFrameDone to be true + EXPECT_FALSE(crsfFrameDone); // data is not a valid rc channels frame so don't expect crsfFrameDone to be true EXPECT_EQ(CRSF_ADDRESS_BROADCAST, crsfFrame.frame.deviceAddress); EXPECT_EQ(CRSF_FRAME_RC_CHANNELS_PAYLOAD_SIZE + CRSF_FRAME_LENGTH_TYPE_CRC, crsfFrame.frame.frameLength); EXPECT_EQ(CRSF_FRAMETYPE_RC_CHANNELS_PACKED, crsfFrame.frame.type); diff --git a/src/test/unit/scheduler_unittest.cc b/src/test/unit/scheduler_unittest.cc index a4a51e85e6..1515f18c40 100644 --- a/src/test/unit/scheduler_unittest.cc +++ b/src/test/unit/scheduler_unittest.cc @@ -204,7 +204,7 @@ TEST(SchedulerUnittest, TestQueueAddAndRemove) // fill up the queue for (int taskId = 0; taskId < TASK_COUNT; ++taskId) { const bool added = queueAdd(&cfTasks[taskId]); - EXPECT_EQ(true, added); + EXPECT_TRUE(added); EXPECT_EQ(taskId + 1, taskQueueSize); EXPECT_EQ(deadBeefPtr, taskQueueArray[TASK_COUNT + 1]); } @@ -218,7 +218,7 @@ TEST(SchedulerUnittest, TestQueueAddAndRemove) // and empty it again for (int taskId = 0; taskId < TASK_COUNT; ++taskId) { const bool removed = queueRemove(&cfTasks[taskId]); - EXPECT_EQ(true, removed); + EXPECT_TRUE(removed); EXPECT_EQ(TASK_COUNT - taskId - 1, taskQueueSize); EXPECT_EQ(NULL, taskQueueArray[TASK_COUNT - taskId]); EXPECT_EQ(deadBeefPtr, taskQueueArray[TASK_COUNT + 1]); @@ -272,7 +272,7 @@ TEST(SchedulerUnittest, TestQueueArray) cfTaskInfo_t taskInfo; getTaskInfo(static_cast(enqueuedTasks + 1), &taskInfo); - EXPECT_EQ(false, taskInfo.isEnabled); + EXPECT_FALSE(taskInfo.isEnabled); setTaskEnabled(static_cast(enqueuedTasks), true); EXPECT_EQ(enqueuedTasks, taskQueueSize); EXPECT_EQ(lastTaskPrev, taskQueueArray[enqueuedTasks - 1]); diff --git a/src/test/unit/sensor_gyro_unittest.cc b/src/test/unit/sensor_gyro_unittest.cc index c11fa23f00..95286c7168 100644 --- a/src/test/unit/sensor_gyro_unittest.cc +++ b/src/test/unit/sensor_gyro_unittest.cc @@ -65,7 +65,7 @@ TEST(SensorGyro, Init) { pgResetAll(); const bool initialised = gyroInit(); - EXPECT_EQ(true, initialised); + EXPECT_TRUE(initialised); EXPECT_EQ(GYRO_FAKE, detectedSensors[SENSOR_INDEX_GYRO]); } @@ -75,7 +75,7 @@ TEST(SensorGyro, Read) gyroInit(); fakeGyroSet(gyroDevPtr, 5, 6, 7); const bool read = gyroDevPtr->readFn(gyroDevPtr); - EXPECT_EQ(true, read); + EXPECT_TRUE(read); EXPECT_EQ(5, gyroDevPtr->gyroADCRaw[X]); EXPECT_EQ(6, gyroDevPtr->gyroADCRaw[Y]); EXPECT_EQ(7, gyroDevPtr->gyroADCRaw[Z]); @@ -87,7 +87,7 @@ TEST(SensorGyro, Calibrate) gyroInit(); fakeGyroSet(gyroDevPtr, 5, 6, 7); const bool read = gyroDevPtr->readFn(gyroDevPtr); - EXPECT_EQ(true, read); + EXPECT_TRUE(read); EXPECT_EQ(5, gyroDevPtr->gyroADCRaw[X]); EXPECT_EQ(6, gyroDevPtr->gyroADCRaw[Y]); EXPECT_EQ(7, gyroDevPtr->gyroADCRaw[Z]); @@ -100,7 +100,7 @@ TEST(SensorGyro, Calibrate) EXPECT_EQ(9, gyroDevPtr->gyroZero[Y]); EXPECT_EQ(10, gyroDevPtr->gyroZero[Z]); gyroStartCalibration(false); - EXPECT_EQ(false, gyroIsCalibrationComplete()); + EXPECT_FALSE(gyroIsCalibrationComplete()); while (!gyroIsCalibrationComplete()) { gyroDevPtr->readFn(gyroDevPtr); performGyroCalibration(gyroSensorPtr, gyroMovementCalibrationThreshold); @@ -121,7 +121,7 @@ TEST(SensorGyro, Update) gyroInit(); gyroDevPtr->readFn = fakeGyroRead; gyroStartCalibration(false); - EXPECT_EQ(false, gyroIsCalibrationComplete()); + EXPECT_FALSE(gyroIsCalibrationComplete()); timeUs_t currentTimeUs = 0; fakeGyroSet(gyroDevPtr, 5, 6, 7); @@ -130,7 +130,7 @@ TEST(SensorGyro, Update) fakeGyroSet(gyroDevPtr, 5, 6, 7); gyroUpdate(currentTimeUs); } - EXPECT_EQ(true, gyroIsCalibrationComplete()); + EXPECT_TRUE(gyroIsCalibrationComplete()); EXPECT_EQ(5, gyroDevPtr->gyroZero[X]); EXPECT_EQ(6, gyroDevPtr->gyroZero[Y]); EXPECT_EQ(7, gyroDevPtr->gyroZero[Z]);