diff options
Diffstat (limited to 'tests/gtest_dlt_common.cpp')
| -rw-r--r-- | tests/gtest_dlt_common.cpp | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/tests/gtest_dlt_common.cpp b/tests/gtest_dlt_common.cpp index d7c6d9c..27831d3 100644 --- a/tests/gtest_dlt_common.cpp +++ b/tests/gtest_dlt_common.cpp @@ -261,7 +261,7 @@ TEST(t_dlt_buffer_reset, normal) // Normal Use-Case. expect 0 EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); EXPECT_LE(0, dlt_buffer_reset(&buf)); - EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); + } TEST(t_dlt_buffer_reset, abnormal) { @@ -812,15 +812,15 @@ TEST(t_dlt_buffer_copy, nullpointer) int size = sizeof(DltUserHeader); // NULL-Pointer, expected -1 - EXPECT_LE(-1, dlt_buffer_copy(NULL,NULL,size)); - EXPECT_LE(-1, dlt_buffer_copy(NULL,NULL,0)); - EXPECT_LE(-1, dlt_buffer_copy(NULL,(unsigned char *)&header,size)); - EXPECT_LE(-1, dlt_buffer_copy(NULL,(unsigned char *)&header,0)); + EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(NULL,NULL,size)); + EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(NULL,NULL,0)); + EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(NULL,(unsigned char *)&header,size)); + EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(NULL,(unsigned char *)&header,0)); EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_LE(-1, dlt_buffer_copy(&buf,NULL,size)); + EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(&buf,NULL,size)); EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_LE(-1, dlt_buffer_copy(&buf,NULL,0)); + EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_buffer_copy(&buf,NULL,0)); EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); } /* End Method: dlt_common::dlt_buffer_copy */ @@ -1238,7 +1238,6 @@ TEST(t_dlt_buffer_info, normal) // Normal Use-Case EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); EXPECT_NO_THROW(dlt_buffer_info(&buf)); - EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); } TEST(t_dlt_buffer_info, abnormal) { @@ -1263,7 +1262,6 @@ TEST(t_dlt_buffer_status, normal) // Normal Use-Case EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); EXPECT_NO_THROW(dlt_buffer_status(&buf)); - EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); } TEST(t_dlt_buffer_status, abnormal) { @@ -3094,8 +3092,7 @@ TEST(t_dlt_message_read, normal) EXPECT_LE(DLT_RETURN_ERROR, dlt_message_read(&file.msg,(unsigned char*) buffer,255,0,1)); } EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); - EXPECT_LE(DLT_RETURN_OK, dlt_file_close(&file, 0)); - EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); + EXPECT_LE(DLT_RETURN_OK, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); EXPECT_LE(DLT_RETURN_OK, dlt_file_init(&file, 0)); EXPECT_LE(DLT_RETURN_OK, dlt_file_open(&file, openfile, 0)); @@ -3106,8 +3103,6 @@ TEST(t_dlt_message_read, normal) EXPECT_LE(DLT_RETURN_ERROR, dlt_message_read(&file.msg,(unsigned char *) buffer,255,1,1)); } EXPECT_LE(DLT_RETURN_OK, dlt_buffer_free_dynamic(&buf)); - EXPECT_LE(DLT_RETURN_OK, dlt_file_close(&file, 0)); - EXPECT_LE(DLT_RETURN_OK, dlt_file_free(&file, 0)); } TEST(t_dlt_message_read, abnormal) { @@ -3130,9 +3125,9 @@ TEST(t_dlt_message_read, nullpointer) // NULL_Pointer, expected -1 EXPECT_GE(DLT_RETURN_ERROR, dlt_message_read(NULL, NULL, 0,0,0)); - EXPECT_GE(DLT_RETURN_ERROR, dlt_message_read(NULL, (u_int8_t *)&buf, 0,0,0)); + EXPECT_GE(DLT_RETURN_ERROR, dlt_message_read(NULL, (uint8_t *)&buf, 0,0,0)); EXPECT_GE(DLT_RETURN_ERROR, dlt_message_read(&file.msg, NULL, 0,0,0)); - EXPECT_GE(DLT_RETURN_ERROR, dlt_message_read(&file.msg, (u_int8_t *)&buf, 0,0,0)); + EXPECT_GE(DLT_RETURN_ERROR, dlt_message_read(&file.msg, (uint8_t *)&buf, 0,0,0)); } /* End Method:dlt_common::dlt_message_read */ @@ -3340,16 +3335,11 @@ TEST(t_dlt_log_init, normal) // Normal Use-Case, exptect 0-3 EXPECT_NO_THROW(dlt_log_init(DLT_LOG_TO_CONSOLE)); - EXPECT_NO_THROW(dlt_log_free()); EXPECT_NO_THROW(dlt_log_init(DLT_LOG_TO_SYSLOG)); - EXPECT_NO_THROW(dlt_log_free()); EXPECT_NO_THROW(dlt_log_set_filename("/tmp/dlt.log")); EXPECT_NO_THROW(dlt_log_init(DLT_LOG_TO_FILE)); - EXPECT_NO_THROW(dlt_log_free()); EXPECT_NO_THROW(dlt_log_init(DLT_LOG_TO_FILE)); - EXPECT_NO_THROW(dlt_log_free()); EXPECT_NO_THROW(dlt_log_init(DLT_LOG_DROPPED)); - EXPECT_NO_THROW(dlt_log_free()); } TEST(t_dlt_log_init, abnormal) { @@ -3377,11 +3367,8 @@ TEST(t_dlt_log_free, normal) // Normal Use-Case, expected 0 EXPECT_NO_THROW(dlt_log_init(DLT_LOG_TO_CONSOLE)); - EXPECT_NO_THROW(dlt_log_free()); EXPECT_NO_THROW(dlt_log_init(DLT_LOG_TO_SYSLOG)); - EXPECT_NO_THROW(dlt_log_free()); EXPECT_NO_THROW(dlt_log_init(DLT_LOG_DROPPED)); - EXPECT_NO_THROW(dlt_log_free()); } TEST(t_dlt_log_free, abnormal) { |