Skip to content

Commit

Permalink
submodule umock update (#1460)
Browse files Browse the repository at this point in the history 
* update unit tests for umock aliasing

* submodule reference update

* update unit tests for umock aliasing

* update unit tests for umock aliasing

* update unit test for umock aliasing

* update unit tests for umock aliasing

* update umock register value functions for BINARY_DATA

* fix umock aliasing type

* update umock register value functions for BINARY_DATA

* update umock register value functions for data

* update submodule references

* fix unit tests

* populated BINARY_DATA shell functions

* revert to shell functions
  • Loading branch information
@ttins
ttins committed Mar 16, 2020
1 parent 4be17ec commit 8a27860
Show file tree
Hide file tree
Showing 50 changed files with 483 additions and 180 deletions.
2 changes: 1 addition & 1 deletion c-utility
Submodule c-utility updated 17 files
+1 −1 adapters/httpapi_winhttp.c
+2 −2 adapters/linux_time.c
+1 −1 adapters/linux_time.h
+3 −3 adapters/tickcounter_linux.c
+10 −7 adapters/tlsio_mbedtls.c
+1 −1 deps/umock-c
+1 −2 inc/azure_c_shared_utility/tickcounter.h
+1 −1 pal/ios-osx/tlsio_appleios.c
+1 −1 tests/platform_win32_ut/platform_win32_ut.c
+1 −2 tests/sastoken_ut/sastoken_ut.c
+0 −3 tests/tlsio_bearssl_ut/tlsio_bearssl_ut.c
+10 −0 tests/tlsio_mbedtls_ut/tlsio_mbedtls_ut.c
+0 −2 tests/uws_client_ut/uws_client_ut.c
+1 −1 tests/x509_schannel_ut/x509_schannel_ut.c
+0 −1 tests/xio_ut/xio_ut.c
+1 −1 testtools/ctest
+1 −1 testtools/testrunner
2 changes: 1 addition & 1 deletion deps/azure-c-testrunnerswitcher
Submodule azure-c-testrunnerswitcher updated from a33cd0 to 8734bd
2 changes: 1 addition & 1 deletion deps/azure-ctest
Submodule azure-ctest updated from 13baad to 4aa84c
2 changes: 1 addition & 1 deletion deps/uhttp
Submodule uhttp updated 5 files
+1 −1 deps/azure-c-testrunnerswitcher
+1 −1 deps/azure-ctest
+1 −1 deps/c-utility
+1 −1 deps/umock-c
+4 −4 tests/uhttp_ut/uhttp_ut.c
2 changes: 1 addition & 1 deletion deps/umock-c
Submodule umock-c updated 55 files
+2 −0 CMakeLists.txt
+0 −215 build/.vsts-ci.yml
+298 −0 build/devops_gated.yml
+11 −8 build/linux/build_linux.sh
+0 −19 build/linux_c_gcc44.sh
+0 −59 build/linux_c_option_test.sh
+0 −36 build/linux_install_deps.sh
+0 −90 build/raspberrypi_c.sh
+0 −21 build/ubuntu_clang.sh
+0 −62 build/windows_c.cmd
+0 −33 build/windowsce_c.cmd
+1 −1 deps/ctest
+1 −1 deps/testrunner
+29 −6 devdoc/umock_c_lib_requirements_with_ids.md
+0 −2 devdoc/umock_c_negative_tests_requirements.md
+13 −2 devdoc/umockalloc_requirements.md
+22 −10 devdoc/umockautoignoreargs_requirements.md
+1 −1 devdoc/umockcall_requirements.md
+0 −2 devdoc/umocktypes_bool_requirements.md
+2 −32 devdoc/umocktypes_c_requirements.md
+4 −0 devdoc/umocktypes_charptr_requirements.md
+0 −408 devdoc/umocktypes_stdint_requirements.md
+157 −0 devdoc/umocktypes_wcharptr_requirements.md
+26 −5 doc/umock_c.md
+2 −5 inc/umock_c/umock_c.h
+1 −0 inc/umock_c/umockalloc.h
+33 −0 inc/umock_c/umocktypes_wcharptr.h
+1 −0 set_vld_vars.bat
+2 −0 src/umock_c_negative_tests.c
+7 −0 src/umockalloc.c
+170 −113 src/umockautoignoreargs.c
+6 −3 src/umockcall.c
+1 −0 src/umockcallpairs.c
+4 −1 src/umockcallrecorder.c
+13 −4 src/umocktypes.c
+1 −1 src/umocktypes_bool.c
+13 −16 src/umocktypes_c.c
+14 −10 src/umocktypes_charptr.c
+2 −10 src/umocktypes_stdint.c
+354 −0 src/umocktypes_wcharptr.c
+1 −0 tests/CMakeLists.txt
+60 −1 tests/umock_c_int/umock_c_int.c
+11 −0 tests/umock_c_malloc_hook_int/umock_c_malloc_hook_int.c
+10 −6 tests/umock_c_negt_ut/umock_c_negative_tests_ut.c
+133 −10 tests/umockalloc_ut/umockalloc_ut.c
+116 −0 tests/umockautoignoreargs_ut/umockautoignoreargs_ut.c
+37 −35 tests/umockcall_ut/umockcall_ut.c
+6 −1 tests/umockcallrecorder_ut/umockcallrecorder_ut.c
+20 −20 tests/umocktypes_c_ut/umocktypes_c_ut.c
+8 −6 tests/umocktypes_charptr_ut/umocktypes_charptr_ut.c
+74 −54 tests/umocktypes_ut/umocktypes_ut.c
+19 −0 tests/umocktypes_wcharptr_ut/CMakeLists.txt
+12 −0 tests/umocktypes_wcharptr_ut/main.c
+15 −0 tests/umocktypes_wcharptr_ut/umocktypes_wcharptr_mocked.c
+908 −0 tests/umocktypes_wcharptr_ut/umocktypes_wcharptr_ut.c
5 changes: 2 additions & 3 deletions iothub_client/tests/iothub_client_authorization_ut/iothub_client_authorization_ut.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,6 @@ TEST_SUITE_INITIALIZE(suite_init)
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_AUTHORIZATION_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(time_t, long long);
REGISTER_UMOCK_ALIAS_TYPE(STRING_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(XDA_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_SECURITY_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(BUFFER_HANDLE, void*);

REGISTER_GLOBAL_MOCK_HOOK(gballoc_malloc, my_gballoc_malloc);
Expand All @@ -166,7 +164,8 @@ TEST_SUITE_INITIALIZE(suite_init)
REGISTER_GLOBAL_MOCK_RETURN(SASToken_Validate, true);

#ifdef USE_PROV_MODULE
REGISTER_UMOCK_ALIAS_TYPE(DEVICE_AUTH_TYPE, void*);
REGISTER_UMOCK_ALIAS_TYPE(DEVICE_AUTH_TYPE, int);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_SECURITY_HANDLE, void*);

REGISTER_GLOBAL_MOCK_HOOK(iothub_device_auth_create, my_iothub_device_auth_create);
REGISTER_GLOBAL_MOCK_RETURN(iothub_device_auth_create, NULL);
Expand Down
1 change: 0 additions & 1 deletion iothub_client/tests/iothubclient_ll_u2b_ut/iothub_client_ll_u2b_ut.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,6 @@ TEST_SUITE_INITIALIZE(TestClassInitialize)
REGISTER_TYPE(HTTPAPI_REQUEST_TYPE, HTTPAPI_REQUEST_TYPE);
REGISTER_TYPE(IOTHUB_CREDENTIAL_TYPE, IOTHUB_CREDENTIAL_TYPE);
REGISTER_TYPE(BLOB_RESULT, BLOB_RESULT);
REGISTER_UMOCK_ALIAS_TYPE(LOCK_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(BUFFER_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(char **, void*);
REGISTER_UMOCK_ALIAS_TYPE(STRING_HANDLE, void*);
Expand Down
4 changes: 1 addition & 3 deletions iothub_client/tests/iothubclient_ll_ut/iothubclient_ll_ut.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,10 @@ TEST_SUITE_INITIALIZE(suite_init)
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CORE_LL_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_MESSAGE_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_TRANSPORT_PROVIDER, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CONFIG, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_CONFIG, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_EVENT_CONFIRMATION_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_MESSAGE_CALLBACK_ASYNC, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CONNECTION_STATUS_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_RETRY_POLICY, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_RETRY_POLICY, int);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_TWIN_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_REPORTED_STATE_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_METHOD_CALLBACK_ASYNC, void*);
Expand Down
5 changes: 2 additions & 3 deletions iothub_client/tests/iothubclient_ut/iothubclient_ut.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,20 +89,19 @@ TEST_SUITE_INITIALIZE(suite_init)
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CORE_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_MESSAGE_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_TRANSPORT_PROVIDER, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CONFIG, void*);
REGISTER_UMOCK_ALIAS_TYPE(TRANSPORT_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_EVENT_CONFIRMATION_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_MESSAGE_CALLBACK_ASYNC, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CONNECTION_STATUS_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_RETRY_POLICY, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_TWIN_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_RETRY_POLICY, int);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_REPORTED_STATE_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_METHOD_CALLBACK_ASYNC, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_INBOUND_DEVICE_METHOD_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(METHOD_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_FILE_UPLOAD_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_FILE_UPLOAD_GET_DATA_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_FILE_UPLOAD_GET_DATA_CALLBACK_EX, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_TWIN_CALLBACK, void*);

REGISTER_GLOBAL_MOCK_RETURN(IoTHubClientCore_CreateFromConnectionString, TEST_IOTHUB_CLIENT_CORE_HANDLE);
REGISTER_GLOBAL_MOCK_RETURN(IoTHubClientCore_Create, TEST_IOTHUB_CLIENT_CORE_HANDLE);
Expand Down
5 changes: 2 additions & 3 deletions iothub_client/tests/iothubclientcore_ll_ut/iothub_client_core_ll_ut.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -753,14 +753,12 @@ TEST_SUITE_INITIALIZE(suite_init)
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_TRANSPORT_PROVIDER, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_DEVICE_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_MESSAGE_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_DEVICE_TWIN_STATE, void*);
REGISTER_UMOCK_ALIAS_TYPE(CONSTBUFFER_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_IDENTITY_TYPE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_IDENTITY_TYPE, int);
REGISTER_UMOCK_ALIAS_TYPE(BUFFER_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(METHOD_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_AUTHORIZATION_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_LL_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_SECURITY_TYPE, int);
REGISTER_UMOCK_ALIAS_TYPE(PLATFORM_INFO_OPTION, int);

REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_RESULT, int);
Expand All @@ -785,6 +783,7 @@ TEST_SUITE_INITIALIZE(suite_init)

