Make it build

CMakeLists.txt

@@ -92,17 +92,17 @@ set(run_traceability ${original_run_traceability})
 add_subdirectory(deps/servicefabric)
 
 set(sf_c_util_h_files
-    inc/configuration_reader.h
-    inc/fabric_async_op_cb.h
-    inc/fabric_async_op_cb_com.h
-    inc/fabric_async_op_wrapper.h
-    inc/fabric_async_op_sync_wrapper.h
-    inc/fabric_op_completed_sync_ctx.h
-    inc/fabric_op_completed_sync_ctx_com.h
-    inc/fabric_string_result.h
-    inc/fabric_string_result_com.h
-    inc/hresult_to_string.h
-    inc/servicefabric_enums_to_strings.h
+    inc/sf_c_util/configuration_reader.h
+    inc/sf_c_util/fabric_async_op_cb.h
+    inc/sf_c_util/fabric_async_op_cb_com.h
+    inc/sf_c_util/fabric_async_op_wrapper.h
+    inc/sf_c_util/fabric_async_op_sync_wrapper.h
+    inc/sf_c_util/fabric_op_completed_sync_ctx.h
+    inc/sf_c_util/fabric_op_completed_sync_ctx_com.h
+    inc/sf_c_util/fabric_string_result.h
+    inc/sf_c_util/fabric_string_result_com.h
+    inc/sf_c_util/hresult_to_string.h
+    inc/sf_c_util/servicefabric_enums_to_strings.h
 )
 
 set(sf_c_util_c_files

deps/c-util

@@ -1 +1 @@
-Subproject commit 382dbbe8371ca495219084751ef420ecd6dc44e1
+Subproject commit 8930898551d5f2556b01069539757fd639ad535b

inc/sf_c_util/fabric_async_op_cb_com.h

@@ -9,7 +9,7 @@
 #include "fabriccommon.h"
 #include "unknwn.h"
 #include "com_wrapper/com_wrapper.h"
-#include "fabric_async_op_cb.h"
+#include "sf_c_util/fabric_async_op_cb.h"
 
 #ifdef __cplusplus
 extern "C" {

inc/sf_c_util/fabric_async_op_sync_wrapper.h

@@ -29,9 +29,9 @@
 #include "c_util/log_critical_and_terminate.h"
 
 #include "com_wrapper/com_wrapper.h"
-#include "fabric_async_op_cb.h"
-#include "fabric_async_op_cb_com.h"
-#include "hresult_to_string.h"
+#include "sf_c_util/fabric_async_op_cb.h"
+#include "sf_c_util/fabric_async_op_cb_com.h"
+#include "sf_c_util/hresult_to_string.h"
 
 #include "umock_c/umock_c_prod.h"
 #ifdef __cplusplus

inc/sf_c_util/fabric_async_op_wrapper.h

@@ -24,9 +24,9 @@
 #include "c_pal/gballoc_hl_redirect.h"
 
 #include "com_wrapper/com_wrapper.h"
-#include "fabric_async_op_cb.h"
-#include "fabric_async_op_cb_com.h"
-#include "hresult_to_string.h"
+#include "sf_c_util/fabric_async_op_cb.h"
+#include "sf_c_util/fabric_async_op_cb_com.h"
+#include "sf_c_util/hresult_to_string.h"
 
 #include "umock_c/umock_c_prod.h"
 #ifdef __cplusplus

inc/sf_c_util/fabric_op_completed_sync_ctx_com.h

@@ -9,7 +9,7 @@
 #include "fabriccommon.h"
 #include "unknwn.h"
 #include "com_wrapper/com_wrapper.h"
-#include "fabric_op_completed_sync_ctx.h"
+#include "sf_c_util/fabric_op_completed_sync_ctx.h"
 
 #ifdef __cplusplus
 extern "C" {

inc/sf_c_util/fabric_string_result_com.h

@@ -9,7 +9,7 @@
 #include "fabriccommon.h"
 #include "unknwn.h"
 #include "com_wrapper/com_wrapper.h"
-#include "fabric_string_result.h"
+#include "sf_c_util/fabric_string_result.h"
 
 #ifdef __cplusplus
 extern "C" {

src/configuration_reader.c

@@ -16,9 +16,9 @@
 #include "c_pal/gballoc_hl_redirect.h"
 #include "c_pal/string_utils.h"
 
-#include "hresult_to_string.h"
+#include "sf_c_util/hresult_to_string.h"
 
-#include "configuration_reader.h"
+#include "sf_c_util/configuration_reader.h"
 
 #define TRUEString "True"
 #define FALSEString "False"

src/fabric_async_op_cb.c

@@ -14,7 +14,7 @@
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
 
-#include "fabric_async_op_cb.h"
+#include "sf_c_util/fabric_async_op_cb.h"
 
 typedef struct FABRIC_ASYNC_OP_CB_TAG
 {

src/fabric_async_op_cb_com.c

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "com_wrapper/com_wrapper.h"
-#include "fabric_async_op_cb.h"
-#include "fabric_async_op_cb_com.h"
+#include "sf_c_util/fabric_async_op_cb.h"
+#include "sf_c_util/fabric_async_op_cb_com.h"
 
 DEFINE_COM_WRAPPER_OBJECT(FABRIC_ASYNC_OP_CB_HANDLE, FABRIC_ASYNC_OP_CB_HANDLE_INTERFACES);

src/fabric_op_completed_sync_ctx.c

@@ -11,7 +11,7 @@
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
 
-#include "fabric_op_completed_sync_ctx.h"
+#include "sf_c_util/fabric_op_completed_sync_ctx.h"
 
 typedef struct FABRIC_OP_COMPLETED_SYNC_CTX_TAG
 {

src/fabric_op_completed_sync_ctx_com.c

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "com_wrapper/com_wrapper.h"
-#include "fabric_op_completed_sync_ctx.h"
-#include "fabric_op_completed_sync_ctx_com.h"
+#include "sf_c_util/fabric_op_completed_sync_ctx.h"
+#include "sf_c_util/fabric_op_completed_sync_ctx_com.h"
 
 DEFINE_COM_WRAPPER_OBJECT(FABRIC_OP_COMPLETED_SYNC_CTX_HANDLE, FABRIC_OP_COMPLETED_SYNC_CTX_HANDLE_INTERFACES);

src/fabric_string_result.c

@@ -12,7 +12,7 @@
 #include "c_pal/gballoc_hl.h"
 #include "c_pal/gballoc_hl_redirect.h"
 
-#include "fabric_string_result.h"
+#include "sf_c_util/fabric_string_result.h"
 
 typedef struct FABRIC_STRING_RESULT_TAG
 {

src/fabric_string_result_com.c

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "com_wrapper/com_wrapper.h"
-#include "fabric_string_result.h"
-#include "fabric_string_result_com.h"
+#include "sf_c_util/fabric_string_result.h"
+#include "sf_c_util/fabric_string_result_com.h"
 
 DEFINE_COM_WRAPPER_OBJECT(FABRIC_STRING_RESULT_HANDLE, FABRIC_STRING_RESULT_HANDLE_INTERFACES);

src/hresult_to_string.c

@@ -23,9 +23,9 @@ void same_as_free(void* ptr)
 #include "macro_utils/macro_utils.h"
 #include "c_logging/xlogging.h"
 
-#include "servicefabric_enums_to_strings.h"
+#include "sf_c_util/servicefabric_enums_to_strings.h"
 
-#include "hresult_to_string.h"
+#include "sf_c_util/hresult_to_string.h"
 
 #define N_MAX_MODULES 100
 #define N_MAX_CHARACTERS 1000

src/servicefabric_enums_to_strings.c

@@ -9,7 +9,7 @@
 #include "macro_utils/macro_utils.h"
 #include "fabrictypes.h"
 
-#include "servicefabric_enums_to_strings.h"
+#include "sf_c_util/servicefabric_enums_to_strings.h"
 
 typedef struct SF_ENUM_AND_STRING_TAG
 {

tests/configuration_reader_ut/CMakeLists.txt

@@ -10,12 +10,14 @@ ${theseTestsName}.c
 
 set(${theseTestsName}_c_files
 ../../src/configuration_reader.c
+../../src/hresult_to_string.c
+../../src/servicefabric_enums_to_strings.c
 )
 
 set(${theseTestsName}_h_files
-../../inc/configuration_reader.h
+../../inc/sf_c_util/configuration_reader.h
 )
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS debug FabricUUIDD optimized FabricUUID test_helpers c_pal_reals c_util_reals)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS debug FabricUUIDD optimized FabricUUID c_pal_reals c_util_reals c_util_test_helpers)

tests/configuration_reader_ut/configuration_reader_ut.c

@@ -51,7 +51,7 @@ static void my_gballoc_free(void* ptr)
 #include "real_gballoc_hl.h"
 #include "real_rc_string.h"
 
-#include "rc_string_test_type.h"
+#include "c_util_test_helpers/rc_string_test_type.h"
 
 /*following function cannot be mocked because of variable number of arguments:( so it is copy&pasted here*/
 char* sprintf_char_function(const char* format, ...)

tests/fabric_async_op_cb_ut/CMakeLists.txt

@@ -13,7 +13,7 @@ set(${theseTestsName}_c_files
 )
 
 set(${theseTestsName}_h_files
-../../inc/fabric_async_op_cb.h
+../../inc/sf_c_util/fabric_async_op_cb.h
 )
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)

tests/fabric_async_op_sync_wrapper_ut/CMakeLists.txt

@@ -19,7 +19,7 @@ test_async_operation_context.c
 )
 
 set(${theseTestsName}_h_files
-../../inc/fabric_async_op_sync_wrapper.h
+../../inc/sf_c_util/fabric_async_op_sync_wrapper.h
 test_fabric_async_operation.h
 test_fabric_async_operation_com.h
 test_fabric_async_operation_sync_wrapper.h
@@ -33,4 +33,4 @@ testasyncoperation.h
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID com_wrapper synchronization c_pal_reals)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID com_wrapper synchronization c_pal_reals sf_c_util)

tests/fabric_async_op_sync_wrapper_ut/fabric_async_op_sync_wrapper_ut.c

@@ -43,9 +43,9 @@ static void my_gballoc_free(void* ptr)
 #include "c_util/log_critical_and_terminate.h"
 
 #define GBALLOC_HL_REDIRECT_H
-#include "fabric_async_op_cb.h"
+#include "sf_c_util/fabric_async_op_cb.h"
 #include "com_wrapper/com_wrapper.h"
-#include "fabric_async_op_cb_com.h"
+#include "sf_c_util/fabric_async_op_cb_com.h"
 #include "../../src/fabric_async_op_cb_com.c"
 #include "test_fabric_async_operation.h"
 #include "test_fabric_async_operation_com.h"

tests/fabric_async_op_sync_wrapper_ut/test_fabric_async_operation_sync_wrapper.c

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "test_fabric_async_operation_sync_wrapper.h"
-#include "fabric_async_op_sync_wrapper.h"
+#include "sf_c_util/fabric_async_op_sync_wrapper.h"
 #include "testasyncoperation.h"
 
 DEFINE_FABRIC_ASYNC_OPERATION_SYNC(ITestAsyncOperation, TestOperation, TEST_FABRIC_OPERATION_SIGNATURE)

tests/fabric_async_op_sync_wrapper_ut/test_fabric_async_operation_sync_wrapper.h

@@ -4,7 +4,7 @@
 #ifndef TEST_FABRIC_ASYNC_OPERATION_CALL_H
 #define TEST_FABRIC_ASYNC_OPERATION_CALL_H
 
-#include "fabric_async_op_sync_wrapper.h"
+#include "sf_c_util/fabric_async_op_sync_wrapper.h"
 #include "testasyncoperation.h"
 
 #ifdef __cplusplus

tests/fabric_async_op_sync_wrapper_ut/test_wrapper_no_args.c

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "test_wrapper_no_args.h"
-#include "fabric_async_op_sync_wrapper.h"
+#include "sf_c_util/fabric_async_op_sync_wrapper.h"
 #include "testasyncoperation.h"
 
 DEFINE_FABRIC_ASYNC_OPERATION_SYNC(ITestAsyncOperation, TestOperationWithNoArgs, TEST_FABRIC_OPERATION_WITH_NO_ARGS_SIGNATURE)

tests/fabric_async_op_sync_wrapper_ut/test_wrapper_no_args.h

@@ -4,7 +4,7 @@
 #ifndef TEST_WRAPPER_NO_ARGS_H
 #define TEST_WRAPPER_NO_ARGS_H
 
-#include "fabric_async_op_sync_wrapper.h"
+#include "sf_c_util/fabric_async_op_sync_wrapper.h"
 #include "testasyncoperation.h"
 
 #ifdef __cplusplus

tests/fabric_async_op_sync_wrapper_ut/test_wrapper_no_begin_args.c

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "test_wrapper_no_begin_args.h"
-#include "fabric_async_op_sync_wrapper.h"
+#include "sf_c_util/fabric_async_op_sync_wrapper.h"
 #include "testasyncoperation.h"
 
 DEFINE_FABRIC_ASYNC_OPERATION_SYNC(ITestAsyncOperation, TestOperationWithNoBeginArgs, TEST_FABRIC_OPERATION_WITH_NO_BEGIN_ARGS_SIGNATURE)

tests/fabric_async_op_sync_wrapper_ut/test_wrapper_no_begin_args.h

@@ -4,7 +4,7 @@
 #ifndef TEST_WRAPPER_NO_BEGIN_ARGS_H
 #define TEST_WRAPPER_NO_BEGIN_ARGS_H
 
-#include "fabric_async_op_sync_wrapper.h"
+#include "sf_c_util/fabric_async_op_sync_wrapper.h"
 #include "testasyncoperation.h"
 
 #ifdef __cplusplus

tests/fabric_async_op_sync_wrapper_ut/test_wrapper_no_end_args.c

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "test_wrapper_no_end_args.h"
-#include "fabric_async_op_sync_wrapper.h"
+#include "sf_c_util/fabric_async_op_sync_wrapper.h"
 #include "testasyncoperation.h"
 
 DEFINE_FABRIC_ASYNC_OPERATION_SYNC(ITestAsyncOperation, TestOperationWithNoEndArgs, TEST_FABRIC_OPERATION_WITH_NO_END_ARGS_SIGNATURE)

tests/fabric_async_op_sync_wrapper_ut/test_wrapper_no_end_args.h

@@ -4,7 +4,7 @@
 #ifndef TEST_WRAPPER_NO_END_ARGS_H
 #define TEST_WRAPPER_NO_END_ARGS_H
 
-#include "fabric_async_op_sync_wrapper.h"
+#include "sf_c_util/fabric_async_op_sync_wrapper.h"
 #include "testasyncoperation.h"
 
 #ifdef __cplusplus

tests/fabric_async_op_wrapper_ut/CMakeLists.txt

@@ -19,7 +19,7 @@ test_async_operation_context.c
 )
 
 set(${theseTestsName}_h_files
-../../inc/fabric_async_op_wrapper.h
+../../inc/sf_c_util/fabric_async_op_wrapper.h
 test_fabric_async_operation.h
 test_fabric_async_operation_com.h
 test_fabric_async_operation_wrapper.h
@@ -33,4 +33,4 @@ testasyncoperation.h
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID com_wrapper c_pal_reals)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util debug FabricUUIDD optimized FabricUUID com_wrapper c_pal_reals sf_c_util)

tests/fabric_async_op_wrapper_ut/fabric_async_op_wrapper_ut.c

@@ -38,9 +38,9 @@ static void my_gballoc_free(void* ptr)
 #include "c_pal/gballoc_hl.h"
 
 #define GBALLOC_HL_REDIRECT_H
-#include "fabric_async_op_cb.h"
+#include "sf_c_util/fabric_async_op_cb.h"
 #include "com_wrapper/com_wrapper.h"
-#include "fabric_async_op_cb_com.h"
+#include "sf_c_util/fabric_async_op_cb_com.h"
 #include "../../src/fabric_async_op_cb_com.c"
 #include "test_fabric_async_operation.h"
 #include "test_fabric_async_operation_com.h"

tests/fabric_async_op_wrapper_ut/test_fabric_async_operation_wrapper.c

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "test_fabric_async_operation_wrapper.h"
-#include "fabric_async_op_wrapper.h"
+#include "sf_c_util/fabric_async_op_wrapper.h"
 #include "testasyncoperation.h"
 
 DEFINE_FABRIC_ASYNC_OPERATION(ITestAsyncOperation, TestOperation, TEST_FABRIC_OPERATION_SIGNATURE);

tests/fabric_async_op_wrapper_ut/test_fabric_async_operation_wrapper.h

@@ -4,7 +4,7 @@
 #ifndef TEST_FABRIC_ASYNC_OPERATION_CALL_H
 #define TEST_FABRIC_ASYNC_OPERATION_CALL_H
 
-#include "fabric_async_op_wrapper.h"
+#include "sf_c_util/fabric_async_op_wrapper.h"
 #include "testasyncoperation.h"
 
 #ifdef __cplusplus

tests/fabric_async_op_wrapper_ut/test_wrapper_no_args.c

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "test_wrapper_no_args.h"
-#include "fabric_async_op_wrapper.h"
+#include "sf_c_util/fabric_async_op_wrapper.h"
 #include "testasyncoperation.h"
 
 DEFINE_FABRIC_ASYNC_OPERATION(ITestAsyncOperation, TestOperationWithNoArgs, TEST_FABRIC_OPERATION_WITH_NO_ARGS_SIGNATURE)

tests/fabric_async_op_wrapper_ut/test_wrapper_no_args.h

@@ -4,7 +4,7 @@
 #ifndef TEST_WRAPPER_NO_ARGS_H
 #define TEST_WRAPPER_NO_ARGS_H
 
-#include "fabric_async_op_wrapper.h"
+#include "sf_c_util/fabric_async_op_wrapper.h"
 #include "testasyncoperation.h"
 
 #ifdef __cplusplus

tests/fabric_async_op_wrapper_ut/test_wrapper_no_begin_args.c

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "test_wrapper_no_begin_args.h"
-#include "fabric_async_op_wrapper.h"
+#include "sf_c_util/fabric_async_op_wrapper.h"
 #include "testasyncoperation.h"
 
 DEFINE_FABRIC_ASYNC_OPERATION(ITestAsyncOperation, TestOperationWithNoBeginArgs, TEST_FABRIC_OPERATION_WITH_NO_BEGIN_ARGS_SIGNATURE)

tests/fabric_async_op_wrapper_ut/test_wrapper_no_begin_args.h

@@ -4,7 +4,7 @@
 #ifndef TEST_WRAPPER_NO_BEGIN_ARGS_H
 #define TEST_WRAPPER_NO_BEGIN_ARGS_H
 
-#include "fabric_async_op_wrapper.h"
+#include "sf_c_util/fabric_async_op_wrapper.h"
 #include "testasyncoperation.h"
 
 #ifdef __cplusplus

tests/fabric_async_op_wrapper_ut/test_wrapper_no_end_args.c

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #include "test_wrapper_no_end_args.h"
-#include "fabric_async_op_wrapper.h"
+#include "sf_c_util/fabric_async_op_wrapper.h"
 #include "testasyncoperation.h"
 
 DEFINE_FABRIC_ASYNC_OPERATION(ITestAsyncOperation, TestOperationWithNoEndArgs, TEST_FABRIC_OPERATION_WITH_NO_END_ARGS_SIGNATURE)

tests/fabric_async_op_wrapper_ut/test_wrapper_no_end_args.h

@@ -4,7 +4,7 @@
 #ifndef TEST_WRAPPER_NO_END_ARGS_H
 #define TEST_WRAPPER_NO_END_ARGS_H
 
-#include "fabric_async_op_wrapper.h"
+#include "sf_c_util/fabric_async_op_wrapper.h"
 #include "testasyncoperation.h"
 
 #ifdef __cplusplus

tests/fabric_op_completed_sync_ctx_ut/CMakeLists.txt

@@ -14,7 +14,7 @@ test_callback.c
 )
 
 set(${theseTestsName}_h_files
-../../inc/fabric_op_completed_sync_ctx.h
+../../inc/sf_c_util/fabric_op_completed_sync_ctx.h
 test_callback.h
 test_callback_com.h
 )

