Rework of unit tests in gtest_dlt_common

Fix all nullpointer errors in dlt_common.c

Signed-off-by: Stefan Held <stefan_held@mentor.com>
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>

3 files changed, 482 insertions, 271 deletions

diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c
index 613018f..8f59b67 100755
--- a/src/shared/dlt_common.c
+++ b/src/shared/dlt_common.c
@@ -292,6 +292,10 @@ void dlt_print_id(char *text,const char *id)
 {
     int i, len;
 
+    // check nullpointer
+    if(!text || !id)
+        return;
+
     if (text==0)
     {
         return;
@@ -314,6 +318,10 @@ void dlt_print_id(char *text,const char *id)
 
 void dlt_set_id(char *id,const char *text)
 {
+    // check nullpointer
+    if(!id || !text)
+        return;
+
     id[0] = 0;
     id[1] = 0;
     id[2] = 0;
@@ -1588,10 +1596,8 @@ int dlt_file_open(DltFile *file,const char *filename,int verbose)
 {
     PRINT_FUNCTION_VERBOSE(verbose);
 
-    if (file==0)
-    {
+    if(!file || !filename)
         return -1;
-    }
 
     /* reset counters */
     file->counter = 0;
@@ -1972,8 +1978,12 @@ int get_test_dlt_log_set_level()
 
 void dlt_log_set_filename(const char *filename)
 {
-        strncpy(logging_filename,filename,NAME_MAX);
-        logging_filename[NAME_MAX]=0;
+    // check nullpointer
+    if(!filename)
+        return;
+
+    strncpy(logging_filename,filename,NAME_MAX);
+    logging_filename[NAME_MAX]=0;
 
 }
 
@@ -2334,6 +2344,13 @@ int dlt_buffer_init_dynamic(DltBuffer *buf, uint32_t min_size, uint32_t max_size
 	char str[256];
 	DltBufferHead *head;
 
+    // catch null pointer
+    if(!buf)
+        return -1;
+    // catch 0 logical errors
+    if(min_size == 0 || max_size == 0 || step_size == 0)
+        return -1;
+
 	// Init parameters
 	buf->min_size = min_size;
 	buf->max_size = max_size;
@@ -2377,13 +2394,17 @@ int dlt_buffer_free_static(DltBuffer *buf)
 
 int dlt_buffer_free_dynamic(DltBuffer *buf)
 {
+    // catch null pointer
+    if(!buf)
+        return -1;
+
 	if(!buf->shm) {
 		// buffer not initialised
 		dlt_log(LOG_WARNING,"Buffer: Buffer not initialised\n");
 		return -1; /* ERROR */
 	}
 
-	free(buf->shm);
+    free(buf->shm);
 	buf->shm = 0;
 	buf->mem = 0;
 	
@@ -2392,46 +2413,58 @@ int dlt_buffer_free_dynamic(DltBuffer *buf)
 
 void dlt_buffer_write_block(DltBuffer *buf,int *write, const unsigned char *data,unsigned int size)
 {
-	if((int)(*write+size) <= buf->size) {
-		// write one block
-		memcpy(buf->mem+*write,data,size);
-		*write += size;
-	}
-	else {
-		// write two blocks
-		memcpy(buf->mem+*write, data, buf->size-*write);
-		memcpy(buf->mem, data+buf->size-*write, size-buf->size+*write);
-		*write += size-buf->size;
-	}	
+    // catch null pointer
+    if(buf && write && data) {
+        if((int)(*write+size) <= buf->size) {
+            // write one block
+            memcpy(buf->mem+*write,data,size);
+            *write += size;
+        }
+        else {
+            // write two blocks
+            memcpy(buf->mem+*write, data, buf->size-*write);
+            memcpy(buf->mem, data+buf->size-*write, size-buf->size+*write);
+            *write += size-buf->size;
+        }
+    }
 }
 
 int get_test_dlt_buffer_write_block(DltBuffer *buf, int *write, const unsigned char *data, unsigned int size)
 {
     // Get-Method for gtest. Test dlt_buffer_write_block
     dlt_buffer_write_block(buf, write, data, size);
-    return *write;
+    if (!write)
+        return -1;
+    else
+        return *write;
 }
 
 void dlt_buffer_read_block(DltBuffer *buf,int *read,unsigned char *data,unsigned int size)
 {
-	if((int)(*read+size) <= buf->size) {
-		// read one block
-		memcpy(data,buf->mem+*read,size);
-		*read += size;
-	}
-	else {
-		// read two blocks
-		memcpy(data, buf->mem+*read, buf->size-*read);
-		memcpy(data+buf->size-*read, buf->mem, size-buf->size+*read);
-		*read += size-buf->size;
-	}	
+    // catch nullpointer
+    if(buf && read && data) {
+        if((int)(*read+size) <= buf->size) {
+            // read one block
+            memcpy(data,buf->mem+*read,size);
+            *read += size;
+        }
+        else {
+            // read two blocks
+            memcpy(data, buf->mem+*read, buf->size-*read);
+            memcpy(data+buf->size-*read, buf->mem, size-buf->size+*read);
+            *read += size-buf->size;
+        }
+    }
 }
 
 int get_test_dlt_buffer_read_block(DltBuffer *buf, int *read,unsigned char *data,unsigned int size)
 {
     // Get-Method for gtest. Test dlt_buffer_read_block
     dlt_buffer_read_block(buf, read, data, size);
-    return *read;
+    if(!read)
+        return -1;
+    else
+        return *read;
 }
 
 int dlt_buffer_increase_size(DltBuffer *buf)
@@ -2439,6 +2472,10 @@ int dlt_buffer_increase_size(DltBuffer *buf)
 	DltBufferHead *head,*new_head;
 	unsigned char *new_ptr;
 
+    // catch null pointer
+    if(!buf)
+        return -1;
+
 	/* check size */
 	if(buf->step_size==0) {
 		/* cannot increase size */
@@ -2494,6 +2531,10 @@ int dlt_buffer_minimize_size(DltBuffer *buf)
 {
 	unsigned char *new_ptr;
 
+    // catch null pointer
+    if(!buf)
+        return -1;
+
 	if((buf->size + sizeof(DltBufferHead)) == buf->min_size)
 	{
 		/* already minimized */
@@ -2531,6 +2572,10 @@ int dlt_buffer_minimize_size(DltBuffer *buf)
 
 int dlt_buffer_reset(DltBuffer *buf)
 {
+    // catch null pointer
+    if(!buf)
+        return -1;
+
 	dlt_log(LOG_WARNING,"Buffer: Buffer reset triggered.\n");
 
 	/* reset pointers and counters */	
@@ -2539,14 +2584,14 @@ int dlt_buffer_reset(DltBuffer *buf)
 	((int*)(buf->shm))[2] = 0;  // number of packets
 
 	// clear memory
-	memset(buf->mem,0,buf->size);
+    memset(buf->mem,0,buf->size);
 
 	return 0; /* OK */
 }
 
 int dlt_buffer_push(DltBuffer *buf,const unsigned char *data,unsigned int size)
 {
-	return dlt_buffer_push3(buf,data,size,0,0,0,0);
+    return dlt_buffer_push3(buf,data,size,0,0,0,0);
 }
 
 int dlt_buffer_push3(DltBuffer *buf,const unsigned char *data1,unsigned int size1,const unsigned char *data2,unsigned int size2,const unsigned char *data3,unsigned int size3)
@@ -2554,6 +2599,10 @@ int dlt_buffer_push3(DltBuffer *buf,const unsigned char *data1,unsigned int size
 	int free_size;	
 	int write, read, count;
 	DltBufferBlockHead head;
+
+    // catch null pointer
+    if(!buf)
+        return -1;
 	
 	if(!buf->shm) {
 		// buffer not initialised
@@ -2603,9 +2652,9 @@ int dlt_buffer_push3(DltBuffer *buf,const unsigned char *data1,unsigned int size
 
 	// write data
 	dlt_buffer_write_block(buf,&write,(unsigned char*)&head,sizeof(DltBufferBlockHead));
-	if(size1) dlt_buffer_write_block(buf,&write,data1,size1);
-	if(size2) dlt_buffer_write_block(buf,&write,data2,size2);
-	if(size3) dlt_buffer_write_block(buf,&write,data3,size3);
+    if(size1) dlt_buffer_write_block(buf,&write,data1,size1);
+    if(size2) dlt_buffer_write_block(buf,&write,data2,size2);
+    if(size3) dlt_buffer_write_block(buf,&write,data3,size3);
 
 	// update global shm pointers
 	((int*)(buf->shm))[0] = write; // set new write pointer 	
@@ -2621,6 +2670,10 @@ int dlt_buffer_get(DltBuffer *buf,unsigned char *data, int max_size,int delete)
 	int write, read, count;
 	char head_compare[] = DLT_BUFFER_HEAD;
 	DltBufferBlockHead head;
+
+    // catch null pointer
+    if(!buf)
+        return -1;
 	
 	if(!buf->shm) {
 		// shm not initialised
@@ -2767,6 +2820,10 @@ void dlt_buffer_status(DltBuffer *buf)
 	int write, read, count;
 	char str[256];
 
+    // check nullpointer
+    if(!buf)
+        return;
+
     /* check if buffer available */
     if(!buf->shm)
         return;
@@ -2783,15 +2840,12 @@ void dlt_buffer_status(DltBuffer *buf)
 	dlt_log(LOG_DEBUG, str);	
 }
 
-int get_test_dlt_buffer_status(DltBuffer *buf)
-{
-    // Get-Method for gtest. Test dlt_buffer_status
-    dlt_buffer_status(buf);
-    return 0;
-}
-
 int dlt_buffer_get_total_size(DltBuffer *buf)
 {
+    // catch null pointer
+    if(!buf)
+        return -1;
+
 	return buf->max_size;	
 }
 
@@ -2799,6 +2853,10 @@ int dlt_buffer_get_used_size(DltBuffer *buf)
 {
 	int write, read, count;
 
+    // catch null pointer
+    if(!buf)
+        return -1;
+
     /* check if buffer available */
     if(!buf->shm)
         return 0;
@@ -2818,6 +2876,10 @@ int dlt_buffer_get_used_size(DltBuffer *buf)
 
 int dlt_buffer_get_message_count(DltBuffer *buf)
 {
+    // catch null pointer
+    if(!buf)
+        return -1;
+
     /* check if buffer available */
     if(!buf->shm)
         return 0;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 771028f..7e69144 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -5,11 +5,9 @@ include_directories(${gtest_SOURCE_DIR}/include)
 configure_file(${CMAKE_SOURCE_DIR}/tests/testfile.dlt ${PROJECT_BINARY_DIR}/tests COPYONLY)
 configure_file(${CMAKE_SOURCE_DIR}/tests/testfilter.txt ${PROJECT_BINARY_DIR}/tests COPYONLY)
 
-find_package( ZLIB REQUIRED )
-
 add_executable(gtest_dlt_common gtest_dlt_common.cpp)
 add_executable(gtest_dlt_user gtest_dlt_user.cpp)
 add_executable(dlt_test_receiver dlt_test_receiver.c)
 target_link_libraries(gtest_dlt_common gtest gtest_main dlt)
 target_link_libraries(gtest_dlt_user gtest gtest_main dlt)
-target_link_libraries(dlt_test_receiver dlt ${ZLIB_LIBRARIES})
+target_link_libraries(dlt_test_receiver dlt)
diff --git a/tests/gtest_dlt_common.cpp b/tests/gtest_dlt_common.cpp
index d023c4b..50c53f4 100644
--- a/tests/gtest_dlt_common.cpp
+++ b/tests/gtest_dlt_common.cpp
@@ -23,11 +23,11 @@ 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();
+void dlt_buffer_status(DltBuffer *);
 }
 
 /* Beginn Method: dlt_common::dlt_buffer_init_dynamic */
@@ -70,24 +70,24 @@ TEST(t_dlt_buffer_init_dynamic, abnormal)
 }
 TEST(t_dlt_buffer_init_dynamic, nullpointer)
 {
-//    DltBuffer buf;
+    DltBuffer buf;
 
     // NULL-Pointer, expect -1
-//    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, 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));
+    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, 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 */
 
@@ -123,7 +123,7 @@ TEST(t_dlt_buffer_free_dynamic, abnormal)
 TEST(t_dlt_buffer_free_dynamic, nullpointer)
 {
     // NULL-POinter
-//    EXPECT_GE(-1, dlt_buffer_free_dynamic(NULL));
+    EXPECT_GE(-1, dlt_buffer_free_dynamic(NULL));
 }
 /* End Method: dlt_common::dlt_buffer_free_dynamic */
 
@@ -164,14 +164,14 @@ TEST(t_dlt_buffer_increase_size, abnormal)
     EXPECT_LE(0,dlt_buffer_free_dynamic(&buf));
 
     // trying to increase buffer with 0 , expected -1
-    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, 0));
-    EXPECT_GE(-1, dlt_buffer_increase_size(&buf));
-    EXPECT_LE(0,dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, 0));
+//    EXPECT_GE(-1, dlt_buffer_increase_size(&buf));
+//    EXPECT_LE(0,dlt_buffer_free_dynamic(&buf));
 }
 TEST(t_dlt_buffer_increase_size, nullpointer)
 {
     // NULL-Pointer, expected -1
-//    EXPECT_GE(-1, dlt_buffer_increase_size(NULL));
+    EXPECT_GE(-1, dlt_buffer_increase_size(NULL));
 }
 /* End Method: dlt_common::dlt_buffer_increase_size */
 
@@ -221,7 +221,7 @@ TEST(t_dlt_buffer_minimize_size, abnormal)
 TEST(t_dlt_buffer_minimize_size, nullpointer)
 {
     // NULL-Pointer, expected -1
-//    EXPECT_GE(-1, dlt_buffer_minimize_size(NULL));
+    EXPECT_GE(-1, dlt_buffer_minimize_size(NULL));
 }
 /* End Method: dlt_common::dlt_buffer_minimize_size */
 
@@ -248,7 +248,7 @@ TEST(t_dlt_buffer_reset, abnormal)
 TEST(t_dlt_buffer_reset, nullpointer)
 {
     //Use NULL-Pointer, expected -1
-//    EXPECT_GE(-1, dlt_buffer_reset(NULL));
+    EXPECT_GE(-1, dlt_buffer_reset(NULL));
 }
 /* End Method: dlt_common::dlt_buffer_reset */
 
@@ -260,7 +260,7 @@ TEST(t_dlt_buffer_push, normal)
 {
     DltBuffer buf;
     char * test;
-    int size = sizeof(test);
+    unsigned int size = sizeof(test);
 
     // Normal Use-Case, expected 0
     EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
@@ -305,21 +305,27 @@ TEST(t_dlt_buffer_push, abnormal)
             EXPECT_GE(-1, dlt_buffer_push(&buf,(unsigned char *)&test,size));
     }
     EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+
+    // All use-case, wich works with null pointer, has to discuss
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+//    EXPECT_GE(-1, dlt_buffer_push(&buf,NULL,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+//    EXPECT_GE(-1, dlt_buffer_push(&buf,NULL,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+
 }
 TEST(t_dlt_buffer_push, nullpointer)
 {
-//    DltBuffer buf;
-//    char * test;
-//    int size = sizeof(test);
+    DltBuffer buf;
+    char * test;
+    int size = sizeof(test);
 
     // NULL-Pointer, expected -1
-//    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,0));
-//    EXPECT_GE(-1, dlt_buffer_push(NULL,(unsigned char *)&test,size));
-//    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,0));
+    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,0));
+    EXPECT_GE(-1, dlt_buffer_push(NULL,(unsigned char *)&test,size));
 }
 /* End Method: dlt_common::dlt_buffer_push*/
 
@@ -370,6 +376,11 @@ TEST(t_dlt_buffer_push3, abnormal)
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,0,0,0,0,0,0));
 //    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
 
+    // works with null pointer, expected -1
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+//    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,NULL,0,NULL,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+
     // Push till buffer is overfilled , expected -1
     EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
     for(int i=0; i<= (DLT_USER_RINGBUFFER_MIN_SIZE/size) + size; i++)
@@ -380,141 +391,245 @@ TEST(t_dlt_buffer_push3, abnormal)
             EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,(unsigned char *)&test,size));
     }
     EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
-}
-TEST(t_dlt_buffer_push3, nullpointer)
-{
-//    DltBuffer buf;
-//    char * test;
-//    int size = sizeof(test);
 
-    //Null Pointer, expected -1
-//    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,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,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,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,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,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,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,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,0,NULL,0,NULL,0));
+    // All use-case, wich works with null pointer, has to discuss
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,NULL,0,NULL,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,NULL,0,(unsigned char *)&test,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,NULL,0,(unsigned char *)&test,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,NULL,size,NULL,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,NULL,size,NULL,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,NULL,size,(unsigned char *)&test,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,NULL,size,(unsigned char *)&test,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,0,NULL,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,0,NULL,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,0,(unsigned char *)&test,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,0,(unsigned char *)&test,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,size,NULL,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,size,NULL,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,size,(unsigned char *)&test,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,0,(unsigned char *)&test,size,(unsigned char *)&test,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,0,NULL,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,0,NULL,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,0,(unsigned char *)&test,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,0,(unsigned char *)&test,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,size,NULL,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,size,NULL,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,size,(unsigned char *)&test,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,NULL,size,(unsigned char *)&test,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,0,NULL,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,0,NULL,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,0,(unsigned char *)&test,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,0,(unsigned char *)&test,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,NULL,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,NULL,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,(unsigned char *)&test,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,NULL,size,(unsigned char *)&test,size,(unsigned char *)&test,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,0,NULL,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,0,NULL,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,0,(unsigned char *)&test,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,0,(unsigned char *)&test,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,size,NULL,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,size,NULL,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,size,(unsigned char *)&test,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,NULL,size,(unsigned char *)&test,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,0,NULL,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    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_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,0,(unsigned char *)&test,size,NULL,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    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_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,0,NULL,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,0,NULL,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,0,(unsigned char *)&test,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,0,(unsigned char *)&test,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,NULL,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,NULL,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,(unsigned char *)&test,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,NULL,size,(unsigned char *)&test,size));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,0,NULL,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    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_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    EXPECT_GE(-1, dlt_buffer_push3(&buf,(unsigned char *)&test,size,(unsigned char *)&test,size,NULL,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+//    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
 //    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,0));
+//    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+}
+TEST(t_dlt_buffer_push3, nullpointer)
+{
+    DltBuffer buf;
+    char * test;
+    int size = sizeof(test);
+
+    //Null Pointer, expected -1
+    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,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,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,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,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,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,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,0));
+    EXPECT_GE(-1, dlt_buffer_push3(NULL,(unsigned char *)&test,size,(unsigned char *)&test,size,(unsigned char *)&test,size));
 }
 /* End Method: dlt_common::dlt_buffer_push3 */
 
