Prepare test code for future additional binaries

Remove unnecessary dependencies.
Change name of test sources.
Change name of test binary.
Fix formatting.

Change-Id: Iaa39359c224c13714095f4bbafdef742e046563e

diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec
index 9fecde1..6a88e20 100644 (file)
--- a/packaging/key-manager.spec
+++ b/packaging/key-manager.spec
@@ -14,6 +14,7 @@ BuildRequires: pkgconfig(libsmack)
 BuildRequires: pkgconfig(libsystemd-daemon)
 BuildRequires: pkgconfig(db-util)
 BuildRequires: boost-devel
+Requires: boost-test
 %{?systemd_requires}
 
 %description
@@ -161,4 +162,4 @@ fi
 
 %files -n key-manager-tests
 %defattr(-,root,root,-)
-%{_bindir}/key-manager-tests
+%{_bindir}/ckm-tests-internal-provider

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 762689d..4e8d20b 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,55 +1,39 @@
-SET(TARGET_KEY_MANAGER_TEST "key-manager-tests")
 PKG_CHECK_MODULES(KEY_MANAGER_TEST_DEP
-       dlog
-       openssl
-       libsmack
-       libsystemd-daemon
-       REQUIRED
-       )
+    dlog
+    openssl
+    REQUIRED
+    )
+
+SET(TARGET_KEY_MANAGER_TEST_PROVIDER "ckm-tests-internal-provider")
 
 SET(KEY_MANAGER_SRC_PATH ${PROJECT_SOURCE_DIR}/src)
 SET(KEY_MANAGER_PATH ${PROJECT_SOURCE_DIR}/src/manager)
 
-SET(KEY_MANAGER_TEST_SOURCES
-       ${KEY_MANAGER_PATH}/main/key-manager-util.cpp
-       ${KEY_MANAGER_PATH}/main/generic-socket-manager.cpp
-       ${KEY_MANAGER_PATH}/main/socket-manager.cpp
-       ${KEY_MANAGER_PATH}/service/echo.cpp
-       ${KEY_MANAGER_PATH}/service/ckm-service.cpp
-       ${KEY_MANAGER_PATH}/service/ckm-logic.cpp
-       ${KEY_MANAGER_PATH}/service/key-provider.cpp
-       ${KEY_MANAGER_PATH}/service/ocsp.cpp
-       ${KEY_MANAGER_PATH}/service/DBCryptoModule.cpp
-       ${KEY_MANAGER_PATH}/service/CryptoService.cpp
-       ${KEY_MANAGER_PATH}/service/file-system.cpp
-       ${KEY_MANAGER_PATH}/service/db-crypto.cpp
-
-       ${PROJECT_SOURCE_DIR}/tests/main.cpp
-       )
+SET(KEY_MANAGER_TEST_PROVIDER_SOURCES
+    ${KEY_MANAGER_PATH}/service/key-provider.cpp
+    ${PROJECT_SOURCE_DIR}/tests/test-key-provider.cpp
+    )
 
 SET_SOURCE_FILES_PROPERTIES(
-       ${KEY_MANAGER_TEST_SOURCES}
-       PROPERTIES
-               COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden")
+    ${KEY_MANAGER_TEST_SOURCES}
+    PROPERTIES
+        COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden")
 
 INCLUDE_DIRECTORIES(SYSTEM ${KEY_MANAGER_TEST_DEP_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(
-       ${KEY_MANAGER_SRC_PATH}/include
-       ${KEY_MANAGER_PATH}/main
-       ${KEY_MANAGER_PATH}/common
-       ${KEY_MANAGER_PATH}/service
-       ${KEY_MANAGER_PATH}/sqlcipher
-       ${KEY_MANAGER_PATH}/dpl/core/include
-       ${KEY_MANAGER_PATH}/dpl/log/include
-       ${KEY_MANAGER_PATH}/dpl/db/include
-       )
-
-ADD_EXECUTABLE(${TARGET_KEY_MANAGER_TEST} ${KEY_MANAGER_TEST_SOURCES})
-
-TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER_TEST}
-       ${KEY_MANAGER_TEST_DEP_LIBRARIES}
-       ${TARGET_KEY_MANAGER_COMMON}
-       ${TARGET_KEY_MANAGER_KEY_PROVIDER}
-       )
-
-INSTALL(TARGETS ${TARGET_KEY_MANAGER_TEST} DESTINATION bin)
+    ${KEY_MANAGER_SRC_PATH}/include
+    ${KEY_MANAGER_PATH}/service
+    ${KEY_MANAGER_PATH}/dpl/core/include
+    ${KEY_MANAGER_PATH}/dpl/log/include
+    )
+
+ADD_EXECUTABLE(${TARGET_KEY_MANAGER_TEST_PROVIDER}
+            ${KEY_MANAGER_TEST_PROVIDER_SOURCES})
+
+TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER_TEST_PROVIDER}
+    ${KEY_MANAGER_TEST_DEP_LIBRARIES}
+    ${TARGET_KEY_MANAGER_COMMON}
+    ${TARGET_KEY_MANAGER_KEY_PROVIDER}
+    )
+
+INSTALL(TARGETS ${TARGET_KEY_MANAGER_TEST_PROVIDER} DESTINATION bin)

