Remove ifdef guards around unit and HIL tests.

These guards were our way of getting around the contents of these files being included in note-arduino builds. With this commit, we're getting rid of them. Instead, in note-arduino when we include note-c, we'll remove the test subdirectory all together. Then these files aren't even there to begin with, so they can't mess up the note-arduino build.
blues · Jan 8, 2024 · 697eb2f · 697eb2f
1 parent 04fb1fa
commit 697eb2f
Show file tree

Hide file tree

Showing 118 changed files with 216 additions and 238 deletions.
diff --git a/test/hitl/card.binary/lib/notecard_binary/NotecardBinary.cpp b/test/hitl/card.binary/lib/notecard_binary/NotecardBinary.cpp
@@ -1,5 +1,3 @@
-#ifdef PLATFORMIO
-
 #include "NotecardBinary.h"
 
 Notecard notecard;
@@ -14,4 +12,4 @@ BufferBinaryGenerator small_image(small_binary);
 // ensure the virtual destructor is defined.
 BinaryGenerator::~BinaryGenerator() {}
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/lib/notecard_binary/NotecardBinary.h b/test/hitl/card.binary/lib/notecard_binary/NotecardBinary.h
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #pragma once
 
@@ -1185,4 +1184,4 @@ class NoteAddHandler : public FileHandler
 extern BinaryImage small_binary;
 extern BufferBinaryGenerator small_image;
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/lib/notecard_binary/NotecardComms.cpp b/test/hitl/card.binary/lib/notecard_binary/NotecardComms.cpp
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #include "NotecardComms.h"
 #include <Arduino.h>
@@ -144,4 +143,4 @@ size_t readDataUntilTimeout(Stream& serial, size_t timeout, uint8_t* buf, size_t
 HardwareSerial Serial2(A0,A3);
 HardwareSerial Serial3(A5,A4); // A5 is RX, A4 is TX
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/lib/notecard_binary/NotecardComms.h b/test/hitl/card.binary/lib/notecard_binary/NotecardComms.h
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #pragma once
 
@@ -48,4 +47,4 @@ bool set_aux_serial_baudrate(size_t baudrate=NOTECARD_IF_AUX_SERIAL_BAUDRATE, No
 
 extern Notecard notecard;
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/lib/notecard_binary/small_img.cpp b/test/hitl/card.binary/lib/notecard_binary/small_img.cpp
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #include "small_img.h"
 
@@ -4919,4 +4918,4 @@ const uint8_t small_img_map[] = {
 };
 size_t small_img_len = 73687;
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/lib/notecard_binary/small_img.h b/test/hitl/card.binary/lib/notecard_binary/small_img.h
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #pragma once
 
@@ -8,4 +7,4 @@
 extern const uint8_t small_img_map[];
 extern size_t small_img_len;
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/src/main.cpp b/test/hitl/card.binary/src/main.cpp
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #include "NotecardBinary.h"
 
@@ -17,4 +16,4 @@ void loop()
 
 }
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/test/test_binary_generators.cpp b/test/hitl/card.binary/test/test_binary_generators.cpp
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #include "NotecardBinary.h"
 #include <Arduino.h>
@@ -89,4 +88,4 @@ void testsuite_binary_generators()
     RUN_TEST(test_random_generator);
 }
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/test/test_binary_generators.h b/test/hitl/card.binary/test/test_binary_generators.h
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #pragma once
 #include "NotecardBinary.h"
@@ -60,4 +59,4 @@ struct BuildRandom {
     }
 };
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/test/test_card_binary.cpp b/test/hitl/card.binary/test/test_card_binary.cpp
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #include "NotecardBinary.h"
 #include "NotecardComms.h"