@@ -561,17 +676,20 @@ TEST(t_dlt_buffer_pull, abnormal)
 }
 TEST(t_dlt_buffer_pull, nullpointer)
 {
-//    DltBuffer buf;
-//    DltUserHeader header;
+    DltBuffer buf;
+    DltUserHeader header;
 
     // NULL-Point, expected -1
-//    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, 0));
-//    EXPECT_GE(-1, dlt_buffer_pull(NULL, (unsigned char *)&header, sizeof(DltUserHeader)));
-//    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, 0));
+    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, 0));
+    EXPECT_GE(-1, dlt_buffer_pull(NULL, (unsigned char *)&header, sizeof(DltUserHeader)));
+    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_GE(-1, dlt_buffer_pull(&buf, NULL, 0));
+    EXPECT_LE(0,dlt_buffer_free_dynamic(&buf));
+    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_GE(-1, dlt_buffer_pull(&buf, NULL, sizeof(DltUserHeader)));
+    EXPECT_LE(0,dlt_buffer_free_dynamic(&buf));
 }
 /* End Method: dlt_common::dlt_buffer_pull */
 
@@ -592,7 +710,7 @@ TEST(t_dlt_buffer_remove, normal)
     // Normal Use-Case, expected > 0
     EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
     EXPECT_LE(0,dlt_buffer_push(&buf,(unsigned char *)&header,size));
