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

progress

This commit is contained in:
rusefi 2018-03-04 23:42:30 -05:00
parent 0b3585047e
commit a0725457f4
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
unit_tests/test_trigger_decoder.cpp
View File

@ -584,12 +584,18 @@ void testTriggerDecoder(void) {
extern fuel_Map3D_t fuelMap;
void assertEvent(const char *msg, int index, void *callback, efitime_t start, efitime_t momentX, long param) {
scheduling_s * assertEvent5(const char *msg, int index, void *callback, efitime_t start, efitime_t momentX) {
assertTrueM(msg, schedulingQueue.size() > index);
scheduling_s *ev = schedulingQueue.getForUnitText(index);
assertEqualsM4(msg, " up/down", (void*)ev->callback == (void*) callback, 1);
assertEqualsM(msg, momentX, ev->momentX - start);
InjectionSignalPair *eventPair = (InjectionSignalPair *)ev->param;
scheduling_s *event = schedulingQueue.getForUnitText(index);
assertEqualsM4(msg, " up/down", (void*)event->callback == (void*) callback, 1);
assertEqualsM(msg, momentX, event->momentX - start);
return event;
}
void assertEvent(const char *msg, int index, void *callback, efitime_t start, efitime_t momentX, long param) {
scheduling_s *event = assertEvent5(msg, index, callback, start, momentX);
InjectionSignalPair *eventPair = (InjectionSignalPair *)event->param;
InjectionSignalPair *expectedPair = (InjectionSignalPair *)param;
@ -617,6 +623,7 @@ void setupSimpleTestEngineWithMafAndTT_ONE_trigger(EngineTestHelper *eth) {
Engine *engine = &eth->engine;
EXPAND_Engine
timeNowUs = 0;
eth->clearQueue();
assertEquals(LM_PLAIN_MAF, engineConfiguration->fuelAlgorithm);
@ -624,9 +631,6 @@ void setupSimpleTestEngineWithMafAndTT_ONE_trigger(EngineTestHelper *eth) {
engineConfiguration->specs.cylindersCount = 4;
engineConfiguration->injectionMode = IM_BATCH;
timeNowUs = 0;
schedulingQueue.clear();
setArrayValues(config->cltFuelCorrBins, CLT_CURVE_SIZE, 1);
setArrayValues(engineConfiguration->injector.battLagCorr, VBAT_INJECTOR_CURVE_SIZE, 0);
// this is needed to update injectorLag

1
unit_tests/unit_test_framework.h
View File

@ -21,6 +21,7 @@ void assertTrueM(const char *msg, float actual);
void assertFalse(float actual);
void assertFalseM(const char *msg, float actual);
scheduling_s * assertEvent5(const char *msg, int index, void *callback, efitime_t start, efitime_t momentX);
void assertEvent(const char *msg, int index, void *callback, efitime_t start, efitime_t momentX, long param);
void assertInjectorUpEvent(const char *msg, int eventIndex, efitime_t momentX, long injectorIndex DECLARE_ENGINE_PARAMETER_SUFFIX);
void assertInjectorDownEvent(const char *msg, int eventIndex, efitime_t momentX, long injectorIndex DECLARE_ENGINE_PARAMETER_SUFFIX);