This commit is contained in:
Andrey 2022-09-24 22:51:12 -04:00
parent 632957cbc4
commit 533d30efd1
3 changed files with 6 additions and 6 deletions

View File

@ -18,7 +18,7 @@ public:
} }
~CsvReader(); ~CsvReader();
void open(const char *fileName, const int* columnIndeces); void open(const char *fileName, const int* columnIndeces = SINGLE_TRIGGER_FIRST);
bool haveMore(); bool haveMore();
void processLine(EngineTestHelper *eth); void processLine(EngineTestHelper *eth);
void readLine(EngineTestHelper *eth); void readLine(EngineTestHelper *eth);

View File

@ -5,7 +5,7 @@
TEST(crankingGm24x, gmRealCrankingFromFile) { TEST(crankingGm24x, gmRealCrankingFromFile) {
CsvReader reader(1, /* vvtCount */ 0); CsvReader reader(1, /* vvtCount */ 0);
reader.open("tests/trigger/resources/gm_24x_cranking.csv", SINGLE_TRIGGER_FIRST); reader.open("tests/trigger/resources/gm_24x_cranking.csv");
EngineTestHelper eth(TEST_ENGINE); EngineTestHelper eth(TEST_ENGINE);
engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->isFasterEngineSpinUpEnabled = true;
engineConfiguration->alwaysInstantRpm = true; engineConfiguration->alwaysInstantRpm = true;

View File

@ -12,7 +12,7 @@
TEST(crankingVW, vwRealCrankingFromFile) { TEST(crankingVW, vwRealCrankingFromFile) {
CsvReader reader(1, /* vvtCount */ 0); CsvReader reader(1, /* vvtCount */ 0);
reader.open("tests/trigger/resources/nick_1.csv", SINGLE_TRIGGER_FIRST); reader.open("tests/trigger/resources/nick_1.csv");
EngineTestHelper eth (VW_ABA); EngineTestHelper eth (VW_ABA);
engineConfiguration->alwaysInstantRpm = true; engineConfiguration->alwaysInstantRpm = true;
eth.setTriggerType(TT_60_2_VW); eth.setTriggerType(TT_60_2_VW);
@ -33,7 +33,7 @@ TEST(crankingVW, crankingTwiceWithGap) {
{ {
CsvReader reader(1, /* vvtCount */ 0); CsvReader reader(1, /* vvtCount */ 0);
reader.open("tests/trigger/resources/nick_1.csv", SINGLE_TRIGGER_FIRST); reader.open("tests/trigger/resources/nick_1.csv");
while (reader.haveMore()) { while (reader.haveMore()) {
reader.processLine(&eth); reader.processLine(&eth);
@ -49,7 +49,7 @@ TEST(crankingVW, crankingTwiceWithGap) {
// Offset by a short time offset, 10 seconds // Offset by a short time offset, 10 seconds
CsvReader reader(1, /* vvtCount */ 0, 10); CsvReader reader(1, /* vvtCount */ 0, 10);
reader.open("tests/trigger/resources/nick_1.csv", SINGLE_TRIGGER_FIRST); reader.open("tests/trigger/resources/nick_1.csv");
while (reader.haveMore()) { while (reader.haveMore()) {
reader.processLine(&eth); reader.processLine(&eth);
@ -63,7 +63,7 @@ TEST(crankingVW, crankingTwiceWithGap) {
// Offset by long time offset, 5m14.15s // Offset by long time offset, 5m14.15s
CsvReader reader(1, /* vvtCount */ 0, 314.159); CsvReader reader(1, /* vvtCount */ 0, 314.159);
reader.open("tests/trigger/resources/nick_1.csv", SINGLE_TRIGGER_FIRST); reader.open("tests/trigger/resources/nick_1.csv");
while (reader.haveMore()) { while (reader.haveMore()) {
reader.processLine(&eth); reader.processLine(&eth);