tests/fabric_op_completed_sync_ctx_ut/fabric_op_completed_sync_ctx_ut.c

@@ -52,7 +52,7 @@ DEFINE_COM_WRAPPER_OBJECT(TEST_CALLBACK_HANDLE, TEST_CALLBACK_HANDLE_INTERFACES)
 #include "real_gballoc_hl.h"
 
 
-#include "fabric_op_completed_sync_ctx.h"
+#include "sf_c_util/fabric_op_completed_sync_ctx.h"
 
 
 static TEST_MUTEX_HANDLE test_serialize_mutex;

tests/fabric_string_result_ut/CMakeLists.txt

@@ -13,7 +13,7 @@ set(${theseTestsName}_c_files
 )
 
 set(${theseTestsName}_h_files
-../../inc/fabric_string_result.h
+../../inc/sf_c_util/fabric_string_result.h
 )
 
 include_directories($<TARGET_PROPERTY:FabricClient,INTERFACE_INCLUDE_DIRECTORIES>)

tests/fabric_string_result_ut/fabric_string_result_ut.c

@@ -39,7 +39,7 @@ static void my_gballoc_free(void* ptr)
 #include "real_gballoc_hl.h"
 
 
-#include "fabric_string_result.h"
+#include "sf_c_util/fabric_string_result.h"
 
 static TEST_MUTEX_HANDLE test_serialize_mutex;
 

