From e22cbacc419121c1d7befbdec3f72647d60dda70 Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Sun, 26 Jul 2020 12:12:17 +0200
Subject: [PATCH] :rotating_light: fix warning

---
 test/CMakeLists.txt                |  2 +-
 test/{utils => src}/test_utils.hpp |  0
 test/src/unit-bson.cpp             |  2 +-
 test/src/unit-cbor.cpp             | 16 ++++++++--------
 test/src/unit-msgpack.cpp          |  2 +-
 test/src/unit-ubjson.cpp           |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename test/{utils => src}/test_utils.hpp (100%)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9ce1594c..76ba31d8 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -151,7 +151,7 @@ foreach(file ${files})
         $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-deprecated;-Wno-float-equal>
         $<$<CXX_COMPILER_ID:GNU>:-Wno-deprecated-declarations>
     )
-    target_include_directories(${testcase} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/utils ${CMAKE_BINARY_DIR}/include thirdparty/doctest thirdparty/fifo_map)
+    target_include_directories(${testcase} PRIVATE ${CMAKE_BINARY_DIR}/include thirdparty/doctest thirdparty/fifo_map)
     target_link_libraries(${testcase} PRIVATE ${NLOHMANN_JSON_TARGET_NAME})
 
     if (JSON_Coverage)
diff --git a/test/utils/test_utils.hpp b/test/src/test_utils.hpp
similarity index 100%
rename from test/utils/test_utils.hpp
rename to test/src/test_utils.hpp
diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp
index 80a8012d..c5a71a3d 100644
--- a/test/src/unit-bson.cpp
+++ b/test/src/unit-bson.cpp
@@ -35,7 +35,7 @@ using nlohmann::json;
 #include <fstream>
 #include <sstream>
 #include <test_data.hpp>
-#include <test_utils.hpp>
+#include "test_utils.hpp"
 
 TEST_CASE("BSON")
 {
diff --git a/test/src/unit-cbor.cpp b/test/src/unit-cbor.cpp
index b0c2b04d..0d55de85 100644
--- a/test/src/unit-cbor.cpp
+++ b/test/src/unit-cbor.cpp
@@ -39,7 +39,7 @@ using nlohmann::json;
 #include <iostream>
 #include <set>
 #include <test_data.hpp>
-#include <test_utils.hpp>
+#include "test_utils.hpp"
 
 namespace
 {
@@ -2709,19 +2709,19 @@ TEST_CASE("Tagged values")
     SECTION("tagged binary")
     {
         // create a binary value of subtype 42
-        json j;
-        j["binary"] = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 42);
+        json j_binary;
+        j_binary["binary"] = json::binary({0xCA, 0xFE, 0xBA, 0xBE}, 42);
 
         // convert to CBOR
-        const auto v = json::to_cbor(j);
-        CHECK(v == std::vector<std::uint8_t> {0xA1, 0x66, 0x62, 0x69, 0x6E, 0x61, 0x72, 0x79, 0xD8, 0x2A, 0x44, 0xCA, 0xFE, 0xBA, 0xBE});
+        const auto vec = json::to_cbor(j_binary);
+        CHECK(vec == std::vector<std::uint8_t> {0xA1, 0x66, 0x62, 0x69, 0x6E, 0x61, 0x72, 0x79, 0xD8, 0x2A, 0x44, 0xCA, 0xFE, 0xBA, 0xBE});
 
         // parse error when parsing tagged value
-        CHECK_THROWS_AS(json::from_cbor(v), json::parse_error);
-        CHECK_THROWS_WITH(json::from_cbor(v), "[json.exception.parse_error.112] parse error at byte 9: syntax error while parsing CBOR value: invalid byte: 0xD8");
+        CHECK_THROWS_AS(json::from_cbor(vec), json::parse_error);
+        CHECK_THROWS_WITH(json::from_cbor(vec), "[json.exception.parse_error.112] parse error at byte 9: syntax error while parsing CBOR value: invalid byte: 0xD8");
 
         // binary without subtype when tags are ignored
-        json jb = json::from_cbor(v, true, true, json::cbor_tag_handler_t::ignore);
+        json jb = json::from_cbor(vec, true, true, json::cbor_tag_handler_t::ignore);
         CHECK(jb.is_object());
         CHECK(jb["binary"].is_binary());
         CHECK(!jb["binary"].get_binary().has_subtype());
diff --git a/test/src/unit-msgpack.cpp b/test/src/unit-msgpack.cpp
index c3761fb5..e53a6d59 100644
--- a/test/src/unit-msgpack.cpp
+++ b/test/src/unit-msgpack.cpp
@@ -37,7 +37,7 @@ using nlohmann::json;
 #include <iomanip>
 #include <set>
 #include <test_data.hpp>
-#include <test_utils.hpp>
+#include "test_utils.hpp"
 
 namespace
 {
diff --git a/test/src/unit-ubjson.cpp b/test/src/unit-ubjson.cpp
index 663d8ec1..7e1a841f 100644
--- a/test/src/unit-ubjson.cpp
+++ b/test/src/unit-ubjson.cpp
@@ -36,7 +36,7 @@ using nlohmann::json;
 #include <fstream>
 #include <set>
 #include <test_data.hpp>
-#include <test_utils.hpp>
+#include "test_utils.hpp"
 
 namespace
 {