Test global UDLs

nlohmann · Aug 1, 2022 · fbd1f9e · fbd1f9e
1 parent 3a874fb
commit fbd1f9e
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 13 deletions.
diff --git a/cmake/ci.cmake b/cmake/ci.cmake
@@ -525,6 +525,7 @@ add_custom_target(ci_test_noglobaludls
     COMMAND CXX=${CLANG_TOOL} ${CMAKE_COMMAND}
     -DCMAKE_BUILD_TYPE=Debug -GNinja
     -DJSON_BuildTests=ON -DJSON_FastTests=ON -DJSON_GlobalUDLs=OFF
+    -DCMAKE_CXX_FLAGS=-DJSON_TEST_NO_GLOBAL_UDLS
     -S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_noglobaludls
     COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_noglobaludls
     COMMAND cd ${PROJECT_BINARY_DIR}/build_noglobaludls && ${CMAKE_CTEST_COMMAND} --parallel ${N} --output-on-failure

diff --git a/tests/src/unit-class_parser.cpp b/tests/src/unit-class_parser.cpp
@@ -11,7 +11,9 @@
 #define JSON_TESTS_PRIVATE
 #include <nlohmann/json.hpp>
 using nlohmann::json;
-using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
 
 #include <valarray>
 

diff --git a/tests/src/unit-deserialization.cpp b/tests/src/unit-deserialization.cpp
@@ -11,7 +11,9 @@
 
 #include <nlohmann/json.hpp>
 using nlohmann::json;
-using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
 
 #include <iostream>
 #include <iterator>

diff --git a/tests/src/unit-element_access2.cpp b/tests/src/unit-element_access2.cpp
@@ -10,7 +10,9 @@
 #include "doctest_compatibility.h"
 
 #include <nlohmann/json.hpp>
-using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
 
 TEST_CASE_TEMPLATE("element access 2", Json, nlohmann::json, nlohmann::ordered_json)
 {

diff --git a/tests/src/unit-json_patch.cpp b/tests/src/unit-json_patch.cpp
@@ -10,7 +10,9 @@
 
 #include <nlohmann/json.hpp>
 using nlohmann::json;
-using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
 
 #include <fstream>
 #include "make_test_data_available.hpp"

diff --git a/tests/src/unit-json_pointer.cpp b/tests/src/unit-json_pointer.cpp
@@ -11,7 +11,9 @@
 #define JSON_TESTS_PRIVATE
 #include <nlohmann/json.hpp>
 using nlohmann::json;
-using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
 
 #include <sstream>
 

diff --git a/tests/src/unit-merge_patch.cpp b/tests/src/unit-merge_patch.cpp
@@ -10,7 +10,9 @@
 
 #include <nlohmann/json.hpp>
 using nlohmann::json;
-using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
 
 TEST_CASE("JSON Merge Patch")
 {

diff --git a/tests/src/unit-msgpack.cpp b/tests/src/unit-msgpack.cpp
@@ -10,7 +10,9 @@
 
 #include <nlohmann/json.hpp>
 using nlohmann::json;
-using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
 
 #include <fstream>
 #include <sstream>

diff --git a/tests/src/unit-readme.cpp b/tests/src/unit-readme.cpp
@@ -10,7 +10,9 @@
 
 #include <nlohmann/json.hpp>
 using nlohmann::json;
-using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
 
 #include <deque>
 #include <forward_list>

diff --git a/tests/src/unit-regression1.cpp b/tests/src/unit-regression1.cpp
@@ -14,7 +14,9 @@
 #define JSON_TESTS_PRIVATE
 #include <nlohmann/json.hpp>
 using nlohmann::json;
-using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
 
 #include <fstream>
 #include <sstream>

diff --git a/tests/src/unit-regression2.cpp b/tests/src/unit-regression2.cpp
@@ -22,7 +22,9 @@
 #include <nlohmann/json.hpp>
 using json = nlohmann::json;
 using ordered_json = nlohmann::ordered_json;
-using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
 
 #include <cstdio>
 #include <list>

diff --git a/tests/src/unit-udl.cpp b/tests/src/unit-udl.cpp
@@ -8,8 +8,6 @@
 
 #include "doctest_compatibility.h"
 
-#undef JSON_USE_GLOBAL_UDLS
-#define JSON_USE_GLOBAL_UDLS 0
 #include <nlohmann/json.hpp>
 
 TEST_CASE("user-defined string literals")
@@ -48,4 +46,12 @@ TEST_CASE("user-defined string literals")
         CHECK(R"({"foo": "bar", "baz": 42})"_json == j_expected);
         CHECK("/foo/bar"_json_pointer == ptr_expected);
     }
+
+#ifndef JSON_TEST_NO_GLOBAL_UDLS
+    SECTION("global namespace")
+    {
+        CHECK(R"({"foo": "bar", "baz": 42})"_json == j_expected);
+        CHECK("/foo/bar"_json_pointer == ptr_expected);
+    }
+#endif
 }
diff --git a/tests/src/unit-udt.cpp b/tests/src/unit-udt.cpp
@@ -14,7 +14,9 @@ DOCTEST_GCC_SUPPRESS_WARNING("-Wnoexcept")
 
 #include <nlohmann/json.hpp>
 using nlohmann::json;
-using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#ifdef JSON_TEST_NO_GLOBAL_UDLS
+    using namespace nlohmann::literals; // NOLINT(google-build-using-namespace)
+#endif
 
 #include <map>
 #include <memory>