From 96c169761a27f40f6df1c541d200df470e9b176a Mon Sep 17 00:00:00 2001 From: Stefan Held Date: Tue, 28 Apr 2015 15:35:19 +0200 Subject: added dlt_log_* unit tests rework of dlt_buffer_* and dlt_messages_* unit tests Signed-off-by: Stefan Held Signed-off-by: Alexander Wenzel --- tests/gtest_dlt_common.cpp | 1767 +++++++++++++++++++++++++++----------------- 1 file changed, 1071 insertions(+), 696 deletions(-) (limited to 'tests') diff --git a/tests/gtest_dlt_common.cpp b/tests/gtest_dlt_common.cpp index a1c7568..1cabd55 100644 --- a/tests/gtest_dlt_common.cpp +++ b/tests/gtest_dlt_common.cpp @@ -9,6 +9,8 @@ extern "C" { #include "dlt_user_shared.h" #include "dlt_user_shared_cfg.h" #include "dlt_user_cfg.h" +#include "dlt_client.h" +#include int dlt_buffer_increase_size(DltBuffer *); int dlt_buffer_minimize_size(DltBuffer *); int dlt_buffer_reset(DltBuffer *); @@ -17,6 +19,14 @@ int dlt_buffer_push3(DltBuffer *,const unsigned char *,unsigned int,const unsign int dlt_buffer_get(DltBuffer *,unsigned char *, int,int); int dlt_buffer_pull(DltBuffer *,unsigned char *, int); int dlt_buffer_remove(DltBuffer *); +int get_test_dlt_buffer_write_block(DltBuffer *, int *, unsigned char*, int); +int get_test_dlt_buffer_read_block(DltBuffer *, int *, unsigned char*, int); +int get_test_dlt_buffer_info(DltBuffer *); +int get_test_dlt_buffer_status(DltBuffer *); +int get_test_dlt_log_set_level(); +char * get_test_dlt_log_set_filename(); +int get_test_dlt_log_init(); +int get_test_dlt_log_free(); } /* Beginn Method: dlt_common::dlt_buffer_init_dynamic */ @@ -62,21 +72,21 @@ TEST(t_dlt_buffer_init_dynamic, nullpointer) DltBuffer buf; // NULL-Pointer, expect -1 - EXPECT_GE(-1, dlt_buffer_init_dynamic(NULL, NULL, NULL, NULL)); - EXPECT_GE(-1, dlt_buffer_init_dynamic(NULL, NULL, NULL, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_GE(-1, dlt_buffer_init_dynamic(NULL, NULL, DLT_USER_RINGBUFFER_MAX_SIZE, NULL)); - EXPECT_GE(-1, dlt_buffer_init_dynamic(NULL, NULL, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_GE(-1, dlt_buffer_init_dynamic(NULL, DLT_USER_RINGBUFFER_MIN_SIZE, NULL, NULL)); - EXPECT_GE(-1, dlt_buffer_init_dynamic(NULL, DLT_USER_RINGBUFFER_MIN_SIZE, NULL, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_GE(-1, dlt_buffer_init_dynamic(NULL, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, NULL)); + EXPECT_GE(-1, dlt_buffer_init_dynamic(NULL, 0, 0, 0)); + EXPECT_GE(-1, dlt_buffer_init_dynamic(NULL, 0, 0, DLT_USER_RINGBUFFER_STEP_SIZE)); + EXPECT_GE(-1, dlt_buffer_init_dynamic(NULL, 0, DLT_USER_RINGBUFFER_MAX_SIZE, 0)); + EXPECT_GE(-1, dlt_buffer_init_dynamic(NULL, 0, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + EXPECT_GE(-1, dlt_buffer_init_dynamic(NULL, DLT_USER_RINGBUFFER_MIN_SIZE, 0, 0)); + EXPECT_GE(-1, dlt_buffer_init_dynamic(NULL, DLT_USER_RINGBUFFER_MIN_SIZE, 0, DLT_USER_RINGBUFFER_STEP_SIZE)); + EXPECT_GE(-1, dlt_buffer_init_dynamic(NULL, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, 0)); EXPECT_GE(-1, dlt_buffer_init_dynamic(NULL, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, NULL, NULL, NULL)); - EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, NULL, NULL, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, NULL, DLT_USER_RINGBUFFER_MAX_SIZE, NULL)); - EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, NULL, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, NULL, NULL)); - EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, NULL, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, NULL)); + EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, 0, 0, 0)); + EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, 0, 0, DLT_USER_RINGBUFFER_STEP_SIZE)); + EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, 0, DLT_USER_RINGBUFFER_MAX_SIZE, 0)); + EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, 0, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, 0, 0)); + EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, 0, DLT_USER_RINGBUFFER_STEP_SIZE)); + EXPECT_GE(-1, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, 0)); } /* End Method: dlt_common::dlt_buffer_init_dynamic */ @@ -302,13 +312,13 @@ TEST(t_dlt_buffer_push, nullpointer) int size = sizeof(test); // NULL-Pointer, expected -1 - EXPECT_GE(-1, dlt_buffer_push(NULL,NULL,NULL)); + EXPECT_GE(-1, dlt_buffer_push(NULL,NULL,0)); EXPECT_GE(-1, dlt_buffer_push(NULL,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push(NULL,(unsigned char *)&test,NULL)); + EXPECT_GE(-1, dlt_buffer_push(NULL,(unsigned char *)&test,0)); EXPECT_GE(-1, dlt_buffer_push(NULL,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push(&buf,NULL,NULL)); + EXPECT_GE(-1, dlt_buffer_push(&buf,NULL,0)); EXPECT_GE(-1, dlt_buffer_push(&buf,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push(&buf,(unsigned char *)&test,NULL)); + EXPECT_GE(-1, dlt_buffer_push(&buf,(unsigned char *)&test,0)); } /* End Method: dlt_common::dlt_buffer_push*/ @@ -377,133 +387,133 @@ TEST(t_dlt_buffer_push3, nullpointer) int size = sizeof(test); //Null Pointer, expected -1 - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,NULL,NULL,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,NULL,NULL,NULL,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,NULL,NULL,NULL,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,NULL,NULL,NULL,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,NULL,NULL,size,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,NULL,NULL,size,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,NULL,NULL,size,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,NULL,NULL,size,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,NULL,(unsigned char *)&test,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,NULL,(unsigned char *)&test,NULL,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,NULL,(unsigned char *)&test,NULL,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,NULL,(unsigned char *)&test,NULL,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,NULL,(unsigned char *)&test,size,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,NULL,(unsigned char *)&test,size,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,NULL,(unsigned char *)&test,size,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,NULL,(unsigned char *)&test,size,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,NULL,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,NULL,NULL,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,NULL,NULL,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,NULL,NULL,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,NULL,size,NULL,NULL)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,0,NULL,0,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,0,NULL,0,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,0,NULL,0,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,0,NULL,0,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,0,NULL,size,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,0,NULL,size,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,0,NULL,size,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,0,NULL,size,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,0,(unsigned char *)&test,0,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,0,(unsigned char *)&test,0,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,0,(unsigned char *)&test,0,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,0,(unsigned char *)&test,0,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,0,(unsigned char *)&test,size,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,0,(unsigned char *)&test,size,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,0,(unsigned char *)&test,size,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,0,(unsigned char *)&test,size,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,NULL,0,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,NULL,0,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,NULL,0,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,NULL,0,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,NULL,size,NULL,0)); EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,NULL,size,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,NULL,size,(unsigned char *)&test,NULL)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,NULL,size,(unsigned char *)&test,0)); EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,NULL,size,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,NULL,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,NULL,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,NULL,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,size,NULL,NULL)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,0,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,0,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,0,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,0,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,size,NULL,0)); EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,size,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,size,(unsigned char *)&test,NULL)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,size,(unsigned char *)&test,0)); EXPECT_GE(-1, dlt_buffer_push3(NULL,NULL,size,(unsigned char *)&test,size,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,NULL,NULL,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,NULL,NULL,NULL,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,NULL,NULL,NULL,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,NULL,NULL,NULL,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,NULL,NULL,size,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,NULL,NULL,size,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,NULL,NULL,size,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,NULL,NULL,size,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,NULL,(unsigned char *)&test,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,NULL,(unsigned char *)&test,NULL,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,NULL,(unsigned char *)&test,NULL,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,NULL,(unsigned char *)&test,NULL,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,NULL,(unsigned char *)&test,size,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,NULL,(unsigned char *)&test,size,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,NULL,(unsigned char *)&test,size,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,NULL,(unsigned char *)&test,size,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,NULL,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,NULL,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,NULL,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,size,NULL,NULL)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,0,NULL,0,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,0,NULL,0,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,0,NULL,0,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,0,NULL,0,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,0,NULL,size,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,0,NULL,size,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,0,NULL,size,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,0,NULL,size,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,0,(unsigned char *)&test,0,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,0,(unsigned char *)&test,0,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,0,(unsigned char *)&test,0,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,0,(unsigned char *)&test,0,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,0,(unsigned char *)&test,size,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,0,(unsigned char *)&test,size,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,0,(unsigned char *)&test,size,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,0,(unsigned char *)&test,size,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,0,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,0,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,0,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,0,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,size,NULL,0)); EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,size,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,size,(unsigned char *)&test,NULL)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,size,(unsigned char *)&test,0)); EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,NULL,size,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,NULL,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,NULL,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,NULL,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,size,NULL,NULL)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,0,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,0,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,0,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,0,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,size,NULL,0)); EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,size,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,size,(unsigned char *)&test,NULL)); + EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,size,(unsigned char *)&test,0)); EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,size,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,NULL,NULL,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,NULL,NULL,NULL,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,NULL,NULL,NULL,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,NULL,NULL,NULL,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,NULL,NULL,size,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,NULL,NULL,size,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,NULL,NULL,size,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,NULL,NULL,size,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,NULL,(unsigned char *)&test,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,NULL,(unsigned char *)&test,NULL,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,NULL,(unsigned char *)&test,NULL,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,NULL,(unsigned char *)&test,NULL,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,NULL,(unsigned char *)&test,size,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,NULL,(unsigned char *)&test,size,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,NULL,(unsigned char *)&test,size,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,NULL,(unsigned char *)&test,size,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,NULL,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,NULL,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,NULL,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,size,NULL,NULL)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,NULL,0,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,NULL,0,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,NULL,0,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,NULL,0,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,NULL,size,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,NULL,size,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,NULL,size,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,NULL,size,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,0,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,0,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,0,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,0,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,size,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,size,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,size,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,size,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,0,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,0,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,0,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,0,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,size,NULL,0)); EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,size,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,size,(unsigned char *)&test,NULL)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,size,(unsigned char *)&test,0)); EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,size,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,NULL,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,NULL,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,NULL,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,NULL,NULL)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,0,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,0,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,0,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,0,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,NULL,0)); EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,(unsigned char *)&test,NULL)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,(unsigned char *)&test,0)); EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,NULL,NULL,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,NULL,NULL,NULL,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,NULL,NULL,NULL,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,NULL,NULL,NULL,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,NULL,NULL,size,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,NULL,NULL,size,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,NULL,NULL,size,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,NULL,NULL,size,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,NULL,(unsigned char *)&test,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,NULL,(unsigned char *)&test,NULL,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,NULL,(unsigned char *)&test,NULL,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,NULL,(unsigned char *)&test,NULL,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,NULL,(unsigned char *)&test,size,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,NULL,(unsigned char *)&test,size,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,NULL,(unsigned char *)&test,size,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,NULL,(unsigned char *)&test,size,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,NULL,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,NULL,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,NULL,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,NULL,NULL)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,0,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,0,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,0,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,0,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,size,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,size,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,size,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,size,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,0,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,0,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,0,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,0,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,size,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,size,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,size,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,size,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,0,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,0,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,0,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,0,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,NULL,0)); EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,(unsigned char *)&test,NULL)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,(unsigned char *)&test,0)); EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,NULL,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,NULL,(unsigned char *)&test,NULL)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,NULL,(unsigned char *)&test,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,NULL,NULL)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,0,NULL,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,0,NULL,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,0,(unsigned char *)&test,0)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,0,(unsigned char *)&test,size)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,NULL,0)); EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,NULL,size)); - EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,(unsigned char *)&test,NULL)); + EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,(unsigned char *)&test,0)); } /* End Method: dlt_common::dlt_buffer_push3 */ @@ -555,13 +565,13 @@ TEST(t_dlt_buffer_pull, nullpointer) DltUserHeader header; // NULL-Point, expected -1 - EXPECT_GE(-1, dlt_buffer_pull(NULL, NULL, NULL)); + EXPECT_GE(-1, dlt_buffer_pull(NULL, NULL, 0)); EXPECT_GE(-1, dlt_buffer_pull(NULL, NULL, sizeof(DltUserHeader))); - EXPECT_GE(-1, dlt_buffer_pull(NULL, (unsigned char *)&header, NULL)); + EXPECT_GE(-1, dlt_buffer_pull(NULL, (unsigned char *)&header, 0)); EXPECT_GE(-1, dlt_buffer_pull(NULL, (unsigned char *)&header, sizeof(DltUserHeader))); - EXPECT_GE(-1, dlt_buffer_pull(&buf, NULL, NULL)); + EXPECT_GE(-1, dlt_buffer_pull(&buf, NULL, 0)); EXPECT_GE(-1, dlt_buffer_pull(&buf, NULL, sizeof(DltUserHeader))); - EXPECT_GE(-1, dlt_buffer_pull(&buf, (unsigned char *)&header, NULL)); + EXPECT_GE(-1, dlt_buffer_pull(&buf, (unsigned char *)&header, 0)); } /* End Method: dlt_common::dlt_buffer_pull */ @@ -581,7 +591,7 @@ TEST(t_dlt_buffer_remove, normal) // Normal Use-Case, expected > 0 EXPECT_EQ(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_EQ(0,dlt_buffer_push(&buf,(unsigned char *)&header,sizeof(DltUserHeader))); + EXPECT_EQ(0,dlt_buffer_push(&buf,(unsigned char *)&header,size)); EXPECT_LE(1, dlt_buffer_remove(&buf)); EXPECT_EQ(0,dlt_buffer_free_dynamic(&buf)); } @@ -589,6 +599,7 @@ TEST(t_dlt_buffer_remove, abnormal) { DltBuffer buf; DltUserHeader header; + int size = sizeof(DltUserHeader); // Uninizialised, expected -1 EXPECT_GE(-1, dlt_buffer_remove(&buf)); @@ -601,7 +612,7 @@ TEST(t_dlt_buffer_remove, abnormal) // Call remove 10 time, expected > 1 till buffer is empty // pushed one time so expect one > 1 and 9 times < 0 EXPECT_EQ(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_EQ(0,dlt_buffer_push(&buf,(unsigned char *)&header,sizeof(DltUserHeader))); + EXPECT_EQ(0,dlt_buffer_push(&buf,(unsigned char *)&header,size)); for(int i=0; i<10;i++) { if(i == 0) @@ -661,11 +672,11 @@ TEST(t_dlt_buffer_copy, nullpointer) // NULL-Pointer, expected -1 EXPECT_LE(-1, dlt_buffer_copy(NULL,NULL,size)); - EXPECT_LE(-1, dlt_buffer_copy(NULL,NULL,NULL)); + 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,NULL)); + EXPECT_LE(-1, dlt_buffer_copy(NULL,(unsigned char *)&header,0)); EXPECT_LE(-1, dlt_buffer_copy(&buf,NULL,size)); - EXPECT_LE(-1, dlt_buffer_copy(&buf,NULL,NULL)); + EXPECT_LE(-1, dlt_buffer_copy(&buf,NULL,0)); EXPECT_LE(-1, dlt_buffer_copy(&buf,(unsigned char *)&header,size)); } /* End Method: dlt_common::dlt_buffer_copy */ @@ -673,122 +684,130 @@ TEST(t_dlt_buffer_copy, nullpointer) /* Begin Method: dlt_common::dlt_buffer_get */ -/* + TEST(t_dlt_buffer_get, normal) { - DltBuffer get; - DltUserHeader head_get; - - EXPECT_EQ(0, dlt_buffer_init_dynamic(&get, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_EQ(0,dlt_buffer_push(&get,(unsigned char *)&head_get,sizeof(DltUserHeader))); - printf("#### %i\n", dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),0)); - EXPECT_LE(0, dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),0)); - EXPECT_EQ(0, dlt_buffer_free_dynamic(&get)); - - EXPECT_EQ(0, dlt_buffer_init_dynamic(&get, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_EQ(0,dlt_buffer_push(&get,(unsigned char *)&head_get,sizeof(DltUserHeader))); - printf("#### %i\n", dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),0)); - EXPECT_LE(0, dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),1)); - EXPECT_EQ(0, dlt_buffer_free_dynamic(&get)); - - EXPECT_EQ(0, dlt_buffer_init_dynamic(&get, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - printf("#### %i\n", dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),0)); - EXPECT_EQ(-1, dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),1)); - EXPECT_EQ(0, dlt_buffer_free_dynamic(&get)); - - EXPECT_EQ(0, dlt_buffer_init_dynamic(&get, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - printf("#### %i\n", dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),0)); - ((int*)(get.shm))[0] = 50000; - EXPECT_EQ(-1, dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),1)); - EXPECT_EQ(0, dlt_buffer_free_dynamic(&get)); - - EXPECT_EQ(0, dlt_buffer_init_dynamic(&get, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - printf("#### %i\n", dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),0)); - ((int*)(get.shm))[1] = 50000; - EXPECT_EQ(-1, dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),1)); - EXPECT_EQ(0, dlt_buffer_free_dynamic(&get)); - - EXPECT_EQ(0, dlt_buffer_init_dynamic(&get, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - printf("#### %i\n", dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),0)); - ((int*)(get.shm))[2] = -50000; - EXPECT_EQ(-1, dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),1)); - EXPECT_EQ(0, dlt_buffer_free_dynamic(&get)); - - EXPECT_EQ(0, dlt_buffer_init_dynamic(&get, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - printf("#### %i\n", dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),0)); - ((int*)(get.shm))[2] = 0; - EXPECT_EQ(-1, dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),1)); - EXPECT_EQ(0, dlt_buffer_free_dynamic(&get)); - - EXPECT_EQ(0, dlt_buffer_init_dynamic(&get, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - printf("#### %i\n", dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),0)); - ((int*)(get.shm))[0] = 4000; - ((int*)(get.shm))[1] = 5000; - ((int*)(get.shm))[2] = 0; - EXPECT_EQ(-1, dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),1)); - EXPECT_EQ(0, dlt_buffer_free_dynamic(&get)); - - EXPECT_EQ(0, dlt_buffer_init_dynamic(&get, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - printf("#### %i\n", dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),0)); - ((int*)(get.shm))[0] = 10; - ((int*)(get.shm))[1] = 5; - ((int*)(get.shm))[2] = 5; - EXPECT_EQ(-1, dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),1)); - EXPECT_EQ(0, dlt_buffer_free_dynamic(&get)); - - EXPECT_EQ(0, dlt_buffer_init_dynamic(&get, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - printf("#### %i\n", dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),0)); - ((int*)(get.shm))[2] = 50000; - EXPECT_EQ(-1, dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),1)); - EXPECT_EQ(0, dlt_buffer_free_dynamic(&get)); - - EXPECT_EQ(0, dlt_buffer_init_dynamic(&get, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_EQ(0,dlt_buffer_push(&get,(unsigned char *)&head_get,sizeof(DltUserHeader))); - printf("#### %i\n", dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),0)); - ((int*)(get.shm))[0] = 19; - EXPECT_EQ(-1, dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),1)); - EXPECT_EQ(0, dlt_buffer_free_dynamic(&get)); - - EXPECT_EQ(0, dlt_buffer_init_dynamic(&get, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_EQ(0,dlt_buffer_push(&get,(unsigned char *)&head_get,sizeof(DltUserHeader))); - printf("#### %i\n", dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),0)); - ((int*)(get.shm))[2] = 19; - EXPECT_LE(0, dlt_buffer_get(&get,(unsigned char*)&head_get,5,1)); - EXPECT_EQ(0, dlt_buffer_free_dynamic(&get)); + DltBuffer buf; + DltUserHeader header; + int size = sizeof(DltUserHeader); + + // Normal Use-Case + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + EXPECT_EQ(0,dlt_buffer_push(&buf,(unsigned char *)&header,size)); + printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0)); + EXPECT_LE(0, dlt_buffer_get(&buf,(unsigned char*)&header,size,0)); + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); + + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + EXPECT_EQ(0,dlt_buffer_push(&buf,(unsigned char *)&header,size)); + printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0)); + EXPECT_LE(0, dlt_buffer_get(&buf,(unsigned char*)&header,size,1)); + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); + + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0)); + EXPECT_EQ(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1)); + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); + + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0)); + ((int*)(buf.shm))[0] = 50000; + EXPECT_EQ(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1)); + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); + + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0)); + ((int*)(buf.shm))[1] = 50000; + EXPECT_EQ(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1)); + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0)); + ((int*)(buf.shm))[2] = -50000; + EXPECT_EQ(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1)); + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); + + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0)); + ((int*)(buf.shm))[2] = 0; + EXPECT_EQ(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1)); + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); + + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0)); + ((int*)(buf.shm))[0] = 4000; + ((int*)(buf.shm))[1] = 5000; + ((int*)(buf.shm))[2] = 0; + EXPECT_EQ(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1)); + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); + + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0)); + ((int*)(buf.shm))[0] = 10; + ((int*)(buf.shm))[1] = 5; + ((int*)(buf.shm))[2] = 5; + EXPECT_EQ(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1)); + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); + + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0)); + ((int*)(buf.shm))[2] = 50000; + EXPECT_EQ(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1)); + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); + + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + EXPECT_EQ(0,dlt_buffer_push(&buf,(unsigned char *)&header,size)); + printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0)); + ((int*)(buf.shm))[0] = 19; + EXPECT_EQ(-1, dlt_buffer_get(&buf,(unsigned char*)&header,size,1)); + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); + + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + EXPECT_EQ(0,dlt_buffer_push(&buf,(unsigned char *)&header,size)); + printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0)); + ((int*)(buf.shm))[2] = 19; + EXPECT_LE(0, dlt_buffer_get(&buf,(unsigned char*)&header,5,1)); + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); } TEST(t_dlt_buffer_get, abnormal) { - DltBuffer get; - DltUserHeader head_get; - - EXPECT_EQ(0, dlt_buffer_init_dynamic(&get, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_EQ(0,dlt_buffer_push(&get,(unsigned char *)&head_get,sizeof(DltUserHeader))); - printf("#### %i\n", dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),0)); - EXPECT_LE(0, dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),123456789123456789)); // Delete: suggest int to bool - EXPECT_EQ(0, dlt_buffer_free_dynamic(&get)); + DltBuffer buf; + DltUserHeader header; + int size = sizeof(DltUserHeader); - EXPECT_EQ(0, dlt_buffer_init_dynamic(&get, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_EQ(0,dlt_buffer_push(&get,(unsigned char *)&head_get,sizeof(DltUserHeader))); - printf("#### %i\n", dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),0)); - EXPECT_LE(0, dlt_buffer_get(&get,NULL,sizeof(DltUserHeader),1)); // unsigned char = NULL still work - EXPECT_EQ(0, dlt_buffer_free_dynamic(&get)); + // Uninizialsied, expected -1 + EXPECT_GE(-1, dlt_buffer_get(&buf,(unsigned char *)&header,size, 0)); - EXPECT_EQ(0, dlt_buffer_init_dynamic(&get, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); - EXPECT_EQ(0,dlt_buffer_push(&get,(unsigned char *)&head_get,sizeof(DltUserHeader))); - printf("#### %i\n", dlt_buffer_get(&get,(unsigned char*)&head_get,sizeof(DltUserHeader),0)); - EXPECT_LE(0, dlt_buffer_get(&get,NULL,NULL,1)); // unsigned char = NULL still work && size = NULL - EXPECT_EQ(0, dlt_buffer_free_dynamic(&get)); + // Integer with 12345678 + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + EXPECT_EQ(0,dlt_buffer_push(&buf,(unsigned char *)&header,size)); + printf("#### %i\n", dlt_buffer_get(&buf,(unsigned char*)&header,size,0)); + EXPECT_LE(0, dlt_buffer_get(&buf,(unsigned char*)&header,size,12345678)); + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); } TEST(t_dlt_buffer_get, nullpointer) { - DltBuffer get; - DltUserHeader head_get; + DltBuffer buf; + DltUserHeader header; + int size = sizeof(DltUserHeader); - EXPECT_DEATH({dlt_buffer_get(NULL, (unsigned char*)&head_get,sizeof(DltUserHeader),0);}, ""); - EXPECT_DEATH({dlt_buffer_get(&get, (unsigned char*)&head_get,sizeof(DltUserHeader),0);}, ""); + // NULL-Pointer + EXPECT_GE(-1, dlt_buffer_get(NULL, NULL, 0, 0)); + EXPECT_GE(-1, dlt_buffer_get(NULL, NULL, 0, 1)); + EXPECT_GE(-1, dlt_buffer_get(NULL, NULL, size, 0)); + EXPECT_GE(-1, dlt_buffer_get(NULL, NULL, size, 1)); + EXPECT_GE(-1, dlt_buffer_get(NULL, (unsigned char*)&header, 0, 0)); + EXPECT_GE(-1, dlt_buffer_get(NULL, (unsigned char*)&header, 0, 1)); + EXPECT_GE(-1, dlt_buffer_get(NULL, (unsigned char*)&header, size, 0)); + EXPECT_GE(-1, dlt_buffer_get(NULL, (unsigned char*)&header, size, 1)); + EXPECT_GE(-1, dlt_buffer_get(&buf, NULL, 0, 0)); + EXPECT_GE(-1, dlt_buffer_get(&buf, NULL, 0, 1)); + EXPECT_GE(-1, dlt_buffer_get(&buf, NULL, size, 0)); + EXPECT_GE(-1, dlt_buffer_get(&buf, NULL, size, 1)); + EXPECT_GE(-1, dlt_buffer_get(&buf, (unsigned char*)&header, 0, 0)); + EXPECT_GE(-1, dlt_buffer_get(&buf, (unsigned char*)&header, 0, 1)); + EXPECT_GE(-1, dlt_buffer_get(&buf, (unsigned char*)&header, size, 0)); } -*/ /* End Method: dlt_common::dlt_buffer_get */ @@ -827,12 +846,9 @@ TEST(t_dlt_buffer_get_message_count, normal) TEST(t_dlt_buffer_get_message_count, abnormal) { DltBuffer buf; - DltUserHeader header; // Uninizialised, expected -1 EXPECT_GE(-1, dlt_buffer_get_message_count(&buf)); - - } TEST(t_dlt_buffer_get_message_count, nullpointer) { @@ -923,11 +939,211 @@ TEST(t_dlt_buffer_get_used_size, nullpointer) /* End Method: dlt_common::dlt_buffer_get_used_size*/ + + +/* Begin Method: dlt_common::dlt_buffer_write_block */ +TEST(t_dlt_buffer_write_block, normal) +{ + DltBuffer buf; + char * data; + int write; + int test1 = 1000; + int test2 = 8; + + // Normal Use-Case, expected same as size as input + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + write = ((int*)(buf.shm))[0]; + EXPECT_EQ(test1, get_test_dlt_buffer_write_block(&buf,&write, (unsigned char *)&data, test1)); + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); + + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + write = ((int*)(buf.shm))[0]; + EXPECT_EQ(test2, get_test_dlt_buffer_write_block(&buf,&write, (unsigned char *)&data, test2)); + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); + + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + write = ((int*)(buf.shm))[0]; + int tmp =0; + for(int i = 0; i<= 100; i++) + { + tmp += i; + EXPECT_EQ(tmp, get_test_dlt_buffer_write_block(&buf,&write, (unsigned char *)&data, i)); + } + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); +} +TEST(t_dlt_buffer_write_block, abnormal) +{ + DltBuffer buf; + char * data; + int write; + + // wrong values + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + write = ((int*)(buf.shm))[0]; + int tmp =0; + for(int i = 100; i<= 1000; i++) + { + tmp += i; + EXPECT_EQ(tmp, get_test_dlt_buffer_write_block(&buf,&write, (unsigned char *)&data, i)); + } + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); +} +TEST(t_dlt_buffer_write_block, nullpointer) +{ + DltBuffer buf; + char * data; + int write; + int test1 = 1000; + + // NULL-Pointer, expected < 0 + EXPECT_LE(-1, get_test_dlt_buffer_write_block(NULL, NULL, NULL, 0)); + EXPECT_LE(-1, get_test_dlt_buffer_write_block(NULL, NULL, NULL, test1)); + EXPECT_LE(-1, get_test_dlt_buffer_write_block(NULL, NULL, (unsigned char *)&data, 0)); + EXPECT_LE(-1, get_test_dlt_buffer_write_block(NULL, NULL, (unsigned char *)&data, test1)); + EXPECT_LE(-1, get_test_dlt_buffer_write_block(NULL, &write, NULL, 0)); + EXPECT_LE(-1, get_test_dlt_buffer_write_block(NULL, &write, NULL, test1)); + EXPECT_LE(-1, get_test_dlt_buffer_write_block(NULL, &write, (unsigned char *)&data, 0)); + EXPECT_LE(-1, get_test_dlt_buffer_write_block(NULL, &write, (unsigned char *)&data, test1)); + EXPECT_LE(-1, get_test_dlt_buffer_write_block(&buf, NULL, NULL, 0)); + EXPECT_LE(-1, get_test_dlt_buffer_write_block(&buf, NULL, NULL, test1)); + EXPECT_LE(-1, get_test_dlt_buffer_write_block(&buf, NULL, (unsigned char *)&data, 0)); + EXPECT_LE(-1, get_test_dlt_buffer_write_block(&buf, NULL, (unsigned char *)&data, test1)); + EXPECT_LE(-1, get_test_dlt_buffer_write_block(&buf, &write, NULL, 0)); + EXPECT_LE(-1, get_test_dlt_buffer_write_block(&buf, &write, NULL, test1)); + EXPECT_LE(-1, get_test_dlt_buffer_write_block(&buf, &write, (unsigned char *)&data, 0)); +} +/* End Method: dlt_common::dlt_buffer_write_block */ + + + + +/* Begin Method: dlt_common::dlt_buffer_read_block */ +TEST(t_dlt_buffer_read_block, normal) +{ + DltBuffer buf; + char * data; + int read; + int test1 = 1000; + int test2 = 8; + + // Normal Use-Case, expected same as size as input + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + read = ((int*)(buf.shm))[1]; + EXPECT_EQ(test1, get_test_dlt_buffer_write_block(&buf,&read, (unsigned char *)&data, test1)); + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); + + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + read = ((int*)(buf.shm))[1]; + EXPECT_EQ(test2, get_test_dlt_buffer_write_block(&buf,&read, (unsigned char *)&data, test2)); + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); + + +} +TEST(t_dlt_buffer_read_block, abnormal) +{ + DltBuffer buf; + char * data; + int read; + + // wrong values + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + read = ((int*)(buf.shm))[1]; + int tmp =0; + for(int i = 0; i<= 100; i++) + { + tmp += i; + EXPECT_EQ(tmp, get_test_dlt_buffer_read_block(&buf,&read, (unsigned char *)&data, i)); + } + EXPECT_EQ(0, dlt_buffer_free_dynamic(&buf)); +} +TEST(t_dlt_buffer_read_block, nullpointer) +{ + DltBuffer buf; + char * data; + int read; + int test1 = 1000; + + // NULL-Pointer, expected < 0 + EXPECT_LE(-1, get_test_dlt_buffer_read_block(NULL, NULL, NULL, 0)); + EXPECT_LE(-1, get_test_dlt_buffer_read_block(NULL, NULL, NULL, test1)); + EXPECT_LE(-1, get_test_dlt_buffer_read_block(NULL, NULL, (unsigned char *)&data, 0)); + EXPECT_LE(-1, get_test_dlt_buffer_read_block(NULL, NULL, (unsigned char *)&data, test1)); + EXPECT_LE(-1, get_test_dlt_buffer_read_block(NULL, &read, NULL, 0)); + EXPECT_LE(-1, get_test_dlt_buffer_read_block(NULL, &read, NULL, test1)); + EXPECT_LE(-1, get_test_dlt_buffer_read_block(NULL, &read, (unsigned char *)&data, 0)); + EXPECT_LE(-1, get_test_dlt_buffer_read_block(NULL, &read, (unsigned char *)&data, test1)); + EXPECT_LE(-1, get_test_dlt_buffer_read_block(&buf, NULL, NULL, 0)); + EXPECT_LE(-1, get_test_dlt_buffer_read_block(&buf, NULL, NULL, test1)); + EXPECT_LE(-1, get_test_dlt_buffer_read_block(&buf, NULL, (unsigned char *)&data, 0)); + EXPECT_LE(-1, get_test_dlt_buffer_read_block(&buf, NULL, (unsigned char *)&data, test1)); + EXPECT_LE(-1, get_test_dlt_buffer_read_block(&buf, &read, NULL, 0)); + EXPECT_LE(-1, get_test_dlt_buffer_read_block(&buf, &read, NULL, test1)); + EXPECT_LE(-1, get_test_dlt_buffer_read_block(&buf, &read, (unsigned char *)&data, 0)); +} +/* End Method: dlt_common::dlt_buffer_read_block */ + + + + +/* Begin Method: dlt_common::dlt_buffer_info */ +TEST(t_dlt_buffer_info, normal) +{ + DltBuffer buf; + + // Normal Use-Case + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + EXPECT_EQ(0, get_test_dlt_buffer_info(&buf)); +} +TEST(t_dlt_buffer_info, abnormal) +{ + DltBuffer buf; + + // Uninizialised, expected -1 + EXPECT_GE(-1, get_test_dlt_buffer_info(&buf)); +} +TEST(t_dlt_buffer_info, nullpointer) +{ + // NULL-Pointer, expected -1 + EXPECT_GE(-1, get_test_dlt_buffer_info(NULL)); +} +/* End Method: dlt_common::dlt_buffer_info */ + + + + +/* Begin Method: dlt_common::dlt_buffer_status */ +TEST(t_dlt_buffer_status, normal) +{ + DltBuffer buf; + + // Normal Use-Case + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + EXPECT_EQ(0, get_test_dlt_buffer_status(&buf)); +} +TEST(t_dlt_buffer_status, abnormal) +{ + DltBuffer buf; + + // Uninizialised, expected -1 + EXPECT_GE(-1, get_test_dlt_buffer_status(&buf)); +} +TEST(t_dlt_buffer_status, nullpointer) +{ + // NULL-Pointer, expected -1 + EXPECT_GE(-1, get_test_dlt_buffer_status(NULL)); +} +/* End Method: dlt_common::dlt_buffer_status */ + + + + /*##############################################################################################################################*/ /*##############################################################################################################################*/ /*##############################################################################################################################*/ + + /* Begin Method: dlt_common::dlt_message_init*/ TEST(t_dlt_message_init, normal) { @@ -957,13 +1173,9 @@ TEST(t_dlt_message_init, abnormal) } TEST(t_dlt_message_init, nullpointer) { - DltMessage msg; - //NULL-Pointer, expected -1 - EXPECT_GE(-1, dlt_message_init(NULL, NULL)); EXPECT_GE(-1, dlt_message_init(NULL, 0)); EXPECT_GE(-1, dlt_message_init(NULL, 1)); - EXPECT_GE(-1, dlt_message_init(&msg, NULL)); } /* End Method: dlt_common::dlt_message_init*/ @@ -1000,13 +1212,9 @@ TEST(t_dlt_message_free, abnormal) } TEST(t_dlt_message_free, nullpointer) { - DltMessage msg; - //NULL-Pointer, expected -1 - EXPECT_GE(-1, dlt_message_free(NULL, NULL)); EXPECT_GE(-1, dlt_message_free(NULL, 0)); EXPECT_GE(-1, dlt_message_free(NULL, 1)); - EXPECT_GE(-1, dlt_message_free(&msg, NULL)); } /* End Method: dlt_common::dlt_message_free */ @@ -1067,16 +1275,12 @@ TEST(t_dlt_file_open, nullpointer) /*---------------------------------------*/ // NULL-Pointer, expected -1 - EXPECT_GE(-1, dlt_file_open(NULL, NULL, NULL)); EXPECT_GE(-1, dlt_file_open(NULL, NULL, 0)); EXPECT_GE(-1, dlt_file_open(NULL, NULL, 1)); - EXPECT_GE(-1, dlt_file_open(NULL, openfile, NULL)); EXPECT_GE(-1, dlt_file_open(NULL, openfile, 0)); EXPECT_GE(-1, dlt_file_open(NULL, openfile, 1)); - EXPECT_GE(-1, dlt_file_open(&file, NULL, NULL)); EXPECT_GE(-1, dlt_file_open(&file, NULL, 0)); EXPECT_GE(-1, dlt_file_open(&file, NULL, 1)); - EXPECT_GE(-1, dlt_file_open(&file, openfile, NULL)); } /* End Method: dlt_common::dlt_file_open */ @@ -1158,27 +1362,20 @@ TEST(t_dlt_message_print_ascii, nullpointer) /*---------------------------------------*/ // NULL-Pointer, expected -1 - EXPECT_GE(-1, dlt_message_print_ascii(NULL,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_ascii(NULL,NULL,NULL,0)); - EXPECT_GE(-1, dlt_message_print_ascii(NULL,NULL,NULL,1)); - EXPECT_GE(-1, dlt_message_print_ascii(NULL,NULL,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_ascii(NULL,NULL,0,0)); + EXPECT_GE(-1, dlt_message_print_ascii(NULL,NULL,0,1)); EXPECT_GE(-1, dlt_message_print_ascii(NULL,NULL,DLT_DAEMON_TEXTSIZE,0)); EXPECT_GE(-1, dlt_message_print_ascii(NULL,NULL,DLT_DAEMON_TEXTSIZE,1)); - EXPECT_GE(-1, dlt_message_print_ascii(NULL,text,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_ascii(NULL,text,NULL,0)); - EXPECT_GE(-1, dlt_message_print_ascii(NULL,text,NULL,1)); - EXPECT_GE(-1, dlt_message_print_ascii(NULL,text,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_ascii(NULL,text,0,0)); + EXPECT_GE(-1, dlt_message_print_ascii(NULL,text,0,1)); EXPECT_GE(-1, dlt_message_print_ascii(NULL,text,DLT_DAEMON_TEXTSIZE,0)); EXPECT_GE(-1, dlt_message_print_ascii(NULL,text,DLT_DAEMON_TEXTSIZE,1)); - EXPECT_GE(-1, dlt_message_print_ascii(&file.msg,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_ascii(&file.msg,NULL,NULL,0)); - EXPECT_GE(-1, dlt_message_print_ascii(&file.msg,NULL,NULL,1)); - EXPECT_GE(-1, dlt_message_print_ascii(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_ascii(&file.msg,NULL,0,0)); + EXPECT_GE(-1, dlt_message_print_ascii(&file.msg,NULL,0,1)); EXPECT_GE(-1, dlt_message_print_ascii(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,0)); EXPECT_GE(-1, dlt_message_print_ascii(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,1)); - EXPECT_GE(-1, dlt_message_print_ascii(&file.msg,text,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_ascii(&file.msg,text,NULL,0)); - EXPECT_GE(-1, dlt_message_print_ascii(&file.msg,text,NULL,1)); + EXPECT_GE(-1, dlt_message_print_ascii(&file.msg,text,0,0)); + EXPECT_GE(-1, dlt_message_print_ascii(&file.msg,text,0,1)); } /* End Method: dlt_common::dlt_message_print_ascii*/ @@ -1309,28 +1506,20 @@ TEST(t_dlt_message_print_header, nullpointer) /*---------------------------------------*/ // NULL-Pointer, expected -1 - EXPECT_GE(-1, dlt_message_print_header(NULL,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_header(NULL,NULL,NULL,0)); - EXPECT_GE(-1, dlt_message_print_header(NULL,NULL,NULL,1)); - EXPECT_GE(-1, dlt_message_print_header(NULL,NULL,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_header(NULL,NULL,0,0)); + EXPECT_GE(-1, dlt_message_print_header(NULL,NULL,0,1)); EXPECT_GE(-1, dlt_message_print_header(NULL,NULL,DLT_DAEMON_TEXTSIZE,0)); EXPECT_GE(-1, dlt_message_print_header(NULL,NULL,DLT_DAEMON_TEXTSIZE,1)); - EXPECT_GE(-1, dlt_message_print_header(NULL,text,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_header(NULL,text,NULL,0)); - EXPECT_GE(-1, dlt_message_print_header(NULL,text,NULL,1)); - EXPECT_GE(-1, dlt_message_print_header(NULL,text,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_header(NULL,text,0,0)); + EXPECT_GE(-1, dlt_message_print_header(NULL,text,0,1)); EXPECT_GE(-1, dlt_message_print_header(NULL,text,DLT_DAEMON_TEXTSIZE,0)); EXPECT_GE(-1, dlt_message_print_header(NULL,text,DLT_DAEMON_TEXTSIZE,1)); - EXPECT_GE(-1, dlt_message_print_header(&file.msg,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_header(&file.msg,NULL,NULL,0)); - EXPECT_GE(-1, dlt_message_print_header(&file.msg,NULL,NULL,1)); - EXPECT_GE(-1, dlt_message_print_header(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_header(&file.msg,NULL,0,0)); + EXPECT_GE(-1, dlt_message_print_header(&file.msg,NULL,0,1)); EXPECT_GE(-1, dlt_message_print_header(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,0)); EXPECT_GE(-1, dlt_message_print_header(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,1)); - EXPECT_GE(-1, dlt_message_print_header(&file.msg,text,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_header(&file.msg,text,NULL,0)); - EXPECT_GE(-1, dlt_message_print_header(&file.msg,text,NULL,1)); - EXPECT_GE(-1, dlt_message_print_header(&file.msg,text,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_header(&file.msg,text,0,0)); + EXPECT_GE(-1, dlt_message_print_header(&file.msg,text,0,1)); } /* End Method: dlt_common::dlt_message_print_header */ @@ -1461,28 +1650,20 @@ TEST(t_dlt_message_print_hex, nullpointer) /*---------------------------------------*/ // NULL-Pointer, expected -1 - EXPECT_GE(-1, dlt_message_print_hex(NULL,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_hex(NULL,NULL,NULL,0)); - EXPECT_GE(-1, dlt_message_print_hex(NULL,NULL,NULL,1)); - EXPECT_GE(-1, dlt_message_print_hex(NULL,NULL,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_hex(NULL,NULL,0,0)); + EXPECT_GE(-1, dlt_message_print_hex(NULL,NULL,0,1)); EXPECT_GE(-1, dlt_message_print_hex(NULL,NULL,DLT_DAEMON_TEXTSIZE,0)); EXPECT_GE(-1, dlt_message_print_hex(NULL,NULL,DLT_DAEMON_TEXTSIZE,1)); - EXPECT_GE(-1, dlt_message_print_hex(NULL,text,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_hex(NULL,text,NULL,0)); - EXPECT_GE(-1, dlt_message_print_hex(NULL,text,NULL,1)); - EXPECT_GE(-1, dlt_message_print_hex(NULL,text,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_hex(NULL,text,0,0)); + EXPECT_GE(-1, dlt_message_print_hex(NULL,text,0,1)); EXPECT_GE(-1, dlt_message_print_hex(NULL,text,DLT_DAEMON_TEXTSIZE,0)); EXPECT_GE(-1, dlt_message_print_hex(NULL,text,DLT_DAEMON_TEXTSIZE,1)); - EXPECT_GE(-1, dlt_message_print_hex(&file.msg,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_hex(&file.msg,NULL,NULL,0)); - EXPECT_GE(-1, dlt_message_print_hex(&file.msg,NULL,NULL,1)); - EXPECT_GE(-1, dlt_message_print_hex(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_hex(&file.msg,NULL,0,0)); + EXPECT_GE(-1, dlt_message_print_hex(&file.msg,NULL,0,1)); EXPECT_GE(-1, dlt_message_print_hex(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,0)); EXPECT_GE(-1, dlt_message_print_hex(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,1)); - EXPECT_GE(-1, dlt_message_print_hex(&file.msg,text,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_hex(&file.msg,text,NULL,0)); - EXPECT_GE(-1, dlt_message_print_hex(&file.msg,text,NULL,1)); - EXPECT_GE(-1, dlt_message_print_hex(&file.msg,text,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_hex(&file.msg,text,0,0)); + EXPECT_GE(-1, dlt_message_print_hex(&file.msg,text,0,1)); } /* End Method: dlt_common::dlt_message_print_hex */ @@ -1614,28 +1795,20 @@ TEST(t_dlt_message_print_mixed_plain, nullpointer) /*---------------------------------------*/ // NULL-Pointer, expected -1 - EXPECT_GE(-1, dlt_message_print_mixed_plain(NULL,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_mixed_plain(NULL,NULL,NULL,0)); - EXPECT_GE(-1, dlt_message_print_mixed_plain(NULL,NULL,NULL,1)); - EXPECT_GE(-1, dlt_message_print_mixed_plain(NULL,NULL,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_mixed_plain(NULL,NULL,0,0)); + EXPECT_GE(-1, dlt_message_print_mixed_plain(NULL,NULL,0,1)); EXPECT_GE(-1, dlt_message_print_mixed_plain(NULL,NULL,DLT_DAEMON_TEXTSIZE,0)); EXPECT_GE(-1, dlt_message_print_mixed_plain(NULL,NULL,DLT_DAEMON_TEXTSIZE,1)); - EXPECT_GE(-1, dlt_message_print_mixed_plain(NULL,text,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_mixed_plain(NULL,text,NULL,0)); - EXPECT_GE(-1, dlt_message_print_mixed_plain(NULL,text,NULL,1)); - EXPECT_GE(-1, dlt_message_print_mixed_plain(NULL,text,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_mixed_plain(NULL,text,0,0)); + EXPECT_GE(-1, dlt_message_print_mixed_plain(NULL,text,0,1)); EXPECT_GE(-1, dlt_message_print_mixed_plain(NULL,text,DLT_DAEMON_TEXTSIZE,0)); EXPECT_GE(-1, dlt_message_print_mixed_plain(NULL,text,DLT_DAEMON_TEXTSIZE,1)); - EXPECT_GE(-1, dlt_message_print_mixed_plain(&file.msg,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_mixed_plain(&file.msg,NULL,NULL,0)); - EXPECT_GE(-1, dlt_message_print_mixed_plain(&file.msg,NULL,NULL,1)); - EXPECT_GE(-1, dlt_message_print_mixed_plain(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_mixed_plain(&file.msg,NULL,0,0)); + EXPECT_GE(-1, dlt_message_print_mixed_plain(&file.msg,NULL,0,1)); EXPECT_GE(-1, dlt_message_print_mixed_plain(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,0)); EXPECT_GE(-1, dlt_message_print_mixed_plain(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,1)); - EXPECT_GE(-1, dlt_message_print_mixed_plain(&file.msg,text,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_mixed_plain(&file.msg,text,NULL,0)); - EXPECT_GE(-1, dlt_message_print_mixed_plain(&file.msg,text,NULL,1)); - EXPECT_GE(-1, dlt_message_print_mixed_plain(&file.msg,text,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_mixed_plain(&file.msg,text,0,0)); + EXPECT_GE(-1, dlt_message_print_mixed_plain(&file.msg,text,0,1)); } /* End Method: dlt_common::dlt_message_print_mixed_pain */ @@ -1766,28 +1939,20 @@ TEST(t_dlt_message_print_mixed_html, nullpointer) /*---------------------------------------*/ // NULL-Pointer, expected -1 - EXPECT_GE(-1, dlt_message_print_mixed_html(NULL,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_mixed_html(NULL,NULL,NULL,0)); - EXPECT_GE(-1, dlt_message_print_mixed_html(NULL,NULL,NULL,1)); - EXPECT_GE(-1, dlt_message_print_mixed_html(NULL,NULL,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_mixed_html(NULL,NULL,0,0)); + EXPECT_GE(-1, dlt_message_print_mixed_html(NULL,NULL,0,1)); EXPECT_GE(-1, dlt_message_print_mixed_html(NULL,NULL,DLT_DAEMON_TEXTSIZE,0)); EXPECT_GE(-1, dlt_message_print_mixed_html(NULL,NULL,DLT_DAEMON_TEXTSIZE,1)); - EXPECT_GE(-1, dlt_message_print_mixed_html(NULL,text,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_mixed_html(NULL,text,NULL,0)); - EXPECT_GE(-1, dlt_message_print_mixed_html(NULL,text,NULL,1)); - EXPECT_GE(-1, dlt_message_print_mixed_html(NULL,text,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_mixed_html(NULL,text,0,0)); + EXPECT_GE(-1, dlt_message_print_mixed_html(NULL,text,0,1)); EXPECT_GE(-1, dlt_message_print_mixed_html(NULL,text,DLT_DAEMON_TEXTSIZE,0)); EXPECT_GE(-1, dlt_message_print_mixed_html(NULL,text,DLT_DAEMON_TEXTSIZE,1)); - EXPECT_GE(-1, dlt_message_print_mixed_html(&file.msg,NULL,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_mixed_html(&file.msg,NULL,NULL,0)); - EXPECT_GE(-1, dlt_message_print_mixed_html(&file.msg,NULL,NULL,1)); - EXPECT_GE(-1, dlt_message_print_mixed_html(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_mixed_html(&file.msg,NULL,0,0)); + EXPECT_GE(-1, dlt_message_print_mixed_html(&file.msg,NULL,0,1)); EXPECT_GE(-1, dlt_message_print_mixed_html(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,0)); EXPECT_GE(-1, dlt_message_print_mixed_html(&file.msg,NULL,DLT_DAEMON_TEXTSIZE,1)); - EXPECT_GE(-1, dlt_message_print_mixed_html(&file.msg,text,NULL,NULL)); - EXPECT_GE(-1, dlt_message_print_mixed_html(&file.msg,text,NULL,0)); - EXPECT_GE(-1, dlt_message_print_mixed_html(&file.msg,text,NULL,1)); - EXPECT_GE(-1, dlt_message_print_mixed_html(&file.msg,text,DLT_DAEMON_TEXTSIZE,NULL)); + EXPECT_GE(-1, dlt_message_print_mixed_html(&file.msg,text,0,0)); + EXPECT_GE(-1, dlt_message_print_mixed_html(&file.msg,text,0,1)); } /* End Method: dlt_common::dlt_message_print_mixed_html */ @@ -1930,16 +2095,12 @@ TEST(t_dlt_message_filter_check, nullpointer) /*---------------------------------------*/ // NULL-Pointer, expected -1 - EXPECT_GE(-1, dlt_message_filter_check(NULL, NULL, NULL)); EXPECT_GE(-1, dlt_message_filter_check(NULL, NULL, 0)); EXPECT_GE(-1, dlt_message_filter_check(NULL, NULL, 1)); - EXPECT_GE(-1, dlt_message_filter_check(NULL, &filter, NULL)); EXPECT_GE(-1, dlt_message_filter_check(NULL, &filter, 0)); EXPECT_GE(-1, dlt_message_filter_check(NULL, &filter, 1)); - EXPECT_GE(-1, dlt_message_filter_check(&file.msg, NULL, NULL)); EXPECT_GE(-1, dlt_message_filter_check(&file.msg, NULL, 0)); EXPECT_GE(-1, dlt_message_filter_check(&file.msg, NULL, 1)); - EXPECT_GE(-1, dlt_message_filter_check(&file.msg, &filter, NULL)); } /* End Method:dlt_common::dlt_message_filter_check */ @@ -2007,21 +2168,9 @@ TEST(t_dlt_message_get_extraparamters, abnormal) } TEST(t_dlt_message_get_extraparamters, nullpointer) { - DltFile file; - - /* Get PWD so file and filter can be used*/ - char pwd[100]; - getcwd(pwd, 100); - char * openfile; - openfile = (char*)malloc(100 + 14); - sprintf(openfile, "%s/testfile.dlt", pwd); - /*---------------------------------------*/ - // NULL-Pointer, expected -1 - EXPECT_GE(-1, dlt_message_get_extraparameters(NULL, NULL)); EXPECT_GE(-1, dlt_message_get_extraparameters(NULL, 0)); EXPECT_GE(-1, dlt_message_get_extraparameters(NULL, 1)); - EXPECT_GE(-1, dlt_message_get_extraparameters(&file.msg, NULL)); } /* End Method:dlt_common::dlt_message_get_extraparameters */ @@ -2105,28 +2254,20 @@ TEST(t_dlt_message_header, nullpointer) /*---------------------------------------*/ // NULL-Pointer, expected -1 - EXPECT_GE(-1, dlt_message_header(NULL, NULL, NULL, NULL)); - EXPECT_GE(-1, dlt_message_header(NULL, NULL, NULL, 0)); - EXPECT_GE(-1, dlt_message_header(NULL, NULL, NULL, 1)); - EXPECT_GE(-1, dlt_message_header(NULL, NULL, DLT_DAEMON_TEXTSIZE, NULL)); + EXPECT_GE(-1, dlt_message_header(NULL, NULL, 0, 0)); + EXPECT_GE(-1, dlt_message_header(NULL, NULL, 0, 1)); EXPECT_GE(-1, dlt_message_header(NULL, NULL, DLT_DAEMON_TEXTSIZE, 0)); EXPECT_GE(-1, dlt_message_header(NULL, NULL, DLT_DAEMON_TEXTSIZE, 1)); - EXPECT_GE(-1, dlt_message_header(NULL, text, NULL, NULL)); - EXPECT_GE(-1, dlt_message_header(NULL, text, NULL, 0)); - EXPECT_GE(-1, dlt_message_header(NULL, text, NULL, 1)); - EXPECT_GE(-1, dlt_message_header(NULL, text, DLT_DAEMON_TEXTSIZE, NULL)); + EXPECT_GE(-1, dlt_message_header(NULL, text, 0, 0)); + EXPECT_GE(-1, dlt_message_header(NULL, text, 0, 1)); EXPECT_GE(-1, dlt_message_header(NULL, text, DLT_DAEMON_TEXTSIZE, 0)); EXPECT_GE(-1, dlt_message_header(NULL, text, DLT_DAEMON_TEXTSIZE, 1)); - EXPECT_GE(-1, dlt_message_header(&file.msg, NULL, NULL, NULL)); - EXPECT_GE(-1, dlt_message_header(&file.msg, NULL, NULL, 0)); - EXPECT_GE(-1, dlt_message_header(&file.msg, NULL, NULL, 1)); - EXPECT_GE(-1, dlt_message_header(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, NULL)); + EXPECT_GE(-1, dlt_message_header(&file.msg, NULL, 0, 0)); + EXPECT_GE(-1, dlt_message_header(&file.msg, NULL, 0, 1)); EXPECT_GE(-1, dlt_message_header(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 0)); EXPECT_GE(-1, dlt_message_header(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 1)); - EXPECT_GE(-1, dlt_message_header(&file.msg, text, NULL, NULL)); - EXPECT_GE(-1, dlt_message_header(&file.msg, text, NULL, 0)); - EXPECT_GE(-1, dlt_message_header(&file.msg, text, NULL, 1)); - EXPECT_GE(-1, dlt_message_header(&file.msg, text, DLT_DAEMON_TEXTSIZE, NULL)); + EXPECT_GE(-1, dlt_message_header(&file.msg, text, 0, 0)); + EXPECT_GE(-1, dlt_message_header(&file.msg, text, 0, 1)); } /* End Method:dlt_common::dlt_message_header */ @@ -2292,60 +2433,34 @@ TEST(t_dlt_message_header_flags, nullpointer) /*---------------------------------------*/ // NULL-Pointer, expected -1 - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, NULL, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, NULL, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, NULL, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_NONE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_TIME, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_TMSTP, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_MSGCNT, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_ECUID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_APID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_CTID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_MSGTYPE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_MSGSUBTYPE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_VNVSTATUS, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_NOARG, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_ALL, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_NONE, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_TIME, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_TMSTP, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_MSGCNT, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_ECUID, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_APID, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_CTID, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_MSGTYPE, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_MSGSUBTYPE, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_VNVSTATUS, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_NOARG, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_ALL, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_NONE, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_TIME, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_TMSTP, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_MSGCNT, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_ECUID, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_APID, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_CTID, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_MSGTYPE, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_MSGSUBTYPE, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_VNVSTATUS, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_NOARG, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, NULL, DLT_HEADER_SHOW_ALL, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, NULL, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, NULL, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, NULL, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGCNT, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ECUID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, NULL)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, 0, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, 0, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_NONE, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_TIME, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_TMSTP, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_MSGCNT, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_ECUID, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_APID, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_CTID, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_MSGTYPE, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_MSGSUBTYPE, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_VNVSTATUS, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_NOARG, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_ALL, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_NONE, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_TIME, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_TMSTP, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_MSGCNT, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_ECUID, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_APID, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_CTID, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_MSGTYPE, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_MSGSUBTYPE, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_VNVSTATUS, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_NOARG, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, 0, DLT_HEADER_SHOW_ALL, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, 0, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, 0, 1)); EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, 0)); EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, 0)); EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, 0)); @@ -2370,60 +2485,34 @@ TEST(t_dlt_message_header_flags, nullpointer) EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 1)); EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 1)); EXPECT_GE(-1, dlt_message_header_flags(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, NULL, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, NULL, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, NULL, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_NONE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_TIME, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_TMSTP, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_MSGCNT, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_ECUID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_APID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_CTID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_MSGTYPE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_MSGSUBTYPE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_VNVSTATUS, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_NOARG, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_ALL, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_NONE, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_TIME, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_TMSTP, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_MSGCNT, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_ECUID, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_APID, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_CTID, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_MSGTYPE, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_MSGSUBTYPE, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_VNVSTATUS, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_NOARG, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_ALL, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_NONE, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_TIME, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_TMSTP, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_MSGCNT, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_ECUID, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_APID, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_CTID, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_MSGTYPE, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_MSGSUBTYPE, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_VNVSTATUS, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_NOARG, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, NULL, DLT_HEADER_SHOW_ALL, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, NULL, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, NULL, 0)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, NULL, 1)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGCNT, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ECUID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, NULL)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, 0, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, 0, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_NONE, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_TIME, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_TMSTP, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_MSGCNT, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_ECUID, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_APID, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_CTID, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_MSGTYPE, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_MSGSUBTYPE, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_VNVSTATUS, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_NOARG, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_ALL, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_NONE, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_TIME, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_TMSTP, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_MSGCNT, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_ECUID, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_APID, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_CTID, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_MSGTYPE, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_MSGSUBTYPE, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_VNVSTATUS, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_NOARG, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, 0, DLT_HEADER_SHOW_ALL, 1)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, 0, 0)); + EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, 0, 1)); EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, 0)); EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, 0)); EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, 0)); @@ -2448,60 +2537,34 @@ TEST(t_dlt_message_header_flags, nullpointer) EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 1)); EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 1)); EXPECT_GE(-1, dlt_message_header_flags(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, NULL, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, NULL, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, NULL, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_NONE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_TIME, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_TMSTP, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_MSGCNT, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_ECUID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_APID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_CTID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_MSGTYPE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_MSGSUBTYPE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_VNVSTATUS, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_NOARG, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_ALL, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_NONE, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_TIME, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_TMSTP, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_MSGCNT, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_ECUID, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_APID, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_CTID, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_MSGTYPE, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_MSGSUBTYPE, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_VNVSTATUS, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_NOARG, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_ALL, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_NONE, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_TIME, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_TMSTP, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_MSGCNT, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_ECUID, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_APID, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_CTID, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_MSGTYPE, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_MSGSUBTYPE, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_VNVSTATUS, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_NOARG, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, NULL, DLT_HEADER_SHOW_ALL, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, NULL, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, NULL, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, NULL, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGCNT, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ECUID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, NULL)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, 0, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, 0, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_NONE, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_TIME, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_TMSTP, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_MSGCNT, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_ECUID, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_APID, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_CTID, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_MSGTYPE, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_MSGSUBTYPE, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_VNVSTATUS, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_NOARG, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_ALL, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_NONE, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_TIME, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_TMSTP, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_MSGCNT, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_ECUID, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_APID, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_CTID, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_MSGTYPE, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_MSGSUBTYPE, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_VNVSTATUS, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_NOARG, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, 0, DLT_HEADER_SHOW_ALL, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 0, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 0, 1)); EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, 0)); EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, 0)); EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, 0)); @@ -2526,60 +2589,34 @@ TEST(t_dlt_message_header_flags, nullpointer) EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, 1)); EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, 1)); EXPECT_GE(-1, dlt_message_header_flags(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, NULL, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, NULL, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, NULL, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_NONE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_TIME, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_TMSTP, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_MSGCNT, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_ECUID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_APID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_CTID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_MSGTYPE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_MSGSUBTYPE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_VNVSTATUS, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_NOARG, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_ALL, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_NONE, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_TIME, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_TMSTP, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_MSGCNT, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_ECUID, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_APID, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_CTID, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_MSGTYPE, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_MSGSUBTYPE, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_VNVSTATUS, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_NOARG, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_ALL, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_NONE, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_TIME, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_TMSTP, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_MSGCNT, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_ECUID, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_APID, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_CTID, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_MSGTYPE, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_MSGSUBTYPE, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_VNVSTATUS, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_NOARG, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, NULL, DLT_HEADER_SHOW_ALL, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, NULL, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, NULL, 0)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, NULL, 1)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NONE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TIME, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_TMSTP, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGCNT, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ECUID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_APID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_CTID, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGTYPE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_MSGSUBTYPE, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_VNVSTATUS, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_NOARG, NULL)); - EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_HEADER_SHOW_ALL, NULL)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, 0, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, 0, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_NONE, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_TIME, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_TMSTP, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_MSGCNT, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_ECUID, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_APID, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_CTID, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_MSGTYPE, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_MSGSUBTYPE, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_VNVSTATUS, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_NOARG, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_ALL, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_NONE, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_TIME, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_TMSTP, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_MSGCNT, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_ECUID, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_APID, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_CTID, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_MSGTYPE, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_MSGSUBTYPE, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_VNVSTATUS, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_NOARG, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, 0, DLT_HEADER_SHOW_ALL, 1)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0, 0)); + EXPECT_GE(-1, dlt_message_header_flags(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0, 1)); } /* End Method:dlt_common::dlt_message_header_flags */ @@ -2710,32 +2747,20 @@ TEST(t_dlt_message_payload, nullpointer) /*---------------------------------------*/ // NULL-Pointer, expected -1 - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, NULL, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, NULL, 0)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, NULL, 1)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, DLT_OUTPUT_HEX, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, DLT_OUTPUT_ASCII, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, DLT_OUTPUT_MIXED_FOR_PLAIN, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, DLT_OUTPUT_MIXED_FOR_HTML, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, DLT_OUTPUT_ASCII_LIMITED, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, DLT_OUTPUT_HEX, 0)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, DLT_OUTPUT_ASCII, 0)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, DLT_OUTPUT_MIXED_FOR_PLAIN, 0)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, DLT_OUTPUT_MIXED_FOR_HTML, 0)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, DLT_OUTPUT_ASCII_LIMITED, 0)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, DLT_OUTPUT_HEX, 1)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, DLT_OUTPUT_ASCII, 1)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, DLT_OUTPUT_MIXED_FOR_PLAIN, 1)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, DLT_OUTPUT_MIXED_FOR_HTML, 1)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, NULL, DLT_OUTPUT_ASCII_LIMITED, 1)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, DLT_DAEMON_TEXTSIZE, NULL, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, DLT_DAEMON_TEXTSIZE, NULL, 0)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, DLT_DAEMON_TEXTSIZE, NULL, 1)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, NULL)); + EXPECT_GE(-1, dlt_message_payload(NULL, NULL, 0, 0, 0)); + EXPECT_GE(-1, dlt_message_payload(NULL, NULL, 0, 0, 1)); + EXPECT_GE(-1, dlt_message_payload(NULL, NULL, 0, DLT_OUTPUT_HEX, 0)); + EXPECT_GE(-1, dlt_message_payload(NULL, NULL, 0, DLT_OUTPUT_ASCII, 0)); + EXPECT_GE(-1, dlt_message_payload(NULL, NULL, 0, DLT_OUTPUT_MIXED_FOR_PLAIN, 0)); + EXPECT_GE(-1, dlt_message_payload(NULL, NULL, 0, DLT_OUTPUT_MIXED_FOR_HTML, 0)); + EXPECT_GE(-1, dlt_message_payload(NULL, NULL, 0, DLT_OUTPUT_ASCII_LIMITED, 0)); + EXPECT_GE(-1, dlt_message_payload(NULL, NULL, 0, DLT_OUTPUT_HEX, 1)); + EXPECT_GE(-1, dlt_message_payload(NULL, NULL, 0, DLT_OUTPUT_ASCII, 1)); + EXPECT_GE(-1, dlt_message_payload(NULL, NULL, 0, DLT_OUTPUT_MIXED_FOR_PLAIN, 1)); + EXPECT_GE(-1, dlt_message_payload(NULL, NULL, 0, DLT_OUTPUT_MIXED_FOR_HTML, 1)); + EXPECT_GE(-1, dlt_message_payload(NULL, NULL, 0, DLT_OUTPUT_ASCII_LIMITED, 1)); + EXPECT_GE(-1, dlt_message_payload(NULL, NULL, DLT_DAEMON_TEXTSIZE, 0, 0)); + EXPECT_GE(-1, dlt_message_payload(NULL, NULL, DLT_DAEMON_TEXTSIZE, 0, 1)); EXPECT_GE(-1, dlt_message_payload(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 0)); EXPECT_GE(-1, dlt_message_payload(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 0)); EXPECT_GE(-1, dlt_message_payload(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 0)); @@ -2746,32 +2771,20 @@ TEST(t_dlt_message_payload, nullpointer) EXPECT_GE(-1, dlt_message_payload(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 1)); EXPECT_GE(-1, dlt_message_payload(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 1)); EXPECT_GE(-1, dlt_message_payload(NULL, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 1)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, NULL, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, NULL, 0)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, NULL, 1)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, DLT_OUTPUT_HEX, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, DLT_OUTPUT_ASCII, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, DLT_OUTPUT_MIXED_FOR_PLAIN, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, DLT_OUTPUT_MIXED_FOR_HTML, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, DLT_OUTPUT_ASCII_LIMITED, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, DLT_OUTPUT_HEX, 0)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, DLT_OUTPUT_ASCII, 0)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, DLT_OUTPUT_MIXED_FOR_PLAIN, 0)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, DLT_OUTPUT_MIXED_FOR_HTML, 0)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, DLT_OUTPUT_ASCII_LIMITED, 0)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, DLT_OUTPUT_HEX, 1)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, DLT_OUTPUT_ASCII, 1)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, DLT_OUTPUT_MIXED_FOR_PLAIN, 1)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, DLT_OUTPUT_MIXED_FOR_HTML, 1)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, NULL, DLT_OUTPUT_ASCII_LIMITED, 1)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, DLT_DAEMON_TEXTSIZE, NULL, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, DLT_DAEMON_TEXTSIZE, NULL, 0)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, DLT_DAEMON_TEXTSIZE, NULL, 1)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, NULL)); - EXPECT_GE(-1, dlt_message_payload(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, NULL)); + EXPECT_GE(-1, dlt_message_payload(NULL, text, 0, 0, 0)); + EXPECT_GE(-1, dlt_message_payload(NULL, text, 0, 0, 1)); + EXPECT_GE(-1, dlt_message_payload(NULL, text, 0, DLT_OUTPUT_HEX, 0)); + EXPECT_GE(-1, dlt_message_payload(NULL, text, 0, DLT_OUTPUT_ASCII, 0)); + EXPECT_GE(-1, dlt_message_payload(NULL, text, 0, DLT_OUTPUT_MIXED_FOR_PLAIN, 0)); + EXPECT_GE(-1, dlt_message_payload(NULL, text, 0, DLT_OUTPUT_MIXED_FOR_HTML, 0)); + EXPECT_GE(-1, dlt_message_payload(NULL, text, 0, DLT_OUTPUT_ASCII_LIMITED, 0)); + EXPECT_GE(-1, dlt_message_payload(NULL, text, 0, DLT_OUTPUT_HEX, 1)); + EXPECT_GE(-1, dlt_message_payload(NULL, text, 0, DLT_OUTPUT_ASCII, 1)); + EXPECT_GE(-1, dlt_message_payload(NULL, text, 0, DLT_OUTPUT_MIXED_FOR_PLAIN, 1)); + EXPECT_GE(-1, dlt_message_payload(NULL, text, 0, DLT_OUTPUT_MIXED_FOR_HTML, 1)); + EXPECT_GE(-1, dlt_message_payload(NULL, text, 0, DLT_OUTPUT_ASCII_LIMITED, 1)); + EXPECT_GE(-1, dlt_message_payload(NULL, text, DLT_DAEMON_TEXTSIZE, 0, 0)); + EXPECT_GE(-1, dlt_message_payload(NULL, text, DLT_DAEMON_TEXTSIZE, 0, 1)); EXPECT_GE(-1, dlt_message_payload(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 0)); EXPECT_GE(-1, dlt_message_payload(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 0)); EXPECT_GE(-1, dlt_message_payload(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 0)); @@ -2782,32 +2795,20 @@ TEST(t_dlt_message_payload, nullpointer) EXPECT_GE(-1, dlt_message_payload(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 1)); EXPECT_GE(-1, dlt_message_payload(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 1)); EXPECT_GE(-1, dlt_message_payload(NULL, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 1)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, NULL, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, NULL, 0)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, NULL, 1)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, DLT_OUTPUT_HEX, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, DLT_OUTPUT_ASCII, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, DLT_OUTPUT_MIXED_FOR_PLAIN, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, DLT_OUTPUT_MIXED_FOR_HTML, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, DLT_OUTPUT_ASCII_LIMITED, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, DLT_OUTPUT_HEX, 0)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, DLT_OUTPUT_ASCII, 0)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, DLT_OUTPUT_MIXED_FOR_PLAIN, 0)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, DLT_OUTPUT_MIXED_FOR_HTML, 0)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, DLT_OUTPUT_ASCII_LIMITED, 0)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, DLT_OUTPUT_HEX, 1)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, DLT_OUTPUT_ASCII, 1)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, DLT_OUTPUT_MIXED_FOR_PLAIN, 1)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, DLT_OUTPUT_MIXED_FOR_HTML, 1)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, NULL, DLT_OUTPUT_ASCII_LIMITED, 1)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, NULL, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, NULL, 0)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, NULL, 1)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, NULL)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, 0, 0, 0)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, 0, 0, 1)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, 0, DLT_OUTPUT_HEX, 0)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, 0, DLT_OUTPUT_ASCII, 0)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, 0, DLT_OUTPUT_MIXED_FOR_PLAIN, 0)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, 0, DLT_OUTPUT_MIXED_FOR_HTML, 0)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, 0, DLT_OUTPUT_ASCII_LIMITED, 0)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, 0, DLT_OUTPUT_HEX, 1)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, 0, DLT_OUTPUT_ASCII, 1)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, 0, DLT_OUTPUT_MIXED_FOR_PLAIN, 1)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, 0, DLT_OUTPUT_MIXED_FOR_HTML, 1)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, 0, DLT_OUTPUT_ASCII_LIMITED, 1)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 0, 0)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, 0, 1)); EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 0)); EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, 0)); EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 0)); @@ -2818,33 +2819,20 @@ TEST(t_dlt_message_payload, nullpointer) EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, 1)); EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, 1)); EXPECT_GE(-1, dlt_message_payload(&file.msg, NULL, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, 1)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, NULL, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, NULL, 0)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, NULL, 1)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, DLT_OUTPUT_HEX, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, DLT_OUTPUT_ASCII, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, DLT_OUTPUT_MIXED_FOR_PLAIN, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, DLT_OUTPUT_MIXED_FOR_HTML, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, DLT_OUTPUT_ASCII_LIMITED, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, DLT_OUTPUT_HEX, 0)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, DLT_OUTPUT_ASCII, 0)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, DLT_OUTPUT_MIXED_FOR_PLAIN, 0)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, DLT_OUTPUT_MIXED_FOR_HTML, 0)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, DLT_OUTPUT_ASCII_LIMITED, 0)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, DLT_OUTPUT_HEX, 1)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, DLT_OUTPUT_ASCII, 1)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, DLT_OUTPUT_MIXED_FOR_PLAIN, 1)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, DLT_OUTPUT_MIXED_FOR_HTML, 1)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, NULL, DLT_OUTPUT_ASCII_LIMITED, 1)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, NULL, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, NULL, 0)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, NULL, 1)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_PLAIN, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_MIXED_FOR_HTML, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_ASCII_LIMITED, NULL)); - EXPECT_GE(-1, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, DLT_OUTPUT_HEX, 0)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, text, 0, 0, 0)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, text, 0, 0, 1)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, text, 0, DLT_OUTPUT_HEX, 0)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, text, 0, DLT_OUTPUT_ASCII, 0)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, text, 0, DLT_OUTPUT_MIXED_FOR_PLAIN, 0)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, text, 0, DLT_OUTPUT_MIXED_FOR_HTML, 0)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, text, 0, DLT_OUTPUT_ASCII_LIMITED, 0)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, text, 0, DLT_OUTPUT_HEX, 1)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, text, 0, DLT_OUTPUT_ASCII, 1)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, text, 0, DLT_OUTPUT_MIXED_FOR_PLAIN, 1)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, text, 0, DLT_OUTPUT_MIXED_FOR_HTML, 1)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, text, 0, DLT_OUTPUT_ASCII_LIMITED, 1)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0, 0)); + EXPECT_GE(-1, dlt_message_payload(&file.msg, text, DLT_DAEMON_TEXTSIZE, 0, 1)); } /* End Method:dlt_common::dlt_message_payload */ @@ -2907,6 +2895,19 @@ TEST(t_dlt_message_set_extraparamters, abnormal) } TEST(t_dlt_message_set_extraparamters, nullpointer) +{ + // NULL-Pointer, expect -1 + EXPECT_GE(-1, dlt_message_set_extraparameters(NULL, 0)); + EXPECT_GE(-1, dlt_message_set_extraparameters(NULL, 1)); +} +/* End Method:dlt_common::dlt_message_set_extraparameters */ + + + + + +/* Begin Method:dlt_common::dlt_message_read */ +TEST(t_dlt_message_read, normal) { DltFile file; // Get PWD so file and filter can be used @@ -2917,13 +2918,387 @@ TEST(t_dlt_message_set_extraparamters, nullpointer) sprintf(openfile, "%s/testfile.dlt", pwd); /*---------------------------------------*/ - // NULL-Pointer, expect -1 - EXPECT_GE(-1, dlt_message_set_extraparameters(NULL, NULL)); - EXPECT_GE(-1, dlt_message_set_extraparameters(NULL, 0)); - EXPECT_GE(-1, dlt_message_set_extraparameters(NULL, 1)); - EXPECT_GE(-1, dlt_message_set_extraparameters(&file.msg, NULL)); + DltBuffer buf; + + EXPECT_EQ(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE)); + EXPECT_EQ(0, dlt_file_init(&file, 0)); + EXPECT_EQ(0, dlt_file_open(&file, openfile, 0)); + while (dlt_file_read(&file,0)>=0){} + for(int i=0;i=0){} + for(int i=0;i=0){} + for(int i=0;i=0){} + for(int i=0;i=0){} + for(int i=0;i