From 4ed8906748acc1cad47f92d2d1f1777be4b699f5 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Wed, 1 Nov 2023 17:31:08 -0700 Subject: [PATCH] fix tests for no shadowing --- unit_tests/logicdata.cpp | 4 ++-- unit_tests/logicdata_csv_reader.cpp | 10 ++++------ unit_tests/logicdata_csv_reader.h | 4 ++-- unit_tests/test_basic_math/test_find_index.cpp | 16 ++++++++-------- unit_tests/tests/actuators/test_etb.cpp | 8 ++++---- unit_tests/tests/test_hpfp.cpp | 4 ++-- unit_tests/tests/test_hpfp_integrated.cpp | 4 ++-- unit_tests/tests/test_signal_executor.cpp | 8 +++++--- unit_tests/tests/test_util.cpp | 4 ++-- unit_tests/tests/trigger/test_all_triggers.cpp | 5 ++--- unit_tests/tests/trigger/test_nissan_vq_vvt.cpp | 1 - .../trigger/test_real_cranking_miata_na6.cpp | 2 -- .../tests/trigger/test_trigger_decoder.cpp | 3 --- .../tests/trigger/test_trigger_decoder_2.cpp | 4 ++-- .../tests/trigger/test_trigger_input_adc.cpp | 10 +++++----- 15 files changed, 40 insertions(+), 47 deletions(-) diff --git a/unit_tests/logicdata.cpp b/unit_tests/logicdata.cpp index 01cd96374c..72a2b17c73 100644 --- a/unit_tests/logicdata.cpp +++ b/unit_tests/logicdata.cpp @@ -144,10 +144,10 @@ static void writeDouble(double value) { writeByte(0); } else { writeByte(8); - char *ptr = (char*) (void*) &value; + char* c = (char*) (void*) &value; for (int i = 0; i < 8; i++) { - writeByte(ptr[i]); + writeByte(c[i]); } } } diff --git a/unit_tests/logicdata_csv_reader.cpp b/unit_tests/logicdata_csv_reader.cpp index 1a42799377..e7f776a7d2 100644 --- a/unit_tests/logicdata_csv_reader.cpp +++ b/unit_tests/logicdata_csv_reader.cpp @@ -24,8 +24,8 @@ CsvReader::~CsvReader() { void CsvReader::open(const char *fileName, const int* triggerColumnIndeces, const int *vvtColumnIndeces) { printf("Reading from %s\r\n", fileName); fp = fopen(fileName, "r"); - this->triggerColumnIndeces = triggerColumnIndeces; - this->vvtColumnIndeces = vvtColumnIndeces; + m_triggerColumnIndeces = triggerColumnIndeces; + m_vvtColumnIndeces = vvtColumnIndeces; ASSERT_TRUE(fp != nullptr); } @@ -61,8 +61,6 @@ double CsvReader::readTimestampAndValues(double *values) { // todo: separate trigger handling from csv file processing void CsvReader::processLine(EngineTestHelper *eth) { - Engine *engine = ð->engine; - const char s[2] = ","; char *timeStampstr = trim(strtok(buffer, s)); @@ -71,12 +69,12 @@ void CsvReader::processLine(EngineTestHelper *eth) { for (size_t i = 0;i mocks[ETB_COUNT]; - EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { + EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* cfg) { engineConfiguration->etbFunctions[0] = DC_None; engineConfiguration->etbFunctions[1] = DC_None; }); @@ -63,7 +63,7 @@ TEST(etb, initializationSingleThrottle) { EXPECT_CALL(mocks[0], isEtbMode()) .WillOnce(Return(TRUE)); - EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { + EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* cfg) { engineConfiguration->etbFunctions[0] = DC_Throttle1; engineConfiguration->etbFunctions[1] = DC_None; }); @@ -91,7 +91,7 @@ TEST(etb, initializationSingleThrottleInSecondSlot) { EXPECT_CALL(mocks[1], isEtbMode()) .WillOnce(Return(TRUE)); - EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { + EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* cfg) { engineConfiguration->etbFunctions[0] = DC_None; engineConfiguration->etbFunctions[1] = DC_Throttle1; }); @@ -152,7 +152,7 @@ TEST(etb, initializationWastegate) { EXPECT_CALL(mocks[0], isEtbMode()) .WillOnce(Return(false)); - EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { + EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* cfg) { engineConfiguration->etbFunctions[0] = DC_Wastegate; engineConfiguration->etbFunctions[1] = DC_None; }); diff --git a/unit_tests/tests/test_hpfp.cpp b/unit_tests/tests/test_hpfp.cpp index 8f51c8b3b2..ce0007b1e2 100755 --- a/unit_tests/tests/test_hpfp.cpp +++ b/unit_tests/tests/test_hpfp.cpp @@ -207,8 +207,8 @@ TEST(HPFP, Angle) { } TEST(HPFP, Schedule) { - EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { - engineConfiguration->hpfpValvePin = Gpio::A2; // arbitrary + EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* cfg) { + cfg->hpfpValvePin = Gpio::A2; // arbitrary }); engineConfiguration->cylindersCount = 4; diff --git a/unit_tests/tests/test_hpfp_integrated.cpp b/unit_tests/tests/test_hpfp_integrated.cpp index fcdb18131c..09bd6104f8 100644 --- a/unit_tests/tests/test_hpfp_integrated.cpp +++ b/unit_tests/tests/test_hpfp_integrated.cpp @@ -8,8 +8,8 @@ #include "pch.h" TEST(HPFP, IntegratedSchedule) { - EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* engineConfiguration) { - engineConfiguration->hpfpValvePin = Gpio::A2; // arbitrary + EngineTestHelper eth(engine_type_e::TEST_ENGINE, [](engine_configuration_s* cfg) { + cfg->hpfpValvePin = Gpio::A2; // arbitrary }); engineConfiguration->cylindersCount = 4; diff --git a/unit_tests/tests/test_signal_executor.cpp b/unit_tests/tests/test_signal_executor.cpp index 65abe1ede7..39788e24fc 100644 --- a/unit_tests/tests/test_signal_executor.cpp +++ b/unit_tests/tests/test_signal_executor.cpp @@ -18,12 +18,14 @@ static void callback(void *a) { static int complexTestNow; struct TestPwm { - TestPwm(EventQueue *eventQueue) { - this->eventQueue = eventQueue; + TestPwm(EventQueue *eq) + : eventQueue(eq) + { } + scheduling_s s; int period; - EventQueue *eventQueue; + EventQueue* const eventQueue; }; static void complexCallback(TestPwm *testPwm) { diff --git a/unit_tests/tests/test_util.cpp b/unit_tests/tests/test_util.cpp index d000de0ddb..3e0e7e8a0d 100644 --- a/unit_tests/tests/test_util.cpp +++ b/unit_tests/tests/test_util.cpp @@ -161,8 +161,8 @@ TEST(misc, testMalfunctionCentral) { getErrorCodes(&localCopy); // todo: ASSERT_EQ(2, localCopy.count); - for (int code = 0; code < 100; code++) { - addError((ObdCode) code); + for (int c = 0; c < 100; c++) { + addError((ObdCode) c); } getErrorCodes(&localCopy); ASSERT_EQ(MAX_ERROR_CODES_COUNT, localCopy.count); diff --git a/unit_tests/tests/trigger/test_all_triggers.cpp b/unit_tests/tests/trigger/test_all_triggers.cpp index b59d9d6694..0e35062bde 100644 --- a/unit_tests/tests/trigger/test_all_triggers.cpp +++ b/unit_tests/tests/trigger/test_all_triggers.cpp @@ -60,8 +60,7 @@ TEST_P(AllTriggersFixture, TestTrigger) { persistent_config_s pc; efi::clear(pc); Engine e; - Engine* engine = &e; - EngineTestHelperBase base(engine, &pc.engineConfiguration, &pc); + EngineTestHelperBase base(&e, &pc.engineConfiguration, &pc); #if EFI_UNIT_TEST extern TriggerDecoderBase initState; @@ -71,7 +70,7 @@ extern TriggerDecoderBase initState; #endif // EFI_UNIT_TEST engineConfiguration->trigger.type = tt; - setCamOperationMode(); + setCamOperationMode(); TriggerWaveform *shape = &engine->triggerCentral.triggerShape; TriggerFormDetails *triggerFormDetails = &engine->triggerCentral.triggerFormDetails; diff --git a/unit_tests/tests/trigger/test_nissan_vq_vvt.cpp b/unit_tests/tests/trigger/test_nissan_vq_vvt.cpp index 20d391bd65..bda6f80577 100644 --- a/unit_tests/tests/trigger/test_nissan_vq_vvt.cpp +++ b/unit_tests/tests/trigger/test_nissan_vq_vvt.cpp @@ -21,7 +21,6 @@ public: static void func(TriggerCallback *callback) { int formIndex = callback->toothIndex % callback->form->getSize(); - Engine *engine = callback->engine; bool value = callback->form->wave.getChannelState(0, formIndex); diff --git a/unit_tests/tests/trigger/test_real_cranking_miata_na6.cpp b/unit_tests/tests/trigger/test_real_cranking_miata_na6.cpp index 28661cfecc..c9bb55f324 100644 --- a/unit_tests/tests/trigger/test_real_cranking_miata_na6.cpp +++ b/unit_tests/tests/trigger/test_real_cranking_miata_na6.cpp @@ -27,8 +27,6 @@ static void fireTriggerEvent(EngineTestHelper*eth, double timestampS, TriggerWhe event = SHAFT_SECONDARY_FALLING; } - Engine *engine = ð->engine; - timeNowUs = 1'000'000 * timestampS; printf("MIATANA: posting time=%d event=%d\n", timeNowUs, event); hwHandleShaftSignal((int)channel, !isFall, getTimeNowNt()); diff --git a/unit_tests/tests/trigger/test_trigger_decoder.cpp b/unit_tests/tests/trigger/test_trigger_decoder.cpp index c58da60ac4..222f503a44 100644 --- a/unit_tests/tests/trigger/test_trigger_decoder.cpp +++ b/unit_tests/tests/trigger/test_trigger_decoder.cpp @@ -425,9 +425,6 @@ static void setTestBug299(EngineTestHelper *eth) { EXPECT_CALL(*eth->mockAirmass, getAirmass(_, _)) .WillRepeatedly(Return(AirmassResult{0.1008001f, 50.0f})); - Engine *engine = ð->engine; - - eth->assertRpm(0, "RPM=0"); eth->fireTriggerEventsWithDuration(20); diff --git a/unit_tests/tests/trigger/test_trigger_decoder_2.cpp b/unit_tests/tests/trigger/test_trigger_decoder_2.cpp index e7ea4c9ae5..9577293d7b 100644 --- a/unit_tests/tests/trigger/test_trigger_decoder_2.cpp +++ b/unit_tests/tests/trigger/test_trigger_decoder_2.cpp @@ -31,9 +31,9 @@ struct MockTriggerDecoder : public TriggerDecoderBase { MOCK_METHOD(void, onTooManyTeeth, (int actual, int expected), (override)); }; -static auto makeTriggerShape(operation_mode_e mode, const TriggerConfiguration& config) { +static auto makeTriggerShape(operation_mode_e mode, const TriggerConfiguration& cfg) { TriggerWaveform shape; - shape.initializeTriggerWaveform(mode, config); + shape.initializeTriggerWaveform(mode, cfg); return shape; } diff --git a/unit_tests/tests/trigger/test_trigger_input_adc.cpp b/unit_tests/tests/trigger/test_trigger_input_adc.cpp index e8d93c0f08..346f89958e 100644 --- a/unit_tests/tests/trigger/test_trigger_input_adc.cpp +++ b/unit_tests/tests/trigger/test_trigger_input_adc.cpp @@ -34,7 +34,7 @@ void onTriggerChanged(efitick_t stamp, bool isPrimary, bool isRising) { printf("*\r\n"); } -static void simulateTrigger(TriggerAdcDetector &trigAdcState, CsvReader &reader, float voltageDiv, float adcMaxVoltage) { +static void simulateTrigger(TriggerAdcDetector &state, CsvReader &reader, float voltageDiv, float adcMaxVoltage) { static const float Vil = 0.3f * adcMaxVoltage; static const float Vih = 0.7f * adcMaxVoltage; @@ -46,7 +46,7 @@ static void simulateTrigger(TriggerAdcDetector &trigAdcState, CsvReader &reader, // printf("--simulateTrigger %lld %f\r\n", stamp, (float)value); // convert into mcu-adc voltage value = minF(maxF(value / voltageDiv, 0), adcMaxVoltage); - if (trigAdcState.curAdcMode == TRIGGER_ADC_EXTI) { + if (state.curAdcMode == TRIGGER_ADC_EXTI) { int logicValue = 0; // imitate Schmitt trigger input if (value < Vil || value > Vih) { @@ -55,16 +55,16 @@ static void simulateTrigger(TriggerAdcDetector &trigAdcState, CsvReader &reader, if (prevLogicValue != -1) { // printf("--> DIGITAL %d %d\r\n", logicValue, prevLogicValue); - trigAdcState.digitalCallback(stampUs, true, logicValue > prevLogicValue ? true : false); + state.digitalCallback(stampUs, true, logicValue > prevLogicValue ? true : false); } prevLogicValue = logicValue; } - } else if (trigAdcState.curAdcMode == TRIGGER_ADC_ADC) { + } else if (state.curAdcMode == TRIGGER_ADC_ADC) { triggerAdcSample_t sampleValue = value * ADC_MAX_VALUE / adcMaxVoltage; // printf("--> ANALOG %d\r\n", sampleValue); - trigAdcState.analogCallback(stampUs, sampleValue); + state.analogCallback(stampUs, sampleValue); } } }