Michal
/
Prusa-Firmware-MMU
mirror of https://github.com/prusa3d/Prusa-Firmware-MMU
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add more strings to error output in unit tests

pull/282/head
Guðni Már Gilbert 2023-05-27 20:21:18 +00:00 committed by DRracer
parent eb52475819
commit bfc953f52d
1 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/unit/logic/helpers/helpers.ipp
View File

@ -115,17 +115,22 @@ template<typename SM>
bool VerifyState(SM &uf, mg::FilamentLoadState fls, uint8_t idlerSlotIndex, uint8_t selectorSlotIndex,
bool findaPressed, bool pulleyEnabled, ml::Mode greenLEDMode, ml::Mode redLEDMode, ErrorCode err, ProgressCode topLevelProgress) {
CHECKED_ELSE(VerifyEnvironmentState(fls, idlerSlotIndex, selectorSlotIndex, findaPressed, pulleyEnabled, greenLEDMode, redLEDMode)) {
return false;
}
CHECKED_ELSE(uf.Error() == err) {
WARN("uf.Error() != err");
WARN("Expecting error code, err: " << (int)err);
WARN("But actual error code is, uf.Error(): " << (int)uf.Error());
return false;
}
auto tls = uf.TopLevelState();
CHECKED_ELSE(tls == topLevelProgress) {
WARN("tls != topLevelProgress");
return false;
}
CHECKED_ELSE(VerifyEnvironmentState(fls, idlerSlotIndex, selectorSlotIndex, findaPressed, pulleyEnabled, greenLEDMode, redLEDMode)) {
return false;
}
return true;
}
@ -134,28 +139,35 @@ template<typename SM>
bool VerifyState2(SM &uf, mg::FilamentLoadState fls, uint8_t idlerSlotIndex, uint8_t selectorSlotIndex,
bool findaPressed, bool pulleyEnabled, uint8_t ledCheckIndex, ml::Mode greenLEDMode, ml::Mode redLEDMode, ErrorCode err, ProgressCode topLevelProgress) {
CHECKED_ELSE(mg::globals.FilamentLoaded() & fls) {
WARN("mg::globals.FilamentLoaded() & fls is false");
return false;
}
if( idlerSlotIndex < config::toolCount ){ // abusing invalid index to skip checking of slot and position
CHECKED_ELSE(mm::axes[mm::Idler].pos == mi::Idler::SlotPosition(idlerSlotIndex).v) {
WARN("mm::axes[mm::Idler].pos != mi::Idler::SlotPosition(idlerSlotIndex).v");
return false;
}
CHECKED_ELSE(mi::idler.Engaged() == (idlerSlotIndex < config::toolCount)) {
WARN("mi::idler.Engaged() != (idlerSlotIndex < config::toolCount)");
return false;
}
}
if( selectorSlotIndex < config::toolCount ){ // abusing invalid index to skip checking of slot and position
CHECKED_ELSE(mm::axes[mm::Selector].pos == ms::Selector::SlotPosition(selectorSlotIndex).v) {
WARN("mm::axes[mm::Selector].pos != ms::Selector::SlotPosition(selectorSlotIndex).v");
return false;
}
CHECKED_ELSE(ms::selector.Slot() == selectorSlotIndex) {
WARN("ms::selector.Slot() != selectorSlotIndex");
return false;
}
}
CHECKED_ELSE(mf::finda.Pressed() == findaPressed) {
WARN("mf::finda.Pressed() != findaPressed");
return false;
}
CHECKED_ELSE(mm::PulleyEnabled() == pulleyEnabled) {
WARN("mm::PulleyEnabled() != pulleyEnabled");
return false;
}
@ -163,27 +175,37 @@ bool VerifyState2(SM &uf, mg::FilamentLoadState fls, uint8_t idlerSlotIndex, uin
if( ledIndex != ledCheckIndex ){
// the other LEDs should be off
CHECKED_ELSE(ml::leds.Mode(ledIndex, ml::red) == ml::off) {
WARN("ml::leds.Mode(ledIndex, ml::red) != ml::off");
return false;
}
CHECKED_ELSE(ml::leds.Mode(ledIndex, ml::green) == ml::off) {
WARN("ml::leds.Mode(ledIndex, ml::green) != ml::off");
return false;
}
} else {
auto lmr = ml::leds.Mode(ledCheckIndex, ml::red);
CHECKED_ELSE(lmr == redLEDMode) {
WARN("lmr != redLEDMode");
return false;
}
auto lmg = ml::leds.Mode(ledCheckIndex, ml::green);
CHECKED_ELSE(lmg == greenLEDMode) {
WARN("lmg != greenLEDMode");
return false;
}
}
}
CHECKED_ELSE(uf.Error() == err) {
WARN("uf.Error() != err");
WARN("Expecting error code, err: " << (int)err);
WARN("But actual error code is, uf.Error(): " << (int)uf.Error());
return false;
}
CHECKED_ELSE(uf.TopLevelState() == topLevelProgress) {
WARN("uf.TopLevelState() != topLevelProgress");
WARN("Expecting progress code, topLevelProgress: " << (int)topLevelProgress);
WARN("But actual error code is, uf.TopLevelState(): " << (int)uf.TopLevelState());
return false;
}
return true;