Reorganised (some) usage tests so they can be included multiple times

projects/SelfTest/UsageTests/Compilation.tests.cpp

@@ -7,51 +7,53 @@
 
 #include "catch.hpp"
 
+namespace { namespace CompilationTests {
+
+#ifndef COMPILATION_TEST_HELPERS_INCLUDED // Don't compile this more than once per TU
+#define COMPILATION_TEST_HELPERS_INCLUDED
 
 // This is a minimal example for an issue we have found in 1.7.0
-struct foo {
-    int i;
-};
+    struct foo {
+        int i;
+    };
 
-template <typename T>
-bool operator==(const T& val, foo f){
-    return val == f.i;
-}
-
-TEST_CASE("#809") {
-    foo f; f.i = 42;
-    REQUIRE(42 == f);
-}
-
-
-// ------------------------------------------------------------------
-// Changes to REQUIRE_THROWS_AS made it stop working in a template in
-// an unfixable way (as long as C++03 compatibility is being kept).
-// To prevent these from happening in the future, this needs to compile
-
-void throws_int(bool b) {
-    if (b) {
-        throw 1;
+    template<typename T>
+    bool operator==(const T &val, foo f) {
+        return val == f.i;
     }
-}
 
-template <typename T>
-bool templated_tests(T t) {
-    int a = 3;
-    REQUIRE(a == t);
-    CHECK(a == t);
-    REQUIRE_THROWS(throws_int(true));
-    CHECK_THROWS_AS(throws_int(true), int);
-    REQUIRE_NOTHROW(throws_int(false));
+    struct Y {
+        uint32_t v : 1;
+    };
+
+    void throws_int(bool b) {
+        if (b) {
+            throw 1;
+        }
+    }
+
+    template<typename T>
+    bool templated_tests(T t) {
+        int a = 3;
+        REQUIRE(a == t);
+        CHECK(a == t);
+        REQUIRE_THROWS(throws_int(true));
+        CHECK_THROWS_AS(throws_int(true), int);
+        REQUIRE_NOTHROW(throws_int(false));
 #ifndef CATCH_CONFIG_DISABLE_MATCHERS
-    REQUIRE_THAT("aaa", Catch::EndsWith("aaa"));
+        REQUIRE_THAT("aaa", Catch::EndsWith("aaa"));
 #endif
-    return true;
-}
+        return true;
+    }
 
-TEST_CASE("#833") {
-    REQUIRE(templated_tests<int>(3));
-}
+    struct A {
+    };
+
+    std::ostream &operator<<(std::ostream &o, const A &) { return o << 0; }
+
+    struct B : private A {
+        bool operator==(int) const { return true; }
+    };
 
 #ifdef __clang__
 #pragma clang diagnostic push
@@ -63,35 +65,48 @@ TEST_CASE("#833") {
 #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
-// Test containing example where original stream insertable check breaks compilation
-namespace {
-    struct A {};
-    std::ostream& operator<< (std::ostream &o, const A &) { return o << 0; }
+    B f();
 
-    struct B : private A {
-        bool operator== (int) const { return true; }
-    };
+    std::ostream g();
 
-    B f ();
-    std::ostream g ();
-}
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
 
-TEST_CASE( "#872" ) {
-    A dummy;
-    CAPTURE( dummy );
-    B x;
-    REQUIRE (x == 4);
-}
+#endif
 
-struct Y {
-    uint32_t v : 1;
-};
+    TEST_CASE("#809") {
+        foo f;
+        f.i = 42;
+        REQUIRE(42 == f);
+    }
 
-TEST_CASE( "#1027" ) {
-    Y y{ 0 };
-    REQUIRE(y.v == 0);
-    REQUIRE(0 == y.v);
-}
+
+// ------------------------------------------------------------------
+// Changes to REQUIRE_THROWS_AS made it stop working in a template in
+// an unfixable way (as long as C++03 compatibility is being kept).
+// To prevent these from happening in the future, this needs to compile
+
+    TEST_CASE("#833") {
+        REQUIRE(templated_tests<int>(3));
+    }
+
+
+// Test containing example where original stream insertable check breaks compilation
+
+
+    TEST_CASE("#872") {
+        A dummy;
+        CAPTURE(dummy);
+        B x;
+        REQUIRE (x == 4);
+    }
+
+
+    TEST_CASE("#1027") {
+        Y y{0};
+        REQUIRE(y.v == 0);
+        REQUIRE(0 == y.v);
+    }
+
+}} // namespace CompilationTests