summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsangwan.kwon <sangwan.kwon@samsung.com>2016-05-12 14:27:56 +0900
committersangwan.kwon <sangwan.kwon@samsung.com>2016-05-12 16:24:57 +0900
commita409298a53d37fe189ec44896b0dd181edd56c12 (patch)
treecf094173163142e0473528cd63cefff48a9d9aff
parent89b9a4436daf8adc56eeb9396f718af418d660f0 (diff)
downloadcert-checker-a409298a53d37fe189ec44896b0dd181edd56c12.tar.gz
cert-checker-a409298a53d37fe189ec44896b0dd181edd56c12.tar.bz2
cert-checker-a409298a53d37fe189ec44896b0dd181edd56c12.zip
Add TC for client API
Change-Id: I93d6b0de5f82f5cc9985c6464044125bc9ca05c6
-rw-r--r--CMakeLists.txt1
-rw-r--r--packaging/cert-checker.spec1
-rw-r--r--tests/CMakeLists.txt24
-rw-r--r--tests/test_client.cpp41
-rw-r--r--tests/test_logic.cpp9
5 files changed, 61 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7bd3e63..24eac4a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,6 +82,7 @@ SET(TARGET_CERT_CHECKER_POPUP "${SERVICE_NAME}-popup")
# Tests
SET(TARGET_CERT_CHECKER_TESTS "${SERVICE_NAME}-tests")
SET(TARGET_CERT_CHECKER_TESTS_LOGIC "${SERVICE_NAME}-tests-logic")
+SET(TARGET_CERT_CHECKER_TESTS_CLIENT "${SERVICE_NAME}-tests-client")
SET(TARGET_CERT_CHECKER_POPUP_TEST "${SERVICE_NAME}-popup-test")
# Define global macro about PATH
diff --git a/packaging/cert-checker.spec b/packaging/cert-checker.spec
index 27a1c1d..1be983f 100644
--- a/packaging/cert-checker.spec
+++ b/packaging/cert-checker.spec
@@ -185,6 +185,7 @@ fi
%license LICENSE LICENSE.BSL-1.0
%{TZ_SYS_BIN}/%{name}-tests
%{TZ_SYS_BIN}/%{name}-tests-logic
+%{TZ_SYS_BIN}/%{name}-tests-client
%{TZ_SYS_BIN}/%{name}-popup-test
%{DB_INST_DIR}/.%{name}-test.db
%{TZ_SYS_ROOT}/%{name}-test/*/*.xml
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 651072c..c7db294 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -66,6 +66,15 @@ SET(CERT_CHECKER_TESTS_LOGIC_SOURCES
${DPL_CORE_SRC_PATH}/colors.cpp
)
+SET(CERT_CHECKER_TESTS_CLIENT_SOURCES
+ # tests
+ ${CERT_CHECKER_TESTS_SRC_PATH}/main.cpp
+ ${CERT_CHECKER_TESTS_SRC_PATH}/colour_log_formatter.cpp
+ ${CERT_CHECKER_TESTS_SRC_PATH}/test_client.cpp
+ # dpl
+ ${DPL_CORE_SRC_PATH}/colors.cpp
+)
+
SET(CERT_CHECKER_POPUP_TEST_SOURCES
# tests
${CERT_CHECKER_TESTS_SRC_PATH}/popup_test.cpp
@@ -86,13 +95,9 @@ INCLUDE_DIRECTORIES(SYSTEM
ADD_EXECUTABLE(${TARGET_CERT_CHECKER_TESTS} ${CERT_CHECKER_TESTS_SOURCES})
ADD_EXECUTABLE(${TARGET_CERT_CHECKER_TESTS_LOGIC} ${CERT_CHECKER_TESTS_LOGIC_SOURCES})
+ADD_EXECUTABLE(${TARGET_CERT_CHECKER_TESTS_CLIENT} ${CERT_CHECKER_TESTS_CLIENT_SOURCES})
ADD_EXECUTABLE(${TARGET_CERT_CHECKER_POPUP_TEST} ${CERT_CHECKER_POPUP_TEST_SOURCES})
-SET_TARGET_PROPERTIES(${TARGET_CERT_CHECKER_TESTS_LOGIC}
- PROPERTIES
- COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=default"
-)
-
TARGET_LINK_LIBRARIES(${TARGET_CERT_CHECKER_TESTS}
${TARGET_CERT_CHECKER_COMMON}
${CERT_CHECKER_TESTS_DEP_LIBRARIES}
@@ -103,13 +108,19 @@ TARGET_LINK_LIBRARIES(${TARGET_CERT_CHECKER_TESTS}
TARGET_LINK_LIBRARIES(${TARGET_CERT_CHECKER_TESTS_LOGIC}
${TARGET_CERT_CHECKER_COMMON}
- ${TARGET_CERT_CHECKER_CLIENT}
${CERT_CHECKER_TESTS_DEP_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
boost_unit_test_framework
-ldl
)
+TARGET_LINK_LIBRARIES(${TARGET_CERT_CHECKER_TESTS_CLIENT}
+ ${TARGET_CERT_CHECKER_COMMON}
+ ${TARGET_CERT_CHECKER_CLIENT}
+ boost_unit_test_framework
+ -ldl
+ )
+
TARGET_LINK_LIBRARIES(${TARGET_CERT_CHECKER_POPUP_TEST}
${TARGET_CERT_CHECKER_COMMON}
${CERT_CHECKER_TESTS_DEP_LIBRARIES}
@@ -134,4 +145,5 @@ INSTALL(FILES
INSTALL(TARGETS ${TARGET_CERT_CHECKER_TESTS} DESTINATION ${BIN_DIR})
INSTALL(TARGETS ${TARGET_CERT_CHECKER_TESTS_LOGIC} DESTINATION ${BIN_DIR})
+INSTALL(TARGETS ${TARGET_CERT_CHECKER_TESTS_CLIENT} DESTINATION ${BIN_DIR})
INSTALL(TARGETS ${TARGET_CERT_CHECKER_POPUP_TEST} DESTINATION ${BIN_DIR})
diff --git a/tests/test_client.cpp b/tests/test_client.cpp
new file mode 100644
index 0000000..ea2c23b
--- /dev/null
+++ b/tests/test_client.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * @file test_client.cpp
+ * @author Sangwan Kwon (sangwan.kwon@samsung.com)
+ * @version 1.0
+ * @brief Tests of clien API
+ */
+
+#define BOOST_TEST_MODULE CERT_CHECKER_TESTS
+#include <boost/test/unit_test.hpp>
+
+#include "client/ocsp-client.h"
+#include "common/log.h"
+
+using namespace CCHECKER;
+
+BOOST_AUTO_TEST_SUITE(CLIENT_TEST)
+
+BOOST_AUTO_TEST_CASE(client_api) {
+
+ Client::OcspClient oc;
+ BOOST_REQUIRE(oc.request() == Client::E_CC_NONE);
+
+
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/tests/test_logic.cpp b/tests/test_logic.cpp
index 08f1af1..46f7a68 100644
--- a/tests/test_logic.cpp
+++ b/tests/test_logic.cpp
@@ -28,7 +28,6 @@
#include <logic_.h>
#include <app_event_operators.h>
-#include "client/ocsp-client.h"
#include "common/log.h"
using namespace CCHECKER;
@@ -54,14 +53,6 @@ std::string log_apps(std::list<app_t> &apps, std::list<app_t> buff)
BOOST_FIXTURE_TEST_SUITE(LOGIC_TEST, LogicWrapper)
-// TODO(sangwan.kwon) : seperate anothor test program
-BOOST_AUTO_TEST_CASE(client) {
-
- CCHECKER::Client::OcspClient oc;
- oc.request();
-
-}
-
BOOST_AUTO_TEST_CASE(logic_setup) {
BOOST_REQUIRE(setup() == NO_ERROR);