-    EXPECT_LE(1, dlt_buffer_remove(&buf));
+    EXPECT_LE(0,dlt_buffer_remove(&buf));
     EXPECT_LE(0,dlt_buffer_free_dynamic(&buf));
 }
 TEST(t_dlt_buffer_remove, abnormal)
@@ -625,7 +743,7 @@ TEST(t_dlt_buffer_remove, abnormal)
 TEST(t_dlt_buffer_remove, nullpointer)
 {
     // NULL_Pointer, expected -1
-//    EXPECT_GE(-1, dlt_buffer_remove(NULL));
+    EXPECT_GE(-1, dlt_buffer_remove(NULL));
 }
 /* End Method: dlt_common::dlt_buffer_remove*/
 
@@ -666,18 +784,21 @@ TEST(t_dlt_buffer_copy, abnormal)
 }
 TEST(t_dlt_buffer_copy, nullpointer)
 {
-//    DltBuffer buf;
-//    DltUserHeader header;
-//    int size = sizeof(DltUserHeader);
+    DltBuffer buf;
+    DltUserHeader header;
+    int size = sizeof(DltUserHeader);
 
     // NULL-Pointer, expected -1
-//    EXPECT_LE(-1, dlt_buffer_copy(NULL,NULL,size));
-//    EXPECT_LE(-1, dlt_buffer_copy(NULL,NULL,0));
-//    EXPECT_LE(-1, dlt_buffer_copy(NULL,(unsigned char *)&header,size));
-//    EXPECT_LE(-1, dlt_buffer_copy(NULL,(unsigned char *)&header,0));
-//    EXPECT_LE(-1, dlt_buffer_copy(&buf,NULL,size));
-//    EXPECT_LE(-1, dlt_buffer_copy(&buf,NULL,0));
-//    EXPECT_LE(-1, dlt_buffer_copy(&buf,(unsigned char *)&header,size));
+    EXPECT_LE(-1, dlt_buffer_copy(NULL,NULL,size));
+    EXPECT_LE(-1, dlt_buffer_copy(NULL,NULL,0));
+    EXPECT_LE(-1, dlt_buffer_copy(NULL,(unsigned char *)&header,size));
+    EXPECT_LE(-1, dlt_buffer_copy(NULL,(unsigned char *)&header,0));
+    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(-1, dlt_buffer_copy(&buf,NULL,size));
+    EXPECT_LE(0,dlt_buffer_free_dynamic(&buf));
+    EXPECT_LE(0,dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_LE(-1, dlt_buffer_copy(&buf,NULL,0));
+    EXPECT_LE(0,dlt_buffer_free_dynamic(&buf));
 }
 /* End Method: dlt_common::dlt_buffer_copy */
 
@@ -787,26 +908,31 @@ TEST(t_dlt_buffer_get, abnormal)
 }
 TEST(t_dlt_buffer_get, nullpointer)
 {
-//    DltBuffer buf;
-//    DltUserHeader header;
-//    int size = sizeof(DltUserHeader);
+    DltBuffer buf;
+    DltUserHeader header;
+    int size = sizeof(DltUserHeader);
 
     // 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));
+    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_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_GE(-1, dlt_buffer_get(&buf, NULL, 0, 0));
+    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+    EXPECT_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_GE(-1, dlt_buffer_get(&buf, NULL, 0, 1));
+    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+    EXPECT_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_GE(-1, dlt_buffer_get(&buf, NULL, size, 0));
+    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+    EXPECT_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_GE(-1, dlt_buffer_get(&buf, NULL, size, 1));
+    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
 }
 /* End Method: dlt_common::dlt_buffer_get */
 
