Various additions, still WIP

test/test_lib.cpp

@@ -2,10 +2,12 @@
 
 #include <cstdint>
 
-#include "config.h"
+#include "../Software/src/devboard/config.h"
 
 MySerial Serial;
 
 unsigned long testlib_millis = 0;
 
 uint8_t bms_status = ACTIVE;
+
+uint8_t LEDcolor = GREEN;

test/test_lib.h

@@ -16,6 +16,7 @@ class MySerial;
 extern unsigned long testlib_millis;
 extern MySerial Serial;
 extern uint8_t bms_status;
+extern uint8_t LEDcolor;
 
 /* Mock millis() */
 static inline unsigned long millis(void) {

test/utils/events_test.cpp

@@ -1,79 +1,87 @@
 // The test library must be included first!
 #include "../test_lib.h"
 
+#include "../../Software/src/devboard/config.h"
 #include "events.cpp"
+#include "timer.cpp"
+
+/* Local rest variables */
+bool elapsed = false;
 
 /* Helper functions */
+// bool MyTimer::elapsed(void) { return true; }
+
 static void reset_event_msg(void) {
-  snprintf(event_message, sizeof(event_message), "");
+  snprintf(events.message, sizeof(events.message), ".");
 }
 
 TEST(init_events_test) {
   init_events();
 
   for (uint8_t i = 0; i < EVENT_NOF_EVENTS; i++) {
-    ASSERT_EQ(entries[i].occurences, 0);
+    ASSERT_EQ(events.entries[i].occurences, 0);
   }
 }
 
 TEST(update_event_time_test) {
   // Reset
   init_events();
-  time_seconds = 0;
+  events.time_seconds = 0;
 
   // No delta, so time shouldn't increase
   testlib_millis = 0;
   update_event_time();
-  ASSERT_EQ(time_seconds, 0);
+  ASSERT_EQ(events.time_seconds, 0);
 
   // Almost time to bump the seconds
   testlib_millis = 999;
   update_event_time();
-  ASSERT_EQ(time_seconds, 0);
-  ASSERT_EQ(previous_millis, 0);
+  ASSERT_EQ(events.time_seconds, 0);
 
   // millis == 1000, so we should add a second
   testlib_millis = 1000;
   update_event_time();
-  ASSERT_EQ(time_seconds, 1);
-  ASSERT_EQ(previous_millis, 1000);
+  ASSERT_EQ(events.time_seconds, 1);
 
   // We shouldn't add more seconds until 2000 now
   testlib_millis = 1999;
   update_event_time();
-  ASSERT_EQ(time_seconds, 1);
-  ASSERT_EQ(previous_millis, 1000);
+  ASSERT_EQ(events.time_seconds, 1);
   testlib_millis = 2000;
   update_event_time();
-  ASSERT_EQ(time_seconds, 2);
-  ASSERT_EQ(previous_millis, 2000);
+  ASSERT_EQ(events.time_seconds, 2);
 }
 
 TEST(set_event_test) {
   // Reset
   init_events();
-  time_seconds = 0;
+  events.time_seconds = 0;
 
   // Initially, the event should not have any data or occurences
-  ASSERT_EQ(entries[EVENT_CELL_OVER_VOLTAGE].data, 0);
-  ASSERT_EQ(entries[EVENT_CELL_OVER_VOLTAGE].occurences, 0);
-  ASSERT_EQ(entries[EVENT_CELL_OVER_VOLTAGE].timestamp, 0);
+  ASSERT_EQ(events.entries[EVENT_CELL_OVER_VOLTAGE].data, 0);
+  ASSERT_EQ(events.entries[EVENT_CELL_OVER_VOLTAGE].occurences, 0);
+  ASSERT_EQ(events.entries[EVENT_CELL_OVER_VOLTAGE].timestamp, 0);
   // Set current time and overvoltage event for cell 23 (RED color, bms_status == FAULT)
-  time_seconds = 345;
+  events.time_seconds = 345;
   set_event(EVENT_CELL_OVER_VOLTAGE, 123);
   // Ensure proper event data
-  ASSERT_EQ(entries[EVENT_CELL_OVER_VOLTAGE].data, 123);
-  ASSERT_EQ(entries[EVENT_CELL_OVER_VOLTAGE].occurences, 1);
-  ASSERT_EQ(entries[EVENT_CELL_OVER_VOLTAGE].timestamp, 345);
+  ASSERT_EQ(events.entries[EVENT_CELL_OVER_VOLTAGE].data, 123);
+  ASSERT_EQ(events.entries[EVENT_CELL_OVER_VOLTAGE].occurences, 1);
+  ASSERT_EQ(events.entries[EVENT_CELL_OVER_VOLTAGE].timestamp, 345);
   ASSERT_EQ(bms_status, FAULT);
 }
 
-TEST(event_message_test) {
+TEST(events_message_test) {
   reset_event_msg();
 
   set_event(EVENT_DUMMY, 0);  // Set dummy event with no data
 
-  ASSERT_STREQ("The dummy event was set!", event_message);
+  ASSERT_STREQ("The dummy event was set!", events.message);
+}
+
+TEST(event_priority_test) {
+  ASSERT_TRUE(RED > BLUE);
+  ASSERT_TRUE(BLUE > YELLOW);
 }
 
 TEST_MAIN();