更新 tests/CMakeLists.txt

CMakeLists.txt

@@ -1,9 +1,8 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.10.0)
 project(HeightMeasurementSystem VERSION 1.0.0 LANGUAGES CXX)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
 
 # Output directories
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
@@ -12,26 +11,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 # Include directories
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-# Main executable
-add_executable(hsm_main
-    src/main.cpp
-    src/app.cpp
-    src/altitude_calculator.cpp
-    src/data_logger.cpp
-    src/sensor_simulator.cpp
-    src/alert_manager.cpp
-)
-
-# Test executable
-add_executable(hsm_test
-    tests/basic_test.cpp
-    src/altitude_calculator.cpp
-    src/data_logger.cpp
-    src/sensor_simulator.cpp
-    src/alert_manager.cpp
-)
-
-# Enable testing
-enable_testing()
-add_test(NAME BasicTest COMMAND hsm_test)
+# Add subdirectory for tests
+add_subdirectory(tests)

CMakeLists1.txt

@@ -0,0 +1,37 @@
+cmake_minimum_required(VERSION 3.10)
+project(HeightMeasurementSystem VERSION 1.0.0 LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+# Output directories
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+
+# Include directories
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+
+# Main executable
+add_executable(hsm_main
+    src/main.cpp
+    src/app.cpp
+    src/altitude_calculator.cpp
+    src/data_logger.cpp
+    src/sensor_simulator.cpp
+    src/alert_manager.cpp
+)
+
+# Test executable
+add_executable(hsm_test
+    tests/basic_test.cpp
+    src/altitude_calculator.cpp
+    src/data_logger.cpp
+    src/sensor_simulator.cpp
+    src/alert_manager.cpp
+)
+
+# Enable testing
+enable_testing()
+add_test(NAME BasicTest COMMAND hsm_test)

include/alert_manager.hpp

@@ -5,6 +5,8 @@
 #include <string>
 #include <vector>
 #include <memory>
+#include <unordered_map>
+#include <utility>
 
 /**
  * @brief 预警类型枚举
@@ -188,6 +190,14 @@ public:
      */
     float getLowerThreshold() const { return lower_threshold_; }
     
+    /**
+     * @brief 获取高度阈值（上下限）
+     * @return pair<上限阈值, 下限阈值>
+     */
+    std::pair<float, float> getAltitudeThresholds() const { 
+        return std::make_pair(upper_threshold_, lower_threshold_); 
+    }
+    
     /**
      * @brief 检查传感器是否正常
      * @return 传感器状态
@@ -196,26 +206,6 @@ public:
         auto it = alerts_.find(AlertType::SENSOR_FAILURE);
         return it == alerts_.end() || it->second.status != AlertStatus::ACTIVE;
     }
-
-private:
-    // 预警阈值
-    float upper_threshold_;
-    float lower_threshold_;
-    
-    // 当前预警状态
-    std::unordered_map<AlertType, AlertInfo> alerts_;
-    
-    // 预警历史记录
-    std::vector<AlertInfo> alert_history_;
-    
-    // 历史记录最大数量
-    static const size_t MAX_HISTORY = 1000;
-    
-    /**
-     * @brief 添加预警到历史记录
-     * @param alert 预警信息
-     */
-    void addToHistory(const AlertInfo& alert);
     
     /**
      * @brief 触发预警
@@ -246,6 +236,26 @@ private:
      * @return 状态名称
      */
     static std::string getAlertStatusName(AlertStatus status);
+
+private:
+    // 预警阈值
+    float upper_threshold_;
+    float lower_threshold_;
+    
+    // 当前预警状态
+    std::unordered_map<AlertType, AlertInfo> alerts_;
+    
+    // 预警历史记录
+    std::vector<AlertInfo> alert_history_;
+    
+    // 历史记录最大数量
+    static const size_t MAX_HISTORY = 1000;
+    
+    /**
+     * @brief 添加预警到历史记录
+     * @param alert 预警信息
+     */
+    void addToHistory(const AlertInfo& alert);
 };
 
 #endif // HSM_ALERT_MANAGER_HPP

