ZTEST unit testing facility

Author: Asbelos

EXRAIL2MacroBase.h

@@ -875,3 +875,12 @@
 ///brief Resumes locos saved speed
 ///param cab loco id
 ///see XRESTORE_SPEED
+
+#define ZTEST(command,testcode...)
+///brief Developer Unit testing.  Do not use. 
+
+#define ZTEST2(command,reply)
+///brief Developer Unit testing.  Do not use.
+
+#define ZTEST3(command,reply,testcode...)
+///brief Developer Unit testing.  Do not use. 

EXRAIL2MacroReset.h

@@ -230,6 +230,9 @@
 #undef XFWD
 #undef XSAVE_SPEED
 #undef XRESTORE_SPEED
+#undef ZTEST
+#undef ZTEST2
+#undef ZTEST3
 
 #ifndef RMFT2_UNDEF_ONLY
 #include "EXRAIL2MacroBase.h"

EXRAILMacros.h

@@ -323,6 +323,20 @@ case (__COUNTER__ - StringMacroTracker1) : {\
 #define STEALTH(code...) case (__COUNTER__ - StringMacroTracker1) : {code} return; 
 #undef WITHROTTLE
 #define WITHROTTLE(msg) THRUNGE(msg,thrunge_withrottle)
+#undef ZTEST
+#define ZTEST(command,code...) case (__COUNTER__ - StringMacroTracker1) : \
+   Ztest::parse(F(command),nullptr,[]() -> bool { return (code);}); \
+   return;
+#undef ZTEST2
+#define ZTEST2(command,response) case (__COUNTER__ - StringMacroTracker1) : \
+   Ztest::parse(F(command),F(response),nullptr); \
+   return;
+#undef ZTEST3
+#define ZTEST3(command,response,code...) case (__COUNTER__ - StringMacroTracker1) : \
+   Ztest::parse(F(command),F(response),[]() -> bool { return (code);}); \
+   return;
+
+#include "Ztest.h"
 
 void  RMFT2::printMessage(uint16_t id) { 
   thrunger tmode;
@@ -701,6 +715,9 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup];
 #define XPOM(cab,cv,value) OPCODE_XPOM,V(cab),OPCODE_PAD,V(cv),OPCODE_PAD,V(value),
 #define XSAVE_SPEED(cab) OPCODE_XSAVE_SPEED,V(cab),
 #define XRESTORE_SPEED(cab) OPCODE_XRESTORE_SPEED,V(cab),
+#define ZTEST(command,code...) PRINT(dummy)
+#define ZTEST2(command,response) PRINT(dummy)
+#define ZTEST3(command,response,code...) PRINT(dummy)
 
 // Build RouteCode
 const int StringMacroTracker2=__COUNTER__;

EXRAILTest.h

@@ -135,4 +135,37 @@ SEQUENCE(7500)
     RESET(870)
     AT(870)
     PRINT("870 set")
-  DONE
+  DONE
+
+  ROUTE(7800, "ZTESTS")
+  PRINT("ZTESTS starting")
+  ZTEST("<t 3 5 1>",DCC::getLocoSpeedByte(3)==(128+6))
+  ZTEST("<t 3 5 0>",DCC::getLocoSpeedByte(3)==(6))
+  ZTEST("<-3>",DCC::getLocoSpeedByte(3)==(128))  
+  ZTEST2("<$>","<X>\n")
+  DONE
+
+ROUTE(7900,"7900 Test IFSTASHED_HERE")
+   SETLOCO(4)  // set loco 4
+   STASH(200)  // stash loco 4 in stash 2
+    
+// loco is 4
+  IFSTASHED_HERE(100) // should be false
+      PRINT("FAIL Loco 4 in stash 100")
+  ELSE
+      PRINT("OK: loco 4 is not in stash 100")   
+  ENDIF
+
+SETLOCO(3)
+IFSTASHED_HERE(200) // should be false
+      PRINT("FAIL Loco 3 in stash 200")
+ELSE
+      PRINT("OK: loco 3 is not in stash 200")   
+ENDIF
+
+IFSTASHED_HERE(100) // should be true
+      PRINT("OK: Loco 3 is in stash 100")
+ELSE
+      PRINT("FAIL: loco 3 not in stash 100")
+ENDIF
+DONE