From e7e9742ba9dcfe1206bab25ce4a01572c1db80a5 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sat, 24 Sep 2022 15:33:01 -0400 Subject: [PATCH] refactoring: extract constant --- unit_tests/logicdata_csv_reader.h | 3 +++ .../tests/trigger/test_real_cranking_nissan_vq40.cpp | 3 +-- unit_tests/tests/trigger/test_real_gm_24x.cpp | 3 +-- unit_tests/tests/trigger/test_real_k24a2.cpp | 5 ++--- unit_tests/tests/trigger/test_real_nb2_cranking.cpp | 6 ++---- unit_tests/tests/trigger/test_real_volkswagen.cpp | 12 ++++-------- 6 files changed, 13 insertions(+), 19 deletions(-) diff --git a/unit_tests/logicdata_csv_reader.h b/unit_tests/logicdata_csv_reader.h index e0b1f41c7b..234f0a6bcf 100644 --- a/unit_tests/logicdata_csv_reader.h +++ b/unit_tests/logicdata_csv_reader.h @@ -4,6 +4,9 @@ * @date Jun 26, 2021 * @author Andrey Belomutskiy, (c) 2012-2021 */ + +const int SINGLE_TRIGGER_FIRST[1] = {0}; + class CsvReader { public: CsvReader(size_t triggerCount, size_t vvtCount) : CsvReader(triggerCount, vvtCount, 0.0) {} diff --git a/unit_tests/tests/trigger/test_real_cranking_nissan_vq40.cpp b/unit_tests/tests/trigger/test_real_cranking_nissan_vq40.cpp index 72ca891eff..4460639803 100644 --- a/unit_tests/tests/trigger/test_real_cranking_nissan_vq40.cpp +++ b/unit_tests/tests/trigger/test_real_cranking_nissan_vq40.cpp @@ -10,9 +10,8 @@ static void test(int engineSyncCam, float camOffsetAdd) { CsvReader reader(1, /* vvtCount */ 2); - int indeces[] = {0}; - reader.open("tests/trigger/resources/nissan_vq40_cranking-1.csv", indeces); + reader.open("tests/trigger/resources/nissan_vq40_cranking-1.csv", SINGLE_TRIGGER_FIRST); EngineTestHelper eth (HELLEN_121_NISSAN_6_CYL); engineConfiguration->isFasterEngineSpinUpEnabled = false; engineConfiguration->alwaysInstantRpm = true; diff --git a/unit_tests/tests/trigger/test_real_gm_24x.cpp b/unit_tests/tests/trigger/test_real_gm_24x.cpp index 6107691f12..248dc06ae0 100644 --- a/unit_tests/tests/trigger/test_real_gm_24x.cpp +++ b/unit_tests/tests/trigger/test_real_gm_24x.cpp @@ -4,9 +4,8 @@ TEST(crankingGm24x, gmRealCrankingFromFile) { CsvReader reader(1, /* vvtCount */ 0); - int indeces[1] = {0}; - reader.open("tests/trigger/resources/gm_24x_cranking.csv", indeces); + reader.open("tests/trigger/resources/gm_24x_cranking.csv", SINGLE_TRIGGER_FIRST); EngineTestHelper eth(TEST_ENGINE); engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->alwaysInstantRpm = true; diff --git a/unit_tests/tests/trigger/test_real_k24a2.cpp b/unit_tests/tests/trigger/test_real_k24a2.cpp index 4a369616a4..d09f78ec4b 100644 --- a/unit_tests/tests/trigger/test_real_k24a2.cpp +++ b/unit_tests/tests/trigger/test_real_k24a2.cpp @@ -3,10 +3,9 @@ #include "logicdata_csv_reader.h" static void doTest(const char* testFile, int expectedRpm) { - CsvReader reader(1, /* vvtCount */ 0); - int indeces[1] = {0}; + CsvReader reader(/* triggerCount */ 1, /* vvtCount */ 0); - reader.open(testFile, indeces); + reader.open(testFile, SINGLE_TRIGGER_FIRST); EngineTestHelper eth(TEST_ENGINE); engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->alwaysInstantRpm = true; diff --git a/unit_tests/tests/trigger/test_real_nb2_cranking.cpp b/unit_tests/tests/trigger/test_real_nb2_cranking.cpp index d28311e017..71601466d0 100644 --- a/unit_tests/tests/trigger/test_real_nb2_cranking.cpp +++ b/unit_tests/tests/trigger/test_real_nb2_cranking.cpp @@ -10,9 +10,8 @@ TEST(realCrankingNB2, normalCranking) { CsvReader reader(1, /* vvtCount */ 1); - int indeces[] = {0}; - reader.open("tests/trigger/resources/nb2-cranking-good.csv", indeces); + reader.open("tests/trigger/resources/nb2-cranking-good.csv", SINGLE_TRIGGER_FIRST); EngineTestHelper eth (HELLEN_NB2); engineConfiguration->alwaysInstantRpm = true; @@ -37,9 +36,8 @@ TEST(realCrankingNB2, normalCranking) { TEST(realCrankingNB2, crankingMissingInjector) { CsvReader reader(1, /* vvtCount */ 1); - int indeces[] = {0}; - reader.open("tests/trigger/resources/nb2-cranking-good-missing-injector-1.csv", indeces); + reader.open("tests/trigger/resources/nb2-cranking-good-missing-injector-1.csv", SINGLE_TRIGGER_FIRST); EngineTestHelper eth (HELLEN_NB2); engineConfiguration->alwaysInstantRpm = true; diff --git a/unit_tests/tests/trigger/test_real_volkswagen.cpp b/unit_tests/tests/trigger/test_real_volkswagen.cpp index f21cb124a0..b894131341 100644 --- a/unit_tests/tests/trigger/test_real_volkswagen.cpp +++ b/unit_tests/tests/trigger/test_real_volkswagen.cpp @@ -11,9 +11,8 @@ TEST(crankingVW, vwRealCrankingFromFile) { CsvReader reader(1, /* vvtCount */ 0); - int indeces[1] = {0}; - reader.open("tests/trigger/resources/nick_1.csv", indeces); + reader.open("tests/trigger/resources/nick_1.csv", SINGLE_TRIGGER_FIRST); EngineTestHelper eth (VW_ABA); engineConfiguration->alwaysInstantRpm = true; eth.setTriggerType(TT_60_2_VW); @@ -33,9 +32,8 @@ TEST(crankingVW, crankingTwiceWithGap) { { CsvReader reader(1, /* vvtCount */ 0); - int indeces[1] = {0}; - reader.open("tests/trigger/resources/nick_1.csv", indeces); + reader.open("tests/trigger/resources/nick_1.csv", SINGLE_TRIGGER_FIRST); while (reader.haveMore()) { reader.processLine(ð); @@ -50,9 +48,8 @@ TEST(crankingVW, crankingTwiceWithGap) { { // Offset by a short time offset, 10 seconds CsvReader reader(1, /* vvtCount */ 0, 10); - int indeces[1] = {0}; - reader.open("tests/trigger/resources/nick_1.csv", indeces); + reader.open("tests/trigger/resources/nick_1.csv", SINGLE_TRIGGER_FIRST); while (reader.haveMore()) { reader.processLine(ð); @@ -65,9 +62,8 @@ TEST(crankingVW, crankingTwiceWithGap) { { // Offset by long time offset, 5m14.15s CsvReader reader(1, /* vvtCount */ 0, 314.159); - int indeces[1] = {0}; - reader.open("tests/trigger/resources/nick_1.csv", indeces); + reader.open("tests/trigger/resources/nick_1.csv", SINGLE_TRIGGER_FIRST); while (reader.haveMore()) { reader.processLine(ð);