src/alert_manager.cpp

@@ -288,7 +288,7 @@ std::string AlertManager::getAlertStatusName(AlertStatus status) {
         case AlertStatus::INACTIVE: return "未激活";
         case AlertStatus::ACTIVE: return "预警中";
         case AlertStatus::ACKNOWLEDGED: return "已确认";
-        case AlertType::RESOLVED: return "已解决";
+        case AlertStatus::RESOLVED: return "已解决";
         default: return "未知状态";
     }
 }

tests/CMakeLists.txt

@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 3.10.0)
+project(test_CppGenerate)
+include(FetchContent)
+if (MSVC)
+    add_compile_options(/utf-8)
+endif()
+FetchContent_Declare(
+  googletest
+  URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
+)
+# For Windows: Prevent overriding the parent project's compiler/linker settings
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+FetchContent_MakeAvailable(googletest)
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../include)
+
+include(CTest)
+enable_testing()
+
+add_executable(test_CppGenerate test_alert_manager.cpp ../src/alert_manager.cpp)
+
+target_link_libraries(test_CppGenerate gtest gmock gtest_main)
+include(GoogleTest)
+gtest_discover_tests(test_CppGenerate)

tests/CMakeLists2.txt

@@ -0,0 +1,30 @@
+# GoogleTest配置
+include(FetchContent)
+FetchContent_Declare(
+  googletest
+  URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
+)
+# For Windows: Prevent overriding the parent project's compiler/linker settings
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+FetchContent_MakeAvailable(googletest)
+
+# 包含目录
+include_directories(${CMAKE_SOURCE_DIR}/src)
+include_directories(${CMAKE_SOURCE_DIR}/include)
+
+# 启用测试
+enable_testing()
+
+# 添加alert_manager的单元测试
+add_executable(test_alert_manager test_alert_manager.cpp ../src/alert_manager.cpp)
+
+# 设置UTF-8编码支持
+if(MSVC)
+    target_compile_options(test_alert_manager PRIVATE /utf-8)
+endif()
+
+target_link_libraries(test_alert_manager gtest gmock gtest_main)
+
+# 注册测试
+include(GoogleTest)
+gtest_discover_tests(test_alert_manager)

tests/test_alert_manager.cpp

