ljljlj

Author: c-jimenez

tests/test_gen.cpp

@@ -166,12 +166,20 @@ TEST_SUITE("json generation test suite")
             char tmp1[30];
             auto left = nanojsoncpp::generate_value("float_value"sv, static_cast<nanojsoncpp::json_float_t>(3.14), tmp1);
             CHECK_FALSE(left.empty());
+#ifdef NANOJSONCPP_USE_CPP17_FROM_CHARS_TO_CHARS
+            CHECK_EQ(R"("float_value":3.14,)"sv, std::string_view(tmp1, sizeof(tmp1) - left.size()));
+#else
             CHECK_EQ(R"("float_value":3.140000,)"sv, std::string_view(tmp1, sizeof(tmp1) - left.size()));
+#endif
 
             char tmp2[30];
             auto left2 = nanojsoncpp::generate_value("float_value"sv, static_cast<nanojsoncpp::json_float_t>(-3.14), tmp2);
             CHECK_FALSE(left2.empty());
+#ifdef NANOJSONCPP_USE_CPP17_FROM_CHARS_TO_CHARS
+            CHECK_EQ(R"("float_value":-3.14,)"sv, std::string_view(tmp2, sizeof(tmp2) - left2.size()));
+#else
             CHECK_EQ(R"("float_value":-3.140000,)"sv, std::string_view(tmp2, sizeof(tmp2) - left2.size()));
+#endif
 
             char tmp3[15];
             auto left3 = nanojsoncpp::generate_value("float_value"sv, static_cast<nanojsoncpp::json_float_t>(3.14), tmp3);
@@ -183,12 +191,20 @@ TEST_SUITE("json generation test suite")
             char tmp1[20];
             auto left = nanojsoncpp::generate_value(""sv, static_cast<nanojsoncpp::json_float_t>(3.14), tmp1);
             CHECK_FALSE(left.empty());
+#ifdef NANOJSONCPP_USE_CPP17_FROM_CHARS_TO_CHARS
+            CHECK_EQ("3.14,"sv, std::string_view(tmp1, sizeof(tmp1) - left.size()));
+#else
             CHECK_EQ("3.140000,"sv, std::string_view(tmp1, sizeof(tmp1) - left.size()));
+#endif
 
             char tmp2[20];
             auto left2 = nanojsoncpp::generate_value(""sv, static_cast<nanojsoncpp::json_float_t>(-3.14), tmp2);
             CHECK_FALSE(left2.empty());
+#ifdef NANOJSONCPP_USE_CPP17_FROM_CHARS_TO_CHARS
+            CHECK_EQ("-3.14,"sv, std::string_view(tmp2, sizeof(tmp2) - left2.size()));
+#else
             CHECK_EQ("-3.140000,"sv, std::string_view(tmp2, sizeof(tmp2) - left2.size()));
+#endif
 
             char tmp3[3];
             auto left3 = nanojsoncpp::generate_value(""sv, static_cast<nanojsoncpp::json_float_t>(3.14), tmp3);

tests/test_utils.cpp

@@ -20,7 +20,11 @@ TEST_SUITE("nanojsoncpp utilities test suite")
         CHECK_EQ(nanojsoncpp::to_int(""), 0);
         CHECK_EQ(nanojsoncpp::to_int("-"), 0);
         CHECK_EQ(nanojsoncpp::to_int("+123"), 0);
+#ifdef NANOJSONCPP_USE_CPP17_FROM_CHARS_TO_CHARS
+        CHECK_EQ(nanojsoncpp::to_int("12x3"), 12);
+#else
         CHECK_EQ(nanojsoncpp::to_int("12x3"), 0);
+#endif
 
         // Valid values
         CHECK_EQ(nanojsoncpp::to_int("0"), 0);