unittests fixed

Author: Tero Heinonen

test/coap-service/unittest/coap_connection_handler/test_coap_connection_handler.c

@@ -122,8 +122,8 @@ bool test_coap_connection_handler_send_data()
 
     connection_handler_destroy(handler);
 
-    coap_security_handler_stub.sec_obj = (thread_security_t *)malloc(sizeof(thread_security_t));
-    memset(coap_security_handler_stub.sec_obj, 0, sizeof(thread_security_t));
+    coap_security_handler_stub.sec_obj = (coap_security_t *)malloc(sizeof(coap_security_t));
+    memset(coap_security_handler_stub.sec_obj, 0, sizeof(coap_security_t));
     coap_security_handler_stub.sec_obj->_remote_port = 22;
     memset(coap_security_handler_stub.sec_obj->_remote_address, 1, 16 );
 
@@ -199,8 +199,8 @@ bool test_coap_connection_handler_virtual_recv()
         return false;
 
     //handler->socket->data still in memory
-    coap_security_handler_stub.sec_obj = (thread_security_t *)malloc(sizeof(thread_security_t));
-    memset(coap_security_handler_stub.sec_obj, 0, sizeof(thread_security_t));
+    coap_security_handler_stub.sec_obj = (coap_security_t *)malloc(sizeof(coap_security_t));
+    memset(coap_security_handler_stub.sec_obj, 0, sizeof(coap_security_t));
     coap_security_handler_stub.sec_obj->_remote_port = 55;
     memset(coap_security_handler_stub.sec_obj->_remote_address, 4, 16 );
 
@@ -298,8 +298,8 @@ bool test_timer_callbacks()
         return false;
 
     //handler->socket->data still in memory
-    coap_security_handler_stub.sec_obj = (thread_security_t *)malloc(sizeof(thread_security_t));
-    memset(coap_security_handler_stub.sec_obj, 0, sizeof(thread_security_t));
+    coap_security_handler_stub.sec_obj = (coap_security_t *)malloc(sizeof(coap_security_t));
+    memset(coap_security_handler_stub.sec_obj, 0, sizeof(coap_security_t));
     coap_security_handler_stub.sec_obj->_remote_port = 55;
     memset(coap_security_handler_stub.sec_obj->_remote_address, 4, 16 );
     coap_security_handler_stub.sec_obj->_timer_id = 5;
@@ -351,8 +351,8 @@ bool test_socket_api_callbacks()
     socket_callback_t *sckt_data = (socket_callback_t *)malloc(sizeof(socket_callback_t));
     memset(sckt_data, 0, sizeof(socket_callback_t));
 
-    coap_security_handler_stub.sec_obj = (thread_security_t *)malloc(sizeof(thread_security_t));
-    memset(coap_security_handler_stub.sec_obj, 0, sizeof(thread_security_t));
+    coap_security_handler_stub.sec_obj = (coap_security_t *)malloc(sizeof(coap_security_t));
+    memset(coap_security_handler_stub.sec_obj, 0, sizeof(coap_security_t));
 
     socket_api_stub.int8_value = 0;
     nsdynmemlib_stub.returnCounter = 1;
@@ -431,8 +431,8 @@ bool test_security_callbacks()
     socket_callback_t *sckt_data = (socket_callback_t *)malloc(sizeof(socket_callback_t));
     memset(sckt_data, 0, sizeof(socket_callback_t));
 
-    coap_security_handler_stub.sec_obj = (thread_security_t *)malloc(sizeof(thread_security_t));
-    memset(coap_security_handler_stub.sec_obj, 0, sizeof(thread_security_t));
+    coap_security_handler_stub.sec_obj = (coap_security_t *)malloc(sizeof(coap_security_t));
+    memset(coap_security_handler_stub.sec_obj, 0, sizeof(coap_security_t));
 
     nsdynmemlib_stub.returnCounter = 1;
     thread_conn_handler_t *handler = connection_handler_create(&receive_from_sock_cb, &send_to_sock_cb, NULL, NULL);

test/coap-service/unittest/coap_security_handler/test_coap_security_handler.c

@@ -50,11 +50,11 @@ bool test_thread_security_create()
 
     nsdynmemlib_stub.returnCounter = 2;
     mbedtls_stub.crt_expected_int = 0;
-    thread_security_t *handle = thread_security_create(1,2,&buf,12,&send_to_socket, &receive_from_socket, &start_timer_callback, &timer_status_callback);
+    coap_security_t *handle = thread_security_create(1,2,&buf,12,&send_to_socket, &receive_from_socket, &start_timer_callback, &timer_status_callback);
     if( NULL == handle )
         return false;
 
-    ns_dyn_mem_free(handle);
+    thread_security_destroy(handle);
 
     return true;
 }
@@ -64,7 +64,7 @@ bool test_thread_security_destroy()
     uint8_t buf[16];
     nsdynmemlib_stub.returnCounter = 2;
     mbedtls_stub.crt_expected_int = 0;
-    thread_security_t *handle = thread_security_create(1,2,&buf,12,&send_to_socket, &receive_from_socket, &start_timer_callback, &timer_status_callback);
+    coap_security_t *handle = thread_security_create(1,2,&buf,12,&send_to_socket, &receive_from_socket, &start_timer_callback, &timer_status_callback);
     if( NULL == handle )
         return false;
 
@@ -77,7 +77,7 @@ bool test_coap_security_handler_connect()
     uint8_t buf[16];
     nsdynmemlib_stub.returnCounter = 2;
     mbedtls_stub.crt_expected_int = 0;
-    thread_security_t *handle = thread_security_create(1,2,&buf,12,&send_to_socket, &receive_from_socket, &start_timer_callback, &timer_status_callback);
+    coap_security_t *handle = thread_security_create(1,2,&buf,12,&send_to_socket, &receive_from_socket, &start_timer_callback, &timer_status_callback);
     if( NULL == handle )
         return false;
 
@@ -174,7 +174,7 @@ bool test_coap_security_handler_continue_connecting()
     uint8_t buf[16];
     nsdynmemlib_stub.returnCounter = 2;
     mbedtls_stub.crt_expected_int = 0;
-    thread_security_t *handle = thread_security_create(1,2,&buf,12,&send_to_socket, &receive_from_socket, &start_timer_callback, &timer_status_callback);
+    coap_security_t *handle = thread_security_create(1,2,&buf,12,&send_to_socket, &receive_from_socket, &start_timer_callback, &timer_status_callback);
     if( NULL == handle )
         return false;
 
@@ -222,7 +222,7 @@ bool test_coap_security_handler_send_message()
     uint8_t buf[16];
     nsdynmemlib_stub.returnCounter = 2;
     mbedtls_stub.crt_expected_int = 0;
-    thread_security_t *handle = thread_security_create(1,2,&buf,12,&send_to_socket, &receive_from_socket, &start_timer_callback, &timer_status_callback);
+    coap_security_t *handle = thread_security_create(1,2,&buf,12,&send_to_socket, &receive_from_socket, &start_timer_callback, &timer_status_callback);
     if( NULL == handle )
         return false;
 
@@ -243,7 +243,7 @@ bool test_thread_security_send_close_alert()
     uint8_t buf[16];
     nsdynmemlib_stub.returnCounter = 2;
     mbedtls_stub.crt_expected_int = 0;
-    thread_security_t *handle = thread_security_create(1,2,&buf,12,&send_to_socket, &receive_from_socket, &start_timer_callback, &timer_status_callback);
+    coap_security_t *handle = thread_security_create(1,2,&buf,12,&send_to_socket, &receive_from_socket, &start_timer_callback, &timer_status_callback);
     if( NULL == handle )
         return false;
 