@@ -0,0 +1,267 @@
+#include "gtest/gtest.h"
+#include "alert_manager.hpp"
+#include <vector>
+#include <string>
+
+// Mock for time to ensure deterministic tests
+static uint32_t mock_timestamp = 1640995200; // 2022-01-01 00:00:00 UTC
+
+class MockTime { 
+public:
+    static uint32_t getTimestamp() { return mock_timestamp; }
+    static void setTimestamp(uint32_t t) { mock_timestamp = t; }
+};
+
+// Helper function to compare AlertInfo
+bool operator==(const AlertInfo& a, const AlertInfo& b) {
+    return a.type == b.type &&
+           a.status == b.status &&
+           a.trigger_time == b.trigger_time &&
+           a.acknowledge_time == b.acknowledge_time &&
+           a.resolve_time == b.resolve_time &&
+           a.description == b.description;
+}
+
+// Test fixture
+class AlertManagerTest : public ::testing::Test {
+protected:
+    AlertManager manager;
+
+    void SetUp() override {
+        mock_timestamp = 1640995200;
+        manager.initialize();
+    }
+
+    void TearDown() override {
+        manager.clearHistory();
+    }
+};
+
+TEST_F(AlertManagerTest, testAlertManagerDefaultInitialization) {
+    EXPECT_FLOAT_EQ(manager.getAltitudeThresholds().first, 100.0f);
+    EXPECT_FLOAT_EQ(manager.getAltitudeThresholds().second, -50.0f);
+    EXPECT_TRUE(manager.getActiveAlerts().empty());
+    EXPECT_TRUE(manager.getAlertHistory(10).empty());
+}
+
+TEST_F(AlertManagerTest, testInitialize) {
+    // No direct output assertion, but verify initialization logic
+    // This is tested implicitly via constructor
+    EXPECT_NO_FATAL_FAILURE(manager.initialize());
+}
+
+TEST_F(AlertManagerTest, testCheckAltitudeAlertNormal) {
+    mock_timestamp = 1640995200;
+    manager.checkAltitudeAlert(105.0f, mock_timestamp);
+    auto alerts = manager.getActiveAlerts();
+    EXPECT_EQ(alerts.size(), 1);
+    EXPECT_EQ(alerts[0].type, AlertType::ALTITUDE_UPPER);
+    EXPECT_EQ(alerts[0].status, AlertStatus::ACTIVE);
+    EXPECT_EQ(alerts[0].trigger_time, mock_timestamp);
+}
+
+TEST_F(AlertManagerTest, testCheckAltitudeAlertBelowLower) {
+    mock_timestamp = 1640995200;
+    manager.checkAltitudeAlert(-55.0f, mock_timestamp);
+    auto alerts = manager.getActiveAlerts();
+    EXPECT_EQ(alerts.size(), 1);
+    EXPECT_EQ(alerts[0].type, AlertType::ALTITUDE_LOWER);
+    EXPECT_EQ(alerts[0].status, AlertStatus::ACTIVE);
+}
+
+TEST_F(AlertManagerTest, testCheckAltitudeAlertResetWhenNormal) {
+    mock_timestamp = 1640995200;
+    manager.checkAltitudeAlert(105.0f, mock_timestamp); // Trigger upper
+    mock_timestamp = 1640995201;
+    manager.checkAltitudeAlert(90.0f, mock_timestamp); // Reset
+    auto alerts = manager.getActiveAlerts();
+    EXPECT_TRUE(alerts.empty());
+}
+
+TEST_F(AlertManagerTest, testSetAltitudeThresholdsValid) {
+    manager.setAltitudeThresholds(200.0f, -100.0f);
+    auto thresholds = manager.getAltitudeThresholds();
+    EXPECT_FLOAT_EQ(thresholds.first, 200.0f);
+    EXPECT_FLOAT_EQ(thresholds.second, -100.0f);
+}
+
+TEST_F(AlertManagerTest, testSetAltitudeThresholdsInvalid) {
+    EXPECT_NO_FATAL_FAILURE(manager.setAltitudeThresholds(50.0f, 100.0f));
+    // Should print error, but no crash
+    EXPECT_FLOAT_EQ(manager.getAltitudeThresholds().first, 100.0f);
+    EXPECT_FLOAT_EQ(manager.getAltitudeThresholds().second, -50.0f);
+}
+
+TEST_F(AlertManagerTest, testTriggerSensorFailure) {
+    mock_timestamp = 1640995200;
+    manager.triggerSensorFailure(mock_timestamp);
+    auto alerts = manager.getActiveAlerts();
+    EXPECT_EQ(alerts.size(), 1);
+    EXPECT_EQ(alerts[0].type, AlertType::SENSOR_FAILURE);
+    EXPECT_EQ(alerts[0].status, AlertStatus::ACTIVE);
+    EXPECT_EQ(alerts[0].trigger_time, mock_timestamp);
+}
+
+TEST_F(AlertManagerTest, testTriggerLowBattery) {
+    mock_timestamp = 1640995200;
+    manager.triggerLowBattery(mock_timestamp, 15.0f);
+    auto alerts = manager.getActiveAlerts();
+    EXPECT_EQ(alerts.size(), 1);
+    EXPECT_EQ(alerts[0].type, AlertType::LOW_BATTERY);
+    EXPECT_EQ(alerts[0].status, AlertStatus::ACTIVE);
+    EXPECT_NE(alerts[0].description.find("15.0%"), std::string::npos);
+}
+
+TEST_F(AlertManagerTest, testTriggerCommunicationError) {
+    mock_timestamp = 1640995200;
+    manager.triggerCommunicationError(mock_timestamp);
+    auto alerts = manager.getActiveAlerts();
+    EXPECT_EQ(alerts.size(), 1);
+    EXPECT_EQ(alerts[0].type, AlertType::COMMUNICATION_ERROR);
+    EXPECT_EQ(alerts[0].status, AlertStatus::ACTIVE);
+}
+
+TEST_F(AlertManagerTest, testAcknowledgeAllAlerts) {
+    mock_timestamp = 1640995200;
+    manager.triggerSensorFailure(mock_timestamp);
+    manager.triggerLowBattery(mock_timestamp + 1, 10.0f);
+    mock_timestamp = 1640995202;
+    manager.acknowledgeAllAlerts(mock_timestamp);
+    auto alerts = manager.getActiveAlerts();
+    EXPECT_TRUE(alerts.empty());
+    EXPECT_EQ(alerts.size(), 0);
+}
+
+TEST_F(AlertManagerTest, testAcknowledgeAlert) {
+    mock_timestamp = 1640995200;
+    manager.triggerSensorFailure(mock_timestamp);
+    mock_timestamp = 1640995201;
+    manager.acknowledgeAlert(AlertType::SENSOR_FAILURE, mock_timestamp);
+    auto alerts = manager.getActiveAlerts();
+    EXPECT_TRUE(alerts.empty());
+}
+
+TEST_F(AlertManagerTest, testResetAlert) {
+    mock_timestamp = 1640995200;
+    manager.triggerSensorFailure(mock_timestamp);
+    manager.resetAlert(AlertType::SENSOR_FAILURE);
+    auto alerts = manager.getActiveAlerts();
+    EXPECT_TRUE(alerts.empty());
+}
+
+TEST_F(AlertManagerTest, testResetAllAlerts) {
+    mock_timestamp = 1640995200;
+    manager.triggerSensorFailure(mock_timestamp);
+    manager.triggerLowBattery(mock_timestamp + 1, 10.0f);
+    manager.resetAllAlerts();
+    auto alerts = manager.getActiveAlerts();
+    EXPECT_TRUE(alerts.empty());
+}
+
+TEST_F(AlertManagerTest, testHasActiveAlerts) {
+    EXPECT_FALSE(manager.hasActiveAlerts());
+    mock_timestamp = 1640995200;
+    manager.triggerSensorFailure(mock_timestamp);
+    EXPECT_TRUE(manager.hasActiveAlerts());
+}
+
+TEST_F(AlertManagerTest, testHasUnacknowledgedAlerts) {
+    EXPECT_FALSE(manager.hasUnacknowledgedAlerts());
+    mock_timestamp = 1640995200;
+    manager.triggerSensorFailure(mock_timestamp);
+    EXPECT_TRUE(manager.hasUnacknowledgedAlerts());
+    manager.acknowledgeAllAlerts(mock_timestamp + 1);
+    EXPECT_FALSE(manager.hasUnacknowledgedAlerts());
+}
+
+TEST_F(AlertManagerTest, testGetActiveAlerts) {
+    mock_timestamp = 1640995200;
+    manager.triggerSensorFailure(mock_timestamp);
+    auto alerts = manager.getActiveAlerts();
+    EXPECT_EQ(alerts.size(), 1);
+    EXPECT_EQ(alerts[0].type, AlertType::SENSOR_FAILURE);
+}
+
+TEST_F(AlertManagerTest, testGetAlertHistoryMaxCount) {
+    mock_timestamp = 1640995200;
+    for (int i = 0; i < 15; ++i) {
+        manager.triggerSensorFailure(mock_timestamp + i);
+    }
+    auto history = manager.getAlertHistory(10);
+    EXPECT_EQ(history.size(), 10);
+}
+
+TEST_F(AlertManagerTest, testGetStatusDescriptionNoAlerts) {
+    std::string desc = manager.getStatusDescription();
+    EXPECT_EQ(desc, "系统状态：正常");
+}
+
+TEST_F(AlertManagerTest, testGetStatusDescriptionWithAlerts) {
+    mock_timestamp = 1640995200;
+    manager.triggerSensorFailure(mock_timestamp);
+    std::string desc = manager.getStatusDescription();
+    EXPECT_NE(desc.find("有1个活动预警"), std::string::npos);
+    EXPECT_NE(desc.find("传感器故障"), std::string::npos);
+}
+
+TEST_F(AlertManagerTest, testClearHistory) {
+    mock_timestamp = 1640995200;
+    manager.triggerSensorFailure(mock_timestamp);
+    manager.clearHistory();
+    EXPECT_TRUE(manager.getAlertHistory(10).empty());
+}
+
+TEST_F(AlertManagerTest, testAddToHistoryLimit) {
+    mock_timestamp = 1640995200;
+    for (int i = 0; i < 100; ++i) {
+        manager.triggerSensorFailure(mock_timestamp + i);
+    }
+    auto history = manager.getAlertHistory(10);
+    EXPECT_EQ(history.size(), 10);
+}
+
+TEST_F(AlertManagerTest, testTriggerAlert) {
+    mock_timestamp = 1640995200;
+    manager.triggerAlert(AlertType::SENSOR_FAILURE, mock_timestamp, "Test alert");
+    auto alerts = manager.getActiveAlerts();
+    EXPECT_EQ(alerts.size(), 1);
+    EXPECT_EQ(alerts[0].description, "Test alert");
+}
+
+TEST_F(AlertManagerTest, testUpdateAlertStatusAcknowledged) {
+    mock_timestamp = 1640995200;
+    manager.triggerSensorFailure(mock_timestamp);
+    mock_timestamp = 1640995201;
+    manager.updateAlertStatus(AlertType::SENSOR_FAILURE, AlertStatus::ACKNOWLEDGED, mock_timestamp);
+    auto alerts = manager.getActiveAlerts();
+    EXPECT_TRUE(alerts.empty());
+}
+
+TEST_F(AlertManagerTest, testUpdateAlertStatusResolved) {
+    mock_timestamp = 1640995200;
+    manager.triggerSensorFailure(mock_timestamp);
+    mock_timestamp = 1640995201;
+    manager.updateAlertStatus(AlertType::SENSOR_FAILURE, AlertStatus::RESOLVED, mock_timestamp);
+    auto alerts = manager.getActiveAlerts();
+    EXPECT_TRUE(alerts.empty());
+}
+
+TEST_F(AlertManagerTest, testGetAlertTypeName) {
+    EXPECT_EQ(manager.getAlertTypeName(AlertType::ALTITUDE_UPPER), "高度上限预警");
+    EXPECT_EQ(manager.getAlertTypeName(AlertType::NONE), "无");
+    EXPECT_EQ(manager.getAlertTypeName(static_cast<AlertType>(99)), "未知预警");
+}
+
+TEST_F(AlertManagerTest, testGetAlertStatusName) {
+    EXPECT_EQ(manager.getAlertStatusName(AlertStatus::ACTIVE), "预警中");
+    EXPECT_EQ(manager.getAlertStatusName(AlertStatus::INACTIVE), "未激活");
+    EXPECT_EQ(manager.getAlertStatusName(static_cast<AlertStatus>(99)), "未知状态");
+}
+
+TEST_F(AlertManagerTest, testDestructorDoesNotCrash) {
+    // Verify destructor doesn't throw or crash
+    EXPECT_NO_FATAL_FAILURE({
+        AlertManager* mgr = new AlertManager();
+        delete mgr;
+    });
+}