Update umock repo and renamed files that have changed (#297)

This commit is contained in:
Jelani Brandon 2019-04-10 17:36:08 -07:00 коммит произвёл GitHub
Родитель 3848cc88ad
Коммит 5e70cc8a17
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
121 изменённых файлов: 245 добавлений и 276 удалений

6
.gitmodules поставляемый
Просмотреть файл

@ -1,12 +1,12 @@
[submodule "testtools/ctest"]
path = testtools/ctest
url = https://github.com/Azure/azure-ctest.git
[submodule "testtools/umock-c"]
path = testtools/umock-c
url = https://github.com/Azure/umock-c.git
[submodule "testtools/testrunner"]
path = testtools/testrunner
url = https://github.com/Azure/azure-c-testrunnerswitcher.git
[submodule "deps/azure-macro-utils-c"]
path = deps/azure-macro-utils-c
url = https://github.com/Azure/azure-macro-utils-c.git
[submodule "deps/umock-c"]
path = deps/umock-c
url = https://github.com/Azure/umock-c.git

Просмотреть файл

@ -322,7 +322,6 @@ set(source_h_files
./inc/azure_c_shared_utility/tickcounter.h
./inc/azure_c_shared_utility/threadapi.h
./inc/azure_c_shared_utility/xio.h
./inc/azure_c_shared_utility/umock_c_prod.h
./inc/azure_c_shared_utility/uniqueid.h
./inc/azure_c_shared_utility/uuid.h
./inc/azure_c_shared_utility/urlencode.h
@ -554,9 +553,13 @@ if(NOT ${use_installed_dependencies})
if ((NOT TARGET azure_macro_utils_c) AND (EXISTS ${CMAKE_CURRENT_LIST_DIR}/deps/azure-macro-utils-c/CMakeLists.txt))
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/deps/azure-macro-utils-c)
endif()
if ((NOT TARGET umock-c) AND (EXISTS ${CMAKE_CURRENT_LIST_DIR}/deps/umock-c/CMakeLists.txt))
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/deps/umock-c)
endif()
endif()
include_directories(${MACRO_UTILS_INC_FOLDER})
include_directories(${UMOCK_C_INC_FOLDER})
if (${original_run_unittests})
include("dependencies-test.cmake")

Просмотреть файл

@ -5,7 +5,7 @@
#define _ESP8266_MOCK_H_
#include <stdint.h>
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

2
deps/azure-macro-utils-c поставляемый

@ -1 +1 @@
Subproject commit afdb11395921711664af48174d072be048608183
Subproject commit fa20306e554c1764aaa7d04ce09db3d786755d0f

1
deps/umock-c поставляемый Submodule

@ -0,0 +1 @@
Subproject commit 0e3951bd3f93905fea303f18075e9bb1399cd68f

Просмотреть файл