#ifdef USE_EDGE_MODULES
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_EDGE_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_SECURITY_TYPE, int);
#endif // USE_EDGE_MODULES

REGISTER_GLOBAL_MOCK_RETURN(IoTHubClient_GetVersionString, "version 1.0");
Expand Down
7 changes: 3 additions & 4 deletions iothub_client/tests/iothubclientcore_ut/iothubclientcore_ut.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,22 +472,21 @@ TEST_SUITE_INITIALIZE(suite_init)
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CONFIRMATION_RESULT, int);
REGISTER_UMOCK_ALIAS_TYPE(TICK_COUNTER_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_TRANSPORT_PROVIDER, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_DEVICE_TWIN_STATE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_RESULT, int);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_PROCESS_ITEM_RESULT, int);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_STATUS, int);
REGISTER_UMOCK_ALIAS_TYPE(DEVICE_TWIN_UPDATE_STATE, int);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CONNECTION_STATUS, int);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CONNECTION_STATUS_REASON, int);
REGISTER_UMOCK_ALIAS_TYPE(SINGLYLINKEDLIST_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(LOCK_RESULT, void*);
REGISTER_UMOCK_ALIAS_TYPE(LOCK_RESULT, int);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_MESSAGE_CALLBACK_ASYNC, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_MESSAGE_CALLBACK_ASYNC_EX, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_TWIN_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_REPORTED_STATE_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_METHOD_CALLBACK_ASYNC, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_FILE_UPLOAD_RESULT, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_RETRY_POLICY, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_FILE_UPLOAD_RESULT, int);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_RETRY_POLICY, int);
REGISTER_UMOCK_ALIAS_TYPE(LIST_ITEM_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CONNECTION_STATUS_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_INBOUND_DEVICE_METHOD_CALLBACK, void*);
Expand Down
4 changes: 1 addition & 3 deletions iothub_client/tests/iothubdeviceclient_ll_ut/iothubdeviceclient_ll_ut.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,10 @@ TEST_SUITE_INITIALIZE(suite_init)
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CORE_LL_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_MESSAGE_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_TRANSPORT_PROVIDER, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CONFIG, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_CONFIG, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_EVENT_CONFIRMATION_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_MESSAGE_CALLBACK_ASYNC, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CONNECTION_STATUS_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_RETRY_POLICY, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_RETRY_POLICY, int);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_TWIN_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_REPORTED_STATE_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_METHOD_CALLBACK_ASYNC, void*);
Expand Down
3 changes: 1 addition & 2 deletions iothub_client/tests/iothubdeviceclient_ut/iothubdeviceclient_ut.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,11 @@ TEST_SUITE_INITIALIZE(suite_init)
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CORE_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_MESSAGE_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_TRANSPORT_PROVIDER, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CONFIG, void*);
REGISTER_UMOCK_ALIAS_TYPE(TRANSPORT_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_EVENT_CONFIRMATION_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_MESSAGE_CALLBACK_ASYNC, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CONNECTION_STATUS_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_RETRY_POLICY, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_RETRY_POLICY, int);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_TWIN_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_REPORTED_STATE_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_METHOD_CALLBACK_ASYNC, void*);
Expand Down
4 changes: 1 addition & 3 deletions iothub_client/tests/iothubmoduleclient_ll_ut/iothubmoduleclient_ll_ut.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,10 @@ TEST_SUITE_INITIALIZE(suite_init)
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CORE_LL_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_MESSAGE_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_TRANSPORT_PROVIDER, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CONFIG, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_CONFIG, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_EVENT_CONFIRMATION_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_MESSAGE_CALLBACK_ASYNC, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CONNECTION_STATUS_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_RETRY_POLICY, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_RETRY_POLICY, int);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_TWIN_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_REPORTED_STATE_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_METHOD_CALLBACK_ASYNC, void*);
Expand Down
3 changes: 1 addition & 2 deletions iothub_client/tests/iothubmoduleclient_ut/iothubmoduleclient_ut.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,11 @@ TEST_SUITE_INITIALIZE(suite_init)
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CORE_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_MESSAGE_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_TRANSPORT_PROVIDER, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CONFIG, void*);
REGISTER_UMOCK_ALIAS_TYPE(TRANSPORT_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_EVENT_CONFIRMATION_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_MESSAGE_CALLBACK_ASYNC, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_CONNECTION_STATUS_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_RETRY_POLICY, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_RETRY_POLICY, int);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_TWIN_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_REPORTED_STATE_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(IOTHUB_CLIENT_DEVICE_METHOD_CALLBACK_ASYNC, void*);
Expand Down
76 changes: 73 additions & 3 deletions iothub_client/tests/iothubtr_amqp_msgr_ut/iothubtr_amqp_msgr_ut.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -959,6 +959,71 @@ static AMQP_MESSENGER_HANDLE create_and_start_messenger2(AMQP_MESSENGER_CONFIG*
return handle;
}

