diff options
| -rw-r--r-- | tests/gtest_dlt_daemon_offline_log.cpp | 160 |
1 files changed, 58 insertions, 102 deletions
diff --git a/tests/gtest_dlt_daemon_offline_log.cpp b/tests/gtest_dlt_daemon_offline_log.cpp index 43d0917..a48146f 100644 --- a/tests/gtest_dlt_daemon_offline_log.cpp +++ b/tests/gtest_dlt_daemon_offline_log.cpp @@ -37,6 +37,8 @@ TEST(t_dlt_logstorage_list_add, normal) { DltLogStorageFilterList *list = NULL; DltLogStorageFilterConfig *data = NULL; + DltLogStorageUserConfig file_config; + char *path = (char*)"/tmp"; char key = 1; int num_keys = 1; @@ -46,7 +48,7 @@ TEST(t_dlt_logstorage_list_add, normal) dlt_logstorage_filter_set_strategy(data, DLT_LOGSTORAGE_SYNC_ON_MSG); EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_add(&key, num_keys, data, &list)); - EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_destroy(&list, 0)); + EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_destroy(&list, &file_config, path, 0)); } } @@ -71,6 +73,8 @@ TEST(t_dlt_logstorage_list_destroy, normal) { DltLogStorageFilterList *list = NULL; DltLogStorageFilterConfig *data = NULL; + DltLogStorageUserConfig file_config; + char *path = (char*)"/tmp"; char key = 1; int num_keys = 1; @@ -80,7 +84,7 @@ TEST(t_dlt_logstorage_list_destroy, normal) dlt_logstorage_filter_set_strategy(data, DLT_LOGSTORAGE_SYNC_ON_MSG); EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_add(&key, num_keys, data, &list)); - EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_destroy(&list, 0)); + EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_destroy(&list, &file_config, path, 0)); } } @@ -90,6 +94,8 @@ TEST(t_dlt_logstorage_list_find, normal) DltLogStorageFilterList *list = NULL; DltLogStorageFilterConfig *data = NULL; int num_configs = 0; + DltLogStorageUserConfig file_config; + char *path = (char*)"/tmp"; char key[] = ":1234:5678"; char apid[] = "1234"; char ctid[] = "5678"; @@ -113,7 +119,7 @@ TEST(t_dlt_logstorage_list_find, normal) EXPECT_STREQ(apid, config[0]->apids); EXPECT_STREQ(ctid, config[0]->ctids); - EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_destroy(&list, 0)); + EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_destroy(&list, &file_config, path, 0)); } } @@ -189,6 +195,8 @@ TEST(t_dlt_logstorage_prepare_table, normal) { DltLogStorage handle; DltLogStorageFilterConfig data; + DltLogStorageUserConfig file_config; + char *path = (char*)"/tmp"; memset(&handle, 0, sizeof(DltLogStorage)); memset(&data, 0, sizeof(DltLogStorageFilterConfig)); char apids[] = "1234"; @@ -202,7 +210,7 @@ TEST(t_dlt_logstorage_prepare_table, normal) dlt_logstorage_filter_set_strategy(&data, DLT_LOGSTORAGE_SYNC_ON_MSG); EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_prepare_table(&handle, &data)); - EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_destroy(&handle.config_list, 0)); + EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_destroy(&handle.config_list, &file_config, path, 0)); } TEST(t_dlt_logstorage_prepare_table, null) @@ -438,6 +446,8 @@ TEST(t_dlt_logstorage_check_param, null) TEST(t_dlt_logstorage_store_filters, normal) { DltLogStorage handle; + DltLogStorageUserConfig file_config; + char *path = (char*)"/tmp"; char config_file_name[] = "/tmp/dlt_logstorage.conf"; handle.connection_type = DLT_OFFLINE_LOGSTORAGE_DEVICE_CONNECTED; handle.config_status = 0; @@ -446,7 +456,7 @@ TEST(t_dlt_logstorage_store_filters, normal) handle.config_list = NULL; EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_store_filters(&handle, config_file_name)); - EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_destroy(&handle.config_list, 0)); + EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_destroy(&handle.config_list, &file_config, path, 0)); } TEST(t_dlt_logstorage_store_filters, null) @@ -458,6 +468,8 @@ TEST(t_dlt_logstorage_store_filters, null) TEST(t_dlt_logstorage_load_config, normal) { DltLogStorage handle; + DltLogStorageUserConfig file_config; + char *path = (char*)"/tmp"; handle.connection_type = DLT_OFFLINE_LOGSTORAGE_DEVICE_CONNECTED; handle.config_status = 0; handle.write_errors = 0; @@ -465,7 +477,7 @@ TEST(t_dlt_logstorage_load_config, normal) strncpy(handle.device_mount_point, "/tmp", DLT_MOUNT_PATH_MAX); EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_load_config(&handle)); - EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_destroy(&handle.config_list, 0)); + EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_destroy(&handle.config_list, &file_config, path, 0)); } TEST(t_dlt_logstorage_load_config, null) @@ -920,12 +932,13 @@ TEST(t_dlt_logstorage_write_on_msg, normal) unsigned char data3[] = "dlt_data"; EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_prepare_on_msg(&config, &file_config, path, 1)); - EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_write_on_msg(&config, data1, size, data2, size, data3, size)); + EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_write_on_msg(&config, &file_config, path, + data1, size, data2, size, data3, size)); } TEST(t_dlt_logstorage_write_on_msg, null) { - EXPECT_EQ(DLT_RETURN_ERROR, dlt_logstorage_write_on_msg(NULL, NULL, 0, NULL, 0, NULL, 0)); + EXPECT_EQ(DLT_RETURN_ERROR, dlt_logstorage_write_on_msg(NULL, NULL, NULL, NULL, 0, NULL, 0, NULL, 0)); } /* Begin Method: dlt_logstorage::t_dlt_logstorage_sync_on_msg*/ @@ -992,12 +1005,15 @@ TEST(t_dlt_logstorage_write_msg_cache, normal) unsigned char data3[10] = "dlt_dat3"; DltLogStorageFilterConfig config; memset(&config, 0, sizeof(DltLogStorageFilterConfig)); + DltLogStorageUserConfig file_config; + char *path = (char*)"/tmp"; config.cache = calloc(1, 50 + sizeof(DltLogStorageCacheFooter)); if (config.cache != NULL) { config.file_size = 50; - EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_write_msg_cache(&config, data1, size, data2, size, data3, size)); + EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_write_msg_cache(&config, &file_config, path, + data1, size, data2, size, data3, size)); free(config.cache); config.cache = NULL; @@ -1006,7 +1022,7 @@ TEST(t_dlt_logstorage_write_msg_cache, normal) TEST(t_dlt_logstorage_write_msg_cache, null) { - EXPECT_EQ(DLT_RETURN_ERROR, dlt_logstorage_write_msg_cache(NULL, NULL, 0, NULL, 0, NULL, 0)); + EXPECT_EQ(DLT_RETURN_ERROR, dlt_logstorage_write_msg_cache(NULL, NULL, NULL, NULL, 0, NULL, 0, NULL, 0)); } /* Begin Method: dlt_logstorage::t_dlt_logstorage_split_key*/ @@ -1491,55 +1507,35 @@ TEST(t_dlt_logstorage_find_dlt_header, null) } } -/* Begin Method: dlt_logstorage::t_dlt_logstorage_sync_create_new_file*/ -TEST(t_dlt_logstorage_sync_create_new_file, normal) +/* Begin Method: dlt_logstorage::t_dlt_logstorage_find_last_dlt_header*/ +TEST(t_dlt_logstorage_find_last_dlt_header, normal) { - DltLogStorageUserConfig file_config; - memset(&file_config, 0, sizeof(DltLogStorageUserConfig)); - file_config.logfile_timestamp = 191132; - file_config.logfile_delimiter = { '_' }; - file_config.logfile_maxcounter = 5; - file_config.logfile_counteridxlen = 2; - char *path = (char *)"/tmp"; + char data[] = {'a','b','D','L','T',0x01}; DltLogStorageFilterConfig config; memset(&config, 0, sizeof(DltLogStorageFilterConfig)); - char apids; - char ctids; - config.apids = &apids; - config.ctids = &ctids; - config.file_name = (char *)"Test"; - config.records = NULL; - config.log = NULL; - config.cache = NULL; - config.file_size = 50; - config.sync = DLT_LOGSTORAGE_SYNC_ON_DEMAND; - config.num_files = 5; - g_logstorage_cache_max = 16; - unsigned int size = 10; - unsigned char data1[10] = "dlt_data1"; - unsigned char data2[10] = "dlt_data2"; - unsigned char data3[10] = "dlt_data3"; - DltLogStorageCacheFooter *footer = NULL; - - config.cache = calloc(1, 50 + sizeof(DltLogStorageCacheFooter)); + config.cache = calloc(1, sizeof(data)); if (config.cache != NULL) { - footer = (DltLogStorageCacheFooter *)((unsigned char *)config.cache + 50); - - if (footer != NULL) { - EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_prepare_msg_cache(&config, &file_config, path, 1)); - EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_write_msg_cache(&config, data1, size, data2, size, data3, size)); - footer->offset = 0; - EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_sync_create_new_file(&config, &file_config, path, 0)); - free(config.cache); - config.cache = NULL; - } + strncpy((char *)config.cache, data, sizeof(data)); + + /* DLT header starts from index 2 */ + EXPECT_EQ(2, dlt_logstorage_find_last_dlt_header(config.cache, 0, sizeof(data))); + free(config.cache); } } - -TEST(t_dlt_logstorage_sync_create_new_file, null) +TEST(t_dlt_logstorage_find_last_dlt_header, null) { - EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER, dlt_logstorage_sync_create_new_file(NULL, NULL, NULL, 0)); + char data[] = {'N','o','H','e','a','d','e','r'}; + DltLogStorageFilterConfig config; + memset(&config, 0, sizeof(DltLogStorageFilterConfig)); + config.cache = calloc(1, sizeof(data)); + if (config.cache != NULL) + { + /* config.cache =(void *) "a,b,D,L,T,0x01"; */ + strncpy((char *)config.cache, data, sizeof(data)); + EXPECT_EQ(-1, dlt_logstorage_find_last_dlt_header(config.cache, 0, sizeof(data))); + free(config.cache); + } } /* Begin Method: dlt_logstorage::t_dlt_logstorage_sync_to_file*/ @@ -1562,7 +1558,6 @@ TEST(t_dlt_logstorage_sync_to_file, normal) config.records = NULL; config.log = NULL; config.cache = NULL; - config.file_size = 0; config.sync = DLT_LOGSTORAGE_SYNC_ON_DEMAND; config.num_files = 6; config.file_size = 50; @@ -1571,67 +1566,28 @@ TEST(t_dlt_logstorage_sync_to_file, normal) unsigned char data1[10] = "dlt_data0"; unsigned char data2[10] = "dlt_data1"; unsigned char data3[10] = "dlt_data2"; + DltLogStorageCacheFooter *footer = NULL; - config.cache = calloc(1, 50 + sizeof(DltLogStorageCacheFooter)); + config.cache = calloc(1, config.file_size + sizeof(DltLogStorageCacheFooter)); if (config.cache != NULL) { EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_prepare_msg_cache(&config, &file_config, path, 1)); - EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_write_msg_cache(&config, data1, size, data2, size, data3, size)); - EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_sync_to_file(&config, &file_config, path)); - free(config.cache); - config.cache = NULL; - } -} + EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_write_msg_cache(&config, &file_config, path, + data1, size, data2, size, data3, size)); -TEST(t_dlt_logstorage_sync_to_file, null) -{ - EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER, dlt_logstorage_sync_to_file(NULL, NULL, NULL)); -} + footer = (DltLogStorageCacheFooter *)((uint8_t*)config.cache + config.file_size); -/* Begin Method: dlt_logstorage::t_dlt_logstorage_sync_capable_data_to_file*/ -TEST(t_dlt_logstorage_sync_capable_data_to_file, normal) -{ - DltLogStorageUserConfig file_config; - memset(&file_config, 0, sizeof(DltLogStorageUserConfig)); - file_config.logfile_timestamp = 191132; - file_config.logfile_delimiter = { '_' }; - file_config.logfile_maxcounter = 7; - file_config.logfile_counteridxlen = 2; - char *path = (char *)"/tmp"; - DltLogStorageFilterConfig config; - memset(&config, 0, sizeof(DltLogStorageFilterConfig)); - char apids; - char ctids; - config.apids = &apids; - config.ctids = &ctids; - config.file_name = (char *)"Test"; - config.records = NULL; - config.log = NULL; - config.cache = NULL; - config.file_size = 0; - config.sync = DLT_LOGSTORAGE_SYNC_ON_DEMAND; - config.num_files = 7; - config.file_size = 50; - g_logstorage_cache_max = 16; - unsigned int size = 10; - unsigned char data1[10] = "Dlt_data0"; - unsigned char data2[10] = "Dlt_data1"; - unsigned char data3[10] = "Dlt_data2"; - - config.cache = calloc(1, 50 + sizeof(DltLogStorageCacheFooter)); - - if (config.cache != NULL) { - EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_prepare_msg_cache(&config, &file_config, path, 1)); - EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_write_msg_cache(&config, data1, size, data2, size, data3, size)); - EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_sync_capable_data_to_file(&config, 0)); + EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_sync_to_file(&config, &file_config, path, + footer, footer->last_sync_offset, footer->offset)); free(config.cache); config.cache = NULL; } } -TEST(t_dlt_logstorage_sync_capable_data_to_file, null) +TEST(t_dlt_logstorage_sync_to_file, null) { - EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER, dlt_logstorage_sync_capable_data_to_file(NULL, 0)); + EXPECT_EQ(-1, dlt_logstorage_sync_to_file(NULL, NULL, NULL, NULL, 0, 1)); + } /* Begin Method: dlt_logstorage::t_dlt_logstorage_sync_msg_cache*/ @@ -1669,7 +1625,7 @@ TEST(t_dlt_logstorage_sync_msg_cache, normal) if (config.cache != NULL) { EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_prepare_msg_cache(&config, &file_config, path, 1)); - EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_write_msg_cache(&config, data1, size, data2, size, data3, size)); + EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_write_msg_cache(&config, &file_config, path, data1, size, data2, size, data3, size)); EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_sync_msg_cache(&config, &file_config, path, DLT_LOGSTORAGE_SYNC_ON_DEMAND)); free(config.cache); |