@ -1,8 +1,8 @@
# OptionHandler
# Overview
# Overview
Option Handler is a module that builds a container of options relevant to a module. The options can be later retrieved.
Option Handler is a module that builds a container of options relevant to a module. The options can be later retrieved.
It does so by asking the module to clone its options or to destroy them. `OptionHandler` is agnostic to the module it serves.
@ -20,7 +20,7 @@ MU_DEFINE_ENUM(OPTIONHANDLER_RESULT, OPTIONHANDLER_RESULT_VALUES)
extern "C" {
#endif /* __cplusplus */
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
typedef struct OPTIONHANDLER_HANDLE_DATA_TAG* OPTIONHANDLER_HANDLE;

Просмотреть файл

@ -13,7 +13,7 @@
#define AGENTTIME_H
#include <time.h>
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C"

Просмотреть файл

@ -19,7 +19,7 @@ extern "C" {
#include <stddef.h>
#endif
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
/**

Просмотреть файл

@ -14,7 +14,7 @@ extern "C" {
#include <stddef.h>
#endif
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
/**
* @brief Encodes the BUFFER_HANDLE to a base 32 STRING_HANDLE

Просмотреть файл

@ -13,7 +13,7 @@ extern "C"
#include <stdbool.h>
#endif
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
typedef struct BUFFER_TAG* BUFFER_HANDLE;

Просмотреть файл

@ -6,7 +6,7 @@
#include "azure_macro_utils/macro_utils.h"
#include "azure_c_shared_utility/lock.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -4,7 +4,7 @@
#ifndef CONNECTION_STRING_PARSER_H
#define CONNECTION_STRING_PARSER_H
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#include "azure_c_shared_utility/map.h"
#include "azure_c_shared_utility/strings.h"

Просмотреть файл

@ -15,7 +15,7 @@ extern "C"
#include <stdbool.h>
#endif
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
/*this is the handle*/
typedef struct CONSTBUFFER_HANDLE_DATA_TAG* CONSTBUFFER_HANDLE;

Просмотреть файл

@ -5,7 +5,7 @@
#include "azure_c_shared_utility/constbuffer.h"
#include "umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
#include <cstdint>

Просмотреть файл

@ -12,7 +12,7 @@
#include "azure_macro_utils/macro_utils.h"
#include "azure_c_shared_utility/crt_abstractions.h"
#include "azure_c_shared_utility/map.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
#include <cstddef>

Просмотреть файл

@ -4,7 +4,7 @@
#ifndef CRT_ABSTRACTIONS_H
#define CRT_ABSTRACTIONS_H
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
#include <cstdio>

Просмотреть файл

@ -13,7 +13,7 @@ extern "C"
#endif
#include <stdint.h>
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
typedef struct DLIST_ENTRY_TAG
{

Просмотреть файл

@ -13,7 +13,7 @@ extern "C" {
#include <stddef.h>
#endif
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
MOCKABLE_FUNCTION(, const char*, environment_get_variable, const char*, variable_name);

Просмотреть файл

@ -4,7 +4,7 @@
#ifndef GB_RAND_H
#define GB_RAND_H
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -27,7 +27,7 @@
#define ftell ftell_never_called_never_implemented_always_forgotten
#define fprintf fprintf_never_called_never_implemented_always_forgotten
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus

Просмотреть файл

@ -33,7 +33,7 @@ extern "C"
#include <time.h>
#endif
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#undef time
#define time gb_time

Просмотреть файл

@ -4,7 +4,7 @@
#ifndef GBALLOC_H
#define GBALLOC_H
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
#include <cstddef>

Просмотреть файл

@ -4,7 +4,7 @@
#ifndef GBNETWORK_H
#define GBNETWORK_H
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
#include <cstddef>

Просмотреть файл

@ -5,7 +5,7 @@
#define HMAC_H
#include "azure_c_shared_utility/sha.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -6,7 +6,7 @@
#include "azure_macro_utils/macro_utils.h"
#include "azure_c_shared_utility/buffer_.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -5,7 +5,7 @@
#define HTTP_PROXY_IO_H
#include "azure_c_shared_utility/xio.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -16,7 +16,7 @@
#include "azure_c_shared_utility/httpheaders.h"
#include "azure_macro_utils/macro_utils.h"
#include "azure_c_shared_utility/buffer_.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
#include <cstddef>

Просмотреть файл

@ -18,7 +18,7 @@
#include "azure_macro_utils/macro_utils.h"
#include "azure_c_shared_utility/httpapi.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
#include <cstddef>

Просмотреть файл

@ -8,7 +8,7 @@
#include "azure_c_shared_utility/buffer_.h"
#include "azure_c_shared_utility/httpheaders.h"
#include "azure_c_shared_utility/httpapiex.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -21,7 +21,7 @@
#define HTTPHEADERS_H
#include "azure_macro_utils/macro_utils.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
#include <cstddef>

Просмотреть файл

@ -15,7 +15,7 @@
#define LOCK_H
#include "azure_macro_utils/macro_utils.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -12,7 +12,7 @@
#include "azure_macro_utils/macro_utils.h"
#include "azure_c_shared_utility/strings.h"
#include "azure_c_shared_utility/crt_abstractions.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
#include <cstddef>

Просмотреть файл

@ -5,7 +5,7 @@
#define MEMORY_DATA_H
#include "azure_c_shared_utility/uuid.h"
#include "umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
#include <cstdint>

Просмотреть файл

@ -17,7 +17,7 @@ MU_DEFINE_ENUM(OPTIONHANDLER_RESULT, OPTIONHANDLER_RESULT_VALUES)
extern "C" {
#endif /* __cplusplus */
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
typedef struct OPTIONHANDLER_HANDLE_DATA_TAG* OPTIONHANDLER_HANDLE;

Просмотреть файл

@ -6,7 +6,7 @@
#include "azure_c_shared_utility/strings.h"
#include "azure_c_shared_utility/xio.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#define GUID_LENGTH 64

Просмотреть файл

@ -6,7 +6,7 @@
#include "azure_c_shared_utility/strings.h"
#include <stdbool.h>
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -10,7 +10,7 @@ extern "C" {
#include "stdbool.h"
#endif /* __cplusplus */
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
typedef struct SINGLYLINKEDLIST_INSTANCE_TAG* SINGLYLINKEDLIST_HANDLE;
typedef struct LIST_ITEM_INSTANCE_TAG* LIST_ITEM_HANDLE;

Просмотреть файл

@ -6,7 +6,7 @@
#include "azure_c_shared_utility/xio.h"
#include "azure_c_shared_utility/xlogging.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -13,12 +13,12 @@ extern "C"
#include <stdbool.h>
#endif
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
typedef struct STRING_TOKEN_TAG* STRING_TOKEN_HANDLE;
/*
* @brief Tries to identify the first token defined in source up to its length using the delimiters provided.
* @brief Tries to identify the first token defined in source up to its length using the delimiters provided.
* @Remark If no delimiter is found, the entire source string becomes the resulting token. Empty tokens (when delimiters occur side-by-side) can also detected.
* @param source The initial string to be tokenized.
* @param length The length of the source string, not including the null-terminator.
@ -31,7 +31,7 @@ MOCKABLE_FUNCTION(, STRING_TOKEN_HANDLE, StringToken_GetFirst, const char*, sour
/*
* @brief Tries to identify the next token defined in source up to its length using the delimiters provided.
* @Remark After StringToken_GetFirst is initially called, StringToken_GetNext shall be called for obtaining the next tokens.
* If no delimiter is found, the entire source string becomes the resulting token.
* If no delimiter is found, the entire source string becomes the resulting token.
* Empty tokens (when delimiters occur side-by-side) can also detected.
* @param token The handle returned by StringToken_GetFirst.
* @param delimiters Array with null-terminated strings to be used as token delimiters.

Просмотреть файл

@ -5,7 +5,7 @@
#define STRING_TOKENIZER_H
#include "azure_c_shared_utility/strings.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#include "azure_c_shared_utility/string_tokenizer_types.h"
#ifdef __cplusplus

Просмотреть файл

@ -4,7 +4,7 @@
#ifndef STRINGS_H
#define STRINGS_H
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#include "azure_c_shared_utility/strings_types.h"
#ifdef __cplusplus

Просмотреть файл

@ -10,7 +10,7 @@
#define THREADAPI_H
#include "azure_macro_utils/macro_utils.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -11,7 +11,7 @@ extern "C"
#include <stdint.h>
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#if defined(_WIN32) || defined(__MBED__)
typedef uint_fast64_t tickcounter_ms_t; // Use 64-bit because of 32-bit is going to roll over back to zero after roughly 49.7 days that is not good for IoT devices which need keep running for months

Просмотреть файл

@ -5,7 +5,7 @@
#define TLSIO_CYCLONESSL_H
#include "azure_c_shared_utility/xio.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -5,7 +5,7 @@
#define TLSIO_CYCLONESSL_SOCKET_H
#include "tls.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -5,7 +5,7 @@
#define TLSIO_MBEDTLS_H
#include "azure_c_shared_utility/xio.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -5,7 +5,7 @@
#define TLSIO_OPENSSL_H
#include "azure_c_shared_utility/xio.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -8,7 +8,7 @@
#define TLSIO_OPTIONS_H
#include "azure_c_shared_utility/xio.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -5,7 +5,7 @@
#define TLSIO_SCHANNEL_H
#include "azure_c_shared_utility/xio.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -6,7 +6,7 @@
#include "azure_c_shared_utility/xio.h"
#include "azure_c_shared_utility/xlogging.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#include "azure_c_shared_utility/const_defines.h"
#ifdef __cplusplus

Просмотреть файл

@ -1,33 +0,0 @@
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#undef MOCKABLE_FUNCTION
/* This header is meant to be included by production code headers, so that the MOCKABLE_FUNCTION gets enabled. */
/*
If you are porting to a new platform and do not want to build the tests, but only the production code,
simply make sure that this file is in the include path (either by copying it to your inc folder or
by adjusting the include paths).
*/
#ifdef ENABLE_MOCKS
/* Codes_SRS_UMOCK_C_LIB_01_001: [MOCKABLE_FUNCTION shall be used to wrap function definition allowing the user to declare a function that can be mocked.]*/
#define MOCKABLE_FUNCTION(modifiers, result, function, ...) \
MOCKABLE_FUNCTION_UMOCK_INTERNAL_WITH_MOCK(modifiers, result, function, __VA_ARGS__)
#include "umock_c.h"
#else
#include "azure_macro_utils/macro_utils.h"
#define UMOCK_C_PROD_ARG_IN_SIGNATURE(count, arg_type, arg_name) arg_type arg_name MU_IFCOMMA(count)
/* Codes_SRS_UMOCK_C_LIB_01_002: [The macro shall generate a function signature in case ENABLE_MOCKS is not defined.] */
/* Codes_SRS_UMOCK_C_LIB_01_005: [**If ENABLE_MOCKS is not defined, MOCKABLE_FUNCTION shall only generate a declaration for the function.] */
/* Codes_SRS_UMOCK_C_LIB_01_001: [MOCKABLE_FUNCTION shall be used to wrap function definition allowing the user to declare a function that can be mocked.]*/
#define MOCKABLE_FUNCTION(modifiers, result, function, ...) \
result modifiers function(MU_IF(MU_COUNT_ARG(__VA_ARGS__),,void) MU_FOR_EACH_2_COUNTED(UMOCK_C_PROD_ARG_IN_SIGNATURE, __VA_ARGS__));
#endif

Просмотреть файл

@ -13,7 +13,7 @@ extern "C" {
#include <stddef.h>
#endif
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#define UNIQUEID_RESULT_VALUES \
UNIQUEID_OK, \

Просмотреть файл

@ -6,7 +6,7 @@
#include "azure_c_shared_utility/strings.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -12,7 +12,7 @@ extern "C" {
#include <stddef.h>
#endif
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
MOCKABLE_FUNCTION(, bool, utf8_checker_is_valid_utf8, const unsigned char*, utf8_str, size_t, length);

Просмотреть файл

@ -14,7 +14,7 @@ extern "C" {
#include <stdbool.h>
#endif /* __cplusplus */
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
typedef unsigned char UUID_T[16];

Просмотреть файл

@ -5,7 +5,7 @@
#define UWS_CLIENT_H
#include "xio.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#include "azure_c_shared_utility/optionhandler.h"
#ifdef __cplusplus

Просмотреть файл

@ -5,7 +5,7 @@
#define UWS_FRAME_ENCODER_H
#include "azure_c_shared_utility/buffer_.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#include "azure_macro_utils/macro_utils.h"
#ifdef __cplusplus

Просмотреть файл

@ -5,7 +5,7 @@
#define VECTOR_H
#include "azure_c_shared_utility/crt_abstractions.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#include "azure_c_shared_utility/vector_types.h"
#ifdef __cplusplus

Просмотреть файл

@ -4,7 +4,7 @@
#ifndef WS_URL_H
#define WS_URL_H
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
#include <cstddef>

Просмотреть файл

@ -6,7 +6,7 @@
#include "azure_c_shared_utility/xio.h"
#include "azure_c_shared_utility/xlogging.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -10,7 +10,7 @@
extern "C" {
#endif
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
MOCKABLE_FUNCTION(,int, x509_openssl_add_certificates, SSL_CTX*, ssl_ctx, const char*, certificates);
MOCKABLE_FUNCTION(,int, x509_openssl_add_credentials, SSL_CTX*, ssl_ctx, const char*, x509certificate, const char*, x509privatekey);

Просмотреть файл

@ -10,7 +10,7 @@
extern "C" {
#endif
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
typedef struct X509_SCHANNEL_HANDLE_DATA_TAG* X509_SCHANNEL_HANDLE;

Просмотреть файл

@ -6,7 +6,7 @@
#include "azure_c_shared_utility/optionhandler.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#include "azure_macro_utils/macro_utils.h"
#ifdef __cplusplus

Просмотреть файл

@ -13,7 +13,7 @@ extern "C" {
#endif
#include "azure_macro_utils/macro_utils.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
typedef void* DNS_ASYNC_HANDLE;

Просмотреть файл

@ -14,7 +14,7 @@ extern "C" {
#endif
#include "azure_macro_utils/macro_utils.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
/**

Просмотреть файл

@ -15,7 +15,7 @@ extern "C" {
#include <stdbool.h>
#include <stdint.h>
#include "azure_macro_utils/macro_utils.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
// socket_async exposes asynchronous socket operations while hiding OS-specifics. Committing to
// asynchronous operation also simplifies the interface compared to generic sockets.

Просмотреть файл

@ -13,7 +13,7 @@ extern "C" {
#include "azure_c_shared_utility/xio.h"
#include "azure_c_shared_utility/tlsio.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
/** @brief Return the tlsio table of functions.
*

Просмотреть файл

@ -12,7 +12,7 @@
#endif
#include "testrunnerswitcher.h"
#include "umock_c.h"
#include "umock_c/umock_c.h"
static void* my_gballoc_malloc(size_t size)
{

Просмотреть файл

@ -20,15 +20,15 @@ static void my_gballoc_free(void* ptr)
}
#include "testrunnerswitcher.h"
#include "umock_c.h"
#include "umocktypes_charptr.h"
#include "umocktypes_stdint.h"
#include "umock_c_negative_tests.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_charptr.h"
#include "umock_c/umocktypes_stdint.h"
#include "umock_c/umock_c_negative_tests.h"
#include "azure_macro_utils/macro_utils.h"
#define ENABLE_MOCKS
#include "azure_c_shared_utility/gballoc.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#include "azure_c_shared_utility/strings.h"
#include "azure_c_shared_utility/buffer_.h"
#undef ENABLE_MOCKS

Просмотреть файл

@ -9,7 +9,7 @@
#include <stddef.h>
#endif
#include "umock_c.h"
#include "umock_c/umock_c.h"
#include "azure_c_shared_utility/buffer_.h"
#include "testrunnerswitcher.h"

Просмотреть файл

@ -17,7 +17,7 @@
#define ENABLE_MOCKS
#include "umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {
@ -28,7 +28,7 @@ extern "C" {
}
#endif
#include "umock_c.h"
#include "umock_c/umock_c.h"
#define GBALLOC_H

Просмотреть файл

@ -25,11 +25,11 @@ void* my_gballoc_realloc(void* ptr, size_t size)
#include "azure_c_shared_utility/crt_abstractions.h"
#include "testrunnerswitcher.h"
#include "umock_c.h"
#include "umocktypes_charptr.h"
#include "umocktypes_bool.h"
#include "umocktypes_stdint.h"
#include "umock_c_negative_tests.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_charptr.h"
#include "umock_c/umocktypes_bool.h"
#include "umock_c/umocktypes_stdint.h"
#include "umock_c/umock_c_negative_tests.h"
#define ENABLE_MOCKS
#include "azure_c_shared_utility/gballoc.h"

Просмотреть файл

@ -23,11 +23,11 @@ static void my_gballoc_free(void* s)
#include "azure_macro_utils/macro_utils.h"
#include "testrunnerswitcher.h"
#include "umock_c.h"
#include "umocktypes_stdint.h"
#include "umocktypes_charptr.h"
#include "umocktypes_bool.h"
#include "umock_c_negative_tests.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_stdint.h"
#include "umock_c/umocktypes_charptr.h"
#include "umock_c/umocktypes_bool.h"
#include "umock_c/umock_c_negative_tests.h"
#define ENABLE_MOCKS
#include "azure_c_shared_utility/gballoc.h"

Просмотреть файл

@ -22,7 +22,7 @@ void my_gballoc_free(void* ptr)
}
#define ENABLE_MOCKS
#include "umock_c.h"
#include "umock_c/umock_c.h"
#include "azure_c_shared_utility/buffer_.h"
#include "azure_c_shared_utility/gballoc.h"

Просмотреть файл

@ -42,8 +42,8 @@ void my_gballoc_free(void* ptr)
}
#define ENABLE_MOCKS
#include "umock_c.h"
#include "umocktypes_charptr.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_charptr.h"
#include "azure_c_shared_utility/map.h"
#include "azure_c_shared_utility/gballoc.h"

Просмотреть файл

@ -89,11 +89,11 @@ int my_getaddrinfo(const char *node, const char *service, const struct addrinfo
* Include the test tools.
*/
#include "testrunnerswitcher.h"
#include "umock_c.h"
#include "umocktypes_charptr.h"
#include "umocktypes_bool.h"
#include "umocktypes_stdint.h"
#include "umock_c_negative_tests.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_charptr.h"
#include "umock_c/umocktypes_bool.h"
#include "umock_c/umocktypes_stdint.h"
#include "umock_c/umock_c_negative_tests.h"
#include "azure_macro_utils/macro_utils.h"

Просмотреть файл

@ -30,8 +30,8 @@ static const LOCK_HANDLE TEST_LOCK_HANDLE = (LOCK_HANDLE)0x4244;
#define ENABLE_MOCKS
#include "umock_c.h"
#include "umock_c_prod.h"
#include "umock_c/umock_c.h"
#include "umock_c/umock_c_prod.h"
IMPLEMENT_UMOCK_C_ENUM_TYPE(LOCK_RESULT, LOCK_RESULT_VALUES);

Просмотреть файл

@ -27,8 +27,8 @@ static const LOCK_HANDLE TEST_LOCK_HANDLE = (LOCK_HANDLE)0x4244;
#define ENABLE_MOCKS
#include "umock_c.h"
#include "umock_c_prod.h"
#include "umock_c/umock_c.h"
#include "umock_c/umock_c_prod.h"
//TEST_DEFINE_ENUM_TYPE(LOCK_RESULT, LOCK_RESULT_VALUES);
IMPLEMENT_UMOCK_C_ENUM_TYPE(LOCK_RESULT, LOCK_RESULT_VALUES);

Просмотреть файл

@ -8,7 +8,7 @@
#endif
#include "testrunnerswitcher.h"
#include "umock_c.h"
#include "umock_c/umock_c.h"
void* real_malloc(size_t size)
{

Просмотреть файл

@ -9,9 +9,9 @@
#include <stddef.h>
#endif
#include "testrunnerswitcher.h"
#include "umock_c.h"
#include "umocktypes_charptr.h"
#include "umock_c_negative_tests.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_charptr.h"
#include "umock_c/umock_c_negative_tests.h"
static TEST_MUTEX_HANDLE g_testByTest;

Просмотреть файл

@ -60,8 +60,8 @@ void my_gballoc_free(void* ptr)
#endif
#include "testrunnerswitcher.h"
#include "umock_c.h"
#include "umocktypes_charptr.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_charptr.h"
#include "azure_macro_utils/macro_utils.h"
#define MAX_RECEIVE_BUFFER_SIZES 3

Просмотреть файл

@ -65,8 +65,8 @@ void my_gballoc_free(void* ptr)
#include "testrunnerswitcher.h"
#include "azure_macro_utils/macro_utils.h"
#include "umock_c.h"
#include "umocktypes_charptr.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_charptr.h"
#define ENABLE_MOCKS

Просмотреть файл

@ -22,9 +22,9 @@ static void my_gballoc_free(void* ptr)
}
#include "testrunnerswitcher.h"
#include "umock_c.h"
#include "umocktypes_charptr.h"
#include "umock_c_negative_tests.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_charptr.h"
#include "umock_c/umock_c_negative_tests.h"
#include "azure_macro_utils/macro_utils.h"
#define ENABLE_MOCKS

Просмотреть файл

@ -66,8 +66,8 @@ void my_gballoc_free(void* ptr)
}
#include "testrunnerswitcher.h"
#include "umock_c.h"
#include "umocktypes_charptr.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_charptr.h"
#define ENABLE_MOCKS

Просмотреть файл

@ -11,7 +11,7 @@
#include "testrunnerswitcher.h"
#include "azure_c_shared_utility/crt_abstractions.h"
#include "azure_c_shared_utility/lock.h"
#include "umock_c.h"
#include "umock_c/umock_c.h"
static void* my_gballoc_malloc(size_t size)
{

Просмотреть файл

@ -66,8 +66,8 @@ void my_gballoc_free(void* ptr)
}
#include "testrunnerswitcher.h"
#include "umock_c.h"
#include "umocktypes_charptr.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_charptr.h"
static TEST_MUTEX_HANDLE g_testByTest;

Просмотреть файл

@ -17,8 +17,8 @@
static TEST_MUTEX_HANDLE g_testByTest;
#include "umock_c.h"
#include "umocktypes_stdint.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_stdint.h"
#include "azure_c_shared_utility/memory_data.h"
@ -197,7 +197,7 @@ TEST_FUNCTION(write_uint8_t_succeeds)
{
ASSERT_ARE_EQUAL(uint8_t, j+1, destination[j]);
}
}
/* write_uint16_t */
@ -308,7 +308,7 @@ TEST_FUNCTION(write_int8_t_succeeds_2)
{
///arrange
int8_t value = INT8_MIN;
unsigned char destination[8] = { 0 };
///act
@ -316,7 +316,7 @@ TEST_FUNCTION(write_int8_t_succeeds_2)
///assert
ASSERT_ARE_EQUAL(uint8_t, 0x80, destination[0]);
}
/* write_int16_t */

Просмотреть файл

@ -23,9 +23,9 @@ static void my_gballoc_free(void* s)
#include <stddef.h>
#endif
#include "testrunnerswitcher.h"
#include "umock_c.h"
#include "umocktypes_charptr.h"
#include "umock_c_negative_tests.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_charptr.h"
#include "umock_c/umock_c_negative_tests.h"
#include "azure_c_shared_utility/optionhandler.h"
#include "azure_c_shared_utility/optimize_size.h"
@ -61,7 +61,7 @@ static void my_gballoc_free(void* s)
#define ENABLE_MOCKS
#include "azure_c_shared_utility/gballoc.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#include "azure_c_shared_utility/crt_abstractions.h"
#include "azure_c_shared_utility/vector.h"

Просмотреть файл

@ -25,16 +25,16 @@ void my_gballoc_free(void* ptr)
free(ptr);
}
#include "umock_c.h"
#include "umocktypes_charptr.h"
#include "umocktypes_stdint.h"
#include "umock_c_negative_tests.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_charptr.h"
#include "umock_c/umocktypes_stdint.h"
#include "umock_c/umock_c_negative_tests.h"
#include "azure_macro_utils/macro_utils.h"
#define ENABLE_MOCKS
#include "azure_c_shared_utility/gballoc.h"
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#include "azure_c_shared_utility/strings.h"
#include "azure_c_shared_utility/tlsio_schannel.h"
#ifdef USE_OPENSSL

Просмотреть файл

@ -21,7 +21,7 @@ void my_gballoc_free(void* ptr)
#include "testrunnerswitcher.h"
#include "some_refcount_impl.h"
#include "umock_c.h"
#include "umock_c/umock_c.h"
static TEST_MUTEX_HANDLE g_testByTest;

Просмотреть файл

@ -26,8 +26,8 @@ static void my_gballoc_free(void* ptr)
#endif
#include "testrunnerswitcher.h"
#include "umock_c.h"
#include "umocktypes_charptr.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_charptr.h"
#define ENABLE_MOCKS

Просмотреть файл

@ -22,9 +22,9 @@
* Include the test tools.
*/
#include "testrunnerswitcher.h"
#include "umock_c.h"
#include "umocktypes_charptr.h"
#include "umock_c_negative_tests.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_charptr.h"
#include "umock_c/umock_c_negative_tests.h"
#include "azure_macro_utils/macro_utils.h"
#define ENABLE_MOCKS

Просмотреть файл

@ -43,8 +43,8 @@ void my_gballoc_free(void* ptr)
free(ptr);
}
#include "umock_c.h"
#include "umocktypes_bool.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_bool.h"
#include "azure_c_shared_utility/singlylinkedlist.h"
#define ENABLE_MOCKS

Просмотреть файл

@ -32,11 +32,11 @@
* Include the test tools.
*/
#include "testrunnerswitcher.h"
#include "umock_c.h"
#include "umocktypes_charptr.h"
#include "umocktypes_bool.h"
#include "umocktypes_stdint.h"
#include "umock_c_negative_tests.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_charptr.h"
#include "umock_c/umocktypes_bool.h"
#include "umock_c/umocktypes_stdint.h"
#include "umock_c/umock_c_negative_tests.h"
#include "azure_macro_utils/macro_utils.h"
#define ENABLE_MOCKS

Просмотреть файл

@ -61,8 +61,8 @@ void my_gballoc_free(void* ptr)
#define ENABLE_MOCKS
#include "umock_c.h"
#include "umocktypes_charptr.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_charptr.h"
#include "azure_c_shared_utility/singlylinkedlist.h"
static bool g_addrinfo_call_fail;
//static int g_socket_send_size_value;

Просмотреть файл

@ -25,13 +25,13 @@ void real_free(void* ptr)
}
#include "testrunnerswitcher.h"
#include "umock_c.h"
#include "umock_c_negative_tests.h"
#include "umocktypes_charptr.h"
#include "umocktypes_stdint.h"
#include "umocktypes_bool.h"
#include "umocktypes.h"
#include "umocktypes_c.h"
#include "umock_c/umock_c.h"
#include "umock_c/umock_c_negative_tests.h"
#include "umock_c/umocktypes_charptr.h"
#include "umock_c/umocktypes_stdint.h"
#include "umock_c/umocktypes_bool.h"
#include "umock_c/umocktypes.h"
#include "umock_c/umocktypes_c.h"
#include "azure_macro_utils/macro_utils.h"
#define ENABLE_MOCKS
@ -190,7 +190,7 @@ BEGIN_TEST_SUITE(string_token_ut)
size_t length;
const char* delimiters[1];
STRING_TOKEN_HANDLE handle;
length = strlen(string);
delimiters[0] = "?";
@ -285,7 +285,7 @@ BEGIN_TEST_SUITE(string_token_ut)
const char* delimiters[1];
char* string = "https://some.site.com/path/morepath/?prop1=site.com&prop2=/prop2/abc";
size_t length = strlen(string);
delimiters[0] = "?";
umock_c_reset_all_calls();
@ -465,7 +465,7 @@ BEGIN_TEST_SUITE(string_token_ut)
set_expected_calls_for_StringToken_GetFirst();
handle = StringToken_GetFirst(string, length, delimiters, 2);
umock_c_reset_all_calls();
set_expected_calls_for_get_delimiters_lengths();
STRICT_EXPECTED_CALL(free(IGNORED_PTR_ARG)); // delimiters lengths
@ -491,7 +491,7 @@ BEGIN_TEST_SUITE(string_token_ut)
const char* delimiters[2];
char* string = "https://some.site.com/path/morepath/?prop1=site.com&prop2=/prop2/abc";
size_t length = strlen(string);
ASSERT_ARE_EQUAL(int, 0, umock_c_negative_tests_init());
delimiters[0] = "https://";
@ -665,7 +665,7 @@ BEGIN_TEST_SUITE(string_token_ut)
char* string = "https://some.site.com/path/morepath/?prop1=site.com&prop2=/prop2/abc";
size_t length = strlen(string);
delimiters[0] = "?";
umock_c_reset_all_calls();
@ -910,15 +910,15 @@ BEGIN_TEST_SUITE(string_token_ut)
set_expected_calls_for_StringToken_GetNext();
STRICT_EXPECTED_CALL(realloc(IGNORED_PTR_ARG, IGNORED_NUM_ARG));
STRICT_EXPECTED_CALL(malloc(IGNORED_NUM_ARG));
set_expected_calls_for_StringToken_GetNext();
STRICT_EXPECTED_CALL(realloc(IGNORED_PTR_ARG, IGNORED_NUM_ARG));
STRICT_EXPECTED_CALL(malloc(IGNORED_NUM_ARG));
set_expected_calls_for_StringToken_GetNext();
STRICT_EXPECTED_CALL(realloc(IGNORED_PTR_ARG, IGNORED_NUM_ARG));
STRICT_EXPECTED_CALL(malloc(IGNORED_NUM_ARG));
STRICT_EXPECTED_CALL(free(IGNORED_PTR_ARG));
// act

Просмотреть файл

@ -50,8 +50,8 @@ void my_gballoc_free(void* ptr)
#include "azure_c_shared_utility/string_tokenizer.h"
#define ENABLE_MOCKS
#include "umock_c.h"
#include "umocktypes_charptr.h"
#include "umock_c/umock_c.h"
#include "umock_c/umocktypes_charptr.h"
#include "azure_c_shared_utility/gballoc.h"
static TEST_MUTEX_HANDLE g_testByTest;

Просмотреть файл

@ -25,9 +25,9 @@ void my_gballoc_free(void* ptr)
}
#include "testrunnerswitcher.h"
#include "umock_c.h"
#include "umock_c_negative_tests.h"
#include "umocktypes_charptr.h"
#include "umock_c/umock_c.h"
#include "umock_c/umock_c_negative_tests.h"
#include "umock_c/umocktypes_charptr.h"
#define ENABLE_MOCKS

Просмотреть файл

@ -4,7 +4,7 @@
#ifndef CALLEE_H
#define CALLEE_H
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Просмотреть файл

@ -4,7 +4,7 @@
#ifndef TARGET_H
#define TARGET_H
#include "azure_c_shared_utility/umock_c_prod.h"
#include "umock_c/umock_c_prod.h"
#ifdef __cplusplus
extern "C" {

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше