diff --git a/test/test_systems/main.cpp b/test/test_systems/main.cpp index 75d2b93a..e7d3f45e 100644 --- a/test/test_systems/main.cpp +++ b/test/test_systems/main.cpp @@ -16,8 +16,7 @@ int main(int argc, char **argv) { testing::InitGoogleMock(&argc, argv); - if (RUN_ALL_TESTS()) - ; + if (RUN_ALL_TESTS()); // Always return zero-code and allow PlatformIO to parse results return 0; } diff --git a/test/test_systems/tc_mux_v2_testing.h b/test/test_systems/tc_mux_v2_testing.h index c5c0f723..b2c00906 100644 --- a/test/test_systems/tc_mux_v2_testing.h +++ b/test/test_systems/tc_mux_v2_testing.h @@ -3,7 +3,9 @@ #include "TorqueControllerMux.h" #include "TorqueControllers.h" +#include "TorqueControllers.h" #include "fake_controller_type.h" +#include @@ -83,21 +85,6 @@ TEST(TorqueControllerMuxTesting, test_construction_bypass_limits) ASSERT_EQ(test.get_tc_mux_status().output_is_bypassing_limits, true); } -TEST(TorqueControllerMuxTesting, test_invalid_controller_request_error) -{ - TestControllerType inst1, inst2; - TorqueControllerMux<2> test({static_cast(&inst1), static_cast(&inst2)}, {false, false}); - SharedCarState_s state({}, {}, {}, {}, {}, {}); - auto res = test.getDrivetrainCommand(ControllerMode_e::MODE_2, TorqueLimit_e::TCMUX_FULL_TORQUE, state); - - ASSERT_EQ(test.get_tc_mux_status().current_error, TorqueControllerMuxError::ERROR_CONTROLLER_INDEX_OUT_OF_BOUNDS); - for (int i =0; i< 4; i++) - { - - ASSERT_EQ(res.speeds_rpm[i], 0.0); - ASSERT_EQ(res.torqueSetpoints[i], 0.0); - } -} template void test_with_n_controllers() { SharedCarState_s state({}, {}, {}, {}, {}, {}); @@ -333,6 +320,7 @@ TEST(TorqueControllerMuxTesting, test_speed_diff_swap_limit) ASSERT_EQ(out1.torqueSetpoints[1], 1); ASSERT_EQ(out1.torqueSetpoints[2], 1); ASSERT_EQ(out1.torqueSetpoints[3], 1); +} //Mode evaluation tests TEST(TorqueControllerMuxTesting, test_mode0_evaluation)