From 9fdb962ec6243871e760cc1eee2a5c8dca8cdebd Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Fri, 12 Apr 2024 12:19:24 -0700 Subject: [PATCH] more tests that are less chaos now --- unit_tests/tests/trigger/test_cam_vvt_input.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/unit_tests/tests/trigger/test_cam_vvt_input.cpp b/unit_tests/tests/trigger/test_cam_vvt_input.cpp index fc1e01a42b..8cf11f0be0 100644 --- a/unit_tests/tests/trigger/test_cam_vvt_input.cpp +++ b/unit_tests/tests/trigger/test_cam_vvt_input.cpp @@ -60,7 +60,7 @@ TEST(trigger, testNoStartUpWarnings) { TEST(trigger, testNoisyInput) { EngineTestHelper eth(engine_type_e::TEST_ENGINE); - ASSERT_EQ( 0, round(Sensor::getOrZero(SensorType::Rpm))) << "testNoisyInput RPM"; + ASSERT_EQ(0, Sensor::getOrZero(SensorType::Rpm)); eth.firePrimaryTriggerRise(); eth.firePrimaryTriggerFall(); @@ -70,12 +70,10 @@ TEST(trigger, testNoisyInput) { eth.firePrimaryTriggerFall(); eth.firePrimaryTriggerRise(); eth.firePrimaryTriggerFall(); - // error condition since events happened too quick while time does not move - ASSERT_EQ(NOISY_RPM, Sensor::getOrZero(SensorType::Rpm)) << "testNoisyInput RPM should be noisy"; + ASSERT_EQ(0, Sensor::getOrZero(SensorType::Rpm)); - ASSERT_EQ( 2, unitTestWarningCodeState.recentWarnings.getCount()) << "warningCounter#testNoisyInput"; - ASSERT_EQ(ObdCode::CUSTOM_PRIMARY_NOT_ENOUGH_TEETH, unitTestWarningCodeState.recentWarnings.get(0).Code) << "@0"; - ASSERT_EQ(ObdCode::OBD_Crankshaft_Position_Sensor_A_Circuit_Malfunction, unitTestWarningCodeState.recentWarnings.get(1).Code) << "@0"; + EXPECT_EQ(1, unitTestWarningCodeState.recentWarnings.getCount()); + EXPECT_EQ(ObdCode::CUSTOM_PRIMARY_NOT_ENOUGH_TEETH, unitTestWarningCodeState.recentWarnings.get(0).Code); } TEST(trigger, testCamInput) {