From ab105d1671789fc9bd649f7e9ce3e6af22d30f0e Mon Sep 17 00:00:00 2001 From: Manikandan C Date: Wed, 19 Dec 2018 16:10:41 +0100 Subject: Cleanup of unit test fixes Signed-off-by: Manikandan C --- tests/dlt_test_receiver.c | 12 ++++++++++-- tests/gtest_dlt_daemon_event_handler.cpp | 10 +++++----- tests/gtest_dlt_daemon_offline_log.cpp | 17 ++++++----------- tests/start_multinode_test.sh | 9 --------- 4 files changed, 21 insertions(+), 27 deletions(-) (limited to 'tests') diff --git a/tests/dlt_test_receiver.c b/tests/dlt_test_receiver.c index e7abd83..555d5da 100644 --- a/tests/dlt_test_receiver.c +++ b/tests/dlt_test_receiver.c @@ -239,7 +239,11 @@ int main(int argc, char* argv[]) { for (index = optind; index < argc; index++) { - dltclient.servIP = argv[index]; + if(dlt_client_set_server_ip(&dltclient, argv[index]) == -1) + { + fprintf(stderr,"set server ip didn't succeed\n"); + return -1; + } } if (dltclient.servIP == 0) @@ -255,7 +259,11 @@ int main(int argc, char* argv[]) { for (index = optind; index < argc; index++) { - dltclient.serialDevice = argv[index]; + if(dlt_client_set_serial_device(&dltclient, argv[index]) == -1) + { + fprintf(stderr,"set serial device didn't succeed\n"); + return -1; + } } if (dltclient.serialDevice == 0) diff --git a/tests/gtest_dlt_daemon_event_handler.cpp b/tests/gtest_dlt_daemon_event_handler.cpp index 235b69e..df9caa0 100644 --- a/tests/gtest_dlt_daemon_event_handler.cpp +++ b/tests/gtest_dlt_daemon_event_handler.cpp @@ -617,11 +617,11 @@ int connectServer(void) portno = 8080; sockfd = socket(AF_INET, SOCK_STREAM, 0); server = gethostbyname("127.0.0.1"); - bzero((char *) &serv_addr, sizeof(serv_addr)); + memset((char *) &serv_addr, 0, sizeof(serv_addr)); serv_addr.sin_family = AF_INET; - bcopy((char *)server->h_addr, - (char *)&serv_addr.sin_addr.s_addr, - server->h_length); + memcpy((char *)&serv_addr.sin_addr.s_addr, + (char *)server->h_addr, + server->h_length); serv_addr.sin_port = htons(portno); if (connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) @@ -703,7 +703,7 @@ int main(int argc, char **argv) return -1; } - bzero(buffer, 256); + memset(buffer, 0, 256); (void)(read(newsockfd[i - 1], buffer, 255) + 1); /* just ignore result */ i--; } diff --git a/tests/gtest_dlt_daemon_offline_log.cpp b/tests/gtest_dlt_daemon_offline_log.cpp index dba4136..2563e3d 100644 --- a/tests/gtest_dlt_daemon_offline_log.cpp +++ b/tests/gtest_dlt_daemon_offline_log.cpp @@ -953,7 +953,7 @@ TEST(t_dlt_logstorage_sync_on_msg, normal) TEST(t_dlt_logstorage_sync_on_msg, null) { - EXPECT_EQ(DLT_RETURN_ERROR, dlt_logstorage_sync_on_msg(NULL,NULL,NULL, 0)); + EXPECT_EQ(DLT_RETURN_ERROR, dlt_logstorage_sync_on_msg(NULL, NULL, NULL, 0)); } /* Begin Method: dlt_logstorage::t_dlt_logstorage_prepare_msg_cache*/ @@ -1476,7 +1476,6 @@ TEST(t_dlt_logstorage_find_dlt_header, normal) EXPECT_EQ(2, dlt_logstorage_find_dlt_header(config.cache, 0,sizeof(data))); free(config.cache); } - } TEST(t_dlt_logstorage_find_dlt_header, null) @@ -1527,7 +1526,7 @@ TEST(t_dlt_logstorage_sync_create_new_file, normal) config.cache = calloc(1, 50 + sizeof(DltLogStorageCacheFooter)); if(config.cache != NULL) { - footer = (DltLogStorageCacheFooter *)(config.cache + 50); + 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)); @@ -1584,7 +1583,6 @@ TEST(t_dlt_logstorage_sync_to_file, normal) EXPECT_EQ(DLT_RETURN_OK, dlt_logstorage_sync_to_file(&config, &file_config, path)); free(config.cache); config.cache = NULL; - } } @@ -1632,7 +1630,6 @@ TEST(t_dlt_logstorage_sync_capable_data_to_file, normal) free(config.cache); config.cache = NULL; } - } TEST(t_dlt_logstorage_sync_capable_data_to_file, null) @@ -1643,7 +1640,6 @@ TEST(t_dlt_logstorage_sync_capable_data_to_file, null) /* Begin Method: dlt_logstorage::t_dlt_logstorage_sync_msg_cache*/ TEST(t_dlt_logstorage_sync_msg_cache, normal) { - DltLogStorageUserConfig file_config; memset(&file_config, 0, sizeof(DltLogStorageUserConfig)); file_config.logfile_timestamp =191132; @@ -1681,7 +1677,6 @@ TEST(t_dlt_logstorage_sync_msg_cache, normal) free(config.cache); config.cache = NULL; } - } TEST(t_dlt_logstorage_sync_msg_cache, null) @@ -1699,9 +1694,9 @@ int connectServer(void) server = gethostbyname("127.0.0.1"); bzero((char *) &serv_addr, sizeof(serv_addr)); serv_addr.sin_family = AF_INET; - bcopy((char *)server->h_addr, - (char *)&serv_addr.sin_addr.s_addr, - server->h_length); + memcpy((char *)&serv_addr.sin_addr.s_addr, + (char *)server->h_addr, + server->h_length); serv_addr.sin_port = htons(portno); if (connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) { @@ -1767,7 +1762,7 @@ int main(int argc, char **argv) printf("Error in accept"); return -1; } - bzero(buffer, 256); + memset(buffer, 0, 256); (void)(read(newsockfd[i-1], buffer, 255) + 1); /* just ignore result */ i--; } diff --git a/tests/start_multinode_test.sh b/tests/start_multinode_test.sh index 54a58b5..873964c 100755 --- a/tests/start_multinode_test.sh +++ b/tests/start_multinode_test.sh @@ -143,13 +143,6 @@ cleanup() # setupTest() { - if [ "$OS" = "QNX" ] - then - MESSAGE_FILTER_CONF="/etc/dlt_message_filter.conf" - else - MESSAGE_FILTER_CONF="/etc/dlt_message_filter_ald.conf" - fi - which dlt-daemon > /dev/null if [ $? -ne '0' ] then @@ -199,7 +192,6 @@ setupTest() echo "RingbufferStepSize = 500000" >>$tmpPath/$tmpFolder/$gatewayFolderName/dlt.conf echo "ControlSocketPath = /tmp/dlt-ctrl.sock" >>$tmpPath/$tmpFolder/$gatewayFolderName/dlt.conf echo "GatewayConfigFile = $tmpPath/$tmpFolder/$gatewayFolderName/dlt_gateway.conf" >> $tmpPath/$tmpFolder/$gatewayFolderName/dlt.conf - echo "MessageFilterConfigFile = $MESSAGE_FILTER_CONF" >> $tmpPath/$tmpFolder/$gatewayFolderName/dlt.conf touch $tmpPath/$tmpFolder/$gatewayFolderName/dlt_gateway.conf if [ $? -ne '0' ] then @@ -236,7 +228,6 @@ setupTest() echo "RingbufferMaxSize = 10000000" >>$tmpPath/$tmpFolder/$passiveFolderName/dlt.conf echo "RingbufferStepSize = 500000" >>$tmpPath/$tmpFolder/$passiveFolderName/dlt.conf echo "ControlSocketPath = /tmp/dlt-ctrl.sock" >>$tmpPath/$tmpFolder/$passiveFolderName/dlt.conf - echo "MessageFilterConfigFile = $MESSAGE_FILTER_CONF" >> $tmpPath/$tmpFolder/$passiveFolderName/dlt.conf mkdir -p $tmpPath/$tmpFolder/$tmpPassiveDIR if [ $? -ne '0' ] then -- cgit v1.2.1