Fix tests

Author: saki7

include/iris/colorize_format.hpp

@@ -814,9 +814,12 @@ struct colorizing_scanner : scanner<CharT>
 template<class CharT>
 struct basic_dynamic_colorized_string
 {
-    constexpr explicit basic_dynamic_colorized_string(std::basic_string_view<CharT> str) noexcept
+    constexpr explicit basic_dynamic_colorized_string(std::basic_string_view<CharT> str)
         : str_(str)
-    {}
+    {
+        checking_scanner<CharT> scanner(str);
+        scanner.scan();
+    }
 
     std::basic_string_view<CharT> str_;
 };
@@ -828,9 +831,12 @@ using dynamic_colorized_string = basic_dynamic_colorized_string<char>;
 template<class CharT>
 struct basic_dynamic_colorized_format_string
 {
-    constexpr explicit basic_dynamic_colorized_format_string(std::basic_string_view<CharT> str) noexcept
+    constexpr explicit basic_dynamic_colorized_format_string(std::basic_string_view<CharT> str)
         : str_(str)
-    {}
+    {
+        checking_scanner<CharT> scanner(str);
+        scanner.scan();
+    }
 
     std::basic_string_view<CharT> str_;
 };
@@ -896,7 +902,8 @@ struct basic_colorized_string_view
 {
     template<class Str>
         requires StringLike<Str const&>
-    constexpr basic_colorized_string_view(Str const& str) : str_(str)
+    consteval basic_colorized_string_view(Str const& str)
+        : str_(str)
     {
         detail::checking_scanner<CharT> scanner(str);
         scanner.scan();
@@ -963,7 +970,7 @@ struct static_colorized_string
     }();
 };
 
-namespace colorize_literals {
+inline namespace colorize_literals {
 
 template<basic_fixed_string Str>
 [[nodiscard]] consteval static_colorized_string<Str> operator""_col()
@@ -1025,6 +1032,12 @@ constexpr Out colorize_format_to(Out out, colorized_format_string<Args...> fmt,
 
 } // ansi_colorize
 
+inline namespace colorize_literals {
+
+using namespace ansi_colorize::colorize_literals;
+
+} // colorize_literals
+
 using ansi_colorize::static_colorized_string;
 
 using ansi_colorize::dynamic_colorize;

test/colorize_format.cpp

@@ -23,13 +23,6 @@ TEST_CASE("colorized_string")
         test("[fg:red|bg:blue]");
     }
 
-    CHECK_THROWS_AS((void)iris::colorize("[]"), iris::colorize_error);
-    CHECK_THROWS_AS((void)iris::colorize("["), iris::colorize_error);
-    CHECK_THROWS_AS((void)iris::colorize("]"), iris::colorize_error);
-    CHECK_THROWS_AS((void)iris::colorize("[reset|red]"), iris::colorize_error);
-    CHECK_THROWS_AS((void)iris::colorize("[red|reset]"), iris::colorize_error);
-    CHECK_THROWS_AS((void)iris::colorize("[black|red]"), iris::colorize_error);
-
     CHECK_THROWS_AS((void)iris::colorize(iris::dynamic_colorize("[]")), iris::colorize_error);
     CHECK_THROWS_AS((void)iris::colorize(iris::dynamic_colorize("[")), iris::colorize_error);
     CHECK_THROWS_AS((void)iris::colorize(iris::dynamic_colorize("]")), iris::colorize_error);
@@ -163,9 +156,28 @@ TEST_CASE("colorize(fixed)")
     STATIC_CHECK(iris::colorize(str) == "\033[38;2;255;0;0mfoo");
 
     STATIC_CHECK(std::string_view{iris::ansi_colorize::static_colorized_string<str>::colorized} == "\033[38;2;255;0;0mfoo");
-    using namespace iris::ansi_colorize::colorize_literals;
-    auto const s = iris::colorize_format("[red]{}"_col, 42);
-    CHECK(s == "\033[38;2;255;0;0m42");
+
+    {
+        auto const s = iris::colorize_format("[red]{}", 42);
+        CHECK(s == "\033[38;2;255;0;0m42");
+    }
+    {
+        using namespace iris::colorize_literals;
+        auto const s = iris::colorize_format("[red]{}"_col, 42);
+        CHECK(s == "\033[38;2;255;0;0m42");
+    }
+
+    {
+        std::string s;
+        iris::colorize_format_to(std::back_inserter(s), "[red]{}", 42);
+        CHECK(s == "\033[38;2;255;0;0m42");
+    }
+    {
+        using namespace iris::colorize_literals;
+        std::string s;
+        iris::colorize_format_to(std::back_inserter(s), "[red]{}"_col, 42);
+        CHECK(s == "\033[38;2;255;0;0m42");
+    }
 }
 
 #endif