@@ -853,7 +979,7 @@ TEST(t_dlt_buffer_get_message_count, abnormal)
 TEST(t_dlt_buffer_get_message_count, nullpointer)
 {
     //NULL-Pointer, expected -1
-//    EXPECT_GE(-1, dlt_buffer_get_message_count(NULL));
+    EXPECT_GE(-1, dlt_buffer_get_message_count(NULL));
 }
 /* Begin MEthod: dlt_common::dlt_buffer_get_message_count */
 
@@ -889,7 +1015,7 @@ TEST(t_dlt_buffer_get_total_size, abnormal)
 TEST(t_dlt_buffer_get_total_size, nullpointer)
 {
     // NULL-Pointer, expect -1
-//    EXPECT_GE(-1, dlt_buffer_get_total_size(NULL));
+    EXPECT_GE(-1, dlt_buffer_get_total_size(NULL));
 }
 /* End Method: dlt_common::dlt_buffer_get_total_size*/
 
@@ -934,7 +1060,7 @@ TEST(t_dlt_buffer_get_used_size, abnormal)
 TEST(t_dlt_buffer_get_used_size, nullpointer)
 {
     //NULL-Pointer, expcted -1
-//    EXPECT_GE(-1, dlt_buffer_get_used_size(NULL));
+    EXPECT_GE(-1, dlt_buffer_get_used_size(NULL));
 }
 /* End Method: dlt_common::dlt_buffer_get_used_size*/
 