@@ -263,7 +263,7 @@ bool test_coap_security_handler_read()
     uint8_t buf[16];
     nsdynmemlib_stub.returnCounter = 2;
     mbedtls_stub.crt_expected_int = 0;
-    thread_security_t *handle = thread_security_create(1,2,&buf,12,&send_to_socket, &receive_from_socket, &start_timer_callback, &timer_status_callback);
+    coap_security_t *handle = thread_security_create(1,2,&buf,12,&send_to_socket, &receive_from_socket, &start_timer_callback, &timer_status_callback);
     if( NULL == handle )
         return false;
 

test/coap-service/unittest/stub/coap_security_handler_stub.c

@@ -12,7 +12,7 @@
 
 thread_sec_def coap_security_handler_stub;
 
-thread_security_t *thread_security_create(int8_t socket_id, int8_t timer_id, uint8_t *address_ptr, uint16_t port,
+coap_security_t *thread_security_create(int8_t socket_id, int8_t timer_id, uint8_t *address_ptr, uint16_t port,
                                           int (*send_cb)(int8_t socket_id, uint8_t *address_ptr, uint16_t port, const unsigned char *, size_t),
                                           int (*receive_cb)(int8_t socket_id, unsigned char *, size_t),
                                           void (*start_timer_cb)(int8_t timer_id, uint32_t min, uint32_t fin),
@@ -25,12 +25,12 @@ thread_security_t *thread_security_create(int8_t socket_id, int8_t timer_id, uin
     return coap_security_handler_stub.sec_obj;
 }
 
-void thread_security_destroy(thread_security_t *sec)
+void thread_security_destroy(coap_security_t *sec)
 {
 
 }
 
-int coap_security_handler_connect(thread_security_t *sec, bool is_server, const unsigned char *pw, uint8_t len)
+int coap_security_handler_connect(coap_security_t *sec, bool is_server, const unsigned char *pw, uint8_t len)
 {
     sec->_is_started = true;
     if( coap_security_handler_stub.counter >= 0){
@@ -39,7 +39,7 @@ int coap_security_handler_connect(thread_security_t *sec, bool is_server, const
     return coap_security_handler_stub.int_value;
 }
 
-int coap_security_handler_continue_connecting(thread_security_t *sec)
+int coap_security_handler_continue_connecting(coap_security_t *sec)
 {
     if( coap_security_handler_stub.counter >= 0){
         return coap_security_handler_stub.values[coap_security_handler_stub.counter--];
@@ -49,23 +49,23 @@ int coap_security_handler_continue_connecting(thread_security_t *sec)
 }
 
 
-int coap_security_handler_send_message(thread_security_t *sec, unsigned char *message, size_t len)
+int coap_security_handler_send_message(coap_security_t *sec, unsigned char *message, size_t len)
 {
     if( coap_security_handler_stub.counter >= 0){
         return coap_security_handler_stub.values[coap_security_handler_stub.counter--];
     }
     return coap_security_handler_stub.int_value;
 }
 
-int thread_security_send_close_alert(thread_security_t *sec)
+int thread_security_send_close_alert(coap_security_t *sec)
 {
     if( coap_security_handler_stub.counter >= 0){
         return coap_security_handler_stub.values[coap_security_handler_stub.counter--];
     }
     return coap_security_handler_stub.int_value;
 }
 
-int coap_security_handler_read(thread_security_t *sec, unsigned char* buffer, size_t len)
+int coap_security_handler_read(coap_security_t *sec, unsigned char* buffer, size_t len)
 {
     if( coap_security_handler_stub.counter >= 0){
         return coap_security_handler_stub.values[coap_security_handler_stub.counter--];

test/coap-service/unittest/stub/coap_security_handler_stub.h

@@ -8,7 +8,7 @@
 #include "coap_security_handler.h"
 
 typedef struct tsh{
-    thread_security_t *sec_obj;
+    coap_security_t *sec_obj;
     int int_value;
     int counter;
     int values[10];