Optimise Catch2 V3 includes + fix a few cases of missing includes

tests/unit/application/test_application.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
 #include "application.h"
 #include <stdint.h>
 #include "../modules/stubs/stub_serial.h"

tests/unit/application/test_registers.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
 #include "registers.h"
 #include "modules/globals.h"
 #include "../modules/stubs/stub_eeprom.h"

tests/unit/hal/circular_buffer/test_circular_buffer.cpp

@@ -1,4 +1,5 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers_vector.hpp"
 #include "circular_buffer.h"
 
 using Catch::Matchers::Equals;

tests/unit/hal/progmem/test_progmem.cpp

@@ -1,4 +1,5 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers_vector.hpp"
 #include "progmem.h"
 
 using Catch::Matchers::Equals;

tests/unit/logic/cut_filament/test_cut_filament.cpp

@@ -1,4 +1,5 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers_vector.hpp"
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/eject_filament/test_eject_filament.cpp

@@ -1,4 +1,5 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers_vector.hpp"
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/failing_tmc/test_failing_tmc.cpp

@@ -2,7 +2,8 @@
 // As a base for this test, unload_filament was chosen.
 // Moreover, I didn't want to spoil the unit tests of the state machines themself with this.
 
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers_vector.hpp"
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/feed_to_bondtech/test_feed_to_bondtech.cpp

@@ -1,4 +1,5 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers_vector.hpp"
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/feed_to_finda/test_feed_to_finda.cpp

@@ -1,4 +1,5 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers_vector.hpp"
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/homing/test_homing.cpp

@@ -1,4 +1,5 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers_vector.hpp"
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/load_filament/test_load_filament.cpp

@@ -1,4 +1,8 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/generators/catch_generators.hpp"
+#include "catch2/matchers/catch_matchers_vector.hpp"
+
+#include <functional>
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/stubs/main_loop_stub.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
 #include "main_loop_stub.h"
 #include "homing.h"
 

tests/unit/logic/tool_change/test_tool_change.cpp

@@ -1,4 +1,5 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers_vector.hpp"
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/unload_filament/test_unload_filament.cpp

@@ -1,4 +1,7 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers_vector.hpp"
+
+#include <functional>
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/unload_to_finda/test_unload_to_finda.cpp

@@ -1,4 +1,6 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/generators/catch_generators_range.hpp"
+#include "catch2/matchers/catch_matchers_vector.hpp"
 
 #include <functional>
 

tests/unit/modules/buttons/test_buttons.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
 #include "../stubs/stub_adc.h"
 #include "../stubs/stub_timebase.h"
 #include "buttons.h"

tests/unit/modules/leds/test_leds.cpp

@@ -1,4 +1,6 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/generators/catch_generators.hpp"
+#include "catch2/matchers/catch_matchers_vector.hpp"
 #include "leds.h"
 #include "shr16.h"
 #include "../stubs/stub_timebase.h"

tests/unit/modules/motion/test_motion.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
 #include "motion.h"
 
 using namespace modules::motion;

tests/unit/modules/protocol/test_protocol.cpp

@@ -1,8 +1,10 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/generators/catch_generators.hpp"
 #include "../logic/error_codes.h"
 #include "../logic/progress_codes.h"
 #include "protocol.h"
 #include <array>
+#include <algorithm>
 
 // some safe margin for the buffer
 using TXBuff = std::array<uint8_t, 2 * std::max(mp::Protocol::MaxRequestSize(), mp::Protocol::MaxResponseSize())>;

tests/unit/modules/pulse_gen/test_pulse_gen.cpp

@@ -1,4 +1,5 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers_vector.hpp"
 #include "pulse_gen.h"
 #include "../pins.h"
 #include <stdio.h>

tests/unit/modules/speed_table/test_speed_table.cpp

@@ -1,4 +1,5 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers_vector.hpp"
 #include "speed_table.h"
 #include <stdio.h>
 

tests/unit/modules/stubs/stub_eeprom.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include "../../../../src/hal/eeprom.h"
 #include "stub_eeprom.h"

tests/unit/modules/timebase/test_timebase.cpp

@@ -1,4 +1,5 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers_vector.hpp"
 #include "timebase.h"
 #include "../stubs/stub_timebase.h"
 

tests/unit/modules/user_input/test_user_input.cpp

@@ -1,4 +1,5 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/generators/catch_generators.hpp"
 #include "../stubs/stub_adc.h"
 #include "../stubs/stub_timebase.h"
 #include "buttons.h"

tests/unit/system_test.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch_all.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 TEST_CASE("type tests", "[system]") {
     REQUIRE(sizeof(uint64_t) == 8);

tests/unit/test_main.cpp

@@ -1,2 +1 @@
 //#define CATCH_CONFIG_ENABLE_BENCHMARKING
-#include "catch2/catch_all.hpp"