test: handlebars basic spec

Author: alandefreitas

include/mrdox/Support/Handlebars.hpp

@@ -47,6 +47,10 @@ namespace test_suite::detail
     format_value(T const& value)
     {
         std::string out;
+        if constexpr (std::is_convertible_v<std::decay_t<T>, std::string_view>)
+        {
+            out += '\"';
+        }
 #ifdef MRDOX_TEST_HAS_FMT
         if constexpr (fmt::has_formatter<T, fmt::format_context>::value) {
             out += fmt::format("{}", value);
@@ -59,6 +63,10 @@ namespace test_suite::detail
         } else {
             out += demangle<T>();
         }
+        if constexpr (std::is_convertible_v<std::decay_t<T>, std::string_view>)
+        {
+            out += '\"';
+        }
         return out;
     }
 

src/lib/Support/Handlebars.cpp

@@ -277,8 +277,7 @@ BOOST_TEST_DIFF(
     else
     {
         // Compare rendered template with reference
-        auto success_contents = expected_contents;
-        DiffStringsResult diff = diffStrings(success_contents, rendered_contents);
+        DiffStringsResult diff = diffStrings(expected_contents, rendered_contents);
         if (diff.added > 0 || diff.removed > 0)
         {
             std::ofstream out((std::string(error_output_path)));
@@ -292,8 +291,8 @@ BOOST_TEST_DIFF(
             BOOST_TEST(diff.added == 0);
             BOOST_TEST(diff.removed == 0);
         }
-        BOOST_TEST(rendered_contents.size() == success_contents.size());
-        BOOST_TEST(rendered_contents == success_contents);
+        BOOST_TEST(rendered_contents.size() == expected_contents.size());
+        BOOST_TEST((rendered_contents == expected_contents));
     }
 }
 

src/test/lib/Support/Handlebars.cpp

@@ -459,10 +459,10 @@ test(
     (void)func;
     log_ <<
         "#" << id << " " <<
-        file << "(" << line << ") "
-        "failed: " << expr <<
+        file << "(" << line << ")\n"
+        "failed:\n    " << expr <<
         //" in " << func <<
-        "\n";
+        "\n\n";
     log_.flush();
     return false;
 }

src/test_suite/detail/decomposer.hpp

@@ -251,7 +251,7 @@ constexpr detail::log_type log{};
   {                                                              \
       DETAIL_START_WARNINGS_SUPPRESSION                          \
       std::string d = DETAIL_STRINGIFY(__VA_ARGS__);             \
-      d += " (";                                                 \
+      d += "\n    (";                                            \
       DETAIL_SUPPRESS_PARENTHESES_WARNINGS                       \
       d += (test_suite::detail::decomposer() <= __VA_ARGS__).format(); \
       DETAIL_STOP_WARNINGS_SUPPRESSION                           \
@@ -304,27 +304,42 @@ constexpr detail::log_type log{};
 #define BOOST_TEST_NOT(expr) BOOST_TEST(!(expr))
 
 #ifndef BOOST_NO_EXCEPTIONS
+# define BOOST_TEST_THROW_WITH( expr, ex, msg ) \
+    try { \
+        (void)(expr); \
+        ::test_suite::detail::throw_failed_impl( \
+            #expr, #ex, "@anon", \
+            __FILE__, __LINE__); \
+    } \
+    catch(ex const& e) {                 \
+        BOOST_TEST(std::string_view(e.what()) == std::string_view(msg)); \
+    } \
+    catch(...) { \
+        ::test_suite::detail::throw_failed_impl( \
+            #expr, #ex, "@anon", \
+            __FILE__, __LINE__); \
+    }                            \
+    (void) 0
+   //
+
 # define BOOST_TEST_THROWS( expr, ex ) \
     try { \
         (void)(expr); \
         ::test_suite::detail::throw_failed_impl( \
             #expr, #ex, "@anon", \
             __FILE__, __LINE__); \
     } \
-    catch(ex const&) { \
+    catch(ex const&) {                 \
         BOOST_TEST_PASS(); \
     } \
     catch(...) { \
         ::test_suite::detail::throw_failed_impl( \
             #expr, #ex, "@anon", \
             __FILE__, __LINE__); \
-    }
+    }                            \
+    (void) 0
    //
-#else
-   #define BOOST_TEST_THROWS( expr, ex )
-#endif
 
-#ifndef BOOST_NO_EXCEPTIONS
 # define BOOST_TEST_NO_THROW( expr ) \
     try { \
         (void)(expr); \
@@ -340,7 +355,9 @@ constexpr detail::log_type log{};
     }
     //
 #else
-# define BOOST_TEST_NO_THROW( expr ) ( [&]{ expr; return true; }() )
+   #define BOOST_TEST_THROWS( expr, ex )
+   #define BOOST_TEST_THROW_WITH( expr, ex, msg )
+   #define BOOST_TEST_NO_THROW( expr ) ( [&]{ expr; return true; }() )
 #endif
 
 #define TEST_SUITE(type, name) \