standardising unit-test includes

so that external contributors (and importantly right now, example PRs) can contribute new, self-contained unit test code without needing to incorporate new headers

Author: TysonRayJones

tests/unit/calculations.cpp

@@ -11,6 +11,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators_range.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 #include <catch2/matchers/catch_matchers_floating_point.hpp>
 
 #include "tests/utils/qvector.hpp"
@@ -29,8 +30,8 @@
 #include <algorithm>
 #include <type_traits>
 
+using Catch::Matchers::ContainsSubstring;
 using std::vector;
-using namespace Catch::Matchers;
 
 
 

tests/unit/decoherence.cpp

@@ -10,6 +10,7 @@
 #include "quest/include/quest.h"
 
 #include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 #include <catch2/generators/catch_generators_range.hpp>
 
 #include "tests/utils/qvector.hpp"
@@ -26,6 +27,7 @@
 #include <vector>
 #include <algorithm>
 
+using Catch::Matchers::ContainsSubstring;
 using std::vector;
 
 

tests/unit/initialisations.cpp

@@ -10,6 +10,7 @@
 #include "quest/include/quest.h"
 
 #include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 #include <catch2/generators/catch_generators_range.hpp>
 
 #include "tests/utils/qvector.hpp"
@@ -24,6 +25,8 @@
 #include "tests/utils/measure.hpp"
 #include "tests/utils/random.hpp"
 
+using Catch::Matchers::ContainsSubstring;
+
 
 
 /*

tests/unit/types.cpp

@@ -10,6 +10,7 @@
 #include "quest/include/quest.h"
 
 #include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 
 #include "tests/utils/qvector.hpp"
 #include "tests/utils/qmatrix.hpp"
@@ -21,6 +22,8 @@
 #include "tests/utils/macros.hpp"
 #include "tests/utils/random.hpp"
 
+using Catch::Matchers::ContainsSubstring;
+
 
 
 /*
@@ -98,4 +101,4 @@ void reportStr(std::string str);
 void reportScalar(const char* label, qcomp num);
 void reportScalar(const char* label, qreal num);
 void reportScalar(std::string label, qcomp num);
-void reportScalar(std::string label, qreal num);
+void reportScalar(std::string label, qreal num);