char* umock_stringify_AMQP_MESSENGER_MESSAGE_DISPOSITION_INFO(const AMQP_MESSENGER_MESSAGE_DISPOSITION_INFO* value)
{
(void)value;
char* result = "AMQP_MESSENGER_MESSAGE_DISPOSITION_INFO";
return result;
}

int umock_are_equal_AMQP_MESSENGER_MESSAGE_DISPOSITION_INFO(const AMQP_MESSENGER_MESSAGE_DISPOSITION_INFO* left, const AMQP_MESSENGER_MESSAGE_DISPOSITION_INFO* right)
{
int result;

if (((left == NULL) && (right != NULL)) || ((right == NULL) && (left != NULL)))
{
result = 0;
}
else if ((left == NULL) && (right == NULL))
{
result = 1;
}
else
{
if ((strcmp(left->source, right->source) != 0) || (left->message_id != right->message_id))
{
result = 0;
}
else
{
result = 1;
}
}

return result;
}

int umock_copy_AMQP_MESSENGER_MESSAGE_DISPOSITION_INFO(AMQP_MESSENGER_MESSAGE_DISPOSITION_INFO* destination, const AMQP_MESSENGER_MESSAGE_DISPOSITION_INFO* source)
{
int result;

if ((source == NULL) || (destination == NULL))
{
result = -1;
}
else
{
if (source->source == NULL)
{
destination->source = NULL;
}
else
{
(void)strcpy(destination->source, source->source);
}
destination->message_id = source->message_id;
result = 0;
}

return result;
}

