From 3baaf3c9ae700ee2578bb163d44a134f99044ff1 Mon Sep 17 00:00:00 2001 From: ttins Date: Mon, 16 Mar 2020 16:43:37 -0700 Subject: [PATCH 1/4] malloc to calloc calls, fix UTs expected calls --- adapters/condition_win32.c | 2 +- adapters/socketio_win32.c | 2 +- adapters/srw_lock.c | 2 +- adapters/tlsio_schannel.c | 2 +- src/buffer.c | 8 +- src/constbuffer.c | 8 +- src/gballoc.c | 6 +- src/http_proxy_io.c | 2 +- src/httpapiex.c | 2 +- src/map.c | 4 +- src/string_tokenizer.c | 2 +- src/wsio.c | 2 +- tests/azure_base64_ut/azure_base64_ut.c | 6 + tests/buffer_ut/buffer_ut.c | 70 +++++++--- tests/condition_ut/condition_ut.c | 18 ++- .../constbuffer_array_ut.c | 8 ++ tests/constbuffer_ut/constbuffer_ut.c | 126 +++++++++++------ tests/gballoc_ut/gballoc_ut.c | 84 ++++++------ tests/hmacsha256_ut/hmacsha256_ut.c | 6 + tests/http_proxy_io_ut/http_proxy_io_ut.c | 15 +- tests/httpapiex_ut/httpapiex_ut.c | 48 +++++-- tests/map_ut/map_ut.c | 129 +++++++++++------- tests/socketio_win32_ut/socketio_win32_ut.c | 33 ++++- tests/srw_lock_ut/srw_lock_ut.c | 18 ++- .../string_tokenizer_ut/string_tokenizer_ut.c | 42 +++++- tests/wsio_ut/wsio_ut.c | 36 ++++- 26 files changed, 473 insertions(+), 208 deletions(-) diff --git a/adapters/condition_win32.c b/adapters/condition_win32.c index 15e144783..1de080a5c 100644 --- a/adapters/condition_win32.c +++ b/adapters/condition_win32.c @@ -21,7 +21,7 @@ COND_HANDLE Condition_Init(void) { // Codes_SRS_CONDITION_18_002: [ Condition_Init shall create and return a CONDITION_HANDLE ] - CONDITION* cond = (CONDITION*)malloc(sizeof(CONDITION)); + CONDITION* cond = (CONDITION*)calloc(1, sizeof(CONDITION)); // Codes_SRS_CONDITION_18_008: [ Condition_Init shall return NULL if it fails to allocate the CONDITION_HANDLE ] if (cond != NULL) diff --git a/adapters/socketio_win32.c b/adapters/socketio_win32.c index 475971f90..1ce467b2e 100644 --- a/adapters/socketio_win32.c +++ b/adapters/socketio_win32.c @@ -111,7 +111,7 @@ static void indicate_error(SOCKET_IO_INSTANCE* socket_io_instance) static int add_pending_io(SOCKET_IO_INSTANCE* socket_io_instance, const unsigned char* buffer, size_t size, ON_SEND_COMPLETE on_send_complete, void* callback_context) { int result; - PENDING_SOCKET_IO* pending_socket_io = (PENDING_SOCKET_IO*)malloc(sizeof(PENDING_SOCKET_IO)); + PENDING_SOCKET_IO* pending_socket_io = (PENDING_SOCKET_IO*)calloc(1, sizeof(PENDING_SOCKET_IO)); if (pending_socket_io == NULL) { result = MU_FAILURE; diff --git a/adapters/srw_lock.c b/adapters/srw_lock.c index 20a8cc260..716c4e4b2 100644 --- a/adapters/srw_lock.c +++ b/adapters/srw_lock.c @@ -104,7 +104,7 @@ SRW_LOCK_HANDLE srw_lock_create(bool do_statistics, const char* lock_name) { SRW_LOCK_HANDLE result; /*Codes_SRS_SRW_LOCK_02_001: [ srw_lock_create shall allocate memory for SRW_LOCK_HANDLE. ]*/ - result = malloc(sizeof(SRW_LOCK_HANDLE_DATA)); + result = calloc(1, sizeof(SRW_LOCK_HANDLE_DATA)); if (result == NULL) { /*return as is*/ diff --git a/adapters/tlsio_schannel.c b/adapters/tlsio_schannel.c index 1626b3edc..a30d17fb4 100644 --- a/adapters/tlsio_schannel.c +++ b/adapters/tlsio_schannel.c @@ -1296,7 +1296,7 @@ int tlsio_schannel_send(CONCRETE_IO_HANDLE tls_io, const void* buffer, size_t si if (tls_io_instance->tlsio_state == TLSIO_STATE_RENEGOTIATE) { /* add to pending list */ - PENDING_SEND* new_pending_send = (PENDING_SEND*)malloc(sizeof(PENDING_SEND)); + PENDING_SEND* new_pending_send = (PENDING_SEND*)calloc(1, sizeof(PENDING_SEND)); if (new_pending_send == NULL) { LogError("Cannot allocate memory for pending IO"); diff --git a/src/buffer.c b/src/buffer.c index 114746878..d74a1c045 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -18,7 +18,7 @@ typedef struct BUFFER_TAG /* Codes_SRS_BUFFER_07_001: [BUFFER_new shall allocate a BUFFER_HANDLE that will contain a NULL unsigned char*.] */ BUFFER_HANDLE BUFFER_new(void) { - BUFFER* temp = (BUFFER*)malloc(sizeof(BUFFER)); + BUFFER* temp = (BUFFER*)calloc(1, sizeof(BUFFER)); /* Codes_SRS_BUFFER_07_002: [BUFFER_new shall return NULL on any error that occurs.] */ if (temp != NULL) { @@ -64,7 +64,7 @@ BUFFER_HANDLE BUFFER_create(const unsigned char* source, size_t size) else { /*Codes_SRS_BUFFER_02_002: [Otherwise, BUFFER_create shall allocate memory to hold size bytes and shall copy from source size bytes into the newly allocated memory.] */ - result = (BUFFER*)malloc(sizeof(BUFFER)); + result = (BUFFER*)calloc(1, sizeof(BUFFER)); if (result == NULL) { /*Codes_SRS_BUFFER_02_003: [If allocating memory fails, then BUFFER_create shall return NULL.] */ @@ -94,7 +94,7 @@ BUFFER_HANDLE BUFFER_create(const unsigned char* source, size_t size) BUFFER_HANDLE BUFFER_create_with_size(size_t buff_size) { BUFFER* result; - result = (BUFFER*)malloc(sizeof(BUFFER)); + result = (BUFFER*)calloc(1, sizeof(BUFFER)); if (result != NULL) { if (buff_size == 0) @@ -642,7 +642,7 @@ BUFFER_HANDLE BUFFER_clone(BUFFER_HANDLE handle) else { BUFFER* suppliedBuff = (BUFFER*)handle; - BUFFER* b = (BUFFER*)malloc(sizeof(BUFFER)); + BUFFER* b = (BUFFER*)calloc(1, sizeof(BUFFER)); if (b != NULL) { if (BUFFER_safemalloc(b, suppliedBuff->size) != 0) diff --git a/src/constbuffer.c b/src/constbuffer.c index ed29e0c01..78414f05e 100644 --- a/src/constbuffer.c +++ b/src/constbuffer.c @@ -33,7 +33,7 @@ static CONSTBUFFER_HANDLE CONSTBUFFER_Create_Internal(const unsigned char* sourc CONSTBUFFER_HANDLE result; /*Codes_SRS_CONSTBUFFER_02_005: [The non-NULL handle returned by CONSTBUFFER_Create shall have its ref count set to "1".]*/ /*Codes_SRS_CONSTBUFFER_02_010: [The non-NULL handle returned by CONSTBUFFER_CreateFromBuffer shall have its ref count set to "1".]*/ - result = (CONSTBUFFER_HANDLE)malloc(sizeof(CONSTBUFFER_HANDLE_DATA) + size); + result = (CONSTBUFFER_HANDLE)calloc(1, (sizeof(CONSTBUFFER_HANDLE_DATA) + size)); if (result == NULL) { /*Codes_SRS_CONSTBUFFER_02_003: [If creating the copy fails then CONSTBUFFER_Create shall return NULL.]*/ @@ -116,7 +116,7 @@ IMPLEMENT_MOCKABLE_FUNCTION(, CONSTBUFFER_HANDLE, CONSTBUFFER_CreateWithMoveMemo } else { - result = (CONSTBUFFER_HANDLE)malloc(sizeof(CONSTBUFFER_HANDLE_DATA)); + result = (CONSTBUFFER_HANDLE)calloc(1, sizeof(CONSTBUFFER_HANDLE_DATA)); if (result == NULL) { /* Codes_SRS_CONSTBUFFER_01_005: [ If any error occurs, CONSTBUFFER_CreateWithMoveMemory shall fail and return NULL. ]*/ @@ -157,7 +157,7 @@ IMPLEMENT_MOCKABLE_FUNCTION(, CONSTBUFFER_HANDLE, CONSTBUFFER_CreateWithCustomFr } else { - result = (CONSTBUFFER_HANDLE)malloc(sizeof(CONSTBUFFER_HANDLE_DATA)); + result = (CONSTBUFFER_HANDLE)calloc(1, sizeof(CONSTBUFFER_HANDLE_DATA)); if (result == NULL) { /* Codes_SRS_CONSTBUFFER_01_011: [ If any error occurs, CONSTBUFFER_CreateWithMoveMemory shall fail and return NULL. ]*/ @@ -205,7 +205,7 @@ IMPLEMENT_MOCKABLE_FUNCTION(, CONSTBUFFER_HANDLE, CONSTBUFFER_CreateFromOffsetAn else { /*Codes_SRS_CONSTBUFFER_02_028: [ CONSTBUFFER_CreateFromOffsetAndSize shall allocate memory for a new CONSTBUFFER_HANDLE's content. ]*/ - result = (CONSTBUFFER_HANDLE)malloc(sizeof(CONSTBUFFER_HANDLE_DATA)); + result = (CONSTBUFFER_HANDLE)calloc(1, sizeof(CONSTBUFFER_HANDLE_DATA)); if (result == NULL) { /*Codes_SRS_CONSTBUFFER_02_032: [ If there are any failures then CONSTBUFFER_CreateFromOffsetAndSize shall fail and return NULL. ]*/ diff --git a/src/gballoc.c b/src/gballoc.c index 71b9342ac..39fc311c4 100755 --- a/src/gballoc.c +++ b/src/gballoc.c @@ -94,7 +94,7 @@ void* gballoc_malloc(size_t size) } else { - ALLOCATION* allocation = (ALLOCATION*)malloc(sizeof(ALLOCATION)); + ALLOCATION* allocation = (ALLOCATION*)calloc(1, sizeof(ALLOCATION)); if (allocation == NULL) { result = NULL; @@ -150,7 +150,7 @@ void* gballoc_calloc(size_t nmemb, size_t size) } else { - ALLOCATION* allocation = (ALLOCATION*)malloc(sizeof(ALLOCATION)); + ALLOCATION* allocation = (ALLOCATION*)calloc(1, sizeof(ALLOCATION)); if (allocation == NULL) { result = NULL; @@ -211,7 +211,7 @@ void* gballoc_realloc(void* ptr, size_t size) if (ptr == NULL) { /* Codes_SRS_GBALLOC_01_017: [When ptr is NULL, gballoc_realloc shall call the underlying realloc with ptr being NULL and the realloc result shall be tracked by gballoc.] */ - allocation = (ALLOCATION*)malloc(sizeof(ALLOCATION)); + allocation = (ALLOCATION*)calloc(1, sizeof(ALLOCATION)); } else { diff --git a/src/http_proxy_io.c b/src/http_proxy_io.c index 926c38055..1f2c88559 100644 --- a/src/http_proxy_io.c +++ b/src/http_proxy_io.c @@ -78,7 +78,7 @@ static CONCRETE_IO_HANDLE http_proxy_io_create(void* io_create_parameters) else { /* Codes_SRS_HTTP_PROXY_IO_01_001: [ http_proxy_io_create shall create a new instance of the HTTP proxy IO. ]*/ - result = (HTTP_PROXY_IO_INSTANCE*)malloc(sizeof(HTTP_PROXY_IO_INSTANCE)); + result = (HTTP_PROXY_IO_INSTANCE*)calloc(1, sizeof(HTTP_PROXY_IO_INSTANCE)); if (result == NULL) { /* Codes_SRS_HTTP_PROXY_IO_01_051: [ If allocating memory for the new instance fails, http_proxy_io_create shall fail and return NULL. ]*/ diff --git a/src/httpapiex.c b/src/httpapiex.c index 21e5aa1e8..2027dd57a 100644 --- a/src/httpapiex.c +++ b/src/httpapiex.c @@ -82,7 +82,7 @@ HTTPAPIEX_HANDLE HTTPAPIEX_Create(const char* hostName) else { /*Codes_SRS_HTTPAPIEX_02_005: [If creating the handle fails for any reason, then HTTAPIEX_Create shall return NULL.] */ - HTTPAPIEX_HANDLE_DATA* handleData = (HTTPAPIEX_HANDLE_DATA*)malloc(sizeof(HTTPAPIEX_HANDLE_DATA)); + HTTPAPIEX_HANDLE_DATA* handleData = (HTTPAPIEX_HANDLE_DATA*)calloc(1, sizeof(HTTPAPIEX_HANDLE_DATA)); if (handleData == NULL) { LogError("malloc failed."); diff --git a/src/map.c b/src/map.c index be8555ad5..430d7a302 100644 --- a/src/map.c +++ b/src/map.c @@ -24,7 +24,7 @@ typedef struct MAP_HANDLE_DATA_TAG MAP_HANDLE Map_Create(MAP_FILTER_CALLBACK mapFilterFunc) { /*Codes_SRS_MAP_02_001: [Map_Create shall create a new, empty map.]*/ - MAP_HANDLE_DATA* result = (MAP_HANDLE_DATA*)malloc(sizeof(MAP_HANDLE_DATA)); + MAP_HANDLE_DATA* result = (MAP_HANDLE_DATA*)calloc(1, sizeof(MAP_HANDLE_DATA)); /*Codes_SRS_MAP_02_002: [If during creation there are any error, then Map_Create shall return NULL.]*/ if (result != NULL) { @@ -109,7 +109,7 @@ MAP_HANDLE Map_Clone(MAP_HANDLE handle) else { MAP_HANDLE_DATA * handleData = (MAP_HANDLE_DATA *)handle; - result = (MAP_HANDLE_DATA*)malloc(sizeof(MAP_HANDLE_DATA)); + result = (MAP_HANDLE_DATA*)calloc(1, sizeof(MAP_HANDLE_DATA)); if (result == NULL) { /*Codes_SRS_MAP_02_047: [If during cloning, any operation fails, then Map_Clone shall return NULL.] */ diff --git a/src/string_tokenizer.c b/src/string_tokenizer.c index 97e9ec68c..40f3602a4 100644 --- a/src/string_tokenizer.c +++ b/src/string_tokenizer.c @@ -47,7 +47,7 @@ extern STRING_TOKENIZER_HANDLE STRING_TOKENIZER_create_from_char(const char* inp result = NULL; } /* Codes_SRS_STRING_07_002: [STRING_TOKENIZER_create shall allocate a new STRING_TOKENIZER_HANDLE having the content of the STRING_HANDLE copied and current position pointing at the beginning of the string] */ - else if ((result = (STRING_TOKEN*)malloc(sizeof(STRING_TOKEN))) == NULL) + else if ((result = (STRING_TOKEN*)calloc(1, sizeof(STRING_TOKEN))) == NULL) { LogError("Memory Allocation failed. Cannot allocate STRING_TOKENIZER."); } diff --git a/src/wsio.c b/src/wsio.c index 049abd59c..2c028f718 100644 --- a/src/wsio.c +++ b/src/wsio.c @@ -216,7 +216,7 @@ CONCRETE_IO_HANDLE wsio_create(void* io_create_parameters) else { /* Codes_SRS_WSIO_01_001: [wsio_create shall create an instance of wsio and return a non-NULL handle to it.] */ - result = (WSIO_INSTANCE*)malloc(sizeof(WSIO_INSTANCE)); + result = (WSIO_INSTANCE*)calloc(1, sizeof(WSIO_INSTANCE)); if (result == NULL) { /* Codes_SRS_WSIO_01_068: [ If allocating memory for the new wsio instance fails then wsio_create shall return NULL. ]*/ diff --git a/tests/azure_base64_ut/azure_base64_ut.c b/tests/azure_base64_ut/azure_base64_ut.c index 0bb217d7d..a6b0c9360 100644 --- a/tests/azure_base64_ut/azure_base64_ut.c +++ b/tests/azure_base64_ut/azure_base64_ut.c @@ -20,6 +20,11 @@ static void* my_gballoc_malloc(size_t size) return malloc(size); } +static void* my_gballoc_calloc(size_t nmemb, size_t size) +{ + return calloc(nmemb, size); +} + static void* my_gballoc_realloc(void* ptr, size_t size) { return realloc(ptr, size); @@ -1489,6 +1494,7 @@ TEST_SUITE_INITIALIZE(TestSuiteInitialize) umock_c_init(on_umock_c_error); REGISTER_GLOBAL_MOCK_HOOK(gballoc_malloc, my_gballoc_malloc); + REGISTER_GLOBAL_MOCK_HOOK(gballoc_calloc, my_gballoc_calloc); REGISTER_GLOBAL_MOCK_HOOK(gballoc_realloc, my_gballoc_realloc); REGISTER_GLOBAL_MOCK_HOOK(gballoc_free, my_gballoc_free); } diff --git a/tests/buffer_ut/buffer_ut.c b/tests/buffer_ut/buffer_ut.c index ad7665ac1..936269e17 100644 --- a/tests/buffer_ut/buffer_ut.c +++ b/tests/buffer_ut/buffer_ut.c @@ -17,6 +17,9 @@ static size_t currentmalloc_call = 0; static size_t whenShallmalloc_fail = 0; +static size_t currentcalloc_call = 0; +static size_t whenShallcalloc_fail = 0; + static size_t currentrealloc_call = 0; static size_t whenShallrealloc_fail = 0; @@ -42,6 +45,28 @@ void* my_gballoc_malloc(size_t size) return result; } +void* my_gballoc_calloc(size_t nmemb, size_t size) +{ + void* result; + currentcalloc_call++; + if (whenShallcalloc_fail > 0) + { + if (currentcalloc_call == whenShallcalloc_fail) + { + result = NULL; + } + else + { + result = calloc(nmemb, size); + } + } + else + { + result = calloc(nmemb, size); + } + return result; +} + void* my_gballoc_realloc(void* ptr, size_t size) { void* result; @@ -104,6 +129,7 @@ BEGIN_TEST_SUITE(Buffer_UnitTests) umock_c_init(on_umock_c_error); REGISTER_GLOBAL_MOCK_HOOK(gballoc_malloc, my_gballoc_malloc); + REGISTER_GLOBAL_MOCK_HOOK(gballoc_calloc, my_gballoc_calloc); REGISTER_GLOBAL_MOCK_HOOK(gballoc_realloc, my_gballoc_realloc); REGISTER_GLOBAL_MOCK_HOOK(gballoc_free, my_gballoc_free); } @@ -127,6 +153,9 @@ BEGIN_TEST_SUITE(Buffer_UnitTests) currentmalloc_call = 0; whenShallmalloc_fail = 0; + currentcalloc_call = 0; + whenShallcalloc_fail = 0; + currentrealloc_call = 0; whenShallrealloc_fail = 0; } @@ -141,8 +170,8 @@ BEGIN_TEST_SUITE(Buffer_UnitTests) { ///arrange BUFFER_HANDLE g_hBuffer; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); ///act g_hBuffer = BUFFER_new(); @@ -314,8 +343,8 @@ BEGIN_TEST_SUITE(Buffer_UnitTests) int nResult; BUFFER_HANDLE g_hBuffer; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_realloc(IGNORED_PTR_ARG, ALLOCATION_SIZE)) .IgnoreArgument(1); @@ -1409,7 +1438,7 @@ BEGIN_TEST_SUITE(Buffer_UnitTests) (void)BUFFER_build(g_hBuffer, BUFFER_TEST_VALUE, ALLOCATION_SIZE); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)).IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_malloc(ALLOCATION_SIZE)); ///act @@ -1461,8 +1490,8 @@ BEGIN_TEST_SUITE(Buffer_UnitTests) size_t howBig; char c = '3'; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_malloc(1)); @@ -1492,7 +1521,8 @@ BEGIN_TEST_SUITE(Buffer_UnitTests) const unsigned char* data; char c = '3'; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_malloc(1)); @@ -1518,12 +1548,11 @@ BEGIN_TEST_SUITE(Buffer_UnitTests) char c = '3'; BUFFER_HANDLE res; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + whenShallmalloc_fail = 1; + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)); STRICT_EXPECTED_CALL(gballoc_malloc(1)); STRICT_EXPECTED_CALL(gballoc_free(IGNORED_PTR_ARG)); - whenShallmalloc_fail = 2; - ///act res = BUFFER_create((const unsigned char*)&c, 1); @@ -1542,9 +1571,9 @@ BEGIN_TEST_SUITE(Buffer_UnitTests) char c = '3'; BUFFER_HANDLE res; - whenShallmalloc_fail = 1; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) - .IgnoreArgument(1); + whenShallcalloc_fail = 1; + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); ///act res = BUFFER_create((const unsigned char*)&c, 1); @@ -1566,7 +1595,8 @@ BEGIN_TEST_SUITE(Buffer_UnitTests) BUFFER_HANDLE res; size_t alloc_size = 32; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_malloc(alloc_size)); //act @@ -1588,7 +1618,8 @@ BEGIN_TEST_SUITE(Buffer_UnitTests) BUFFER_HANDLE res; size_t alloc_size = 0; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); //act res = BUFFER_create_with_size(alloc_size); @@ -1609,7 +1640,9 @@ BEGIN_TEST_SUITE(Buffer_UnitTests) BUFFER_HANDLE res; size_t alloc_size = 32; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)).SetReturn(NULL); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments() + .SetReturn(NULL); //act res = BUFFER_create_with_size(alloc_size); @@ -1628,7 +1661,8 @@ BEGIN_TEST_SUITE(Buffer_UnitTests) BUFFER_HANDLE res; size_t alloc_size = 32; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_malloc(alloc_size)).SetReturn(NULL); STRICT_EXPECTED_CALL(gballoc_free(IGNORED_PTR_ARG)); diff --git a/tests/condition_ut/condition_ut.c b/tests/condition_ut/condition_ut.c index ff727dd2f..23e74e073 100644 --- a/tests/condition_ut/condition_ut.c +++ b/tests/condition_ut/condition_ut.c @@ -24,6 +24,7 @@ extern "C" { #endif MOCKABLE_FUNCTION(, void*, gballoc_malloc, size_t, size); + MOCKABLE_FUNCTION(, void*, gballoc_calloc, size_t, nmemb, size_t, size); MOCKABLE_FUNCTION(, void, gballoc_free, void*, ptr); #ifdef __cplusplus } @@ -46,6 +47,7 @@ void real_gballoc_free(void* ptr); static TEST_MUTEX_HANDLE g_testByTest; static bool malloc_will_fail = false; +static bool calloc_will_fail = false; TEST_DEFINE_ENUM_TYPE(COND_RESULT, COND_RESULT_VALUES) @@ -64,6 +66,17 @@ void* my_gballoc_malloc(size_t size) return result; } +void* my_gballoc_calloc(size_t nmemb, size_t size) +{ + void* result = NULL; + if (calloc_will_fail == false) + { + result = real_gballoc_calloc(nmemb, size); + } + + return result; +} + void my_gballoc_free(void* ptr) { real_gballoc_free(ptr); @@ -100,6 +113,7 @@ TEST_SUITE_INITIALIZE(a) umock_c_init(on_umock_c_error); REGISTER_GLOBAL_MOCK_HOOK(gballoc_malloc, my_gballoc_malloc); + REGISTER_GLOBAL_MOCK_HOOK(gballoc_calloc, my_gballoc_calloc); REGISTER_GLOBAL_MOCK_HOOK(gballoc_free, my_gballoc_free); } @@ -261,9 +275,9 @@ TEST_FUNCTION(Condition_Init_allocation_fail) { // arrange COND_HANDLE handle = NULL; - malloc_will_fail = true; + calloc_will_fail = true; - EXPECTED_CALL(gballoc_malloc(4)); + EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, 4)); // act handle = Condition_Init(); diff --git a/tests/constbuffer_array_ut/constbuffer_array_ut.c b/tests/constbuffer_array_ut/constbuffer_array_ut.c index 73830c6a2..481991b70 100644 --- a/tests/constbuffer_array_ut/constbuffer_array_ut.c +++ b/tests/constbuffer_array_ut/constbuffer_array_ut.c @@ -14,6 +14,11 @@ static void* my_gballoc_malloc(size_t size) return malloc(size); } +static void* my_gballoc_calloc(size_t nmemb, size_t size) +{ + return calloc(nmemb, size); +} + static void my_gballoc_free(void* s) { free(s); @@ -88,6 +93,9 @@ TEST_SUITE_INITIALIZE(suite_init) REGISTER_GLOBAL_MOCK_HOOK(gballoc_malloc, my_gballoc_malloc); REGISTER_GLOBAL_MOCK_FAIL_RETURN(gballoc_malloc, NULL); + REGISTER_GLOBAL_MOCK_HOOK(gballoc_calloc, my_gballoc_calloc); + REGISTER_GLOBAL_MOCK_FAIL_RETURN(gballoc_calloc, NULL); + REGISTER_GLOBAL_MOCK_HOOK(gballoc_free, my_gballoc_free); } diff --git a/tests/constbuffer_ut/constbuffer_ut.c b/tests/constbuffer_ut/constbuffer_ut.c index 95f1fe9ba..f19b9b8c2 100644 --- a/tests/constbuffer_ut/constbuffer_ut.c +++ b/tests/constbuffer_ut/constbuffer_ut.c @@ -17,6 +17,11 @@ void* my_gballoc_malloc(size_t size) return malloc(size); } +void* my_gballoc_calloc(size_t nmemb, size_t size) +{ + return calloc(nmemb, size); +} + void my_gballoc_free(void* ptr) { free(ptr); @@ -100,6 +105,7 @@ BEGIN_TEST_SUITE(constbuffer_unittests) REGISTER_UMOCK_ALIAS_TYPE(BUFFER_HANDLE, void*); REGISTER_GLOBAL_MOCK_HOOK(gballoc_malloc, my_gballoc_malloc); + REGISTER_GLOBAL_MOCK_HOOK(gballoc_calloc, my_gballoc_calloc); REGISTER_GLOBAL_MOCK_HOOK(gballoc_free, my_gballoc_free); REGISTER_GLOBAL_MOCK_HOOK(BUFFER_u_char, my_BUFFER_u_char); REGISTER_GLOBAL_MOCK_HOOK(BUFFER_length, my_BUFFER_length); @@ -152,7 +158,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) const CONSTBUFFER* content; ///act - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); handle = CONSTBUFFER_Create(BUFFER1_u_char, BUFFER1_length); @@ -183,7 +190,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) ///act STRICT_EXPECTED_CALL(BUFFER_length(BUFFER1_HANDLE)); STRICT_EXPECTED_CALL(BUFFER_u_char(BUFFER1_HANDLE)); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); handle = CONSTBUFFER_CreateFromBuffer(BUFFER1_HANDLE); @@ -211,7 +219,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) STRICT_EXPECTED_CALL(BUFFER_length(BUFFER1_HANDLE)); STRICT_EXPECTED_CALL(BUFFER_u_char(BUFFER1_HANDLE)); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments() .SetReturn(NULL); @@ -248,7 +257,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) CONSTBUFFER_HANDLE handle; ///act - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments() .SetReturn(NULL); handle = CONSTBUFFER_Create(BUFFER1_u_char, BUFFER1_length); @@ -287,7 +297,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) const CONSTBUFFER* content; ///act - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); handle = CONSTBUFFER_Create(BUFFER2_u_char, BUFFER2_length); @@ -312,7 +323,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) const CONSTBUFFER* content; ///act - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); handle = CONSTBUFFER_Create(BUFFER3_u_char, BUFFER3_length); @@ -354,7 +366,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) test_buffer[0] = 42; test_buffer[1] = 43; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); ///act handle = CONSTBUFFER_CreateWithMoveMemory(test_buffer, 2); @@ -382,7 +395,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) test_buffer[0] = 42; test_buffer[1] = 43; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); ///act handle = CONSTBUFFER_CreateWithMoveMemory(test_buffer, 0); @@ -405,7 +419,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) CONSTBUFFER_HANDLE handle; const CONSTBUFFER* content; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); ///act handle = CONSTBUFFER_CreateWithMoveMemory(NULL, 0); @@ -430,7 +445,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) test_buffer[0] = 42; test_buffer[1] = 43; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments() .SetReturn(NULL); ///act @@ -487,7 +503,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) test_buffer[0] = 42; test_buffer[1] = 43; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); ///act handle = CONSTBUFFER_CreateWithCustomFree(test_buffer, 2, free, test_buffer); @@ -514,7 +531,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) test_buffer[0] = 42; test_buffer[1] = 43; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); ///act handle = CONSTBUFFER_CreateWithCustomFree(test_buffer, 2, test_free_func, NULL); @@ -543,7 +561,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) test_buffer[0] = 42; test_buffer[1] = 43; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); ///act handle = CONSTBUFFER_CreateWithCustomFree(test_buffer, 0, free, test_buffer); @@ -566,7 +585,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) CONSTBUFFER_HANDLE handle; const CONSTBUFFER* content; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); ///act handle = CONSTBUFFER_CreateWithCustomFree(NULL, 0, free, NULL); @@ -591,7 +611,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) test_buffer[0] = 42; test_buffer[1] = 43; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments() .SetReturn(NULL); ///act @@ -689,7 +710,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) ///arrange CONSTBUFFER_HANDLE origin; const char source[] = "source"; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); origin = CONSTBUFFER_Create((const unsigned char*)source, sizeof(source)); ASSERT_IS_NOT_NULL(origin); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); @@ -716,7 +738,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) ///arrange CONSTBUFFER_HANDLE origin; const char source[] = "source"; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); origin = CONSTBUFFER_Create((const unsigned char*)source, sizeof(source)); ASSERT_IS_NOT_NULL(origin); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); @@ -738,7 +761,8 @@ BEGIN_TEST_SUITE(constbuffer_unittests) ///arrange CONSTBUFFER_HANDLE origin; const char source[] = "source"; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); origin = CONSTBUFFER_Create((const unsigned char*)source, sizeof(source)); ASSERT_IS_NOT_NULL(origin); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); @@ -763,13 +787,15 @@ BEGIN_TEST_SUITE(constbuffer_unittests) ///arrange CONSTBUFFER_HANDLE origin; const char source[] = "source"; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); origin = CONSTBUFFER_Create((const unsigned char*)source, sizeof(source)); ASSERT_IS_NOT_NULL(origin); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); ///act CONSTBUFFER_HANDLE result = CONSTBUFFER_CreateFromOffsetAndSize(origin, 0, sizeof(source)); @@ -795,13 +821,15 @@ BEGIN_TEST_SUITE(constbuffer_unittests) ///arrange CONSTBUFFER_HANDLE origin; const char source[] = "source"; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); origin = CONSTBUFFER_Create((const unsigned char*)source, sizeof(source)); ASSERT_IS_NOT_NULL(origin); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); ///act CONSTBUFFER_HANDLE result = CONSTBUFFER_CreateFromOffsetAndSize(origin, 0, 0); @@ -826,13 +854,15 @@ BEGIN_TEST_SUITE(constbuffer_unittests) ///arrange CONSTBUFFER_HANDLE origin; const char source[] = "source"; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); origin = CONSTBUFFER_Create((const unsigned char*)source, sizeof(source)); ASSERT_IS_NOT_NULL(origin); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); ///act CONSTBUFFER_HANDLE result = CONSTBUFFER_CreateFromOffsetAndSize(origin, sizeof(source) - 1, 1); @@ -857,13 +887,15 @@ BEGIN_TEST_SUITE(constbuffer_unittests) ///arrange CONSTBUFFER_HANDLE origin; const char source[] = "source"; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); origin = CONSTBUFFER_Create((const unsigned char*)source, sizeof(source)); ASSERT_IS_NOT_NULL(origin); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); ///act CONSTBUFFER_HANDLE result = CONSTBUFFER_CreateFromOffsetAndSize(origin, 1, sizeof(source) - 1); @@ -889,13 +921,15 @@ BEGIN_TEST_SUITE(constbuffer_unittests) ///arrange CONSTBUFFER_HANDLE origin; const char source[] = "source"; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); origin = CONSTBUFFER_Create((const unsigned char*)source, sizeof(source)); ASSERT_IS_NOT_NULL(origin); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); ///act CONSTBUFFER_HANDLE result = CONSTBUFFER_CreateFromOffsetAndSize(origin, sizeof(source), 0); @@ -917,13 +951,15 @@ BEGIN_TEST_SUITE(constbuffer_unittests) ///arrange CONSTBUFFER_HANDLE origin; const char source[] = "source"; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); origin = CONSTBUFFER_Create((const unsigned char*)source, sizeof(source)); ASSERT_IS_NOT_NULL(origin); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments() .SetReturn(NULL); ///act @@ -944,13 +980,15 @@ BEGIN_TEST_SUITE(constbuffer_unittests) ///arrange CONSTBUFFER_HANDLE origin; const char source[] = "source"; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); origin = CONSTBUFFER_Create((const unsigned char*)source, sizeof(source)); ASSERT_IS_NOT_NULL(origin); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); CONSTBUFFER_HANDLE result = CONSTBUFFER_CreateFromOffsetAndSize(origin, 1, sizeof(source) - 1); ASSERT_IS_NOT_NULL(result); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); @@ -979,13 +1017,15 @@ BEGIN_TEST_SUITE(constbuffer_unittests) ///arrange CONSTBUFFER_HANDLE origin; const char source[] = "source"; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); origin = CONSTBUFFER_Create((const unsigned char*)source, sizeof(source)); ASSERT_IS_NOT_NULL(origin); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); CONSTBUFFER_HANDLE result = CONSTBUFFER_CreateFromOffsetAndSize(origin, 1, sizeof(source) - 1); ASSERT_IS_NOT_NULL(result); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); @@ -1017,19 +1057,22 @@ BEGIN_TEST_SUITE(constbuffer_unittests) ///arrange CONSTBUFFER_HANDLE origin; const char source[] = "source"; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); origin = CONSTBUFFER_Create((const unsigned char*)source, sizeof(source)); ASSERT_IS_NOT_NULL(origin); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); CONSTBUFFER_HANDLE result1 = CONSTBUFFER_CreateFromOffsetAndSize(origin, 0, 2); ASSERT_IS_NOT_NULL(result1); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); CONSTBUFFER_HANDLE result2 = CONSTBUFFER_CreateFromOffsetAndSize(result1, 1, 1); ASSERT_IS_NOT_NULL(result2); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); @@ -1056,19 +1099,22 @@ BEGIN_TEST_SUITE(constbuffer_unittests) ///arrange CONSTBUFFER_HANDLE origin; const char source[] = "source"; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); origin = CONSTBUFFER_Create((const unsigned char*)source, sizeof(source)); ASSERT_IS_NOT_NULL(origin); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); CONSTBUFFER_HANDLE result1 = CONSTBUFFER_CreateFromOffsetAndSize(origin, 0, 2); ASSERT_IS_NOT_NULL(result1); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); CONSTBUFFER_HANDLE result2 = CONSTBUFFER_CreateFromOffsetAndSize(result1, 1, 1); ASSERT_IS_NOT_NULL(result2); ASSERT_ARE_EQUAL(char_ptr, umock_c_get_expected_calls(), umock_c_get_actual_calls()); diff --git a/tests/gballoc_ut/gballoc_ut.c b/tests/gballoc_ut/gballoc_ut.c index 68ca6a5d3..9952a60fe 100644 --- a/tests/gballoc_ut/gballoc_ut.c +++ b/tests/gballoc_ut/gballoc_ut.c @@ -117,7 +117,7 @@ TEST_FUNCTION(gballoc_init_resets_memory_used) gballoc_init(); allocation = malloc(OVERHEAD_SIZE); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); gballoc_free(gballoc_malloc(1)); @@ -247,7 +247,7 @@ TEST_FUNCTION(gballoc_malloc_with_0_Size_Calls_Underlying_malloc) STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); /* This is the call to the underlying malloc with the size we want to allocate */ STRICT_EXPECTED_CALL(mock_malloc(0)); @@ -280,7 +280,7 @@ TEST_FUNCTION(gballoc_malloc_with_1_Size_Calls_Underlying_malloc_And_Increases_M STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); /* This is the call to the underlying malloc with the size we want to allocate */ STRICT_EXPECTED_CALL(mock_malloc(1)); @@ -311,7 +311,7 @@ TEST_FUNCTION(When_malloc_Fails_Then_gballoc_malloc_fails_too) STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); /* This is the call to the underlying malloc with the size we want to allocate */ STRICT_EXPECTED_CALL(mock_malloc(1)) @@ -341,7 +341,7 @@ TEST_FUNCTION(When_allocating_memory_for_tracking_information_fails_Then_gballoc STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn((void*)NULL); STRICT_EXPECTED_CALL(Unlock(TEST_LOCK_HANDLE)); @@ -404,7 +404,7 @@ TEST_FUNCTION(gballoc_calloc_with_0_Size_And_ItemCount_Calls_Underlying_calloc) STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); /* This is the call to the underlying malloc with the size we want to allocate */ STRICT_EXPECTED_CALL(mock_calloc(0, 0)); @@ -436,7 +436,7 @@ TEST_FUNCTION(gballoc_calloc_with_1_Item_Of_1_Size_Calls_Underlying_malloc_And_I STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); /* This is the call to the underlying malloc with the size we want to allocate */ STRICT_EXPECTED_CALL(mock_calloc(1, 1)); @@ -468,7 +468,7 @@ TEST_FUNCTION(gballoc_calloc_with_1_Item_Of_0_Size_Calls_Underlying_malloc_And_D STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); /* This is the call to the underlying malloc with the size we want to allocate */ STRICT_EXPECTED_CALL(mock_calloc(1, 0)); @@ -500,7 +500,7 @@ TEST_FUNCTION(gballoc_calloc_with_0_Items_Of_1_Size_Calls_Underlying_malloc_And_ STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); /* This is the call to the underlying malloc with the size we want to allocate */ STRICT_EXPECTED_CALL(mock_calloc(0, 1)); @@ -532,7 +532,7 @@ TEST_FUNCTION(gballoc_calloc_with_42_Items_Of_2_Size_Calls_Underlying_malloc_And STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); /* This is the call to the underlying malloc with the size we want to allocate */ STRICT_EXPECTED_CALL(mock_calloc(42, 2)); @@ -563,7 +563,7 @@ TEST_FUNCTION(When_calloc_Fails_Then_gballoc_calloc_fails_too) STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); /* This is the call to the underlying malloc with the size we want to allocate */ STRICT_EXPECTED_CALL(mock_calloc(1, 1)) @@ -593,7 +593,7 @@ TEST_FUNCTION(When_allocating_memory_for_tracking_information_fails_Then_gballoc STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn((void*)NULL); STRICT_EXPECTED_CALL(Unlock(TEST_LOCK_HANDLE)); @@ -672,7 +672,7 @@ TEST_FUNCTION(gballoc_realloc_with_NULL_Arg_And_0_Size_Calls_Underlying_realloc) STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); /* This is the call to the underlying malloc with the size we want to allocate */ STRICT_EXPECTED_CALL(mock_realloc(NULL, 0)); @@ -704,7 +704,7 @@ TEST_FUNCTION(gballoc_realloc_with_NULL_Arg_And_1_Size_Calls_Underlying_realloc) STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); /* This is the call to the underlying malloc with the size we want to allocate */ STRICT_EXPECTED_CALL(mock_realloc(NULL, 1)); @@ -736,7 +736,7 @@ TEST_FUNCTION(gballoc_realloc_with_Previous_1_Byte_Block_Ptr_And_2_Size_Calls_Un STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); /* This is the call to the underlying malloc with the size we want to allocate */ STRICT_EXPECTED_CALL(mock_realloc(NULL, 1)); @@ -773,7 +773,7 @@ TEST_FUNCTION(When_realloc_fails_then_gballoc_realloc_Fails_Too_And_No_Change_Is STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); /* This is the call to the underlying malloc with the size we want to allocate */ STRICT_EXPECTED_CALL(mock_realloc(NULL, 1)); @@ -808,7 +808,7 @@ TEST_FUNCTION(When_Allocating_Memory_For_tracking_fails_gballoc_realloc_fails) STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn((void*)NULL); STRICT_EXPECTED_CALL(Unlock(TEST_LOCK_HANDLE)); @@ -834,7 +834,7 @@ TEST_FUNCTION(When_The_Pointer_Is_Not_Tracked_gballoc_realloc_Returns_NULL) STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); /* This is the call to the underlying malloc with the size we want to allocate */ STRICT_EXPECTED_CALL(mock_realloc(NULL, 1)); @@ -869,7 +869,7 @@ TEST_FUNCTION(When_ptr_is_null_and_the_underlying_realloc_fails_then_the_memory_ STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); /* This is the call to the underlying malloc with the size we want to allocate */ STRICT_EXPECTED_CALL(mock_realloc(NULL, 1)) @@ -915,7 +915,7 @@ TEST_FUNCTION(when_acquiring_the_lock_fails_then_gballoc_free_does_nothing) allocation = malloc(OVERHEAD_SIZE); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); /* This is the call to the underlying malloc with the size we want to allocate */ STRICT_EXPECTED_CALL(mock_realloc(NULL, 1)); @@ -951,7 +951,7 @@ TEST_FUNCTION(gballoc_free_calls_the_underlying_free) allocation = malloc(OVERHEAD_SIZE); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); /* This is the call to the underlying malloc with the size we want to allocate */ STRICT_EXPECTED_CALL(mock_realloc(NULL, 1)); @@ -989,7 +989,7 @@ TEST_FUNCTION(gballoc_malloc_free_2_times_with_1_byte_yields_1_byte_as_max) allocation = malloc(OVERHEAD_SIZE); /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); STRICT_EXPECTED_CALL(mock_realloc(NULL, 1)); block = gballoc_realloc(NULL, 1); @@ -997,7 +997,7 @@ TEST_FUNCTION(gballoc_malloc_free_2_times_with_1_byte_yields_1_byte_as_max) /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); block = gballoc_realloc(NULL, 1); umock_c_reset_all_calls(); @@ -1029,7 +1029,7 @@ TEST_FUNCTION(gballoc_free_with_an_untracked_pointer_does_not_alter_total_memory /* don't quite like this, but I'm unsure I want to invest more in this memory counting */ STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); gballoc_realloc(NULL, 1); @@ -1117,7 +1117,7 @@ TEST_FUNCTION(gballoc_getCurrentMemoryUsed_after_1_byte_malloc_returns_1) allocation = malloc(OVERHEAD_SIZE); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); STRICT_EXPECTED_CALL(mock_malloc(1)); toBeFreed = gballoc_malloc(1); @@ -1150,7 +1150,7 @@ TEST_FUNCTION(gballoc_getCurrentMemoryUsed_after_2x3_byte_calloc_returns_6) allocation = malloc(OVERHEAD_SIZE); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); toBeFreed = gballoc_calloc(2, 3); umock_c_reset_all_calls(); @@ -1182,7 +1182,7 @@ TEST_FUNCTION(gballoc_getCurrentMemoryUsed_after_1_byte_malloc_and_3_bytes_reall allocation = malloc(OVERHEAD_SIZE); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); STRICT_EXPECTED_CALL(mock_malloc(1)); STRICT_EXPECTED_CALL(Unlock(TEST_LOCK_HANDLE)); @@ -1218,7 +1218,7 @@ TEST_FUNCTION(gballoc_getCurrentMemoryUsed_after_1_byte_malloc_and_free_returns_ allocation = malloc(OVERHEAD_SIZE); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); STRICT_EXPECTED_CALL(mock_malloc(1)); STRICT_EXPECTED_CALL(Unlock(TEST_LOCK_HANDLE)); @@ -1253,7 +1253,7 @@ TEST_FUNCTION(gballoc_getCurrentMemoryUsed_after_2x3_byte_calloc_and_free_return allocation = malloc(OVERHEAD_SIZE); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); STRICT_EXPECTED_CALL(Unlock(TEST_LOCK_HANDLE)); @@ -1287,7 +1287,7 @@ TEST_FUNCTION(gballoc_getCurrentMemoryUsed_after_realloc_and_free_returns_0) allocation = malloc(OVERHEAD_SIZE); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); STRICT_EXPECTED_CALL(mock_malloc(1)); STRICT_EXPECTED_CALL(Unlock(TEST_LOCK_HANDLE)); @@ -1327,12 +1327,12 @@ TEST_FUNCTION(gballoc_getCurrentMemoryUsed_after_1_byte_malloc_and_1_byte_malloc allocation2 = malloc(OVERHEAD_SIZE); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation1); STRICT_EXPECTED_CALL(mock_malloc(1)); STRICT_EXPECTED_CALL(Unlock(TEST_LOCK_HANDLE)); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation2); STRICT_EXPECTED_CALL(mock_malloc(1)); STRICT_EXPECTED_CALL(Unlock(TEST_LOCK_HANDLE)); @@ -1374,12 +1374,12 @@ TEST_FUNCTION(gballoc_getCurrentMemoryUsed_after_1_byte_malloc_and_1_byte_malloc allocation2 = malloc(OVERHEAD_SIZE); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation1); STRICT_EXPECTED_CALL(mock_malloc(1)); STRICT_EXPECTED_CALL(Unlock(TEST_LOCK_HANDLE)); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation2); STRICT_EXPECTED_CALL(mock_malloc(1)); STRICT_EXPECTED_CALL(Unlock(TEST_LOCK_HANDLE)); @@ -1422,12 +1422,12 @@ TEST_FUNCTION(gballoc_getCurrentMemoryUsed_after_1_byte_malloc_and_6_byte_calloc allocation2 = malloc(OVERHEAD_SIZE); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation1); STRICT_EXPECTED_CALL(mock_malloc(1)); STRICT_EXPECTED_CALL(Unlock(TEST_LOCK_HANDLE)); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation2); STRICT_EXPECTED_CALL(mock_calloc(2, 3)); STRICT_EXPECTED_CALL(Unlock(TEST_LOCK_HANDLE)); @@ -1468,13 +1468,13 @@ TEST_FUNCTION(gballoc_getCurrentMemoryUsed_after_1_byte_malloc_and_6_byte_calloc allocation2 = malloc(OVERHEAD_SIZE); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation1); STRICT_EXPECTED_CALL(mock_malloc(1)) .SetReturn((char*)allocation1 + OVERHEAD_SIZE / 2); /*somewhere in the middle of allocation*/ STRICT_EXPECTED_CALL(Unlock(TEST_LOCK_HANDLE)); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation2); STRICT_EXPECTED_CALL(mock_calloc(2, 3)) .SetReturn((char*)allocation2 + OVERHEAD_SIZE / 2); @@ -1516,13 +1516,13 @@ TEST_FUNCTION(gballoc_getCurrentMemoryUsed_after_1_byte_malloc_and_1_byte_malloc allocation2 = malloc(OVERHEAD_SIZE); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation1); STRICT_EXPECTED_CALL(mock_malloc(1)) .SetReturn((char*)allocation1 + OVERHEAD_SIZE / 2); /*somewhere in the middle of allocation*/ STRICT_EXPECTED_CALL(Unlock(TEST_LOCK_HANDLE)); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation2); STRICT_EXPECTED_CALL(mock_realloc(IGNORED_PTR_ARG, 3)) .IgnoreArgument(1) @@ -1649,7 +1649,7 @@ TEST_FUNCTION(gballoc_getAllocationCount_success) allocation = malloc(OVERHEAD_SIZE); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); STRICT_EXPECTED_CALL(mock_malloc(1)); toBeFreed = gballoc_malloc(1); @@ -1712,7 +1712,7 @@ TEST_FUNCTION(gballoc_resetMetrics_success) allocation = malloc(OVERHEAD_SIZE); STRICT_EXPECTED_CALL(Lock(TEST_LOCK_HANDLE)); - EXPECTED_CALL(mock_malloc(0)) + EXPECTED_CALL(mock_calloc(1, 0)) .SetReturn(allocation); STRICT_EXPECTED_CALL(mock_malloc(1)); toBeFreed = gballoc_malloc(1); diff --git a/tests/hmacsha256_ut/hmacsha256_ut.c b/tests/hmacsha256_ut/hmacsha256_ut.c index 5954dd255..ccccbc1c9 100644 --- a/tests/hmacsha256_ut/hmacsha256_ut.c +++ b/tests/hmacsha256_ut/hmacsha256_ut.c @@ -16,6 +16,11 @@ void* real_malloc(size_t size) return malloc(size); } +void* real_calloc(size_t nmemb, size_t size) +{ + return calloc(nmemb, size); +} + void* real_realloc(void* ptr, size_t size) { return realloc(ptr, size); @@ -55,6 +60,7 @@ TEST_SUITE_INITIALIZE(TestClassInitialize) umock_c_init(on_umock_c_error); REGISTER_GLOBAL_MOCK_HOOK(gballoc_malloc, real_malloc); + REGISTER_GLOBAL_MOCK_HOOK(gballoc_calloc, real_calloc); REGISTER_GLOBAL_MOCK_HOOK(gballoc_free, real_free); REGISTER_GLOBAL_MOCK_HOOK(gballoc_realloc, real_realloc); } diff --git a/tests/http_proxy_io_ut/http_proxy_io_ut.c b/tests/http_proxy_io_ut/http_proxy_io_ut.c index b79151e95..ebf4acb3d 100644 --- a/tests/http_proxy_io_ut/http_proxy_io_ut.c +++ b/tests/http_proxy_io_ut/http_proxy_io_ut.c @@ -30,6 +30,11 @@ extern "C" return malloc(size); } + void* real_calloc(size_t nmemb, size_t size) + { + return calloc(nmemb, size); + } + void* real_realloc(void* ptr, size_t size) { return realloc(ptr, size); @@ -305,6 +310,7 @@ TEST_SUITE_INITIALIZE(suite_init) ASSERT_ARE_EQUAL(int, 0, result); REGISTER_GLOBAL_MOCK_HOOK(gballoc_malloc, real_malloc); + REGISTER_GLOBAL_MOCK_HOOK(gballoc_calloc, real_calloc); REGISTER_GLOBAL_MOCK_HOOK(gballoc_realloc, real_realloc); REGISTER_GLOBAL_MOCK_HOOK(gballoc_free, real_free); REGISTER_GLOBAL_MOCK_HOOK(mallocAndStrcpy_s, real_mallocAndStrcpy_s); @@ -381,7 +387,8 @@ TEST_FUNCTION(http_proxy_io_create_succeeds) http_proxy_io_config.username = "test_user"; http_proxy_io_config.password = "shhhh"; - EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(mallocAndStrcpy_s(IGNORED_PTR_ARG, "test_host")) .IgnoreArgument_destination(); STRICT_EXPECTED_CALL(mallocAndStrcpy_s(IGNORED_PTR_ARG, "a_proxy")) @@ -419,7 +426,8 @@ TEST_FUNCTION(http_proxy_io_create_with_NULL_username_and_password_succeeds) http_proxy_io_config.username = NULL; http_proxy_io_config.password = NULL; - EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(mallocAndStrcpy_s(IGNORED_PTR_ARG, "test_host")) .IgnoreArgument_destination(); STRICT_EXPECTED_CALL(mallocAndStrcpy_s(IGNORED_PTR_ARG, "a_proxy")) @@ -553,7 +561,8 @@ TEST_FUNCTION(when_a_call_made_by_http_proxy_io_create_fails_then_http_proxy_io_ int negativeTestsInitResult = umock_c_negative_tests_init(); ASSERT_ARE_EQUAL(int, 0, negativeTestsInitResult); - EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) + EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments() .SetFailReturn(NULL); STRICT_EXPECTED_CALL(mallocAndStrcpy_s(IGNORED_PTR_ARG, "test_host")) .IgnoreArgument_destination() diff --git a/tests/httpapiex_ut/httpapiex_ut.c b/tests/httpapiex_ut/httpapiex_ut.c index 7b5ea1e89..f8e3c8ddf 100644 --- a/tests/httpapiex_ut/httpapiex_ut.c +++ b/tests/httpapiex_ut/httpapiex_ut.c @@ -10,6 +10,9 @@ static size_t currentmalloc_call = 0; static size_t whenShallmalloc_fail = 0; +static size_t currentcalloc_call = 0; +static size_t whenShallcalloc_fail = 0; + static size_t currentrealloc_call = 0; static size_t whenShallrealloc_fail = 0; @@ -35,6 +38,28 @@ void* my_gballoc_malloc(size_t size) return result; } +void* my_gballoc_calloc(size_t nmemb, size_t size) +{ + void* result; + currentcalloc_call++; + if (whenShallcalloc_fail > 0) + { + if (currentcalloc_call == whenShallcalloc_fail) + { + result = NULL; + } + else + { + result = calloc(nmemb, size); + } + } + else + { + result = calloc(nmemb, size); + } + return result; +} + void* my_gballoc_realloc(void* ptr, size_t size) { void* result; @@ -438,6 +463,7 @@ TEST_SUITE_INITIALIZE(TestClassInitialize) REGISTER_UMOCK_ALIAS_TYPE(HTTP_HANDLE, void*); REGISTER_UMOCK_ALIAS_TYPE(const unsigned char*, void*); REGISTER_GLOBAL_MOCK_HOOK(gballoc_malloc, my_gballoc_malloc); + REGISTER_GLOBAL_MOCK_HOOK(gballoc_calloc, my_gballoc_calloc); REGISTER_GLOBAL_MOCK_HOOK(gballoc_realloc, my_gballoc_realloc); REGISTER_GLOBAL_MOCK_HOOK(gballoc_free, my_gballoc_free); REGISTER_GLOBAL_MOCK_HOOK(STRING_construct, my_STRING_construct); @@ -492,6 +518,9 @@ TEST_FUNCTION_INITIALIZE(TestMethodInitialize) currentmalloc_call = 0; whenShallmalloc_fail = 0; + currentcalloc_call = 0; + whenShallcalloc_fail = 0; + currentrealloc_call = 0; whenShallrealloc_fail = 0; @@ -612,8 +641,8 @@ TEST_FUNCTION(HTTPAPIEX_Create_succeeds) { /// arrange HTTPAPIEX_HANDLE result; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(STRING_construct(TEST_HOSTNAME)); STRICT_EXPECTED_CALL(VECTOR_create(IGNORED_NUM_ARG)) @@ -783,9 +812,9 @@ TEST_FUNCTION(HTTPAPIEX_Create_fails_when_malloc_fails) { /// arrange HTTPAPIEX_HANDLE result; - whenShallmalloc_fail = currentmalloc_call + 1; - STRICT_EXPECTED_CALL(gballoc_malloc(0)) - .IgnoreArgument(1); + whenShallcalloc_fail = currentcalloc_call + 1; + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); /// act result = HTTPAPIEX_Create(TEST_HOSTNAME); @@ -802,9 +831,8 @@ TEST_FUNCTION(HTTPAPIEX_Create_fails_when_STRING_construct_fails) { /// arrange HTTPAPIEX_HANDLE result; - STRICT_EXPECTED_CALL(gballoc_malloc(0)) - .IgnoreArgument(1); - + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(STRING_construct(TEST_HOSTNAME)) .SetReturn(NULL); @@ -827,8 +855,8 @@ TEST_FUNCTION(HTTPAPIEX_Create_fails_when_VECTOR_create_fails) { /// arrange HTTPAPIEX_HANDLE result; - STRICT_EXPECTED_CALL(gballoc_malloc(0)) - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(STRING_construct(TEST_HOSTNAME)); diff --git a/tests/map_ut/map_ut.c b/tests/map_ut/map_ut.c index 7bcde9a4f..387f08b84 100644 --- a/tests/map_ut/map_ut.c +++ b/tests/map_ut/map_ut.c @@ -13,6 +13,9 @@ static size_t currentmalloc_call = 0; static size_t whenShallmalloc_fail = 0; +static size_t currentcalloc_call = 0; +static size_t whenShallcalloc_fail = 0; + static size_t currentrealloc_call = 0; static size_t whenShallrealloc_fail = 0; @@ -38,6 +41,28 @@ void* my_gballoc_malloc(size_t size) return result; } +void* my_gballoc_calloc(size_t nmemb, size_t size) +{ + void* result; + currentcalloc_call++; + if (whenShallcalloc_fail > 0) + { + if (currentcalloc_call == whenShallcalloc_fail) + { + result = NULL; + } + else + { + result = calloc(nmemb, size); + } + } + else + { + result = calloc(nmemb, size); + } + return result; +} + void* my_gballoc_realloc(void* ptr, size_t size) { void* result; @@ -172,6 +197,7 @@ BEGIN_TEST_SUITE(map_unittests) REGISTER_UMOCK_ALIAS_TYPE(STRING_HANDLE, void*); REGISTER_GLOBAL_MOCK_HOOK(gballoc_malloc, my_gballoc_malloc); + REGISTER_GLOBAL_MOCK_HOOK(gballoc_calloc, my_gballoc_calloc); REGISTER_GLOBAL_MOCK_HOOK(gballoc_realloc, my_gballoc_realloc); REGISTER_GLOBAL_MOCK_HOOK(gballoc_free, my_gballoc_free); REGISTER_GLOBAL_MOCK_HOOK(STRING_construct, my_STRING_construct); @@ -198,6 +224,9 @@ BEGIN_TEST_SUITE(map_unittests) currentmalloc_call = 0; whenShallmalloc_fail = 0; + currentcalloc_call = 0; + whenShallcalloc_fail = 0; + currentrealloc_call = 0; whenShallrealloc_fail = 0; } @@ -215,8 +244,8 @@ BEGIN_TEST_SUITE(map_unittests) MAP_HANDLE handle; ///arrange - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_free(IGNORED_PTR_ARG)) /*keys*/ .IgnoreArgument(1); @@ -331,9 +360,9 @@ BEGIN_TEST_SUITE(map_unittests) { ///arrange MAP_HANDLE handle; - whenShallmalloc_fail = 1; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) - .IgnoreArgument(1); + whenShallcalloc_fail = 1; + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); ///act handle = Map_Create(NULL); @@ -2105,8 +2134,8 @@ BEGIN_TEST_SUITE(map_unittests) MAP_HANDLE handle = Map_Create(NULL); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); ///act result = Map_Clone(handle); @@ -2132,9 +2161,9 @@ BEGIN_TEST_SUITE(map_unittests) MAP_HANDLE handle = Map_Create(NULL); umock_c_reset_all_calls(); - whenShallmalloc_fail = currentmalloc_call + 1; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) - .IgnoreArgument(1); + whenShallcalloc_fail = currentcalloc_call + 1; + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); ///act result = Map_Clone(handle); @@ -2159,8 +2188,8 @@ BEGIN_TEST_SUITE(map_unittests) (void)Map_AddOrUpdate(handle, TEST_REDKEY, TEST_REDVALUE); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_malloc(sizeof(char*))); /*this is creating a clone of the storage for keys*/ @@ -2196,9 +2225,9 @@ BEGIN_TEST_SUITE(map_unittests) MAP_HANDLE handle = Map_Create(NULL); (void)Map_AddOrUpdate(handle, TEST_REDKEY, TEST_REDVALUE); umock_c_reset_all_calls(); - - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ - .IgnoreArgument(1); + + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_malloc(sizeof(char*))); /*this is creating a clone of the storage for keys*/ @@ -2206,7 +2235,7 @@ BEGIN_TEST_SUITE(map_unittests) STRICT_EXPECTED_CALL(gballoc_malloc(sizeof(char*))); /*this is creating a clone of the storage for values*/ - whenShallmalloc_fail = currentmalloc_call + 5; + whenShallmalloc_fail = currentmalloc_call + 4; STRICT_EXPECTED_CALL(gballoc_malloc(strlen(TEST_REDVALUE) + 1)); /*this is creating a clone of RED value*/ STRICT_EXPECTED_CALL(gballoc_free(IGNORED_PTR_ARG)) @@ -2239,14 +2268,14 @@ BEGIN_TEST_SUITE(map_unittests) (void)Map_AddOrUpdate(handle, TEST_REDKEY, TEST_REDVALUE); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_malloc(sizeof(char*))); /*this is creating a clone of the storage for keys*/ STRICT_EXPECTED_CALL(gballoc_malloc(strlen(TEST_REDKEY) + 1)); /*this is creating a clone of RED key*/ - whenShallmalloc_fail = currentmalloc_call + 4; + whenShallmalloc_fail = currentmalloc_call + 3; STRICT_EXPECTED_CALL(gballoc_malloc(sizeof(char*))); /*this is creating a clone of the storage for values*/ STRICT_EXPECTED_CALL(gballoc_free(IGNORED_PTR_ARG)) @@ -2277,12 +2306,12 @@ BEGIN_TEST_SUITE(map_unittests) (void)Map_AddOrUpdate(handle, TEST_REDKEY, TEST_REDVALUE); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_malloc(sizeof(char*))); /*this is creating a clone of the storage for keys*/ - whenShallmalloc_fail = currentmalloc_call + 3; + whenShallmalloc_fail = currentmalloc_call + 2; STRICT_EXPECTED_CALL(gballoc_malloc(strlen(TEST_REDKEY) + 1)); /*this is creating a clone of RED key*/ STRICT_EXPECTED_CALL(gballoc_free(IGNORED_PTR_ARG)) @@ -2311,9 +2340,9 @@ BEGIN_TEST_SUITE(map_unittests) (void)Map_AddOrUpdate(handle, TEST_REDKEY, TEST_REDVALUE); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ - .IgnoreArgument(1); - whenShallmalloc_fail = currentmalloc_call + 2; + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ + .IgnoreAllArguments(); + whenShallmalloc_fail = currentmalloc_call + 1; STRICT_EXPECTED_CALL(gballoc_malloc(sizeof(char*))); /*this is creating a clone of the storage for keys*/ STRICT_EXPECTED_CALL(gballoc_free(IGNORED_PTR_ARG)) .IgnoreArgument(1); @@ -2339,9 +2368,9 @@ BEGIN_TEST_SUITE(map_unittests) (void)Map_AddOrUpdate(handle, TEST_REDKEY, TEST_REDVALUE); umock_c_reset_all_calls(); - whenShallmalloc_fail = currentmalloc_call + 1; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ - .IgnoreArgument(1); + whenShallcalloc_fail = currentcalloc_call + 1; + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ + .IgnoreAllArguments(); ///act result = Map_Clone(handle); @@ -2368,8 +2397,8 @@ BEGIN_TEST_SUITE(map_unittests) (void)Map_AddOrUpdate(handle, TEST_BLUEKEY, TEST_BLUEVALUE); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_malloc(2*sizeof(char*))); /*this is creating a clone of the storage for keys*/ @@ -2411,8 +2440,8 @@ BEGIN_TEST_SUITE(map_unittests) (void)Map_AddOrUpdate(handle, TEST_BLUEKEY, TEST_BLUEVALUE); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_malloc(2 * sizeof(char*))); /*this is creating a clone of the storage for keys*/ @@ -2424,7 +2453,7 @@ BEGIN_TEST_SUITE(map_unittests) STRICT_EXPECTED_CALL(gballoc_malloc(strlen(TEST_REDVALUE) + 1)); /*this is creating a clone of RED value*/ - whenShallmalloc_fail = currentmalloc_call + 7; + whenShallmalloc_fail = currentmalloc_call + 6; STRICT_EXPECTED_CALL(gballoc_malloc(strlen(TEST_BLUEVALUE) + 1)); /*this is creating a clone of BLUE value*/ STRICT_EXPECTED_CALL(gballoc_free(IGNORED_PTR_ARG)) @@ -2462,8 +2491,8 @@ BEGIN_TEST_SUITE(map_unittests) (void)Map_AddOrUpdate(handle, TEST_BLUEKEY, TEST_BLUEVALUE); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_malloc(2 * sizeof(char*))); /*this is creating a clone of the storage for keys*/ @@ -2473,7 +2502,7 @@ BEGIN_TEST_SUITE(map_unittests) STRICT_EXPECTED_CALL(gballoc_malloc(2 * sizeof(char*))); /*this is creating a clone of the storage for values*/ - whenShallmalloc_fail = currentmalloc_call + 6; + whenShallmalloc_fail = currentmalloc_call + 5; STRICT_EXPECTED_CALL(gballoc_malloc(strlen(TEST_REDVALUE) + 1)); /*this is creating a clone of RED value*/ STRICT_EXPECTED_CALL(gballoc_free(IGNORED_PTR_ARG)) @@ -2509,8 +2538,8 @@ BEGIN_TEST_SUITE(map_unittests) (void)Map_AddOrUpdate(handle, TEST_BLUEKEY, TEST_BLUEVALUE); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_malloc(2 * sizeof(char*))); /*this is creating a clone of the storage for keys*/ @@ -2518,7 +2547,7 @@ BEGIN_TEST_SUITE(map_unittests) STRICT_EXPECTED_CALL(gballoc_malloc(strlen(TEST_BLUEKEY) + 1)); /*this is creating a clone of BLUE key*/ - whenShallmalloc_fail = currentmalloc_call + 5; + whenShallmalloc_fail = currentmalloc_call + 4; STRICT_EXPECTED_CALL(gballoc_malloc(2 * sizeof(char*))); /*this is creating a clone of the storage for values*/ STRICT_EXPECTED_CALL(gballoc_free(IGNORED_PTR_ARG)) @@ -2552,14 +2581,14 @@ BEGIN_TEST_SUITE(map_unittests) (void)Map_AddOrUpdate(handle, TEST_BLUEKEY, TEST_BLUEVALUE); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_malloc(2 * sizeof(char*))); /*this is creating a clone of the storage for keys*/ STRICT_EXPECTED_CALL(gballoc_malloc(strlen(TEST_REDKEY) + 1)); /*this is creating a clone of RED key*/ - whenShallmalloc_fail = currentmalloc_call + 4; + whenShallmalloc_fail = currentmalloc_call + 3; STRICT_EXPECTED_CALL(gballoc_malloc(strlen(TEST_BLUEKEY) + 1)); /*this is creating a clone of BLUE key*/ STRICT_EXPECTED_CALL(gballoc_free(IGNORED_PTR_ARG)) @@ -2591,8 +2620,8 @@ BEGIN_TEST_SUITE(map_unittests) (void)Map_AddOrUpdate(handle, TEST_BLUEKEY, TEST_BLUEVALUE); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_malloc(2 * sizeof(char*))); /*this is creating a clone of the storage for keys*/ @@ -2626,10 +2655,10 @@ BEGIN_TEST_SUITE(map_unittests) (void)Map_AddOrUpdate(handle, TEST_BLUEKEY, TEST_BLUEVALUE); umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ + .IgnoreAllArguments(); - whenShallmalloc_fail = currentmalloc_call + 2; + whenShallmalloc_fail = currentmalloc_call + 1; STRICT_EXPECTED_CALL(gballoc_malloc(2 * sizeof(char*))); /*this is creating a clone of the storage for keys*/ STRICT_EXPECTED_CALL(gballoc_free(IGNORED_PTR_ARG)) .IgnoreArgument(1); @@ -2656,9 +2685,9 @@ BEGIN_TEST_SUITE(map_unittests) (void)Map_AddOrUpdate(handle, TEST_BLUEKEY, TEST_BLUEVALUE); umock_c_reset_all_calls(); - whenShallmalloc_fail = currentmalloc_call + 1; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ - .IgnoreArgument(1); + whenShallcalloc_fail = currentcalloc_call + 1; + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) /*this is creating the HANDLE structure*/ + .IgnoreAllArguments(); ///act result = Map_Clone(handle); diff --git a/tests/socketio_win32_ut/socketio_win32_ut.c b/tests/socketio_win32_ut/socketio_win32_ut.c index 13e092caf..d62da6ac0 100644 --- a/tests/socketio_win32_ut/socketio_win32_ut.c +++ b/tests/socketio_win32_ut/socketio_win32_ut.c @@ -29,6 +29,9 @@ static size_t currentmalloc_call; static size_t whenShallmalloc_fail; +static size_t currentcalloc_call; +static size_t whenShallcalloc_fail; + void* my_gballoc_malloc(size_t size) { void* result; @@ -51,14 +54,31 @@ void* my_gballoc_malloc(size_t size) return result; } -void my_gballoc_free(void* ptr) +void* my_gballoc_calloc(size_t nmemb, size_t size) { - free(ptr); + void* result; + currentcalloc_call++; + if (whenShallcalloc_fail > 0) + { + if (currentcalloc_call == whenShallcalloc_fail) + { + result = NULL; + } + else + { + result = calloc(nmemb, size); + } + } + else + { + result = calloc(nmemb, size); + } + return result; } -void* my_gballoc_calloc(size_t nmemb, size_t size) +void my_gballoc_free(void* ptr) { - return calloc(nmemb, size); + free(ptr); } #define ENABLE_MOCKS @@ -423,6 +443,8 @@ TEST_FUNCTION_INITIALIZE(method_init) currentmalloc_call = 0; whenShallmalloc_fail = 0; + currentcalloc_call = 0; + whenShallcalloc_fail = 0; list_head_count = 0; singlylinkedlist_add_called = false; g_addrinfo_call_fail = false; @@ -890,7 +912,8 @@ TEST_FUNCTION(socketio_send_returns_1_succeeds) EXPECTED_CALL(singlylinkedlist_get_head_item(IGNORED_PTR_ARG)); EXPECTED_CALL(send(IGNORED_NUM_ARG, IGNORED_PTR_ARG, IGNORED_NUM_ARG, IGNORED_NUM_ARG)).SetReturn(1); EXPECTED_CALL(WSAGetLastError()).SetReturn(WSAEWOULDBLOCK); - EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) + .IgnoreAllArguments(); EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); EXPECTED_CALL(singlylinkedlist_add(IGNORED_PTR_ARG, IGNORED_PTR_ARG)); diff --git a/tests/srw_lock_ut/srw_lock_ut.c b/tests/srw_lock_ut/srw_lock_ut.c index bd450130f..7d89ea30e 100644 --- a/tests/srw_lock_ut/srw_lock_ut.c +++ b/tests/srw_lock_ut/srw_lock_ut.c @@ -14,6 +14,11 @@ static void* my_gballoc_malloc(size_t size) return malloc(size); } +static void* my_gballoc_calloc(size_t nmemb, size_t size) +{ + return calloc(nmemb, size); +} + static void my_gballoc_free(void* s) { free(s); @@ -62,7 +67,7 @@ static void my_timer_destroy(TIMER_HANDLE timer) static SRW_LOCK_HANDLE TEST_srw_lock_create(bool do_statistics, const char* lock_name) { SRW_LOCK_HANDLE result; - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)); if (do_statistics) { STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); @@ -119,6 +124,7 @@ TEST_SUITE_INITIALIZE(suite_init) ASSERT_ARE_EQUAL(int, 0, result, "umock_c_init"); REGISTER_GLOBAL_MOCK_HOOK(gballoc_malloc, my_gballoc_malloc); + REGISTER_GLOBAL_MOCK_HOOK(gballoc_calloc, my_gballoc_calloc); REGISTER_GLOBAL_MOCK_HOOK(gballoc_free, my_gballoc_free); REGISTER_GLOBAL_MOCK_HOOK(timer_destroy, my_timer_destroy); @@ -159,7 +165,7 @@ TEST_FUNCTION_CLEANUP(method_cleanup) TEST_FUNCTION(srw_lock_create_succeeds) { ///arrange - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)); STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); STRICT_EXPECTED_CALL(timer_create()) .SetReturn((TIMER_HANDLE)my_gballoc_malloc(2)); @@ -185,7 +191,7 @@ TEST_FUNCTION(srw_lock_create_succeeds) TEST_FUNCTION(srw_lock_create_with_do_statistics_false_succeeds) { ///arrange - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)); STRICT_EXPECTED_CALL(mocked_InitializeSRWLock(IGNORED_PTR_ARG)); ///act @@ -204,7 +210,7 @@ TEST_FUNCTION(srw_lock_create_with_do_statistics_false_succeeds) TEST_FUNCTION(srw_lock_create_fails_1) { ///arrange - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)); STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); STRICT_EXPECTED_CALL(timer_create()) .SetReturn(NULL); @@ -225,7 +231,7 @@ TEST_FUNCTION(srw_lock_create_fails_1) TEST_FUNCTION(srw_lock_create_fails_2) { ///arrange - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)); STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) .SetReturn(NULL); STRICT_EXPECTED_CALL(gballoc_free(IGNORED_PTR_ARG)); @@ -244,7 +250,7 @@ TEST_FUNCTION(srw_lock_create_fails_2) TEST_FUNCTION(srw_lock_create_fails_3) { ///arrange - STRICT_EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) .SetReturn(NULL); ///act diff --git a/tests/string_tokenizer_ut/string_tokenizer_ut.c b/tests/string_tokenizer_ut/string_tokenizer_ut.c index c018ad0bd..26d3bddae 100644 --- a/tests/string_tokenizer_ut/string_tokenizer_ut.c +++ b/tests/string_tokenizer_ut/string_tokenizer_ut.c @@ -16,6 +16,9 @@ static size_t currentmalloc_call; static size_t whenShallmalloc_fail; +static size_t currentcalloc_call; +static size_t whenShallcalloc_fail; + void* my_gballoc_malloc(size_t size) { void* result; @@ -38,6 +41,28 @@ void* my_gballoc_malloc(size_t size) return result; } +void* my_gballoc_calloc(size_t nmemb, size_t size) +{ + void* result; + currentcalloc_call++; + if (whenShallcalloc_fail > 0) + { + if (currentcalloc_call == whenShallcalloc_fail) + { + result = NULL; + } + else + { + result = calloc(nmemb, size); + } + } + else + { + result = calloc(nmemb, size); + } + return result; +} + void* my_gballoc_realloc(void* ptr, size_t size) { return realloc(ptr, size); @@ -83,6 +108,7 @@ BEGIN_TEST_SUITE(string_tokenizer_unittests) ASSERT_ARE_EQUAL(int, 0, result); REGISTER_GLOBAL_MOCK_HOOK(gballoc_malloc, my_gballoc_malloc); + REGISTER_GLOBAL_MOCK_HOOK(gballoc_calloc, my_gballoc_calloc); REGISTER_GLOBAL_MOCK_HOOK(gballoc_realloc, my_gballoc_realloc); REGISTER_GLOBAL_MOCK_HOOK(gballoc_free, my_gballoc_free); } @@ -105,6 +131,9 @@ BEGIN_TEST_SUITE(string_tokenizer_unittests) currentmalloc_call = 0; whenShallmalloc_fail = 0; + + currentcalloc_call = 0; + whenShallcalloc_fail = 0; } TEST_FUNCTION_CLEANUP(cleans) @@ -139,8 +168,8 @@ BEGIN_TEST_SUITE(string_tokenizer_unittests) umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(0)) //Token Allocation. - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) //Token Allocation. + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_malloc(0)) //Token Content Allocation. .IgnoreArgument(1); @@ -181,8 +210,8 @@ BEGIN_TEST_SUITE(string_tokenizer_unittests) umock_c_reset_all_calls(); - STRICT_EXPECTED_CALL(gballoc_malloc(0)) //Token Allocation. - .IgnoreArgument(1); + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) //Token Allocation. + .IgnoreAllArguments(); STRICT_EXPECTED_CALL(gballoc_malloc(0)) //Token Content Allocation. .IgnoreArgument(1); @@ -210,10 +239,11 @@ BEGIN_TEST_SUITE(string_tokenizer_unittests) umock_c_reset_all_calls(); - EXPECTED_CALL(gballoc_malloc(0)); //Token Allocation. + STRICT_EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) //Token Allocation. + .IgnoreAllArguments(); - whenShallmalloc_fail = currentmalloc_call + 1; + whenShallcalloc_fail = currentcalloc_call + 1; ///act t = STRING_TOKENIZER_create(input_string_handle); diff --git a/tests/wsio_ut/wsio_ut.c b/tests/wsio_ut/wsio_ut.c index 0a195cc58..8a0ac1661 100644 --- a/tests/wsio_ut/wsio_ut.c +++ b/tests/wsio_ut/wsio_ut.c @@ -50,6 +50,9 @@ IMPLEMENT_UMOCK_C_ENUM_TYPE(OPTIONHANDLER_RESULT, OPTIONHANDLER_RESULT_VALUES); static size_t currentmalloc_call; static size_t whenShallmalloc_fail; +static size_t currentcalloc_call; +static size_t whenShallcalloc_fail; + static void* my_gballoc_malloc(size_t size) { void* result; @@ -72,6 +75,28 @@ static void* my_gballoc_malloc(size_t size) return result; } +static void* my_gballoc_calloc(size_t nmemb, size_t size) +{ + void* result; + currentcalloc_call++; + if (whenShallcalloc_fail > 0) + { + if (currentcalloc_call == whenShallcalloc_fail) + { + result = NULL; + } + else + { + result = calloc(nmemb, size); + } + } + else + { + result = calloc(nmemb, size); + } + return result; +} + static void my_gballoc_free(void* ptr) { free(ptr); @@ -266,6 +291,7 @@ TEST_SUITE_INITIALIZE(suite_init) default_wsio_config.underlying_io_parameters = TEST_UNDERLYING_IO_PARAMETERS; REGISTER_GLOBAL_MOCK_HOOK(gballoc_malloc, my_gballoc_malloc); + REGISTER_GLOBAL_MOCK_HOOK(gballoc_calloc, my_gballoc_calloc); REGISTER_GLOBAL_MOCK_HOOK(gballoc_free, my_gballoc_free); REGISTER_GLOBAL_MOCK_RETURN(singlylinkedlist_create, TEST_SINGLYLINKEDSINGLYLINKEDLIST_HANDLE); REGISTER_GLOBAL_MOCK_HOOK(singlylinkedlist_remove, my_singlylinkedlist_remove); @@ -348,7 +374,7 @@ TEST_FUNCTION(wsio_create_for_secure_connection_with_valid_args_succeeds) // arrange CONCRETE_IO_HANDLE wsio; - EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)); STRICT_EXPECTED_CALL(uws_client_create_with_io(TEST_UNDERLYING_IO_INTERFACE, TEST_UNDERLYING_IO_PARAMETERS, TEST_HOST_ADDRESS, 443, TEST_RESOURCE_NAME, IGNORED_PTR_ARG, 1)); STRICT_EXPECTED_CALL(singlylinkedlist_create()); @@ -446,7 +472,7 @@ TEST_FUNCTION(when_allocating_memory_fails_wsio_create_fails) { // arrange CONCRETE_IO_HANDLE wsio; - EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)) + EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)) .SetReturn(NULL); // act @@ -463,7 +489,7 @@ TEST_FUNCTION(when_uws_create_fails_then_wsio_create_fails) // arrange CONCRETE_IO_HANDLE wsio; - EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)); STRICT_EXPECTED_CALL(uws_client_create_with_io(TEST_UNDERLYING_IO_INTERFACE, TEST_UNDERLYING_IO_PARAMETERS, TEST_HOST_ADDRESS, 443, TEST_RESOURCE_NAME, IGNORED_PTR_ARG, 1)) .SetReturn(NULL); EXPECTED_CALL(gballoc_free(IGNORED_PTR_ARG)); @@ -482,7 +508,7 @@ TEST_FUNCTION(when_singlylinkedlist_create_fails_then_wsio_create_fails) // arrange CONCRETE_IO_HANDLE wsio; - EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)); STRICT_EXPECTED_CALL(uws_client_create_with_io(TEST_UNDERLYING_IO_INTERFACE, TEST_UNDERLYING_IO_PARAMETERS, TEST_HOST_ADDRESS, 443, TEST_RESOURCE_NAME, IGNORED_PTR_ARG, 1)); STRICT_EXPECTED_CALL(singlylinkedlist_create()) .SetReturn(NULL); @@ -517,7 +543,7 @@ TEST_FUNCTION(wsio_create_for_secure_connection_with_valid_args_succeeds_2) wsio_config.underlying_io_interface = TEST_UNDERLYING_IO_INTERFACE; wsio_config.underlying_io_parameters = NULL; - EXPECTED_CALL(gballoc_malloc(IGNORED_NUM_ARG)); + EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, IGNORED_NUM_ARG)); STRICT_EXPECTED_CALL(uws_client_create_with_io(TEST_UNDERLYING_IO_INTERFACE, NULL, "another.com", 80, "haga", IGNORED_PTR_ARG, 1)); STRICT_EXPECTED_CALL(singlylinkedlist_create()); From bc873d51ff2c2a44c01f50c4dcbc4bbce29f398d Mon Sep 17 00:00:00 2001 From: ttins Date: Tue, 17 Mar 2020 09:16:55 -0700 Subject: [PATCH 2/4] fix missing calloc reset --- tests/condition_ut/condition_ut.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/condition_ut/condition_ut.c b/tests/condition_ut/condition_ut.c index 23e74e073..ba0472dda 100644 --- a/tests/condition_ut/condition_ut.c +++ b/tests/condition_ut/condition_ut.c @@ -133,6 +133,7 @@ TEST_FUNCTION_INITIALIZE(f) umock_c_reset_all_calls(); malloc_will_fail = false; + calloc_will_fail = false; } TEST_FUNCTION_CLEANUP(cleans) @@ -145,7 +146,7 @@ TEST_FUNCTION(Condition_Init_Success) { //arrange COND_HANDLE handle = NULL; - EXPECTED_CALL(gballoc_malloc(4)); + EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, 4)); EXPECTED_CALL(gballoc_free(0)); //act @@ -180,7 +181,7 @@ TEST_FUNCTION(Condition_Post_Handle_Succeed) COND_HANDLE handle = NULL; COND_RESULT result; - EXPECTED_CALL(gballoc_malloc(4)); + EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, 4)); EXPECTED_CALL(gballoc_free(0)); handle = Condition_Init(); @@ -241,7 +242,7 @@ TEST_FUNCTION(Condition_Wait_LOCK_NULL_Ms_Fail) //arrange COND_HANDLE handle = NULL; COND_RESULT result; - EXPECTED_CALL(gballoc_malloc(4)); + EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, 4)); EXPECTED_CALL(gballoc_free(0)); handle = Condition_Init(); From 2581a3eee924b405f40b32476459e210f585e030 Mon Sep 17 00:00:00 2001 From: ttins Date: Tue, 17 Mar 2020 12:32:42 -0700 Subject: [PATCH 3/4] revert to malloc, add memset --- adapters/condition_win32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adapters/condition_win32.c b/adapters/condition_win32.c index 1de080a5c..c8bea50e5 100644 --- a/adapters/condition_win32.c +++ b/adapters/condition_win32.c @@ -20,12 +20,12 @@ CONDITION; COND_HANDLE Condition_Init(void) { // Codes_SRS_CONDITION_18_002: [ Condition_Init shall create and return a CONDITION_HANDLE ] - - CONDITION* cond = (CONDITION*)calloc(1, sizeof(CONDITION)); + CONDITION* cond = (CONDITION*)malloc(sizeof(CONDITION)); // Codes_SRS_CONDITION_18_008: [ Condition_Init shall return NULL if it fails to allocate the CONDITION_HANDLE ] if (cond != NULL) { + (void)memset(cond, 0, sizeof(CONDITION)); cond->event_handle = CreateEvent(NULL, FALSE, FALSE, NULL); if (cond->event_handle == NULL) From 3847953f1d8385274ab6dc7baf406ead4b7871a8 Mon Sep 17 00:00:00 2001 From: ttins Date: Tue, 17 Mar 2020 12:33:23 -0700 Subject: [PATCH 4/4] revert UT expected calls --- tests/condition_ut/condition_ut.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/condition_ut/condition_ut.c b/tests/condition_ut/condition_ut.c index ba0472dda..57fd2c88c 100644 --- a/tests/condition_ut/condition_ut.c +++ b/tests/condition_ut/condition_ut.c @@ -146,7 +146,7 @@ TEST_FUNCTION(Condition_Init_Success) { //arrange COND_HANDLE handle = NULL; - EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, 4)); + EXPECTED_CALL(gballoc_malloc(4)); EXPECTED_CALL(gballoc_free(0)); //act @@ -181,7 +181,7 @@ TEST_FUNCTION(Condition_Post_Handle_Succeed) COND_HANDLE handle = NULL; COND_RESULT result; - EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, 4)); + EXPECTED_CALL(gballoc_malloc(4)); EXPECTED_CALL(gballoc_free(0)); handle = Condition_Init(); @@ -242,7 +242,7 @@ TEST_FUNCTION(Condition_Wait_LOCK_NULL_Ms_Fail) //arrange COND_HANDLE handle = NULL; COND_RESULT result; - EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, 4)); + EXPECTED_CALL(gballoc_malloc(4)); EXPECTED_CALL(gballoc_free(0)); handle = Condition_Init(); @@ -276,9 +276,9 @@ TEST_FUNCTION(Condition_Init_allocation_fail) { // arrange COND_HANDLE handle = NULL; - calloc_will_fail = true; + malloc_will_fail = true; - EXPECTED_CALL(gballoc_calloc(IGNORED_NUM_ARG, 4)); + EXPECTED_CALL(gballoc_malloc(4)); // act handle = Condition_Init();