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_common.cpp | 3 -- tests/gtest_dlt_daemon_gateway.cpp | 61 +++++++++++++++++++++++++++++----- tests/gtest_dlt_daemon_offline_log.cpp | 13 +++++--- tests/gtest_dlt_user.cpp | 27 ++++++++------- 4 files changed, 76 insertions(+), 28 deletions(-) diff --git a/tests/gtest_dlt_daemon_common.cpp b/tests/gtest_dlt_daemon_common.cpp index 1f02462..7935a3a 100644 --- a/tests/gtest_dlt_daemon_common.cpp +++ b/tests/gtest_dlt_daemon_common.cpp @@ -1727,9 +1727,6 @@ TEST(t_dlt_daemon_user_send_log_state, nullpointer) } /* End Method: dlt_daemon_common::dlt_daemon_user_send_log_state */ - - - /*##############################################################################################################################*/ /*##############################################################################################################################*/ /*##############################################################################################################################*/ diff --git a/tests/gtest_dlt_daemon_gateway.cpp b/tests/gtest_dlt_daemon_gateway.cpp index 8b293bb..5bdefac 100644 --- a/tests/gtest_dlt_daemon_gateway.cpp +++ b/tests/gtest_dlt_daemon_gateway.cpp @@ -95,13 +95,22 @@ TEST(t_dlt_gateway_init, nullpointer) /* Begin Method: dlt_gateway::t_dlt_gateway_send_control_message*/ TEST(t_dlt_gateway_send_control_message, Normal) { - int ret = 0; DltDaemonLocal daemon_local; DltGatewayConnection connections; DltConnection connections1; DltReceiver receiver1; + DltPassiveControlMessage p_control_msgs; + DltServiceSetLogLevel req; + memset(&daemon_local,0, sizeof(DltDaemonLocal)); + memset(&connections, 0, sizeof(DltGatewayConnection)); + memset(&p_control_msgs,0, sizeof(DltPassiveControlMessage)); + strcpy(req.apid,"LOG"); + strcpy(req.ctid,"TES"); + req.log_level = 1; + daemon_local.pGateway.connections = &connections; daemon_local.pEvent.connections = &connections1; + daemon_local.pGateway.connections->p_control_msgs = &p_control_msgs; daemon_local.pEvent.connections->next = NULL; daemon_local.pEvent.pfd = 0; daemon_local.pEvent.nfds = 0; @@ -109,20 +118,56 @@ TEST(t_dlt_gateway_send_control_message, Normal) daemon_local.pEvent.connections->receiver = &receiver1; memset(daemon_local.flags.gatewayConfigFile, 0, DLT_DAEMON_FLAG_MAX); strncpy(daemon_local.flags.gatewayConfigFile, "/tmp/dlt_gateway.conf", DLT_DAEMON_FLAG_MAX - 1); - ret = dlt_gateway_init(&daemon_local, 0); + (void) dlt_gateway_init(&daemon_local, 0); - EXPECT_EQ(DLT_RETURN_OK, ret); + daemon_local.pGateway.connections->p_control_msgs->id = DLT_SERVICE_ID_GET_LOG_INFO; + EXPECT_EQ(DLT_RETURN_OK, dlt_gateway_send_control_message(daemon_local.pGateway.connections, + daemon_local.pGateway.connections->p_control_msgs, + NULL, 0)); - dlt_gateway_send_control_message(daemon_local.pGateway.connections, - daemon_local.pGateway.connections->p_control_msgs, - NULL, - 0); - dlt_gateway_deinit(&daemon_local.pGateway, 0); + daemon_local.pGateway.connections->p_control_msgs->id = DLT_SERVICE_ID_GET_DEFAULT_LOG_LEVEL; + EXPECT_EQ(DLT_RETURN_OK, dlt_gateway_send_control_message(daemon_local.pGateway.connections, + daemon_local.pGateway.connections->p_control_msgs, + NULL, 0)); + + daemon_local.pGateway.connections->p_control_msgs->id = DLT_SERVICE_ID_GET_SOFTWARE_VERSION; + EXPECT_EQ(DLT_RETURN_OK, dlt_gateway_send_control_message(daemon_local.pGateway.connections, + daemon_local.pGateway.connections->p_control_msgs, + NULL, 0)); + + daemon_local.pGateway.connections->p_control_msgs->id = DLT_SERVICE_ID_SET_LOG_LEVEL; + + EXPECT_EQ(DLT_RETURN_OK, dlt_gateway_send_control_message(daemon_local.pGateway.connections, + daemon_local.pGateway.connections->p_control_msgs, + (void*)&req, 0)); } TEST(t_dlt_gateway_send_control_message, nullpointer) { + DltDaemonLocal daemon_local; + DltFilterConfiguration current; + daemon_local.pFilter.current = ¤t; + DltGatewayConnection connections; + DltConnection connections1; + DltReceiver receiver1; + DltPassiveControlMessage p_control_msgs; + memset(&daemon_local,0, sizeof(DltDaemonLocal)); + memset(&connections, 0, sizeof(DltGatewayConnection)); + memset(&p_control_msgs,0, sizeof(DltPassiveControlMessage)); + daemon_local.pGateway.connections = &connections; + daemon_local.pEvent.connections = &connections1; + daemon_local.pGateway.connections->p_control_msgs = &p_control_msgs; + daemon_local.pEvent.connections->next = NULL; + daemon_local.pEvent.connections->receiver = &receiver1; + memset(daemon_local.flags.gatewayConfigFile,0,DLT_DAEMON_FLAG_MAX); + strncpy(daemon_local.flags.gatewayConfigFile, "/tmp/dlt_gateway.conf", DLT_DAEMON_FLAG_MAX - 1); + EXPECT_EQ(DLT_RETURN_WRONG_PARAMETER, dlt_gateway_send_control_message(NULL, NULL, NULL, 0)); + + daemon_local.pGateway.connections->p_control_msgs->id = DLT_SERVICE_ID_SET_LOG_LEVEL; + EXPECT_EQ(DLT_RETURN_ERROR,dlt_gateway_send_control_message(daemon_local.pGateway.connections, + daemon_local.pGateway.connections->p_control_msgs, + NULL, 0)); } /* Begin Method: dlt_gateway::t_dlt_gateway_store_connection*/ 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'}; diff --git a/tests/gtest_dlt_user.cpp b/tests/gtest_dlt_user.cpp index 918af11..cc7851a 100644 --- a/tests/gtest_dlt_user.cpp +++ b/tests/gtest_dlt_user.cpp @@ -163,8 +163,6 @@ TEST(t_dlt_user_log_write_start, normal) /* the defined enum values for log level */ EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); - EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_OFF)); - EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_FATAL)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_ERROR)); @@ -173,10 +171,13 @@ TEST(t_dlt_user_log_write_start, normal) EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_INFO)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); + /* To test the default behaviour and the default log level set to DLT_LOG_INFO */ + EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_OFF)); + EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEBUG)); - EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); + EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_VERBOSE)); - EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); + EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData)); EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context)); EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app()); @@ -259,8 +260,6 @@ TEST(t_dlt_user_log_write_start_id, normal) messageid = 0; EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEFAULT, messageid)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); - EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_OFF, messageid)); - EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_FATAL, messageid)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_ERROR, messageid)); @@ -269,16 +268,17 @@ TEST(t_dlt_user_log_write_start_id, normal) EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_INFO, messageid)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); + /* To test the default behaviour and the default log level set to DLT_LOG_INFO */ + EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_OFF, messageid)); + EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEBUG, messageid)); - EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); + EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_VERBOSE, messageid)); - EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); + EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData)); messageid = UINT32_MAX; EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEFAULT, messageid)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); - EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_OFF, messageid)); - EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_FATAL, messageid)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_ERROR, messageid)); @@ -287,10 +287,13 @@ TEST(t_dlt_user_log_write_start_id, normal) EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_INFO, messageid)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); + /* To test the default behaviour and the default log level set to DLT_LOG_INFO */ + EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_OFF, messageid)); + EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEBUG, messageid)); - EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); + EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData)); EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_VERBOSE, messageid)); - EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData)); + EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData)); EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context)); EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app()); -- cgit v1.2.1