void umock_free_AMQP_MESSENGER_MESSAGE_DISPOSITION_INFO(AMQP_MESSENGER_MESSAGE_DISPOSITION_INFO* value)
{
//do nothing
(void)value;
}

static void register_global_mock_returns()
{
REGISTER_GLOBAL_MOCK_RETURN(STRING_construct, TEST_STRING_HANDLE);
Expand Down Expand Up @@ -1100,22 +1165,26 @@ static void register_mock_aliases()
REGISTER_UMOCK_ALIAS_TYPE(ON_MESSAGE_SEND_COMPLETE, void*);
REGISTER_UMOCK_ALIAS_TYPE(ON_MESSAGE_RECEIVED, void*);
REGISTER_UMOCK_ALIAS_TYPE(ON_MESSAGE_RECEIVER_STATE_CHANGED, void*);
REGISTER_UMOCK_ALIAS_TYPE(receiver_settle_mode, int);
REGISTER_UMOCK_ALIAS_TYPE(receiver_settle_mode, unsigned char);
REGISTER_UMOCK_ALIAS_TYPE(AMQP_MESSENGER_SEND_STATUS, int);
REGISTER_UMOCK_ALIAS_TYPE(OPTIONHANDLER_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(OPTIONHANDLER_RESULT, int);
REGISTER_UMOCK_ALIAS_TYPE(pfCloneOption, void*);
REGISTER_UMOCK_ALIAS_TYPE(pfDestroyOption, void*);
REGISTER_UMOCK_ALIAS_TYPE(pfSetOption, void*);
REGISTER_UMOCK_ALIAS_TYPE(time_t, int);
REGISTER_UMOCK_ALIAS_TYPE(time_t, long long);
REGISTER_UMOCK_ALIAS_TYPE(delivery_number, int);
REGISTER_UMOCK_ALIAS_TYPE(AMQP_MESSENGER_MESSAGE_DISPOSITION_INFO, void*);
REGISTER_UMOCK_ALIAS_TYPE(MESSAGE_QUEUE_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(MQ_MESSAGE_HANDLE, void*);
REGISTER_UMOCK_ALIAS_TYPE(MESSAGE_PROCESSING_COMPLETED_CALLBACK, void*);
REGISTER_UMOCK_ALIAS_TYPE(MAP_HANDLE, void*);
}

static void register_mock_value_types()
{
REGISTER_UMOCK_VALUE_TYPE(AMQP_MESSENGER_MESSAGE_DISPOSITION_INFO);
}

static void reset_test_data()
{
size_t i;
Expand Down Expand Up @@ -1200,6 +1269,7 @@ TEST_SUITE_INITIALIZE(TestClassInitialize)
ASSERT_ARE_EQUAL(int, 0, result);

register_mock_aliases();
register_mock_value_types();
register_global_mock_hooks();
register_global_mock_returns();

Expand Down

0 comments on commit 8a27860

Please sign in to comment.