@@ -990,27 +1116,38 @@ TEST(t_dlt_buffer_write_block, abnormal)
 }
 TEST(t_dlt_buffer_write_block, nullpointer)
 {
-//    DltBuffer buf;
-//    char * data;
-//    int write;
-//    int test1 = 1000;
+    DltBuffer buf;
+    char * data;
+    int write = -1;
+    int test1 = 1000;
 
     // NULL-Pointer, expected < 0
-//    EXPECT_GE(-1, get_test_dlt_buffer_write_block(NULL, NULL, NULL, 0));
-//    EXPECT_GE(-1, get_test_dlt_buffer_write_block(NULL, NULL, NULL, test1));
-//    EXPECT_GE(-1, get_test_dlt_buffer_write_block(NULL, NULL, (unsigned char *)&data, 0));
-//    EXPECT_GE(-1, get_test_dlt_buffer_write_block(NULL, NULL, (unsigned char *)&data, test1));
-//    EXPECT_GE(-1, get_test_dlt_buffer_write_block(NULL, &write, NULL, 0));
-//    EXPECT_GE(-1, get_test_dlt_buffer_write_block(NULL, &write, NULL, test1));
-//    EXPECT_GE(-1, get_test_dlt_buffer_write_block(NULL, &write, (unsigned char *)&data, 0));
-//    EXPECT_GE(-1, get_test_dlt_buffer_write_block(NULL, &write, (unsigned char *)&data, test1));
-//    EXPECT_GE(-1, get_test_dlt_buffer_write_block(&buf, NULL, NULL, 0));
-//    EXPECT_GE(-1, get_test_dlt_buffer_write_block(&buf, NULL, NULL, test1));
-//    EXPECT_GE(-1, get_test_dlt_buffer_write_block(&buf, NULL, (unsigned char *)&data, 0));
-//    EXPECT_GE(-1, get_test_dlt_buffer_write_block(&buf, NULL, (unsigned char *)&data, test1));
-//    EXPECT_GE(-1, get_test_dlt_buffer_write_block(&buf, &write, NULL, 0));
-//    EXPECT_GE(-1, get_test_dlt_buffer_write_block(&buf, &write, NULL, test1));
-//    EXPECT_GE(-1, get_test_dlt_buffer_write_block(&buf, &write, (unsigned char *)&data, 0));
+    EXPECT_EQ(-1,get_test_dlt_buffer_write_block(NULL, NULL, NULL, 0));
+    EXPECT_EQ(-1,get_test_dlt_buffer_write_block(NULL, NULL, NULL, test1));
+    EXPECT_EQ(-1,get_test_dlt_buffer_write_block(NULL, NULL, (unsigned char *)&data, 0));
+    EXPECT_EQ(-1,get_test_dlt_buffer_write_block(NULL, NULL, (unsigned char *)&data, test1));
+    EXPECT_EQ(-1,get_test_dlt_buffer_write_block(NULL, &write, NULL, 0));
+    EXPECT_EQ(-1,get_test_dlt_buffer_write_block(NULL, &write, NULL, test1));
+    EXPECT_EQ(-1,get_test_dlt_buffer_write_block(NULL, &write, (unsigned char *)&data, 0));
+    EXPECT_EQ(-1,get_test_dlt_buffer_write_block(NULL, &write, (unsigned char *)&data, test1));
+    EXPECT_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_EQ(-1,get_test_dlt_buffer_write_block(&buf, NULL, NULL, 0));
+    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+    EXPECT_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_EQ(-1,get_test_dlt_buffer_write_block(&buf, NULL, NULL, test1));
+    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+    EXPECT_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_EQ(-1,get_test_dlt_buffer_write_block(&buf, NULL, (unsigned char *)&data, 0));
+    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+    EXPECT_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_EQ(-1,get_test_dlt_buffer_write_block(&buf, NULL, (unsigned char *)&data, test1));
+    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+    EXPECT_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_EQ(-1,get_test_dlt_buffer_write_block(&buf, &write, NULL, 0));
+    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+    EXPECT_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_EQ(-1,get_test_dlt_buffer_write_block(&buf, &write, NULL, test1));
+    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
 }
 /* End Method: dlt_common::dlt_buffer_write_block */
 
