helper method
This commit is contained in:
parent
2fc0a6e424
commit
979de72c67
|
@ -622,6 +622,10 @@ static void assertInjectionEvent(const char *msg, InjectionEvent *ev, int inject
|
||||||
assertEqualsM4(msg, " event offset", angleOffset, ev->injectionStart.angleOffset);
|
assertEqualsM4(msg, " event offset", angleOffset, ev->injectionStart.angleOffset);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void assertRpm(const char *msg, int expectedRpm DECLARE_ENGINE_PARAMETER_SUFFIX) {
|
||||||
|
assertEqualsM(msg, expectedRpm, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE));
|
||||||
|
}
|
||||||
|
|
||||||
void setupSimpleTestEngineWithMafAndTT_ONE_trigger(EngineTestHelper *eth, injection_mode_e injMode) {
|
void setupSimpleTestEngineWithMafAndTT_ONE_trigger(EngineTestHelper *eth, injection_mode_e injMode) {
|
||||||
Engine *engine = ð->engine;
|
Engine *engine = ð->engine;
|
||||||
EXPAND_Engine
|
EXPAND_Engine
|
||||||
|
@ -659,14 +663,14 @@ static void setTestBug299(EngineTestHelper *eth) {
|
||||||
EXPAND_Engine
|
EXPAND_Engine
|
||||||
|
|
||||||
|
|
||||||
assertEqualsM("RPM=0", 0, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE));
|
assertRpm("RPM=0", 0 PASS_ENGINE_PARAMETER_SUFFIX);
|
||||||
assertEqualsM("setTestBug299 EL", 0, getEngineLoadT(PASS_ENGINE_PARAMETER_SIGNATURE));
|
assertEqualsM("setTestBug299 EL", 0, getEngineLoadT(PASS_ENGINE_PARAMETER_SIGNATURE));
|
||||||
assertEqualsM("setTestBug299 IAT", 30, engine->sensors.iat);
|
assertEqualsM("setTestBug299 IAT", 30, engine->sensors.iat);
|
||||||
eth->fireTriggerEvents2(1, MS2US(20));
|
eth->fireTriggerEvents2(1, MS2US(20));
|
||||||
// still no RPM since need to cycles measure cycle duration
|
// still no RPM since need to cycles measure cycle duration
|
||||||
assertEqualsM("setTestBug299: RPM#1", 0, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE));
|
assertRpm("setTestBug299: RPM#1", 0 PASS_ENGINE_PARAMETER_SUFFIX);
|
||||||
eth->fireTriggerEvents2(1, MS2US(20));
|
eth->fireTriggerEvents2(1, MS2US(20));
|
||||||
assertEqualsM("setTestBug299: RPM#2", 3000, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE));
|
assertRpm("setTestBug299: RPM#2", 3000 PASS_ENGINE_PARAMETER_SUFFIX);
|
||||||
|
|
||||||
eth->clearQueue();
|
eth->clearQueue();
|
||||||
|
|
||||||
|
@ -755,17 +759,16 @@ static void setTestBug299(EngineTestHelper *eth) {
|
||||||
assertEqualsM("exec#3", 0, schedulingQueue.executeAll(timeNowUs));
|
assertEqualsM("exec#3", 0, schedulingQueue.executeAll(timeNowUs));
|
||||||
|
|
||||||
|
|
||||||
testMafValue = 0;
|
|
||||||
assertEqualsM("maf", 0, getMaf(PASS_ENGINE_PARAMETER_SIGNATURE));
|
|
||||||
|
|
||||||
assertEqualsM("iatC", 1, engine->engineState.iatFuelCorrection);
|
assertEqualsM("iatC", 1, engine->engineState.iatFuelCorrection);
|
||||||
assertEqualsM("cltC", 1, engine->engineState.cltFuelCorrection);
|
assertEqualsM("cltC", 1, engine->engineState.cltFuelCorrection);
|
||||||
assertEqualsM("lag", 0, engine->engineState.injectorLag);
|
assertEqualsM("lag", 0, engine->engineState.injectorLag);
|
||||||
|
|
||||||
|
testMafValue = 0;
|
||||||
|
assertEqualsM("maf", 0, getMaf(PASS_ENGINE_PARAMETER_SIGNATURE));
|
||||||
|
|
||||||
assertEqualsM("setTestBug299: RPM", 3000, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE));
|
assertEqualsM("setTestBug299: RPM", 3000, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE));
|
||||||
|
|
||||||
assertEqualsM("fuel#1", 1.5, engine->injectionDuration);
|
assertEqualsM("fuel#1", 1.5, engine->injectionDuration);
|
||||||
|
|
||||||
assertEqualsM("duty for maf=0", 7.5, getInjectorDutyCycle(engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE) PASS_ENGINE_PARAMETER_SUFFIX));
|
assertEqualsM("duty for maf=0", 7.5, getInjectorDutyCycle(engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE) PASS_ENGINE_PARAMETER_SUFFIX));
|
||||||
|
|
||||||
testMafValue = 3;
|
testMafValue = 3;
|
||||||
|
|
|
@ -23,4 +23,6 @@ void testTriggerDecoder2(const char *msg, engine_type_e type, int synchPointInde
|
||||||
void setupSimpleTestEngineWithMafAndTT_ONE_trigger(EngineTestHelper *eth, injection_mode_e injMode = IM_BATCH);
|
void setupSimpleTestEngineWithMafAndTT_ONE_trigger(EngineTestHelper *eth, injection_mode_e injMode = IM_BATCH);
|
||||||
void testNoiselessDecoder(void);
|
void testNoiselessDecoder(void);
|
||||||
|
|
||||||
|
void assertRpm(const char *msg, int expectedRpm DECLARE_ENGINE_PARAMETER_SUFFIX);
|
||||||
|
|
||||||
#endif /* TEST_TRIGGER_DECODER_H_ */
|
#endif /* TEST_TRIGGER_DECODER_H_ */
|
||||||
|
|
Loading…
Reference in New Issue