added missing errorx tests for conversion from string scalar node to …

…compatible string type
fktn-k · Apr 20, 2024 · 1458ff9 · 1458ff9
1 parent 294f1d6
commit 1458ff9
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/include/fkYAML/detail/conversions/from_node.hpp b/include/fkYAML/detail/conversions/from_node.hpp
@@ -268,7 +268,9 @@ template <
         conjunction<
             is_basic_node<BasicNodeType>,
             negation<std::is_same<CompatibleStringType, typename BasicNodeType::string_type>>,
-            std::is_constructible<CompatibleStringType, const typename BasicNodeType::string_type&>>::value,
+            disjunction<
+                std::is_constructible<CompatibleStringType, const typename BasicNodeType::string_type&>,
+                std::is_assignable<CompatibleStringType, const typename BasicNodeType::string_type&>>>::value,
         int> = 0>
 inline void from_node(const BasicNodeType& n, CompatibleStringType& s)
 {

diff --git a/single_include/fkYAML/node.hpp b/single_include/fkYAML/node.hpp
@@ -8212,7 +8212,9 @@ template <
         conjunction<
             is_basic_node<BasicNodeType>,
             negation<std::is_same<CompatibleStringType, typename BasicNodeType::string_type>>,
-            std::is_constructible<CompatibleStringType, const typename BasicNodeType::string_type&>>::value,
+            disjunction<
+                std::is_constructible<CompatibleStringType, const typename BasicNodeType::string_type&>,
+                std::is_assignable<CompatibleStringType, const typename BasicNodeType::string_type&>>>::value,
         int> = 0>
 inline void from_node(const BasicNodeType& n, CompatibleStringType& s)
 {

diff --git a/test/unit_test/test_node_class.cpp b/test/unit_test/test_node_class.cpp
@@ -2501,8 +2501,20 @@ TEST_CASE("Node_AddTagName")
 // test cases for value getters (copy)
 //
 
+struct string_wrap
+{
+    string_wrap() = default;
+    string_wrap& operator=(const std::string& _str)
+    {
+        str = _str;
+        return *this;
+    }
+    std::string str;
+};
+
 TEST_CASE("Node_GetValue")
 {
+
     SECTION("sequence")
     {
         fkyaml::node node(fkyaml::node::sequence_type {fkyaml::node(true), fkyaml::node(false)});
@@ -2525,6 +2537,7 @@ TEST_CASE("Node_GetValue")
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::integer_type>(), fkyaml::type_error);
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::float_number_type>(), fkyaml::type_error);
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::string_type>(), fkyaml::type_error);
+            REQUIRE_THROWS_AS(node.get_value<string_wrap>(), fkyaml::type_error);
         }
     }
 
@@ -2552,6 +2565,7 @@ TEST_CASE("Node_GetValue")
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::integer_type>(), fkyaml::type_error);
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::float_number_type>(), fkyaml::type_error);
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::string_type>(), fkyaml::type_error);
+            REQUIRE_THROWS_AS(node.get_value<string_wrap>(), fkyaml::type_error);
         }
     }
 
@@ -2573,6 +2587,7 @@ TEST_CASE("Node_GetValue")
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::integer_type>(), fkyaml::type_error);
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::float_number_type>(), fkyaml::type_error);
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::string_type>(), fkyaml::type_error);
+            REQUIRE_THROWS_AS(node.get_value<string_wrap>(), fkyaml::type_error);
         }
     }
 
@@ -2593,6 +2608,7 @@ TEST_CASE("Node_GetValue")
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::integer_type>(), fkyaml::type_error);
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::float_number_type>(), fkyaml::type_error);
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::string_type>(), fkyaml::type_error);
+            REQUIRE_THROWS_AS(node.get_value<string_wrap>(), fkyaml::type_error);
         }
     }
 
@@ -2620,6 +2636,7 @@ TEST_CASE("Node_GetValue")
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::boolean_type>(), fkyaml::type_error);
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::float_number_type>(), fkyaml::type_error);
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::string_type>(), fkyaml::type_error);
+            REQUIRE_THROWS_AS(node.get_value<string_wrap>(), fkyaml::type_error);
         }
 
         SECTION("non-integer node value")
@@ -2660,6 +2677,7 @@ TEST_CASE("Node_GetValue")
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::boolean_type>(), fkyaml::type_error);
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::integer_type>(), fkyaml::type_error);
             REQUIRE_THROWS_AS(node.get_value<fkyaml::node::string_type>(), fkyaml::type_error);
+            REQUIRE_THROWS_AS(node.get_value<string_wrap>(), fkyaml::type_error);
         }
 
         SECTION("non-float-number node value")
@@ -2692,6 +2710,13 @@ TEST_CASE("Node_GetValue")
             REQUIRE(str == "test");
         }
 
+        SECTION("compatible string value")
+        {
+            auto str_wrap = node.get_value<string_wrap>();
+            REQUIRE(str_wrap.str.size() == 4);
+            REQUIRE(str_wrap.str == "test");
+        }
+
 #ifdef FK_YAML_HAS_CXX_17
         SECTION("string view")
         {