diff --git a/unit_tests/logicdata_csv_reader.cpp b/unit_tests/logicdata_csv_reader.cpp index 51457a3e64..2ca6d751ac 100644 --- a/unit_tests/logicdata_csv_reader.cpp +++ b/unit_tests/logicdata_csv_reader.cpp @@ -46,8 +46,13 @@ void CsvReader::processLine(EngineTestHelper *eth) { char *timeStampstr = trim(strtok(line, s)); bool newState[2]; - newState[columnIndeces[0]] = trim(strtok(NULL, s))[0] == '1'; - newState[columnIndeces[1]] = trim(strtok(NULL, s))[0] == '1'; + char *firstToken = trim(strtok(NULL, s)); + char *secondToken = trim(strtok(NULL, s)); + + newState[columnIndeces[0]] = firstToken[0] == '1'; + if (secondToken != nullptr && triggerCount > 1) { + newState[columnIndeces[1]] = secondToken[0] == '1'; + } double timeStamp = std::stod(timeStampstr); diff --git a/unit_tests/logicdata_csv_reader.h b/unit_tests/logicdata_csv_reader.h index 8629751f0d..f2886e07b1 100644 --- a/unit_tests/logicdata_csv_reader.h +++ b/unit_tests/logicdata_csv_reader.h @@ -13,6 +13,8 @@ public: bool currentState[2]; + int triggerCount = 2; + int lineIndex = -1; int * columnIndeces; diff --git a/unit_tests/tests/trigger/test_real_volkswagen.cpp b/unit_tests/tests/trigger/test_real_volkswagen.cpp index 421aa5f7ab..302f33d249 100644 --- a/unit_tests/tests/trigger/test_real_volkswagen.cpp +++ b/unit_tests/tests/trigger/test_real_volkswagen.cpp @@ -11,15 +11,16 @@ TEST(crankingVW, vwRealCrankingFromFile) { CsvReader reader; + reader.triggerCount = 1; int indeces[1] = {0}; reader.open("tests/trigger/recourses/nick_1.csv", indeces); WITH_ENGINE_TEST_HELPER (VW_ABA); - /* while (reader.haveMore()) { reader.processLine(ð); } + /* ASSERT_EQ( 0, eth.recentWarnings()->getCount())<< "warningCounter#vwRealCranking"; ASSERT_EQ( 560, GET_RPM())<< reader.lineIndex; */