Refactor util.hpp and perf_tests.cpp:

- Simplify `NOLINT` macros in `util.hpp` by removing redundant `NOLINTBEGIN` and `NOLINTEND` comments.
- Replace `nlohmann::json` with `ppc::util::InitJSONPtr` in `perf_tests.cpp` for consistency.
- Remove unused JSON include in `perf_tests.cpp`.

Author: allnes

modules/core/performance/tests/perf_tests.cpp

@@ -14,7 +14,6 @@
 #include "core/performance/tests/test_task.hpp"
 #include "core/task/include/task.hpp"
 #include "core/util/include/util.hpp"
-#include "nlohmann/json.hpp"
 
 TEST(perf_tests, check_perf_pipeline) {
   std::vector<uint32_t> in(2000, 1);
@@ -124,15 +123,15 @@ class GetStringTaskTypeTest : public ::testing::TestWithParam<TaskTypeTestCase>
 
   void SetUp() override {
     temp_path = std::filesystem::temp_directory_path() / "test_settings.json";
-    nlohmann::json j;
-    j["tasks"]["all"] = "ALL";
-    j["tasks"]["stl"] = "STL";
-    j["tasks"]["omp"] = "OMP";
-    j["tasks"]["mpi"] = "MPI";
-    j["tasks"]["tbb"] = "TBB";
-    j["tasks"]["seq"] = "SEQ";
-
-    std::ofstream(temp_path) << j.dump();
+    auto j = ppc::util::InitJSONPtr();
+    (*j)["tasks"]["all"] = "ALL";
+    (*j)["tasks"]["stl"] = "STL";
+    (*j)["tasks"]["omp"] = "OMP";
+    (*j)["tasks"]["mpi"] = "MPI";
+    (*j)["tasks"]["tbb"] = "TBB";
+    (*j)["tasks"]["seq"] = "SEQ";
+
+    std::ofstream(temp_path) << (*j).dump();
   }
 
   void TearDown() override { std::filesystem::remove(temp_path); }

modules/core/util/include/util.hpp

@@ -17,29 +17,12 @@
 #pragma warning(pop)
 #endif
 
-/* NOLINTBEGIN */
-#define ASSERT_ANY_THROW_NOLINT(...) ASSERT_ANY_THROW(__VA_ARGS__)
-/* NOLINTEND */
-
-/* NOLINTBEGIN */
-#define EXPECT_THROW_NOLINT(...) EXPECT_THROW(__VA_ARGS__)
-/* NOLINTEND */
-
-/* NOLINTBEGIN */
-#define INSTANTIATE_TEST_SUITE_P_NOLINT(...) INSTANTIATE_TEST_SUITE_P(__VA_ARGS__)
-/* NOLINTEND */
-
-/* NOLINTBEGIN */
-#define TEST_NOLINT(...) TEST(__VA_ARGS__)
-/* NOLINTEND */
-
-/* NOLINTBEGIN */
-#define ASSERT_DEATH_IF_SUPPORTED_NOLINT(...) ASSERT_DEATH_IF_SUPPORTED(__VA_ARGS__)
-/* NOLINTEND */
-
-/* NOLINTBEGIN */
-#define TYPED_TEST_NOLINT(...) TYPED_TEST(__VA_ARGS__)
-/* NOLINTEND */
+#define ASSERT_ANY_THROW_NOLINT(...) ASSERT_ANY_THROW(__VA_ARGS__)                    // NOLINT
+#define EXPECT_THROW_NOLINT(...) EXPECT_THROW(__VA_ARGS__)                            // NOLINT
+#define INSTANTIATE_TEST_SUITE_P_NOLINT(...) INSTANTIATE_TEST_SUITE_P(__VA_ARGS__)    // NOLINT
+#define TEST_NOLINT(...) TEST(__VA_ARGS__)                                            // NOLINT
+#define ASSERT_DEATH_IF_SUPPORTED_NOLINT(...) ASSERT_DEATH_IF_SUPPORTED(__VA_ARGS__)  // NOLINT
+#define TYPED_TEST_NOLINT(...) TYPED_TEST(__VA_ARGS__)                                // NOLINT
 
 namespace ppc::util {