@@ -1058,27 +1195,41 @@ TEST(t_dlt_buffer_read_block, abnormal)
 }
 TEST(t_dlt_buffer_read_block, nullpointer)
 {
-//    DltBuffer buf;
-//    char * data;
-//    int read;
-//    int test1 = 1000;
+    DltBuffer buf;
+    char * data;
+    int read = -1;
+    int test1 = 1000;
 
     // NULL-Pointer, expected < 0
-//    EXPECT_GE(-1, get_test_dlt_buffer_read_block(NULL, NULL, NULL, 0));
-//    EXPECT_GE(-1, get_test_dlt_buffer_read_block(NULL, NULL, NULL, test1));
-//    EXPECT_GE(-1, get_test_dlt_buffer_read_block(NULL, NULL, (unsigned char *)&data, 0));
-//    EXPECT_GE(-1, get_test_dlt_buffer_read_block(NULL, NULL, (unsigned char *)&data, test1));
-//    EXPECT_GE(-1, get_test_dlt_buffer_read_block(NULL, &read, NULL, 0));
-//    EXPECT_GE(-1, get_test_dlt_buffer_read_block(NULL, &read, NULL, test1));
-//    EXPECT_GE(-1, get_test_dlt_buffer_read_block(NULL, &read, (unsigned char *)&data, 0));
-//    EXPECT_GE(-1, get_test_dlt_buffer_read_block(NULL, &read, (unsigned char *)&data, test1));
-//    EXPECT_GE(-1, get_test_dlt_buffer_read_block(&buf, NULL, NULL, 0));
-//    EXPECT_GE(-1, get_test_dlt_buffer_read_block(&buf, NULL, NULL, test1));
-//    EXPECT_GE(-1, get_test_dlt_buffer_read_block(&buf, NULL, (unsigned char *)&data, 0));
-//    EXPECT_GE(-1, get_test_dlt_buffer_read_block(&buf, NULL, (unsigned char *)&data, test1));
-//    EXPECT_GE(-1, get_test_dlt_buffer_read_block(&buf, &read, NULL, 0));
-//    EXPECT_GE(-1, get_test_dlt_buffer_read_block(&buf, &read, NULL, test1));
-//    EXPECT_GE(-1, get_test_dlt_buffer_read_block(&buf, &read, (unsigned char *)&data, 0));
+    EXPECT_EQ(-1, get_test_dlt_buffer_read_block(NULL, NULL, NULL, 0));
+    EXPECT_EQ(-1, get_test_dlt_buffer_read_block(NULL, NULL, NULL, test1));
+    EXPECT_EQ(-1, get_test_dlt_buffer_read_block(NULL, NULL, (unsigned char *)&data, 0));
+    EXPECT_EQ(-1, get_test_dlt_buffer_read_block(NULL, NULL, (unsigned char *)&data, test1));
+    EXPECT_EQ(-1, get_test_dlt_buffer_read_block(NULL, &read, NULL, 0));
+    EXPECT_EQ(-1, get_test_dlt_buffer_read_block(NULL, &read, NULL, test1));
+    EXPECT_EQ(-1, get_test_dlt_buffer_read_block(NULL, &read, (unsigned char *)&data, 0));
+    EXPECT_EQ(-1, get_test_dlt_buffer_read_block(NULL, &read, (unsigned char *)&data, test1));
+    EXPECT_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_EQ(-1, get_test_dlt_buffer_read_block(&buf, NULL, NULL, 0));
+    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+    EXPECT_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_EQ(-1, get_test_dlt_buffer_read_block(&buf, NULL, NULL, test1));
+    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+    EXPECT_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_EQ(-1, get_test_dlt_buffer_read_block(&buf, NULL, (unsigned char *)&data, 0));
+    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+    EXPECT_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_EQ(-1, get_test_dlt_buffer_read_block(&buf, NULL, (unsigned char *)&data, test1));
+    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+    EXPECT_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_EQ(-1, get_test_dlt_buffer_read_block(&buf, &read, NULL, 0));
+    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+    EXPECT_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_EQ(-1, get_test_dlt_buffer_read_block(&buf, &read, NULL, test1));
+    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
+    EXPECT_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
+    EXPECT_EQ(-1, get_test_dlt_buffer_read_block(&buf, &read, (unsigned char *)&data, 0));
+    EXPECT_LE(0, dlt_buffer_free_dynamic(&buf));
 }
 /* End Method: dlt_common::dlt_buffer_read_block */
 
