From 2b0e0b95fb6a3a5e5a6e104db652a01d9707a3db Mon Sep 17 00:00:00 2001 From: Saya Sugiura Date: Fri, 30 Jul 2021 18:54:08 +0900 Subject: gtest: Bring-in changes Signed-off-by: Saya Sugiura --- tests/gtest_dlt_daemon_offline_log.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'tests/gtest_dlt_daemon_offline_log.cpp') diff --git a/tests/gtest_dlt_daemon_offline_log.cpp b/tests/gtest_dlt_daemon_offline_log.cpp index 650aa02..0eb7715 100644 --- a/tests/gtest_dlt_daemon_offline_log.cpp +++ b/tests/gtest_dlt_daemon_offline_log.cpp @@ -107,15 +107,17 @@ TEST(t_dlt_logstorage_list_find, normal) data->ctids = strdup(ctid); dlt_logstorage_filter_set_strategy(data, DLT_LOGSTORAGE_SYNC_ON_MSG); - ASSERT_EQ(DLT_RETURN_OK, dlt_logstorage_list_add(key, num_keys, data, &list)); + EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_add(key, num_keys, data, &list)); num_configs = dlt_logstorage_list_find(key, &list, config); - ASSERT_EQ(1, num_configs); - ASSERT_NE((DltLogStorageFilterConfig *)NULL, config[0]); + EXPECT_EQ(1, num_configs); + EXPECT_NE((DltLogStorageFilterConfig *)NULL, config[0]); - EXPECT_STREQ(apid, config[0]->apids); - EXPECT_STREQ(ctid, config[0]->ctids); + if (num_configs > 0) { + EXPECT_STREQ(apid, config[0]->apids); + EXPECT_STREQ(ctid, config[0]->ctids); + } EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_list_destroy(&list, &file_config, path, 0)); } @@ -1679,6 +1681,7 @@ TEST(t_dlt_logstorage_find_last_dlt_header, normal) free(config.cache); } } + TEST(t_dlt_logstorage_find_last_dlt_header, null) { char data[] = {'N','o','H','e','a','d','e','r'}; -- cgit v1.2.1