diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e55f92..86342fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,8 +17,12 @@ if(USED_JEMALLOC) LINK_LIBRARIES(-ljemalloc) endif() +ADD_SUBDIRECTORY(./unit_test) + LINK_LIBRARIES(-lpthread -lcjson -lconfig -lcurl) ADD_EXECUTABLE(ztp_client ${ZTP_SRC} ztp_main.c) +ADD_LIBRARY(ztp SHARED ${ZTP_SRC}) + INCLUDE_DIRECTORIES("./include") \ No newline at end of file diff --git a/unit_test/CMakeLists.txt b/unit_test/CMakeLists.txt new file mode 100644 index 0000000..24de945 --- /dev/null +++ b/unit_test/CMakeLists.txt @@ -0,0 +1,48 @@ +# Download and unpack googletest at configure time +CONFIGURE_FILE(GoogleTest.cmake googletest-download/CMakeLists.txt) +EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . + RESULT_VARIABLE result + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download ) +if(result) + MESSAGE(FATAL_ERROR "CMake step for googletest failed: ${result}") +endif() +EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} --build . + RESULT_VARIABLE result + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download ) +if(result) + MESSAGE(FATAL_ERROR "Build step for googletest failed: ${result}") +endif() + +# Prevent overriding the parent project's compiler/linker +# settings on Windows +SET(gtest_force_shared_crt ON CACHE BOOL "" FORCE) + +# Add googletest directly to our build. This defines +# the gtest and gtest_main targets. +ADD_SUBDIRECTORY(${CMAKE_CURRENT_BINARY_DIR}/googletest-src + ${CMAKE_CURRENT_BINARY_DIR}/googletest-build + EXCLUDE_FROM_ALL) + +# The gtest/gtest_main targets carry header search path +# dependencies automatically when using CMake 2.8.11 or +# later. Otherwise we have to add them here ourselves. +if (CMAKE_VERSION VERSION_LESS 2.8.11) + INCLUDE_DIRECTORIES("${gtest_SOURCE_DIR}/include") +endif() + +FIND_LIBRARY(ZTP_LIBRARY libztp.so ${CMAKE_CURRENT_BINARY_DIR}/../) + +AUX_SOURCE_DIRECTORY(./test TEST_SRC) + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) + +# Now simply link against gtest or gtest_main as needed. Eg +add_executable(ztp_unit ${TEST_SRC}) + +#if(ZTP_LIBRARY_FOUND) +target_link_libraries(ztp_unit ${ZTP_LIBRARY} ztp gtest_main) +#else() +#target_link_libraries(ztp_unit gtest_main ztp) +#endif() + +add_test(NAME ztp_unit_test COMMAND ztp_unit) \ No newline at end of file diff --git a/unit_test/GoogleTest.cmake b/unit_test/GoogleTest.cmake new file mode 100644 index 0000000..1e73787 --- /dev/null +++ b/unit_test/GoogleTest.cmake @@ -0,0 +1,15 @@ +cmake_minimum_required(VERSION 3.10) + +project(googletest-download NONE) + +include(ExternalProject) +ExternalProject_Add(googletest + GIT_REPOSITORY https://github.com/google/googletest.git + GIT_TAG master + SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src" + BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build" + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" + TEST_COMMAND "" +) \ No newline at end of file diff --git a/unit_test/test/json_test.cpp b/unit_test/test/json_test.cpp new file mode 100644 index 0000000..0c532fc --- /dev/null +++ b/unit_test/test/json_test.cpp @@ -0,0 +1,39 @@ +// +// Created by xajhu on 2019/11/29 0029. +// + +#include "gtest/gtest.h" +#include +using namespace std; + +extern "C" { +#include "json_interface.h" +} + +TEST(json_encode_test, retOK) +{ + int ret = 0; + const char *pJson; + AUTH_ZTH_REQ ztpReq; + + memset(&ztpReq, 0, sizeof(AUTH_ZTH_REQ)); + ztpReq.pESN = (char*)"ace08484843"; + + pJson = Struct2Json(&ztpReq, JE_AUTH_ZTP, false, &ret); + + if(pJson) { + free((void *)pJson); + } + + ASSERT_EQ(0,ret); +} + +int main(int argc, char** argv) +{ + int ret; + + testing::InitGoogleTest(&argc, argv); + ret = RUN_ALL_TESTS(); + + return 0; +} diff --git a/ztp_main.c b/ztp_main.c index 3907838..09bdf3e 100644 --- a/ztp_main.c +++ b/ztp_main.c @@ -20,6 +20,7 @@ void __onPost(void *pData, unsigned int size, const char *pReqUrl, UNUSED(iFinished); UNUSED(pUserData); + LOG_EX(LOG_Info, "Post URL: %s\n", pReqUrl); LOG_EX(LOG_Info, "Post Result: %s\n", (char *)pData); } @@ -40,7 +41,8 @@ int main(int argc, char **argv) pJson = Struct2Json(&ztpReq, JE_AUTH_ZTP, FALSE, &ret); if(pJson && ret == ERR_OK) { - http_post_request("https://xajhuang.com:3006/post", pJson, __onPost); + //http_post_request("https://xajhuang.com:3006/post", pJson, __onPost); + http_post_request("http://172.28.73.43:8088/device/esn?ESN=1", pJson, __onPost); } else { LOG_EX(LOG_Error, "Create JSON error: %d\n", ret); }