From bb574603bad085b9634ecada49a9ad9a88c868cb Mon Sep 17 00:00:00 2001
From: "D.R.racer" <drracer@drracer.eu>
Date: Thu, 23 Sep 2021 10:18:01 +0200
Subject: [PATCH] Reformat helpers.ipp - makes placing breakpoint easier

---
 tests/unit/logic/helpers/helpers.ipp | 88 +++++++++++++++++++++-------
 1 file changed, 66 insertions(+), 22 deletions(-)

diff --git a/tests/unit/logic/helpers/helpers.ipp b/tests/unit/logic/helpers/helpers.ipp
index 1e538ec..e49d068 100644
--- a/tests/unit/logic/helpers/helpers.ipp
+++ b/tests/unit/logic/helpers/helpers.ipp
@@ -1,20 +1,40 @@
 bool VerifyEnvironmentState(bool filamentLoaded, uint8_t idlerSlotIndex, uint8_t selectorSlotIndex,
     bool findaPressed, ml::Mode greenLEDMode, ml::Mode redLEDMode) {
-    CHECKED_ELSE(mg::globals.FilamentLoaded() == filamentLoaded) { return false; }
-    CHECKED_ELSE(mm::axes[mm::Idler].pos == mi::Idler::SlotPosition(idlerSlotIndex).v) { return false; }
-    CHECKED_ELSE(mi::idler.Engaged() == (idlerSlotIndex < config::toolCount)) { return false; }
-    CHECKED_ELSE(mm::axes[mm::Selector].pos == ms::Selector::SlotPosition(selectorSlotIndex).v) { return false; }
-    CHECKED_ELSE(ms::selector.Slot() == selectorSlotIndex) { return false; }
-    CHECKED_ELSE(mf::finda.Pressed() == findaPressed) { return false; }
+    CHECKED_ELSE(mg::globals.FilamentLoaded() == filamentLoaded) {
+    return false;
+    }
+    CHECKED_ELSE(mm::axes[mm::Idler].pos == mi::Idler::SlotPosition(idlerSlotIndex).v) {
+    return false;
+    }
+    CHECKED_ELSE(mi::idler.Engaged() == (idlerSlotIndex < config::toolCount)) {
+    return false;
+    }
+    CHECKED_ELSE(mm::axes[mm::Selector].pos == ms::Selector::SlotPosition(selectorSlotIndex).v) {
+    return false;
+    }
+    CHECKED_ELSE(ms::selector.Slot() == selectorSlotIndex) {
+    return false;
+    }
+    CHECKED_ELSE(mf::finda.Pressed() == findaPressed) {
+    return false;
+    }
 
     for(uint8_t ledIndex = 0; ledIndex < config::toolCount; ++ledIndex){
         if( ledIndex != selectorSlotIndex ){
             // the other LEDs should be off
-            CHECKED_ELSE(ml::leds.Mode(ledIndex, ml::red) == ml::off) { return false; }
-            CHECKED_ELSE(ml::leds.Mode(ledIndex, ml::green) == ml::off) { return false; }
+            CHECKED_ELSE(ml::leds.Mode(ledIndex, ml::red) == ml::off) {
+            return false;
+            }
+            CHECKED_ELSE(ml::leds.Mode(ledIndex, ml::green) == ml::off) {
+            return false;
+            }
         } else {
-            CHECKED_ELSE(ml::leds.Mode(selectorSlotIndex, ml::red) == redLEDMode) { return false; }
-            CHECKED_ELSE(ml::leds.Mode(selectorSlotIndex, ml::green) == greenLEDMode) { return false; }
+            CHECKED_ELSE(ml::leds.Mode(selectorSlotIndex, ml::red) == redLEDMode) {
+            return false;
+            }
+            CHECKED_ELSE(ml::leds.Mode(selectorSlotIndex, ml::green) == greenLEDMode) {
+            return false;
+            }
         }
     }
     return true;
@@ -30,7 +50,9 @@ bool VerifyState(SM &uf, bool filamentLoaded, uint8_t idlerSlotIndex, uint8_t se
     CHECKED_ELSE(uf.Error() == err) {
         return false;
     }
-    CHECKED_ELSE(uf.TopLevelState() == topLevelProgress) { return false; }
+    CHECKED_ELSE(uf.TopLevelState() == topLevelProgress) {
+    return false;
+    }
     return true;
 }
 
@@ -38,26 +60,48 @@ bool VerifyState(SM &uf, bool filamentLoaded, uint8_t idlerSlotIndex, uint8_t se
 template<typename SM>
 bool VerifyState2(SM &uf, bool filamentLoaded, uint8_t idlerSlotIndex, uint8_t selectorSlotIndex,
     bool findaPressed, uint8_t ledCheckIndex, ml::Mode greenLEDMode, ml::Mode redLEDMode, ErrorCode err, ProgressCode topLevelProgress) {
-    CHECKED_ELSE(mg::globals.FilamentLoaded() == filamentLoaded) { return false; }
-    CHECKED_ELSE(mm::axes[mm::Idler].pos == mi::Idler::SlotPosition(idlerSlotIndex).v) { return false; }
+    CHECKED_ELSE(mg::globals.FilamentLoaded() == filamentLoaded) {
+    return false;
+    }
+    CHECKED_ELSE(mm::axes[mm::Idler].pos == mi::Idler::SlotPosition(idlerSlotIndex).v) {
+    return false;
+    }
     CHECKED_ELSE(mi::idler.Engaged() == (idlerSlotIndex < config::toolCount)) { return false; }
-    CHECKED_ELSE(mm::axes[mm::Selector].pos == ms::Selector::SlotPosition(selectorSlotIndex).v) { return false; }
-    CHECKED_ELSE(ms::selector.Slot() == selectorSlotIndex) { return false; }
-    CHECKED_ELSE(mf::finda.Pressed() == findaPressed) { return false; }
+    CHECKED_ELSE(mm::axes[mm::Selector].pos == ms::Selector::SlotPosition(selectorSlotIndex).v) {
+    return false;
+    }
+    CHECKED_ELSE(ms::selector.Slot() == selectorSlotIndex) {
+    return false;
+    }
+    CHECKED_ELSE(mf::finda.Pressed() == findaPressed) {
+    return false;
+    }
 
     for(uint8_t ledIndex = 0; ledIndex < config::toolCount; ++ledIndex){
         if( ledIndex != ledCheckIndex ){
             // the other LEDs should be off
-            CHECKED_ELSE(ml::leds.Mode(ledIndex, ml::red) == ml::off) { return false; }
-            CHECKED_ELSE(ml::leds.Mode(ledIndex, ml::green) == ml::off) { return false; }
+            CHECKED_ELSE(ml::leds.Mode(ledIndex, ml::red) == ml::off) {
+            return false;
+            }
+            CHECKED_ELSE(ml::leds.Mode(ledIndex, ml::green) == ml::off) {
+            return false;
+            }
         } else {
-            CHECKED_ELSE(ml::leds.Mode(ledCheckIndex, ml::red) == redLEDMode) { return false; }
-            CHECKED_ELSE(ml::leds.Mode(ledCheckIndex, ml::green) == greenLEDMode) { return false; }
+            CHECKED_ELSE(ml::leds.Mode(ledCheckIndex, ml::red) == redLEDMode) {
+            return false;
+            }
+            CHECKED_ELSE(ml::leds.Mode(ledCheckIndex, ml::green) == greenLEDMode) {
+            return false;
+            }
         }
     }
 
-    CHECKED_ELSE(uf.Error() == err) { return false; }
-    CHECKED_ELSE(uf.TopLevelState() == topLevelProgress) { return false; }
+    CHECKED_ELSE(uf.Error() == err) {
+    return false;
+    }
+    CHECKED_ELSE(uf.TopLevelState() == topLevelProgress) {
+    return false;
+    }
     return true;
 }