Add tests for cloudproxy service

Test cases for basic functionality verification have been added.
Build of the application has been adapted for Cmake templates usage.

Bug-AGL: SPEC-3485
Change-Id: Iaa4a5e393ac9971be4176e90fa5aee10a4673cd3
Signed-off-by: Leonid Lazarev <leonid.lazarev@orioninc.com>

2 files changed, 18 insertions, 52 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fc397f1..fde17a5 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,64 +14,33 @@
 # limitations under the License.
 ###########################################################################
 
-cmake_minimum_required(VERSION 2.8)
+PROJECT_TARGET_ADD(cloudproxy-binding)
 
-set(TARGETS_ARBINDER cloudproxy-service)
+add_definitions(-DAFB_BINDING_VERSION=3)
 
-INCLUDE(FindThreads)
-FIND_PACKAGE(Threads)
-
-pkg_check_modules(cp_binding_depends afb-daemon glib-2.0 gio-2.0 gio-unix-2.0 json-c)
-set(binding_cp_sources
-  cloudproxy-bindings.cpp
-  utils.h
-  hmi-debug.h
-  ClientManager.h
-  ClientManager.cpp
+set(BINDING_SOURCES
+    cloudproxy-bindings.cpp
+    utils.h
+    hmi-debug.h
+    ClientManager.h
+    ClientManager.cpp
 )
 
-link_libraries(-Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined)
-
 set(AZURE_DEP_LIBS iothub_client)
 
-add_library(${TARGETS_ARBINDER} MODULE ${binding_cp_sources})
-
 include_directories(${CMAKE_SYSROOT}/usr/include/azureiot)
 
-target_compile_options(${TARGETS_ARBINDER} PRIVATE ${cp_binding_depends_CFLAGS})
-if(DEFINED DEBUGMODE)
- target_compile_options(${TARGETS_ARBINDER} PRIVATE -g -O0)
-else(DEFINED DEBUGMODE)
- target_compile_options(${TARGETS_ARBINDER} PRIVATE -g -O2)
-endif(DEFINED DEBUGMODE)
-
-target_link_libraries(${TARGETS_ARBINDER} ${CMAKE_THREAD_LIBS_INIT} ${link_libraries} ${cp_binding_depends_LIBRARIES} ${AZURE_DEP_LIBS})
-
+add_library(${TARGET_NAME} MODULE ${BINDING_SOURCES})
 
-set_target_properties(${TARGETS_ARBINDER} PROPERTIES
-    PREFIX ""
-    LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map"
-    )
+TARGET_LINK_LIBRARIES(${TARGET_NAME} ${link_libraries} ${AZURE_DEP_LIBS})
 
-target_compile_definitions(${TARGETS_ARBINDER}
-    PRIVATE
-        AFB_BINDING_VERSION=3
-        _GNU_SOURCE)
-
-
-if(NOT EXISTS ${PROJECT_BINARY_DIR}/package)
-    add_custom_command(TARGET ${TARGETS_ARBINDER} POST_BUILD
-        COMMAND cp -rf ${PROJECT_SOURCE_DIR}/package ${PROJECT_BINARY_DIR}
-    )
-endif()
-
-add_custom_command(TARGET ${TARGETS_ARBINDER} POST_BUILD
-    COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/lib
-    COMMAND cp -rf ${PROJECT_BINARY_DIR}/src/${TARGETS_ARBINDER}.so ${PROJECT_BINARY_DIR}/package/root/lib
-    COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/etc
-    COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/config_sample.ini ${PROJECT_BINARY_DIR}/package/root/etc/config.ini
-)
+SET_TARGET_PROPERTIES(${TARGET_NAME}  PROPERTIES
+        LABELS "BINDING"
+        PREFIX "lib"
+        LINK_FLAGS "${BINDINGS_LINK_FLAG}"
+        OUTPUT_NAME "${TARGET_NAME}"
+        )
 
-add_custom_target(widget DEPENDS ${PROJECT_BINARY_DIR}/package/root
-    COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/${TARGETS_ARBINDER}.wgt ${PROJECT_BINARY_DIR}/package/root
+add_custom_command(TARGET ${TARGET_NAME} PRE_BUILD
+    COMMAND cp -rv ${PROJECT_SOURCE_DIR}/etc ${PROJECT_BINARY_DIR}/package/
 )
diff --git a/src/config_sample.ini b/src/config_sample.ini
deleted file mode 100644
index fa97cd7..0000000
--- a/src/config_sample.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[AzureCloudConnection]
-DeviceConnectionString=My=Azure=Device=Connection=String
-