diff --git a/lambda-test/lambda-test.c b/lambda-test/lambda-test.c index edb063d..e47a3e6 100644 --- a/lambda-test/lambda-test.c +++ b/lambda-test/lambda-test.c @@ -35,17 +35,20 @@ extern TestClass usartClass; beginSuite("lambda"); -// runClass(adcClass); -// runClass(alertClass); -// runClass(commandClass); -// runClass(displayClass); -// runClass(integersClass); -// runClass(interruptsClass); + runClass(adcClass); + runClass(alertClass); + runClass(commandClass); + runClass(displayClass); + runClass(integersClass); + runClass(interruptsClass); runClass(rulesClass); -// runClass(sensorsClass); -// runClass(stringsClass); -// runClass(usartClass); + runClass(sensorsClass); + runClass(stringsClass); + runClass(usartClass); endSuite(); + while (1) { + } + return 0; } diff --git a/lambda-test/rules-test.c b/lambda-test/rules-test.c index dcac1ba..2746ba6 100644 --- a/lambda-test/rules-test.c +++ b/lambda-test/rules-test.c @@ -10,6 +10,7 @@ #include "avrjunit.h" #include "rules.h" +#include "alert.h" extern uint16_t age; extern int8_t dir; @@ -53,6 +54,8 @@ reason(meas); assertTrue(rules[0].fired); + cancelAlert(); + return true; } @@ -92,6 +95,8 @@ reason(meas); assertTrue(rules[1].fired); + cancelAlert(); + return true; } @@ -131,6 +136,8 @@ reason(meas); assertTrue(rules[2].fired); + cancelAlert(); + return true; } @@ -173,6 +180,8 @@ reason(meas); assertFalse(rules[3].fired); + cancelAlert(); + return true; } @@ -212,6 +221,8 @@ reason(meas); assertFalse(rules[4].fired); + cancelAlert(); + return true; }