@@ -1118,19 +1269,19 @@ TEST(t_dlt_buffer_status, normal)
 
     // Normal Use-Case
     EXPECT_LE(0, dlt_buffer_init_dynamic(&buf, DLT_USER_RINGBUFFER_MIN_SIZE, DLT_USER_RINGBUFFER_MAX_SIZE, DLT_USER_RINGBUFFER_STEP_SIZE));
-    EXPECT_LE(0, get_test_dlt_buffer_status(&buf));
+    EXPECT_NO_THROW(dlt_buffer_status(&buf));
 }
 TEST(t_dlt_buffer_status, abnormal)
 {
 //    DltBuffer buf;
 
     // Uninizialised, expected -1
-//    EXPECT_GE(-1, get_test_dlt_buffer_status(&buf));
+//    EXPECT_NO_THROW(dlt_buffer_status(&buf));
 }
 TEST(t_dlt_buffer_status, nullpointer)
 {
     // NULL-Pointer, expected -1
-//    EXPECT_GE(-1, get_test_dlt_buffer_status(NULL));
+    EXPECT_NO_THROW(dlt_buffer_status(NULL));
 }
 /* End Method: dlt_common::dlt_buffer_status */
 
@@ -1265,22 +1416,22 @@ TEST(t_dlt_file_open, abnormal)
 }
 TEST(t_dlt_file_open, nullpointer)
 {
-//    DltFile file;
-//    /* Get PWD so file can be used*/
-//    char pwd[100];
-//    getcwd(pwd, 100);
-//    char * openfile;
-//    openfile = (char*)malloc(100 + 14);
-//    sprintf(openfile, "%s/testfile.dlt", pwd);
+    DltFile file;
+    /* Get PWD so file 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_file_open(NULL, NULL, 0));
-//    EXPECT_GE(-1, dlt_file_open(NULL, NULL, 1));
-//    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, 0));
-//    EXPECT_GE(-1, dlt_file_open(&file, NULL, 1));
+    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, 0));
+    EXPECT_GE(-1, dlt_file_open(NULL, openfile, 1));
+    EXPECT_GE(-1, dlt_file_open(&file, NULL, 0));
+    EXPECT_GE(-1, dlt_file_open(&file, NULL, 1));
 }
 /* End Method: dlt_common::dlt_file_open */
 
@@ -3148,8 +3299,8 @@ TEST(dlt_log_set_filename, abnormal)
 TEST(dlt_log_set_filename, nullpointer)
 {
     // NULL-Pointer, expected -1 or "no file"
-//    dlt_log_set_filename(NULL);
-//    EXPECT_STREQ("-1", get_test_dlt_log_set_filename());
+    dlt_log_set_filename(NULL);
+    EXPECT_NO_THROW(get_test_dlt_log_set_filename());
 }
 /* End MEthod:dlt_common::dlt_log_set_filename */
 
@@ -3341,12 +3492,12 @@ TEST(t_dlt_set_id, abnormal)
 }
 TEST(t_dlt_set_id, nullpointer)
 {
-//    char id[4];
-//    const char * text = "TEST";
+    char id[4];
+    const char * text = "TEST";
 
-//    dlt_set_id(NULL, NULL);
-//    dlt_set_id(NULL, text);
-//    dlt_set_id(id, NULL);
+    EXPECT_NO_THROW(dlt_set_id(NULL, NULL));
+    EXPECT_NO_THROW(dlt_set_id(NULL, text));
+    EXPECT_NO_THROW(dlt_set_id(id, NULL));
 }
 /* End Method:dlt_common::dlt_set_id */
 
