rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring

This commit is contained in:
rusEfi 2018-07-28 19:35:50 -04:00
parent b2b10537c6
commit cf1d5e2f3e
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
unit_tests/engine_test_helper.cpp
View File

@ -80,12 +80,17 @@ void EngineTestHelper::firePrimaryTriggerFall() {
engine.triggerCentral.handleShaftSignal(SHAFT_PRIMARY_FALLING, &engine, engine.engineConfiguration, &persistentConfig, boardConfiguration);
}
void EngineTestHelper::fireTriggerEventsWithDuration(int durationMs) {
fireTriggerEvents2(1, durationMs);
}
/**
* Sends specified number of rise/fall trigger events, with specified amount of time between those.
*
* This is helpful for TT_ONE trigger wheel decoder and probably other decoders as well.
*/
void EngineTestHelper::fireTriggerEvents2(int count, int durationUs) {
void EngineTestHelper::fireTriggerEvents2(int count, int durationMs) {
int durationUs = MS2US(durationMs);
for (int i = 0; i < count; i++) {
timeNowUs += durationUs;
firePrimaryTriggerRise();
@ -101,7 +106,7 @@ void EngineTestHelper::clearQueue() {
}
void EngineTestHelper::fireTriggerEvents(int count) {
fireTriggerEvents2(count, MS2US(5)); // 5ms
fireTriggerEvents2(count, 5); // 5ms
}
void EngineTestHelper::applyTriggerShape() {

3
unit_tests/engine_test_helper.h
View File

@ -23,7 +23,8 @@ public:
void firePrimaryTriggerRise();
void firePrimaryTriggerFall();
void fireTriggerEvents(int count);
void fireTriggerEvents2(int count, int durationUs);
void fireTriggerEventsWithDuration(int durationMs);
void fireTriggerEvents2(int count, int durationMs);
void clearQueue();
Engine engine;

2
unit_tests/test_fasterEngineSpinningUp.cpp
View File

@ -89,7 +89,7 @@ void testFasterEngineSpinningUp() {
eth.clearQueue();
timeStartUs = timeNowUs;
eth.fireTriggerEvents2(1, MS2US(60));
eth.fireTriggerEvents2(1, 60);
// check if the mode is now changed to 'running' at higher RPM
assertEquals(RUNNING, engine->rpmCalculator.getState());

2
unit_tests/test_startOfCrankingPrimingPulse.cpp
View File

@ -24,7 +24,7 @@ void testPlainCrankingWithoutAdvancedFeatures() {
setupSimpleTestEngineWithMafAndTT_ONE_trigger(&eth);
assertEqualsM("RPM=0", 0, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE));
eth.fireTriggerEvents2(1, MS2US(200));
eth.fireTriggerEvents2(1, 200);
// still no RPM since need to cycles measure cycle duration
assertEqualsM("RPM#1", 0, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE));

4
unit_tests/test_trigger_decoder.cpp
View File

@ -666,10 +666,10 @@ static void setTestBug299(EngineTestHelper *eth) {
assertRpm("RPM=0", 0 PASS_ENGINE_PARAMETER_SUFFIX);
assertEqualsM("setTestBug299 EL", 0, getEngineLoadT(PASS_ENGINE_PARAMETER_SIGNATURE));
assertEqualsM("setTestBug299 IAT", 30, engine->sensors.iat);
eth->fireTriggerEvents2(1, MS2US(20));
eth->fireTriggerEvents2(1, 20);
// still no RPM since need to cycles measure cycle duration
assertRpm("setTestBug299: RPM#1", 0 PASS_ENGINE_PARAMETER_SUFFIX);
eth->fireTriggerEvents2(1, MS2US(20));
eth->fireTriggerEvents2(1, 20);
assertRpm("setTestBug299: RPM#2", 3000 PASS_ENGINE_PARAMETER_SUFFIX);
eth->clearQueue();