From ac44c47265528ddd29afbb9a72bcf095a877ecd1 Mon Sep 17 00:00:00 2001 From: ManikandanChockalingam Date: Tue, 30 Oct 2018 02:51:50 +0100 Subject: dlt-daemon: per ECU list of user information (#80) Prepare daemon to store applications/context information of other ECUs as well. This commit prepares the dlt-daemon to store logs from passive nodes in a logstorage device. Signed-off-by: Christoph Lipka Signed-off-by: ManikandanC --- tests/gtest_dlt_daemon_common.cpp | 604 +++++++++++++++++++++++++++---------- tests/gtest_dlt_daemon_gateway.cpp | 4 - 2 files changed, 453 insertions(+), 155 deletions(-) (limited to 'tests') diff --git a/tests/gtest_dlt_daemon_common.cpp b/tests/gtest_dlt_daemon_common.cpp index c2c33c9..69cc940 100644 --- a/tests/gtest_dlt_daemon_common.cpp +++ b/tests/gtest_dlt_daemon_common.cpp @@ -42,6 +42,7 @@ extern "C" { #include "dlt_daemon_serial.h" #include "dlt_daemon_client.h" #include "dlt_offline_trace.h" +#include "dlt_gateway_types.h" } #ifndef DLT_USER_DIR @@ -53,35 +54,211 @@ extern "C" { #define DLT_USER_FIFO "/tmp/dlt" #endif +/* Begin Method:dlt_daemon_common::dlt_daemon_init_user_information */ +TEST(t_dlt_daemon_init_user_information, normal_one_list) +{ + DltDaemon daemon; + DltGateway gateway; + char ecu[] = "ECU1"; + + EXPECT_EQ(0, dlt_daemon_init(&daemon, + DLT_DAEMON_RINGBUFFER_MIN_SIZE, + DLT_DAEMON_RINGBUFFER_MAX_SIZE, + DLT_DAEMON_RINGBUFFER_STEP_SIZE, + DLT_RUNTIME_DEFAULT_DIRECTORY, + DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + + EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); +} + +/* Begin Method:dlt_daemon_common::dlt_daemon_init_user_information */ +TEST(t_dlt_daemon_init_user_information, normal_multiple_lists) +{ + DltDaemon daemon; + DltGateway gateway; + char ecu[] = "ECU1"; + char ecu2[] = "ECU2"; + char ecu3[] = "ECU3"; + + gateway.connections = + (DltGatewayConnection *)calloc(2, sizeof(DltGatewayConnection)); + gateway.connections[0].ecuid = &ecu2[0]; + gateway.connections[1].ecuid = &ecu3[0]; + gateway.num_connections = 2; + + // Normal Use-Case + EXPECT_EQ(0, dlt_daemon_init(&daemon, + DLT_DAEMON_RINGBUFFER_MIN_SIZE, + DLT_DAEMON_RINGBUFFER_MAX_SIZE, + DLT_DAEMON_RINGBUFFER_STEP_SIZE, + DLT_RUNTIME_DEFAULT_DIRECTORY, + DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); + + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 1, 0)); + EXPECT_EQ(3, daemon.num_user_lists); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + EXPECT_STREQ(gateway.connections[0].ecuid, daemon.user_list[1].ecu); + EXPECT_STREQ(gateway.connections[1].ecuid, daemon.user_list[2].ecu); + + EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); + free(gateway.connections); +} + +TEST(t_dlt_daemon_init_user_information, nullpointer) +{ + DltDaemon daemon; + DltGateway gateway; + + EXPECT_EQ(-1, dlt_daemon_init_user_information(NULL, NULL, 0, 0)); + EXPECT_EQ(-1, dlt_daemon_init_user_information(NULL, &gateway, 0, 0)); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, NULL, 0, 0)); + EXPECT_EQ(-1, dlt_daemon_init_user_information(&daemon, NULL, 1, 0)); +} + +/* Begin Method:dlt_daemon_common::dlt_daemon_find_users_list */ +TEST(t_dlt_daemon_find_users_list, normal_one_list) +{ + DltDaemon daemon; + DltGateway gateway; + DltDaemonRegisteredUsers *user_list; + char ecu[] = "ECU1"; + + EXPECT_EQ(0, dlt_daemon_init(&daemon, + DLT_DAEMON_RINGBUFFER_MIN_SIZE, + DLT_DAEMON_RINGBUFFER_MAX_SIZE, + DLT_DAEMON_RINGBUFFER_STEP_SIZE, + DLT_RUNTIME_DEFAULT_DIRECTORY, + DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + + user_list = dlt_daemon_find_users_list(&daemon, &ecu[0], 0); + EXPECT_NE(user_list, nullptr); + EXPECT_STREQ(user_list->ecu, daemon.ecuid); + + EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); +} + +/* Begin Method:dlt_daemon_common::dlt_daemon_find_users_list */ +TEST(t_dlt_daemon_find_users_list, abnormal) +{ + DltDaemon daemon; + DltGateway gateway; + DltDaemonRegisteredUsers *user_list; + char ecu[] = "ECU1"; + char bla[] = "BLAH"; + + EXPECT_EQ(0, dlt_daemon_init(&daemon, + DLT_DAEMON_RINGBUFFER_MIN_SIZE, + DLT_DAEMON_RINGBUFFER_MAX_SIZE, + DLT_DAEMON_RINGBUFFER_STEP_SIZE, + DLT_RUNTIME_DEFAULT_DIRECTORY, + DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + + user_list = dlt_daemon_find_users_list(&daemon, bla, 0); + EXPECT_EQ(user_list, nullptr); + + EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); +} + +/* Begin Method:dlt_daemon_common::dlt_daemon_init_user_information */ +TEST(t_dlt_daemon_find_users_list, normal_multiple_lists) +{ + DltDaemon daemon; + DltGateway gateway; + char ecu[] = "ECU1"; + char ecu2[] = "ECU2"; + char ecu3[] = "ECU3"; + DltDaemonRegisteredUsers *user_list; + + gateway.connections = + (DltGatewayConnection *)calloc(2, sizeof(DltGatewayConnection)); + gateway.connections[0].ecuid = &ecu2[0]; + gateway.connections[1].ecuid = &ecu3[0]; + gateway.num_connections = 2; + + // Normal Use-Case + EXPECT_EQ(0, dlt_daemon_init(&daemon, + DLT_DAEMON_RINGBUFFER_MIN_SIZE, + DLT_DAEMON_RINGBUFFER_MAX_SIZE, + DLT_DAEMON_RINGBUFFER_STEP_SIZE, + DLT_RUNTIME_DEFAULT_DIRECTORY, + DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); + + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 1, 0)); + EXPECT_EQ(3, daemon.num_user_lists); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + EXPECT_STREQ(gateway.connections[0].ecuid, daemon.user_list[1].ecu); + EXPECT_STREQ(gateway.connections[1].ecuid, daemon.user_list[2].ecu); + + user_list = dlt_daemon_find_users_list(&daemon, &ecu[0], 0); + EXPECT_NE(user_list, nullptr); + EXPECT_STREQ(user_list->ecu, daemon.ecuid); + + user_list = dlt_daemon_find_users_list(&daemon, &ecu2[0], 0); + EXPECT_NE(user_list, nullptr); + EXPECT_STREQ(user_list->ecu, gateway.connections[0].ecuid); + + user_list = dlt_daemon_find_users_list(&daemon, &ecu3[0], 0); + EXPECT_NE(user_list, nullptr); + EXPECT_STREQ(user_list->ecu, gateway.connections[1].ecuid); + + EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); + free(gateway.connections); +} + +TEST(t_dlt_daemon_find_users_list, nullpointer) +{ + DltDaemon daemon; + char ecu[] = "ECU1"; + + EXPECT_EQ(NULL, dlt_daemon_find_users_list(NULL, NULL, 0)); + EXPECT_EQ(NULL, dlt_daemon_find_users_list(&daemon, NULL, 0)); + EXPECT_EQ(NULL, dlt_daemon_find_users_list(NULL, &ecu[0], 0)); +} /* Begin Method:dlt_daemon_common::dlt_daemon_application_add */ TEST(t_dlt_daemon_application_add, normal) { DltDaemon daemon; + DltGateway gateway; const char * apid = "TEST"; pid_t pid = 0; const char * desc = "HELLO_TEST"; DltDaemonApplication *app = NULL; + char ecu[] = "ECU1"; + int fd = 15; // Normal Use-Case EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); - app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + + app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, fd, ecu, 0); //printf("### APP: APID=%s DESCR=%s NUMCONTEXT=%i PID=%i USERHANDLE=%i\n", app->apid,app->application_description, app->num_contexts, app->pid, app->user_handle); EXPECT_STREQ(apid, app->apid); EXPECT_STREQ(desc, app->application_description); EXPECT_EQ(pid, app->pid); - EXPECT_LE(0, dlt_daemon_application_del(&daemon,app, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + EXPECT_LE(0, dlt_daemon_application_del(&daemon,app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); // Apid > 4, expected truncate to 4 char or error apid = "TO_LONG"; - app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); + app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, fd, ecu, 0); char tmp[5]; strncpy(tmp, apid, 4); tmp[4] = '\0'; EXPECT_STREQ(tmp, app->apid); - EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } TEST(t_dlt_daemon_application_add, abnormal) @@ -133,14 +310,18 @@ TEST(t_dlt_daemon_application_add, nullpointer) DltDaemon daemon; const char * apid = "TEST"; const char * desc = "HELLO_TEST"; + int fd = 42; + char ecu[] = "ECU1"; // NULL-Pointer test - EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL,NULL, 0, NULL, 0)); - EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL,NULL, 0, (char *) desc, 0)); - EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL,(char *) apid, 0, NULL, 0)); - EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL,(char *) apid, 0, (char *) desc, 0)); - EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(&daemon,NULL, 0, NULL, 0)); - EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(&daemon,NULL, 0, (char *) desc, 0)); + EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL,NULL, 0, NULL, 0, NULL, 0)); + EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL,NULL, 0, (char *) desc, 0, NULL, 0)); + EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL,(char *) apid, 0, NULL, 0, NULL, 0)); + EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL,(char *) apid, 0, (char *) desc, 0, NULL, 0)); + EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(&daemon,NULL, 0, NULL, 0, NULL, 0)); + EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(&daemon,NULL, 0, (char *) desc, 0, NULL, 0)); + EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL,NULL, 0, NULL, fd, NULL, 0)); + EXPECT_EQ((DltDaemonApplication *)0, dlt_daemon_application_add(NULL,NULL, 0, NULL, 0, ecu, 0)); } /* End Method:dlt_daemon_common::dlt_daemon_application_add */ @@ -151,18 +332,25 @@ TEST(t_dlt_daemon_application_add, nullpointer) TEST(t_dlt_daemon_application_del, normal) { DltDaemon daemon; + DltGateway gateway; const char * apid = "TEST"; pid_t pid = 0; const char * desc = "HELLO_TEST"; DltDaemonApplication *app = NULL; + char ecu[] = "ECU1"; + int fd = 42; // Normal Use-Case, retrun type cannot be tested, only apid and desc EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); - app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); - EXPECT_LE(0, dlt_daemon_application_del(&daemon,app, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, fd, ecu, 0); + EXPECT_LE(0, dlt_daemon_application_del(&daemon,app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } + TEST(t_dlt_daemon_application_del, abnormal) { // DltDaemon daemon; @@ -193,11 +381,12 @@ TEST(t_dlt_daemon_application_del, nullpointer) { DltDaemon daemon; DltDaemonApplication app; + char ecu[] = "ECU1"; // NULL-Pointer - EXPECT_GE(-1, dlt_daemon_application_del(NULL,NULL, 0)); - EXPECT_GE(-1, dlt_daemon_application_del(NULL, &app , 0)); - EXPECT_GE(-1, dlt_daemon_application_del(&daemon,NULL, 0)); + EXPECT_GE(-1, dlt_daemon_application_del(NULL,NULL, NULL, 0)); + EXPECT_GE(-1, dlt_daemon_application_del(NULL, &app, NULL, 0)); + EXPECT_GE(-1, dlt_daemon_application_del(&daemon,NULL, ecu, 0)); } /* End Method: dlt_daemon_common::dlt_daemon_application_del */ @@ -208,29 +397,35 @@ TEST(t_dlt_daemon_application_del, nullpointer) TEST(t_dlt_daemon_application_find, normal) { DltDaemon daemon; + DltGateway gateway; const char * apid = "TEST"; pid_t pid = 0; const char * desc = "HELLO_TEST"; DltDaemonApplication *app = NULL; + char ecu[] = "ECU1"; + int fd = 42; // Normal Use-Case EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); - app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, fd, ecu, 0); EXPECT_STREQ(apid, app->apid); EXPECT_STREQ(desc, app->application_description); EXPECT_EQ(pid, app->pid); - EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); // Application doesn't exist, expect NULL - EXPECT_EQ((DltDaemonApplication *) 0, dlt_daemon_application_find(&daemon, (char *) apid, 0)); + EXPECT_EQ((DltDaemonApplication *) 0, dlt_daemon_application_find(&daemon, ecu, (char *) apid, 0)); // Use a different apid, expect NULL - app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); - EXPECT_LE((DltDaemonApplication *) 0, dlt_daemon_application_find(&daemon, (char *) apid, 0)); - EXPECT_EQ((DltDaemonApplication *) 0, dlt_daemon_application_find(&daemon, (char *) "NEXI", 0)); - EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, fd, ecu, 0); + EXPECT_LE((DltDaemonApplication *) 0, dlt_daemon_application_find(&daemon, ecu, (char *) apid, 0)); + EXPECT_EQ((DltDaemonApplication *) 0, dlt_daemon_application_find(&daemon, ecu, (char *) "NEXI", 0)); + EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } TEST(t_dlt_daemon_application_find, abnormal) @@ -257,9 +452,9 @@ TEST(t_dlt_daemon_application_find, nullpointer) const char * apid = "TEST"; // NULL-Pointer, expected NULL - EXPECT_EQ((DltDaemonApplication *) 0, dlt_daemon_application_find(NULL, NULL, 0)); - EXPECT_EQ((DltDaemonApplication *) 0, dlt_daemon_application_find(NULL, (char *) apid, 0)); - EXPECT_EQ((DltDaemonApplication *) 0, dlt_daemon_application_find(&daemon, NULL, 0)); + EXPECT_EQ((DltDaemonApplication *) 0, dlt_daemon_application_find(NULL, NULL, NULL, 0)); + EXPECT_EQ((DltDaemonApplication *) 0, dlt_daemon_application_find(NULL, (char *) apid, NULL, 0)); + EXPECT_EQ((DltDaemonApplication *) 0, dlt_daemon_application_find(&daemon, NULL, NULL, 0)); } /* End Method: dlt_daemon_common::dlt_daemon_applikation_find */ @@ -270,13 +465,19 @@ TEST(t_dlt_daemon_application_find, nullpointer) TEST(t_dlt_daemon_applications_clear, normal) { DltDaemon daemon; + DltGateway gateway; pid_t pid = 0; + char ecu[] = "ECU1"; + int fd = 42; // Normal Use Case, expect >= 0 EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); - EXPECT_LE((DltDaemonApplication *) 0, dlt_daemon_application_add(&daemon, (char *) "TES1", pid, (char *) "Test clear 1", 0)); - dlt_daemon_application_add(&daemon, (char *) "TES2", pid, (char *) "Test clear 2", 0); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + EXPECT_LE((DltDaemonApplication *) 0, dlt_daemon_application_add(&daemon, (char *) "TES1", pid, (char *) "Test clear 1", fd, ecu, 0)); + dlt_daemon_application_add(&daemon, (char *) "TES2", pid, (char *) "Test clear 2", fd, ecu, 0); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } TEST(t_dlt_daemon_applications_clear, abnormal) @@ -297,7 +498,7 @@ TEST(t_dlt_daemon_applications_clear, abnormal) TEST(t_dlt_daemon_applications_clear, nullpointer) { // NULL-Pointer, expect < 0 - EXPECT_GE(-1, dlt_daemon_applications_clear(NULL, 0)); + EXPECT_GE(-1, dlt_daemon_applications_clear(NULL, NULL, 0)); } /* End Method: dlt_daemon_common::dlt_daemon_applications_clear */ @@ -307,17 +508,23 @@ TEST(t_dlt_daemon_applications_clear, nullpointer) TEST(t_dlt_daemon_applications_invalidate_fd, normal) { DltDaemon daemon; + DltGateway gateway; const char * apid = "TEST"; pid_t pid = 0; const char * desc = "HELLO_TEST"; DltDaemonApplication *app = NULL; + char ecu[] = "ECU1"; + int fd = 42; // Normal Use-Case EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); - app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); - EXPECT_LE(0, dlt_daemon_applications_invalidate_fd(&daemon, app->user_handle, 0)); - EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, fd, ecu, 0); + EXPECT_LE(0, dlt_daemon_applications_invalidate_fd(&daemon, ecu, app->user_handle, 0)); + EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } TEST(t_dlt_daemon_applications_invalidate_fd, abnormal) @@ -342,7 +549,7 @@ TEST(t_dlt_daemon_applications_invalidate_fd, abnormal) TEST(t_dlt_daemon_applications_invalidate_fd, nullpointer) { // NULL-Pointer - EXPECT_GE(-1, dlt_daemon_applications_invalidate_fd(NULL, 0, 0)); + EXPECT_GE(-1, dlt_daemon_applications_invalidate_fd(NULL, NULL, 0, 0)); } /* End Method: dlt_daemon_common::dlt_daemon_applications_invalidate_fd */ @@ -353,18 +560,24 @@ TEST(t_dlt_daemon_applications_invalidate_fd, nullpointer) TEST(t_dlt_daemon_applications_save, normal) { DltDaemon daemon; + DltGateway gateway; const char * apid = "TEST"; pid_t pid = 0; const char * desc = "HELLO_TEST"; DltDaemonApplication *app = NULL; const char * filename = "/tmp/dlt-runtime.cfg"; + char ecu[] = "ECU1"; + int fd = 42; // Normal Use-Case EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); - app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, 0); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + app = dlt_daemon_application_add(&daemon,(char *) apid, pid, (char *) desc, fd, ecu, 0); EXPECT_LE(0, dlt_daemon_applications_save(&daemon, (char *) filename, 0)); - EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } TEST(t_dlt_daemon_applications_save, abnormal) @@ -412,10 +625,15 @@ TEST(t_dlt_daemon_applications_save, nullpointer) TEST(t_dlt_daemon_applications_load, normal) { DltDaemon daemon; + DltGateway gateway; + char ecu[] = "ECU1"; const char * filename = "/tmp/dlt-runtime.cfg"; // Normal Use-Case, first execute t_dlt_daemon_applications_save !! EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); EXPECT_LE(0, dlt_daemon_applications_load(&daemon,(char *) filename, 0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } @@ -486,59 +704,72 @@ TEST(t_dlt_daemon_context_add, normal) // DLT_TRACE_STATUS_ON = 0x01 /**< Trace status: On */ DltDaemon daemon; + DltGateway gateway; ID4 apid = "TES"; ID4 ctid = "CON"; char desc[255] = "TEST dlt_daemon_context_add"; DltDaemonContext *daecontext = NULL; DltDaemonApplication *app = NULL; + char ecu[] = "ECU1"; + int fd = 42; // Normal Use-Case EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); - app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); - daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0); + daecontext = dlt_daemon_context_add(&daemon, apid, ctid, DLT_LOG_DEFAULT, + DLT_TRACE_STATUS_DEFAULT, 0, 0, desc, ecu, 0); //printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid); EXPECT_STREQ(apid, daecontext->apid); EXPECT_STREQ(ctid, daecontext->ctid); EXPECT_STREQ(desc, daecontext->context_description); EXPECT_EQ(DLT_LOG_DEFAULT, daecontext->log_level); EXPECT_EQ(DLT_TRACE_STATUS_DEFAULT, daecontext->trace_status); - EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, 0)); - EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); - EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, ecu, 0)); + EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu,0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } TEST(t_dlt_daemon_context_add, abnormal) { DltDaemon daemon; + DltGateway gateway; ID4 apid = "TES"; ID4 ctid = "CON"; char desc[255] = "TEST dlt_daemon_context_add"; DltDaemonContext *daecontext = NULL; DltDaemonApplication *app = NULL; + char ecu[] = "ECU1"; + int fd = 42; // Log Level dont exists EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); DltLogLevelType DLT_LOG_NOT_EXIST = (DltLogLevelType) - 100; - app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); - daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_NOT_EXIST,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); + app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0); + daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_NOT_EXIST,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0); //printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid); EXPECT_EQ((DltDaemonContext *) 0, daecontext); - EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, 0)); - EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); - EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, ecu, 0)); + EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); // Trace Status dont exists DltTraceStatusType DLT_TRACE_TYPE_NOT_EXIST = (DltTraceStatusType) - 100; - app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); - daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_TYPE_NOT_EXIST,0,0,desc,0); + app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0); + daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_TYPE_NOT_EXIST,0,0,desc,ecu,0); //printf("### CONTEXT: APID=%s\tCTID=%s\n", daecontext->apid,daecontext->ctid); EXPECT_EQ((DltDaemonContext *) 0, daecontext); - EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, 0)); - EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); - EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, ecu, 0)); + EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); // Apid to long // char apid_tl[8] = "TO_LONG"; @@ -615,27 +846,32 @@ TEST(t_dlt_daemon_context_add, abnormal) TEST(t_dlt_daemon_context_add, nullpointer) { DltDaemon daemon; + DltGateway gateway; ID4 apid = "TES"; ID4 ctid = "CON"; + char ecu[] = "ECU1"; char desc[255] = "TEST dlt_daemon_context_add"; // NULL-Pointer EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); - EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,NULL,NULL,0,0,0,0,NULL,0)); - EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,NULL,NULL,0,0,0,0,desc,0)); - EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,NULL,ctid,0,0,0,0,NULL,0)); - EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,NULL,ctid,0,0,0,0,desc,0)); - EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,apid,NULL,0,0,0,0,NULL,0)); - EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,apid,NULL,0,0,0,0,desc,0)); - EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,apid,ctid,0,0,0,0,NULL,0)); - EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,apid,ctid,0,0,0,0,desc,0)); - EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,NULL,NULL,0,0,0,0,NULL,0)); - EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,NULL,NULL,0,0,0,0,desc,0)); - EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,NULL,ctid,0,0,0,0,NULL,0)); - EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,NULL,ctid,0,0,0,0,desc,0)); - EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,apid,NULL,0,0,0,0,NULL,0)); - EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,apid,NULL,0,0,0,0,desc,0)); - EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,apid,ctid,0,0,0,0,NULL,0)); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,NULL,NULL,0,0,0,0,NULL,NULL,0)); + EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,NULL,NULL,0,0,0,0,desc,NULL,0)); + EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,NULL,ctid,0,0,0,0,NULL,NULL,0)); + EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,NULL,ctid,0,0,0,0,desc,NULL,0)); + EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,apid,NULL,0,0,0,0,NULL,NULL,0)); + EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,apid,NULL,0,0,0,0,desc,NULL,0)); + EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,apid,ctid,0,0,0,0,NULL,NULL,0)); + EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(NULL,apid,ctid,0,0,0,0,desc,NULL,0)); + EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,NULL,NULL,0,0,0,0,NULL,NULL,0)); + EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,NULL,NULL,0,0,0,0,desc,NULL,0)); + EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,NULL,ctid,0,0,0,0,NULL,NULL,0)); + EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,NULL,ctid,0,0,0,0,desc,NULL,0)); + EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,apid,NULL,0,0,0,0,NULL,NULL,0)); + EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,apid,NULL,0,0,0,0,desc,NULL,0)); + EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_add(&daemon,apid,ctid,0,0,0,0,NULL,NULL,0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } /* End Method: dlt_daemon_common::dlt_daemon_context_add */ @@ -646,20 +882,26 @@ TEST(t_dlt_daemon_context_add, nullpointer) TEST(t_dlt_daemon_context_del, normal) { DltDaemon daemon; + DltGateway gateway; ID4 apid = "TES"; ID4 ctid = "CON"; char desc[255] = "TEST dlt_daemon_context_add"; DltDaemonContext *daecontext = NULL; DltDaemonApplication *app = NULL; + char ecu[] = "ECU1"; + int fd = 42; // Normal Use-Case EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); - app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); - daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); - EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, 0)); - EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); - EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0); + daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0); + EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, ecu, 0)); + EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } TEST(t_dlt_daemon_context_del, abnormal) @@ -702,11 +944,12 @@ TEST(t_dlt_daemon_context_del, nullpointer) { DltDaemon daemon; DltDaemonContext daecontext; + char ecu[] = "ECU1"; //NULL-Pointer - EXPECT_GE(-1, dlt_daemon_context_del(NULL, NULL, 0)); - EXPECT_GE(-1, dlt_daemon_context_del(NULL, &daecontext, 0)); - EXPECT_GE(-1, dlt_daemon_context_del(&daemon, NULL, 0)); + EXPECT_GE(-1, dlt_daemon_context_del(NULL, NULL, ecu, 0)); + EXPECT_GE(-1, dlt_daemon_context_del(NULL, &daecontext, NULL, 0)); + EXPECT_GE(-1, dlt_daemon_context_del(&daemon, NULL, NULL, 0)); } /* End Method: dlt_daemon_common::dlt_daemon_context_del */ @@ -717,66 +960,78 @@ TEST(t_dlt_daemon_context_del, nullpointer) TEST(t_dlt_daemon_context_find, normal) { DltDaemon daemon; + DltGateway gateway; ID4 apid = "TES"; ID4 ctid = "CON"; char desc[255] = "TEST dlt_daemon_context_add"; DltDaemonContext *daecontext = NULL; DltDaemonApplication *app = NULL; + char ecu[] = "ECU1"; + int fd = 42; // Normal Use-Case EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); - app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); - daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0); + daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0); EXPECT_STREQ(apid, daecontext->apid); EXPECT_STREQ(ctid, daecontext->ctid); EXPECT_STREQ(desc, daecontext->context_description); EXPECT_EQ(DLT_LOG_DEFAULT, daecontext->log_level); EXPECT_EQ(DLT_TRACE_STATUS_DEFAULT, daecontext->trace_status); - EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, 0)); - EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); - EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, ecu, 0)); + EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } TEST(t_dlt_daemon_context_find, abnormal) { DltDaemon daemon; + DltGateway gateway; ID4 apid = "TES"; ID4 ctid = "CON"; char desc[255] = "TEST dlt_daemon_context_add"; DltDaemonContext *daecontext = NULL; DltDaemonApplication *app = NULL; + char ecu[] = "ECU1"; + int fd = 42; // Uninitialized EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); - EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, apid, ctid, 0)); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, apid, ctid, ecu, 0)); // No apid char no_apid[1] = ""; - app = dlt_daemon_application_add(&daemon, no_apid, 0, desc, 0); - daecontext = dlt_daemon_context_add(&daemon,no_apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); - EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, no_apid, ctid, 0)); - EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, 0)); - EXPECT_GE(-1, dlt_daemon_application_del(&daemon, app, 0)); - EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + app = dlt_daemon_application_add(&daemon, no_apid, 0, desc, fd, ecu, 0); + daecontext = dlt_daemon_context_add(&daemon,no_apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0); + EXPECT_EQ((DltDaemonContext *) 0, dlt_daemon_context_find(&daemon, no_apid, ctid, ecu, 0)); + EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, ecu, 0)); + EXPECT_GE(-1, dlt_daemon_application_del(&daemon, app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); // No ctid char no_ctid[1] = ""; - app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); - daecontext = dlt_daemon_context_add(&daemon,apid,no_ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); - EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, apid, no_ctid, 0)); - EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, 0)); - EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); - EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0); + daecontext = dlt_daemon_context_add(&daemon,apid,no_ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0); + EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, apid, no_ctid, ecu, 0)); + EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, ecu, 0)); + EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); // No application added - daecontext = dlt_daemon_context_add(&daemon,no_apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); - EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, no_apid, ctid, 0)); - EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, 0)); - EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + daecontext = dlt_daemon_context_add(&daemon,no_apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0); + EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, no_apid, ctid, ecu, 0)); + EXPECT_GE(-1, dlt_daemon_context_del(&daemon, daecontext, ecu, 0)); + EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); // Verbose != 0 or 1 // app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); @@ -793,14 +1048,16 @@ TEST(t_dlt_daemon_context_find, nullpointer) DltDaemon daemon; ID4 apid = "TES"; ID4 ctid = "CON"; - - EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(NULL, NULL, NULL, 0)); - EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(NULL, NULL, ctid, 0)); - EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(NULL, apid, NULL, 0)); - EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(NULL, apid, ctid, 0)); - EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, NULL, NULL, 0)); - EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, NULL, ctid, 0)); - EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, apid, NULL, 0)); + ID4 ecu = "ECU"; + + EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(NULL, NULL, NULL, NULL, 0)); + EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(NULL, NULL, ctid, NULL, 0)); + EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(NULL, apid, NULL, NULL, 0)); + EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(NULL, apid, ctid, NULL, 0)); + EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, NULL, NULL, NULL, 0)); + EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, NULL, ctid, NULL, 0)); + EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, apid, NULL, NULL, 0)); + EXPECT_EQ((DltDaemonContext *) 0 ,dlt_daemon_context_find(&daemon, NULL, NULL, ecu, 0)); } /* End Method: dlt_daemon_common::dlt_daemon_context_find */ @@ -811,20 +1068,26 @@ TEST(t_dlt_daemon_context_find, nullpointer) TEST(t_dlt_daemon_contexts_clear, normal) { DltDaemon daemon; + DltGateway gateway; ID4 apid = "TES"; ID4 ctid = "CON"; char desc[255] = "TEST dlt_daemon_context_add"; DltDaemonContext *daecontext = NULL; DltDaemonApplication *app = NULL; + char ecu[] = "ECU1"; + int fd = 42; // Normal Use-Case EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); - app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); - daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); - EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, 0)); - EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); - EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0); + daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0); + EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, ecu, 0)); + EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } TEST(t_dlt_daemon_contexts_clear, abnormal) @@ -852,7 +1115,7 @@ TEST(t_dlt_daemon_contexts_clear, abnormal) TEST(t_dlt_daemon_contexts_clear, nullpointer) { // NULL-Pointer - EXPECT_GE(-1, dlt_daemon_contexts_clear(NULL, 0)); + EXPECT_GE(-1, dlt_daemon_contexts_clear(NULL, NULL, 0)); } /* End Method: dlt_daemon_common::dlt_daemon_contexts_clear */ @@ -863,21 +1126,27 @@ TEST(t_dlt_daemon_contexts_clear, nullpointer) TEST(t_dlt_daemon_contexts_invalidate_fd, normal) { DltDaemon daemon; + DltGateway gateway; ID4 apid = "TES"; ID4 ctid = "CON"; char desc[255] = "TEST dlt_daemon_context_add"; DltDaemonContext *daecontext = NULL; DltDaemonApplication *app = NULL; + char ecu[] = "ECU1"; + int fd = 42; // Normal Use-Case EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); - app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); - daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); - EXPECT_LE(0, dlt_daemon_contexts_invalidate_fd(&daemon, app->user_handle, 0)); - EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, 0)); - EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); - EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0); + daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0); + EXPECT_LE(0, dlt_daemon_contexts_invalidate_fd(&daemon, ecu, app->user_handle, 0)); + EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, ecu, 0)); + EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } TEST(t_dlt_daemon_contexts_invalidate_fd, abnormal) @@ -906,7 +1175,7 @@ TEST(t_dlt_daemon_contexts_invalidate_fd, abnormal) TEST(t_dlt_daemon_contexts_invalidate_fd, nullpointer) { // NULL-Pointer - EXPECT_GE(-1, dlt_daemon_contexts_invalidate_fd(NULL, 0, 0)); + EXPECT_GE(-1, dlt_daemon_contexts_invalidate_fd(NULL, NULL, 0, 0)); } /* End Method: dlt_daemon_common::dlt_daemon_contexts_invalidate_fd */ @@ -917,22 +1186,28 @@ TEST(t_dlt_daemon_contexts_invalidate_fd, nullpointer) TEST(t_dlt_daemon_contexts_save, normal) { DltDaemon daemon; + DltGateway gateway; ID4 apid = "TES"; ID4 ctid = "CON"; char desc[255] = "TEST dlt_daemon_context_add"; DltDaemonContext *daecontext = NULL; DltDaemonApplication *app = NULL; const char * filename = "/tmp/dlt-runtime-context.cfg"; + char ecu[] = "ECU1"; + int fd = 42; // Normal Use-Case EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); - app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); - daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0); + daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0); EXPECT_LE(0, dlt_daemon_contexts_save(&daemon, filename, 0)); - EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, 0)); - EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); - EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, ecu, 0)); + EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } TEST(t_dlt_daemon_contexts_save, abnormal) @@ -987,22 +1262,28 @@ TEST(t_dlt_daemon_contexts_save, nullpointer) TEST(t_dlt_daemon_contexts_load, normal) { DltDaemon daemon; + DltGateway gateway; ID4 apid = "TES"; ID4 ctid = "CON"; char desc[255] = "TEST dlt_daemon_context_add"; DltDaemonContext *daecontext = NULL; DltDaemonApplication *app = NULL; const char * filename = "/tmp/dlt-runtime-context.cfg"; + char ecu[] = "ECU1"; + int fd = 42; // Normal Use-Case EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); - app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); - daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,0); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0); + daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,0,desc,ecu,0); EXPECT_LE(0, dlt_daemon_contexts_load(&daemon, filename, 0)); - EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, 0)); - EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); - EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, ecu, 0)); + EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } TEST(t_dlt_daemon_contexts_load, abnormal) @@ -1066,9 +1347,14 @@ TEST(t_dlt_daemon_contexts_load, nullpointer) TEST(t_dlt_daemon_user_send_all_log_state, normal) { DltDaemon daemon; + DltGateway gateway; + char ecu[] = "ECU1"; // Normal Use-Case EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); EXPECT_NO_FATAL_FAILURE(dlt_daemon_user_send_all_log_state(&daemon, 0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } @@ -1090,9 +1376,14 @@ TEST(t_dlt_daemon_user_send_all_log_state, nullpointer) TEST(t_dlt_daemon_user_send_default_update, normal) { DltDaemon daemon; + DltGateway gateway; + char ecu[] = "ECU1"; // Normal Use-Case EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); EXPECT_NO_FATAL_FAILURE(dlt_daemon_user_send_default_update(&daemon, 0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } @@ -1113,21 +1404,27 @@ TEST(t_dlt_daemon_user_send_default_update, nullpointer) TEST(t_dlt_daemon_user_send_log_level, normal) { DltDaemon daemon; + DltGateway gateway; ID4 apid = "TES"; ID4 ctid = "CON"; char desc[255] = "TEST dlt_daemon_context_add"; DltDaemonContext *daecontext = NULL; DltDaemonApplication *app = NULL; + char ecu[] = "ECU1"; + int fd = 42; // Normal Use-Case EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); - app = dlt_daemon_application_add(&daemon, apid, 0, desc, 0); - daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,1,desc,0); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); + app = dlt_daemon_application_add(&daemon, apid, 0, desc, fd, ecu, 0); + daecontext = dlt_daemon_context_add(&daemon,apid,ctid,DLT_LOG_DEFAULT,DLT_TRACE_STATUS_DEFAULT,0,1,desc,ecu,0); EXPECT_LE(0, dlt_daemon_user_send_log_level(&daemon, daecontext, 0)); - EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, 0)); - EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, 0)); - EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, 0)); - EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, 0)); + EXPECT_LE(0, dlt_daemon_context_del(&daemon, daecontext, ecu, 0)); + EXPECT_LE(0, dlt_daemon_application_del(&daemon, app, ecu, 0)); + EXPECT_LE(0, dlt_daemon_contexts_clear(&daemon, ecu, 0)); + EXPECT_LE(0, dlt_daemon_applications_clear(&daemon, ecu, 0)); EXPECT_EQ(0, dlt_daemon_free(&daemon, 0)); } TEST(t_dlt_daemon_user_send_log_level, abnormal) @@ -1181,17 +1478,22 @@ TEST(t_dlt_daemon_user_send_log_level, nullpointer) TEST(t_dlt_daemon_user_send_log_state, normal) { DltDaemon daemon; + DltGateway gateway; // ID4 apid = "TES"; // ID4 ctid = "CON"; // char desc[255] = "TEST dlt_daemon_context_add"; // DltDaemonContext *daecontext; // DltDaemonApplication *app; pid_t pid = 18166; + char ecu[] = "ECU1"; char filename[DLT_DAEMON_COMMON_TEXTBUFSIZE+1]; snprintf(filename,DLT_DAEMON_COMMON_TEXTBUFSIZE,"%s/dlt%d",DLT_USER_DIR,pid); // Normal Use-Case EXPECT_EQ(0, dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, DLT_RUNTIME_DEFAULT_DIRECTORY,DLT_LOG_INFO, DLT_TRACE_STATUS_OFF,0,0)); + dlt_set_id(daemon.ecuid, ecu); + EXPECT_EQ(0, dlt_daemon_init_user_information(&daemon, &gateway, 0, 0)); + EXPECT_STREQ(daemon.ecuid, daemon.user_list[0].ecu); // open(filename, O_RDWR |O_NONBLOCK); // dlt_daemon_init(&daemon, DLT_DAEMON_RINGBUFFER_MIN_SIZE, DLT_DAEMON_RINGBUFFER_MAX_SIZE, DLT_DAEMON_RINGBUFFER_STEP_SIZE, "",0); // app = dlt_daemon_application_add(&daemon, apid, pid, desc, 0); diff --git a/tests/gtest_dlt_daemon_gateway.cpp b/tests/gtest_dlt_daemon_gateway.cpp index 84b1e3a..950f260 100644 --- a/tests/gtest_dlt_daemon_gateway.cpp +++ b/tests/gtest_dlt_daemon_gateway.cpp @@ -402,16 +402,12 @@ TEST(t_dlt_gateway_process_gateway_timer, normal) DltGatewayConnection connections; DltConnection connections1; daemon_local.pGateway.connections = &connections; - DltDaemonContext contexts; - DltDaemonApplication applications; daemon_local.pGateway.num_connections = 1; DltLogStorage storage_handle; daemon_local.pGateway.connections->status = DLT_GATEWAY_CONNECTED; daemon_local.pEvent.connections = &connections1; daemon_local.pEvent.connections->receiver = &receiver; - daemon.contexts = &contexts; - daemon.applications = &applications; daemon.ECUVersionString = ECUVersionString; daemon.storage_handle = &storage_handle; -- cgit v1.2.1