Better catch-utils

libmamba/tests/CMakeLists.txt

@@ -12,8 +12,11 @@ set(
     LIBMAMBA_TEST_SRCS
     include/mambatests.hpp
     src/test_main.cpp
+    # Catch utils
+    src/catch-utils/conda_url.hpp
+    src/catch-utils/msvc_catch_byte.cpp
+    src/catch-utils/msvc_catch_string_view.cpp
     # Utility library
-    src/util/msvc_catch_byte.cpp
     src/util/test_cast.cpp
     src/util/test_compare.cpp
     src/util/test_cryptography.cpp

libmamba/tests/src/catch-printer/conda_url.hpp → libmamba/tests/src/catch-utils/conda_url.hpp

@@ -3,6 +3,7 @@
 // Distributed under the terms of the BSD 3-Clause License.
 //
 // The full license is in the file LICENSE, distributed with this software.
+#pragma once
 
 #include <string>
 

libmamba/tests/src/catch-utils/msvc_catch_string_view.cpp

@@ -0,0 +1,22 @@
+#ifdef _WIN32
+
+// Catch compiled on `conda-forge` for MSVC doesn't support outputting `string_view`.
+// So we have to define StringMaker for it ourselves.
+// The declaration is present though, so this only causes link errors.
+
+#include <string>
+#include <string_view>
+
+#include <catch2/catch_tostring.hpp>
+
+namespace Catch
+{
+
+    std::string StringMaker<std::string_view>::convert(std::string_view str)
+    {
+        return std::string(str);
+    }
+
+}
+
+#endif

libmamba/tests/src/core/test_channel_context.cpp

@@ -13,7 +13,7 @@
 #include "mamba/util/flat_set.hpp"
 #include "mamba/util/url_manip.hpp"
 
-#include "catch-printer/conda_url.hpp"
+#include "catch-utils/conda_url.hpp"
 
 #include "mambatests.hpp"
 

libmamba/tests/src/specs/test_channel.cpp

@@ -12,7 +12,7 @@
 #include "mamba/util/path_manip.hpp"
 #include "mamba/util/string.hpp"
 
-#include "catch-printer/conda_url.hpp"
+#include "catch-utils/conda_url.hpp"
 
 namespace
 {