@@ -473,4 +472,4 @@ void testsuite_card_binary()
     RUN_FILTER(test_max_length_serial);
 }
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/test/test_card_binary.h b/test/hitl/card.binary/test/test_card_binary.h
@@ -1,5 +1,4 @@
-#ifdef PLATFORMIO
 
 void testsuite_card_binary();
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/test/test_main.cpp b/test/hitl/card.binary/test/test_main.cpp
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #include "test_card_binary.h"
 #include "test_binary_generators.h"
@@ -37,4 +36,4 @@ void loop()
 //  #error serial buffer is too small
 // #endif
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/test/test_unity_util.cpp b/test/hitl/card.binary/test/test_unity_util.cpp
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 #include "test_unity_util.h"
 #include <string.h>
@@ -35,4 +34,4 @@ bool filterTest(const char* name)
     return true;
 }
 
-#endif // PLATFORMIO
+
diff --git a/test/hitl/card.binary/test/test_unity_util.h b/test/hitl/card.binary/test/test_unity_util.h
@@ -1,4 +1,3 @@
-#ifdef PLATFORMIO
 
 // This also needs to be added to build_flags in platformio.ini
 #ifndef UNITY_INCLUDE_PRINT_FORMATTED
@@ -32,4 +31,4 @@ extern bool filterTest(const char* name);
         RUN_TEST(func); \
     }
 
-#endif // PLATFORMIO
+
diff --git a/test/src/JAddBinaryToObject_test.cpp b/test/src/JAddBinaryToObject_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -83,4 +83,4 @@ SCENARIO("JAddBinaryToObject")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JAllocString_test.cpp b/test/src/JAllocString_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -59,4 +59,4 @@ SCENARIO("JAllocString")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JAtoI_test.cpp b/test/src/JAtoI_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -58,4 +58,4 @@ SCENARIO("JAtoI")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JBoolValue_test.cpp b/test/src/JBoolValue_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -50,4 +50,4 @@ SCENARIO("JBoolValue")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JContainsString_test.cpp b/test/src/JContainsString_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -68,4 +68,4 @@ SCENARIO("JContainsString")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetArray_test.cpp b/test/src/JGetArray_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -53,4 +53,4 @@ SCENARIO("JGetArray")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetBinaryFromObject_test.cpp b/test/src/JGetBinaryFromObject_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 #include "fff.h"
@@ -80,4 +80,4 @@ SCENARIO("JGetBinaryFromObject")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetBool_test.cpp b/test/src/JGetBool_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -53,4 +53,4 @@ SCENARIO("JGetBool")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetInt_test.cpp b/test/src/JGetInt_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -53,4 +53,4 @@ SCENARIO("JGetInt")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetItemName_test.cpp b/test/src/JGetItemName_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -47,4 +47,4 @@ SCENARIO("JGetItemName")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetNumber_test.cpp b/test/src/JGetNumber_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -53,4 +53,4 @@ SCENARIO("JGetNumber")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetObject_test.cpp b/test/src/JGetObject_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -53,4 +53,4 @@ SCENARIO("JGetObject")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetString_test.cpp b/test/src/JGetString_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -66,4 +66,4 @@ SCENARIO("JGetString")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JGetType_test.cpp b/test/src/JGetType_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -158,4 +158,4 @@ SCENARIO("JGetType")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JIntValue_test.cpp b/test/src/JIntValue_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -46,4 +46,4 @@ SCENARIO("JIntValue")
 
 }
 
-#endif // NOTE_C_TEST
+
diff --git a/test/src/JIsExactString_test.cpp b/test/src/JIsExactString_test.cpp
@@ -11,7 +11,7 @@
  *
  */
 
-#ifdef NOTE_C_TEST
+
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -71,4 +71,4 @@ SCENARIO("JIsExactString")
 
 }
 
-#endif // NOTE_C_TEST
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ @@
      *
      */
-    #ifdef NOTE_C_TEST
     #include <catch2/catch_test_macros.hpp>
@@ Expand Down Expand Up / @@ -58,4 +58,4 @@ SCENARIO("JAtoI") @@
     }
-    #endif // NOTE_C_TEST