Code review fixes

Author: lwhttpdorg

demo/CMakeLists.txt

@@ -7,12 +7,10 @@ set_target_properties(log4cpp_demo PROPERTIES
 # Link to library
 target_link_libraries(log4cpp_demo PRIVATE log4cpp)
 
-# Copy any JSON configs from demo/ to the binary dir after build
 file(GLOB DEMO_CONFIG_FILES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/*.json")
 if (DEMO_CONFIG_FILES)
-    add_custom_command(TARGET log4cpp_demo POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy ${DEMO_CONFIG_FILES} $<TARGET_FILE_DIR:log4cpp_demo>
-    )
+    # Copy the configuration files to build/bin so that the program can run
+    file(COPY ${DEMO_CONFIG_FILES} DESTINATION "${PROJECT_BINARY_DIR}/bin")
 endif ()
 
 # Apply ASAN if enabled

test/CMakeLists.txt

@@ -45,12 +45,12 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 
 # Copy JSON configs at configure time into runtime output dir and test binary dir
 if (TEST_CONFIG_FILES)
-    file(MAKE_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
-    file(COPY ${TEST_CONFIG_FILES} DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+    # build/bin
+    #file(MAKE_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+    #file(COPY ${TEST_CONFIG_FILES} DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
 
     # CTest runs tests with working dir = ${CMAKE_CURRENT_BINARY_DIR} (build/test),
-    # copy configs there so discovery / tests can open "./log4cpp.json"
-    file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+    #file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
     file(COPY ${TEST_CONFIG_FILES} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
 endif ()
 

test/app/file_appender_test.cpp

@@ -6,7 +6,7 @@
 #include "log4cpp/log4cpp.hpp"
 
 void info_logger() {
-    const std::shared_ptr<log4cpp::logger> log = log4cpp::logger_manager::get_logger("info_logger");
+    const std::shared_ptr<log4cpp::logger> log = log4cpp::logger_manager::get_logger("aaa");
     log->trace("this is a trace");
     log->debug("this is a debug");
     log->info("this is a info");
@@ -16,7 +16,7 @@ void info_logger() {
 }
 
 void warn_logger() {
-    const std::shared_ptr<log4cpp::logger> log = log4cpp::logger_manager::get_logger("warn_logger");
+    const std::shared_ptr<log4cpp::logger> log = log4cpp::logger_manager::get_logger("bbb");
     log->trace("this is a trace");
     log->debug("this is a debug");
     log->info("this is a info");

test/app/load_config_test.cpp

@@ -151,6 +151,7 @@ TEST(load_config_test, auto_load_config) {
     auto &log_mgr = log4cpp::supervisor::get_logger_manager();
     // Calling get_logger() causes automatic loading
     const auto logger = log4cpp::logger_manager::get_logger("root");
+    logger->info("[load_config_test.auto_load_config] Calling get_logger() causes automatic loading");
     const log4cpp::config::log4cpp *config = log_mgr.get_config();
     ASSERT_NE(nullptr, config);
 

test/app/serialize_test.cpp

@@ -4,34 +4,46 @@
 
 #include "log4cpp/log4cpp.hpp"
 
-#ifdef _MSC_VER
-// clang-format off
-#include <winsock2.h>
-#include <windows.h>
-// clang-format on
-
-#endif
-
 #include <gtest/gtest.h>
 
 #include "config/log4cpp.hpp"
 
+namespace fs = std::filesystem;
+
 void parse_json(const std::string &config_file, nlohmann::json &expected_json) {
     std::ifstream ifs(config_file);
-    ASSERT_EQ(ifs.is_open(), true);
+    ASSERT_TRUE(ifs.is_open());
     expected_json = nlohmann::json::parse(ifs);
     ifs.close();
 }
 
-TEST(configuration_serialize_test, log4cpp_config_serialize_test) {
-    // Just to load the configuration file
+TEST(configuration_serialize_test, log4cpp_config_roundtrip_test) {
     auto &log_mgr = log4cpp::supervisor::get_logger_manager();
-    ASSERT_NO_THROW(log_mgr.load_config("serialize_test.json"));
-    std::shared_ptr<log4cpp::logger> logger = log4cpp::logger_manager::get_logger("console_logger");
-    const log4cpp::config::log4cpp *config = log_mgr.get_config();
-    const std::string actual_json_str = log4cpp::config::log4cpp::serialize(*config);
-    nlohmann::json expected_json;
-    parse_json("serialize_test.json", expected_json);
-    const nlohmann::json actual_json = nlohmann::json::parse(actual_json_str);
-    EXPECT_EQ(expected_json, actual_json);
+
+    for (const auto &entry: fs::directory_iterator(fs::current_path())) {
+        if (entry.is_regular_file() && entry.path().extension() == ".json") {
+            const std::string filename = entry.path().string();
+
+            // Load original config
+            ASSERT_NO_THROW(log_mgr.load_config(filename));
+            const log4cpp::config::log4cpp original_config = *log_mgr.get_config();
+
+            // Serialize to JSON string
+            const std::string json_str = log4cpp::config::log4cpp::serialize(original_config);
+
+            // Write to a temporary file
+            const std::string tmpfile = (fs::temp_directory_path() / entry.path().filename()).string();
+            {
+                std::ofstream ofs(tmpfile);
+                ofs << json_str;
+            }
+
+            // Load config back from the temporary file
+            ASSERT_NO_THROW(log_mgr.load_config(tmpfile));
+            const log4cpp::config::log4cpp roundtrip_config = *log_mgr.get_config();
+
+            // Compare the two config objects (you may need to implement operator==)
+            EXPECT_EQ(original_config, roundtrip_config) << "Roundtrip mismatch in file: " << filename;
+        }
+    }
 }