🐛 make SAX output locale-independent #4084

nlohmann · Nov 22, 2024 · d4a06db · d4a06db
1 parent 8cc880f
commit d4a06db
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -115,7 +115,7 @@ jobs:
       - name: Build
         run: cmake --build build --target ci_test_coverage
       - name: Archive coverage report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: code-coverage-report
           path: ${{ github.workspace }}/build/html

diff --git a/tests/src/unit-locale-cpp.cpp b/tests/src/unit-locale-cpp.cpp
@@ -111,6 +111,13 @@ TEST_CASE("locale-dependent test (LC_NUMERIC=C")
 {
     WARN_MESSAGE(std::setlocale(LC_NUMERIC, "C") != nullptr, "could not set locale");
 
+    SECTION("check if locale is properly set")
+    {
+        std::array<char, 6> buffer = {};
+        CHECK(std::snprintf(buffer.data(), buffer.size(), "%.2f", 12.34) == 5);
+        CHECK(std::string(buffer.data()) == "12.34");
+    }
+
     SECTION("parsing")
     {
         CHECK(json::parse("12.34").dump() == "12.34");
@@ -128,6 +135,13 @@ TEST_CASE("locale-dependent test (LC_NUMERIC=de_DE")
 {
     WARN_MESSAGE(std::setlocale(LC_NUMERIC, "de_DE") != nullptr, "could not set locale");
 
+    SECTION("check if locale is properly set")
+    {
+        std::array<char, 6> buffer = {};
+        CHECK(std::snprintf(buffer.data(), buffer.size(), "%.2f", 12.34) == 5);
+        CHECK(std::string(buffer.data()) == "12,34");
+    }
+
     SECTION("parsing")
     {
         CHECK(json::parse("12.34").dump() == "12.34");

diff --git a/tests/thirdparty/doctest/doctest.h b/tests/thirdparty/doctest/doctest.h
@@ -5493,7 +5493,7 @@ namespace {
                         .writeAttribute("testsuite", in.data[i]->m_test_suite)
                         .writeAttribute("filename", skipPathFromFilename(in.data[i]->m_file.c_str()))
                         .writeAttribute("line", line(in.data[i]->m_line))
-                        .writeAttribute("skipped", in.data[i]->m_skip);
+                        .writeAttribute("Dped", in.data[i]->m_skip);
                 }
                 xml.scopedElement("OverallResultsTestCases")
                         .writeAttribute("unskipped", in.run_stats->numTestCasesPassingFilters);