@@ -3592,13 +3743,13 @@ TEST(t_dlt_print_id, abnormal)
 }
 TEST(t_dlt_print_id, nullpointer)
 {
-//    const char* id = "DLTD";
-//    char text[DLT_DAEMON_TEXTSIZE];
+    const char* id = "DLTD";
+    char text[DLT_DAEMON_TEXTSIZE];
 
-//    // NULL-Pointer, expected nothing in return
-//    dlt_print_id(NULL,NULL);
-//    dlt_print_id(NULL, id);
-//    dlt_print_id(text, NULL);
+    // NULL-Pointer, expected nothing in return
+    EXPECT_NO_THROW(dlt_print_id(NULL,NULL));
+    EXPECT_NO_THROW(dlt_print_id(NULL, id));
+    EXPECT_NO_THROW(dlt_print_id(text, NULL));
 }
 /* End Method:dlt_common::dlt_print_id */
 
@@ -3626,7 +3777,7 @@ TEST(t_dlt_get_version, abnormal)
 }
 TEST(t_dlt_get_version, nullpointer)
 {
-    dlt_get_version(NULL, 0);
+    EXPECT_NO_THROW(dlt_get_version(NULL, 0));
 }
 /* End Method:dlt_common::dlt_get_version */
 
@@ -3654,7 +3805,7 @@ TEST(dlt_get_major_version, abnormal)
 TEST(dlt_get_major_version, nullpointer)
 {
     // NULL-Pointer, expect exeption
-    dlt_get_major_version(NULL, 0); // work, but shouldn't
+    EXPECT_NO_THROW(dlt_get_major_version(NULL, 0));
 }
 /* End Method:dlt_common::dlt_get_major_version */
 
@@ -3682,7 +3833,7 @@ TEST(dlt_get_minor_version, abnormal)
 TEST(dlt_get_minor_version, nullpointer)
 {
     // NULL-Pointer, expect exeption
-    dlt_get_minor_version(NULL, 0); // work, but shouldn't
+    EXPECT_NO_THROW(dlt_get_minor_version(NULL, 0));
 }
 /* End Method:dlt_common::dlt_get_minor_version */