tests/hresult_to_string_int/CMakeLists.txt

@@ -8,13 +8,4 @@ set(${theseTestsName}_test_files
 ${theseTestsName}.c
 )
 
-set(${theseTestsName}_c_files
-)
-
-set(${theseTestsName}_cpp_files
-)
-
-set(${theseTestsName}_h_files
-)
-
 build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS sf_c_util)

tests/hresult_to_string_int/hresult_to_string_int.c

@@ -15,7 +15,7 @@
 #include "macro_utils/macro_utils.h"
 #include "testrunnerswitcher.h"
 
-#include "hresult_to_string.h"
+#include "sf_c_util/hresult_to_string.h"
 
 static TEST_MUTEX_HANDLE test_serialize_mutex;
 

tests/hresult_to_string_ut/CMakeLists.txt

@@ -10,13 +10,14 @@ ${theseTestsName}.c
 
 set(${theseTestsName}_c_files
 hresult_to_string_mocked.c
+../../src/servicefabric_enums_to_strings.c
 )
 
 set(${theseTestsName}_h_files
-../../inc/hresult_to_string.h
+../../inc/sf_c_util/hresult_to_string.h
 )
 
-build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util sfwrapper c_pal_reals)
+build_test_artifacts(${theseTestsName} "tests/sf_c_util" ADDITIONAL_LIBS c_util c_pal_reals)
 
 if("${building}" STREQUAL "exe")
 #   /ignore:4217 is: "warning LNK4217: symbol 'symbol' defined in 'filename_1.obj' is imported by 'filename_2.obj' in function 'function'"