diff --git a/tests/main.cpp b/tests/test-key-provider.cpp
similarity index 50%
rename from tests/main.cpp
rename to tests/test-key-provider.cpp
index 6351a5e..7d99be5 100644 (file)
--- a/tests/main.cpp
+++ b/tests/test-key-provider.cpp
@@ -11,7 +11,6 @@
 #define SMACK_LABEL_1 "SAMPLE_SMACK_LABEL_1"
 #define SMACK_LABEL_2 "SAMPLE_SMACK_LABEL_2"
 
-
 CKM::KeyProvider keyProvider;
 CKM::RawBuffer rb_test;
 CKM::RawBuffer rb_DEK1;
@@ -21,58 +20,63 @@ CKM::RawBuffer rb_pureDEK1;
 BOOST_AUTO_TEST_SUITE(S1_KEY_PROVIDER)
 
 BOOST_AUTO_TEST_CASE(T00100_initialize){
-       BOOST_CHECK_NO_THROW(CKM::KeyProvider::initializeLibrary());
+    boost::unit_test::unit_test_log.set_threshold_level( boost::unit_test::log_test_units);
+    BOOST_CHECK_NO_THROW(CKM::KeyProvider::initializeLibrary());
 }
 
 BOOST_AUTO_TEST_CASE(T00200_generateDomainKEK){
-       rb_test.clear();
-       BOOST_CHECK(!(rb_test = CKM::KeyProvider::generateDomainKEK(std::string(USERNAME_LONG), std::string(PASSWORD))).empty());
+    rb_test.clear();
+    BOOST_CHECK(!(rb_test = CKM::KeyProvider::generateDomainKEK(std::string(USERNAME_LONG),
+            std::string(PASSWORD))).empty());
 }
 
 BOOST_AUTO_TEST_CASE(T00300_construct){
-       BOOST_CHECK_NO_THROW(keyProvider = CKM::KeyProvider(rb_test, std::string(PASSWORD)));
+    BOOST_CHECK_NO_THROW(keyProvider = CKM::KeyProvider(rb_test, std::string(PASSWORD)));
 }
 
 BOOST_AUTO_TEST_CASE(T00301_construct_incorrect_password){
-       BOOST_CHECK_THROW(keyProvider = CKM::KeyProvider(rb_test, std::string(INCORRECT_PASSWORD)), CKM::KeyProvider::Exception::UnwrapFailed);
+    BOOST_CHECK_THROW(keyProvider = CKM::KeyProvider(rb_test, std::string(INCORRECT_PASSWORD)),
+            CKM::KeyProvider::Exception::UnwrapFailed);
 }
 
 BOOST_AUTO_TEST_CASE(T00400_isInitialized){
-       BOOST_CHECK(keyProvider.isInitialized());
+    BOOST_CHECK(keyProvider.isInitialized());
 }
 
 BOOST_AUTO_TEST_CASE(T00500_getPureDomainKEK){
-       BOOST_CHECK_NO_THROW(rb_test = keyProvider.getPureDomainKEK());
+    BOOST_CHECK_NO_THROW(rb_test = keyProvider.getPureDomainKEK());
 }
 
 BOOST_AUTO_TEST_CASE(T00600_getWrappedDomainKEK){
-       BOOST_CHECK_NO_THROW(rb_test = keyProvider.getWrappedDomainKEK(PASSWORD));
+    BOOST_CHECK_NO_THROW(rb_test = keyProvider.getWrappedDomainKEK(PASSWORD));
 }
 
 BOOST_AUTO_TEST_CASE(T00700_generateDEK){
-       rb_DEK1.clear();
-       BOOST_CHECK_NO_THROW(rb_DEK1 = keyProvider.generateDEK(std::string(SMACK_LABEL_1)));
+    rb_DEK1.clear();
+    BOOST_CHECK_NO_THROW(rb_DEK1 = keyProvider.generateDEK(std::string(SMACK_LABEL_1)));
 }
 
 BOOST_AUTO_TEST_CASE(T00800_getPureDEK){
-       rb_pureDEK1.clear();
-       BOOST_CHECK_NO_THROW(rb_pureDEK1 = keyProvider.getPureDEK(rb_DEK1));
+    rb_pureDEK1.clear();
+    BOOST_CHECK_NO_THROW(rb_pureDEK1 = keyProvider.getPureDEK(rb_DEK1));
 }
 
 BOOST_AUTO_TEST_CASE(T00900_reencrypt){
-       BOOST_CHECK_NO_THROW(CKM::KeyProvider::reencrypt(rb_test, std::string(PASSWORD), std::string(NEW_PASSWORD)));
+    BOOST_CHECK_NO_THROW(CKM::KeyProvider::reencrypt(rb_test, std::string(PASSWORD),
+            std::string(NEW_PASSWORD)));
 }
 
 BOOST_AUTO_TEST_CASE(T00901_reencrypt_incorrect_password){
-       BOOST_CHECK_THROW((rb_test = CKM::KeyProvider::reencrypt(rb_test, std::string(INCORRECT_PASSWORD), std::string(NEW_PASSWORD))), CKM::KeyProvider::Exception::UnwrapFailed);
+    BOOST_CHECK_THROW((rb_test = CKM::KeyProvider::reencrypt(rb_test, std::string(INCORRECT_PASSWORD),
+            std::string(NEW_PASSWORD))), CKM::KeyProvider::Exception::UnwrapFailed);
 }
 
 BOOST_AUTO_TEST_CASE(T01000_getPureDEK_after_reencrypt){
-       BOOST_CHECK_NO_THROW(keyProvider.getPureDEK(rb_DEK1));
+    BOOST_CHECK_NO_THROW(keyProvider.getPureDEK(rb_DEK1));
 }
 
 BOOST_AUTO_TEST_CASE(T10000_closeLibrary){
-       BOOST_CHECK_NO_THROW(CKM::KeyProvider::closeLibrary());
+    BOOST_CHECK_NO_THROW(CKM::KeyProvider::closeLibrary());
 }
 
 BOOST_AUTO_TEST_SUITE_END()
@@ -81,7 +85,7 @@ BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE(S2_CRYPTO_MODULE)
 
 BOOST_AUTO_TEST_CASE(T00100_initialize){
-       BOOST_CHECK(1);
+    BOOST_CHECK(1);
 }
 
 BOOST_AUTO_TEST_SUITE_END()