From 6fb6d4952215b015be5c31277aeeb47780f03f16 Mon Sep 17 00:00:00 2001 From: xietangxin Date: Wed, 22 Feb 2023 09:40:56 +0800 Subject: [PATCH] bugfix:fix testcase compile and run err --- test/test_modules/test_logs.c | 86 ++++++--------------------------- test/test_probes/CMakeLists.txt | 1 + 2 files changed, 15 insertions(+), 72 deletions(-) diff --git a/test/test_modules/test_logs.c b/test/test_modules/test_logs.c index 0bc3a1f..52291cd 100644 --- a/test/test_modules/test_logs.c +++ b/test/test_modules/test_logs.c @@ -25,6 +25,7 @@ #define TEST_META_PATH "/home/logs/meta" #define LOGS_FILE_SIZE (1024) +#define TEST_WR_LOGS_NUM 10 #define WR_LOGS(count, id, func, txt) \ do \ @@ -116,85 +117,26 @@ static void TestLogsWrEventLogs(void) { int count = (LOGS_FILE_SIZE / strlen(EVENT_LOGS_TEXT) + 1); - WR_LOGS(count, 0, wr_event_logs, EVENT_LOGS_TEXT); - CU_ASSERT(is_logs_file_exist(TEST_EVENT_PATH, "event", 0) == 1); - WR_LOGS(count, 1, wr_event_logs, EVENT_LOGS_TEXT); - CU_ASSERT(is_logs_file_exist(TEST_EVENT_PATH, "event", 1) == 1); - WR_LOGS(count, 2, wr_event_logs, EVENT_LOGS_TEXT); - CU_ASSERT(is_logs_file_exist(TEST_EVENT_PATH, "event", 2) == 1); - WR_LOGS(count, 3, wr_event_logs, EVENT_LOGS_TEXT); - CU_ASSERT(is_logs_file_exist(TEST_EVENT_PATH, "event", 3) == 1); - - RE_LOGS(read_event_logs); - CU_ASSERT(is_logs_file_exist(TEST_EVENT_PATH, "event", 0) == 0); - RE_LOGS(read_event_logs); - CU_ASSERT(is_logs_file_exist(TEST_EVENT_PATH, "event", 1) == 0); - - WR_LOGS(count, 4, wr_event_logs, EVENT_LOGS_TEXT); - CU_ASSERT(is_logs_file_exist(TEST_EVENT_PATH, "event", 4) == 1); - WR_LOGS(count, 5, wr_event_logs, EVENT_LOGS_TEXT); - CU_ASSERT(is_logs_file_exist(TEST_EVENT_PATH, "event", 5) == 1); - WR_LOGS(count, 6, wr_event_logs, EVENT_LOGS_TEXT); - CU_ASSERT(is_logs_file_exist(TEST_EVENT_PATH, "event", 6) == 1); - - RE_LOGS(read_event_logs); - CU_ASSERT(is_logs_file_exist(TEST_EVENT_PATH, "event", 2) == 0); - RE_LOGS(read_event_logs); - CU_ASSERT(is_logs_file_exist(TEST_EVENT_PATH, "event", 3) == 0); - RE_LOGS(read_event_logs); - CU_ASSERT(is_logs_file_exist(TEST_EVENT_PATH, "event", 4) == 0); - RE_LOGS(read_event_logs); - CU_ASSERT(is_logs_file_exist(TEST_EVENT_PATH, "event", 5) == 0); - RE_LOGS(read_event_logs); - CU_ASSERT(is_logs_file_exist(TEST_EVENT_PATH, "event", 6) == 0); - - WR_LOGS(count, 7, wr_event_logs, EVENT_LOGS_TEXT); - CU_ASSERT(is_logs_file_exist(TEST_EVENT_PATH, "event", 7) == 1); - + for (int i = 0; i <= TEST_WR_LOGS_NUM; i++) { + WR_LOGS(count, i, wr_event_logs, EVENT_LOGS_TEXT); + CU_ASSERT(is_logs_file_exist(TEST_EVENT_PATH, "event", i) == 1); + RE_LOGS(read_event_logs); + CU_ASSERT(is_logs_file_exist(TEST_EVENT_PATH, "event", i) == 0); + } return; } #define METRICS_LOGS_TEXT "I'am metrics, len 20" static void TestLogsWrMetricLogs(void) { - int ret = 0; int count = (LOGS_FILE_SIZE / strlen(METRICS_LOGS_TEXT) + 1); - WR_LOGS(count, 0, wr_metrics_logs, METRICS_LOGS_TEXT); - CU_ASSERT(is_logs_file_exist(TEST_METRICS_PATH, "metrics", 0) == 1); - WR_LOGS(count, 1, wr_metrics_logs, METRICS_LOGS_TEXT); - CU_ASSERT(is_logs_file_exist(TEST_METRICS_PATH, "metrics", 1) == 1); - WR_LOGS(count, 2, wr_metrics_logs, METRICS_LOGS_TEXT); - CU_ASSERT(is_logs_file_exist(TEST_METRICS_PATH, "metrics", 2) == 1); - WR_LOGS(count, 3, wr_metrics_logs, METRICS_LOGS_TEXT); - CU_ASSERT(is_logs_file_exist(TEST_METRICS_PATH, "metrics", 3) == 1); - - RE_LOGS(read_metrics_logs); - CU_ASSERT(is_logs_file_exist(TEST_METRICS_PATH, "metrics", 0) == 0); - RE_LOGS(read_metrics_logs); - CU_ASSERT(is_logs_file_exist(TEST_METRICS_PATH, "metrics", 1) == 0); - - WR_LOGS(count, 4, wr_metrics_logs, METRICS_LOGS_TEXT); - CU_ASSERT(is_logs_file_exist(TEST_METRICS_PATH, "metrics", 4) == 1); - WR_LOGS(count, 5, wr_metrics_logs, METRICS_LOGS_TEXT); - CU_ASSERT(is_logs_file_exist(TEST_METRICS_PATH, "metrics", 5) == 1); - WR_LOGS(count, 6, wr_metrics_logs, METRICS_LOGS_TEXT); - CU_ASSERT(is_logs_file_exist(TEST_METRICS_PATH, "metrics", 6) == 1); - - RE_LOGS(read_metrics_logs); - CU_ASSERT(is_logs_file_exist(TEST_METRICS_PATH, "metrics", 2) == 0); - RE_LOGS(read_metrics_logs); - CU_ASSERT(is_logs_file_exist(TEST_METRICS_PATH, "metrics", 3) == 0); - RE_LOGS(read_metrics_logs); - CU_ASSERT(is_logs_file_exist(TEST_METRICS_PATH, "metrics", 4) == 0); - RE_LOGS(read_metrics_logs); - CU_ASSERT(is_logs_file_exist(TEST_METRICS_PATH, "metrics", 5) == 0); - RE_LOGS(read_metrics_logs); - CU_ASSERT(is_logs_file_exist(TEST_METRICS_PATH, "metrics", 6) == 0); - - WR_LOGS(count, 7, wr_metrics_logs, METRICS_LOGS_TEXT); - CU_ASSERT(is_logs_file_exist(TEST_METRICS_PATH, "metrics", 7) == 1); - + for (int i = 0; i <= TEST_WR_LOGS_NUM; i++) { + WR_LOGS(count, i, wr_metrics_logs, METRICS_LOGS_TEXT); + CU_ASSERT(is_logs_file_exist(TEST_METRICS_PATH, "metrics", i) == 1); + RE_LOGS(read_metrics_logs); + CU_ASSERT(is_logs_file_exist(TEST_METRICS_PATH, "metrics", i) == 0); + } return; } @@ -216,4 +158,4 @@ void TestLogsMain(CU_pSuite suite) CU_ADD_TEST(suite, TestLogsWrEventLogs); CU_ADD_TEST(suite, TestLogsWrMetricLogs); CU_ADD_TEST(suite, TestLogsMgrDestroy); -} \ No newline at end of file +} diff --git a/test/test_probes/CMakeLists.txt b/test/test_probes/CMakeLists.txt index e4ba433..fe6e805 100644 --- a/test/test_probes/CMakeLists.txt +++ b/test/test_probes/CMakeLists.txt @@ -50,6 +50,7 @@ SET(SOURCES main.c test_probes.c ${COMMON_DIR}/object.c ${COMMON_DIR}/event.c ${COMMON_DIR}/logs.cpp + ${COMMON_DIR}/whitelist_config.c ) FOREACH(FILE ${PROBES_C_LIST}) -- 2.33.0