From 9e8e64f5e4ce1605677a9c34cdeadfaeff5b65e3 Mon Sep 17 00:00:00 2001
From: Zofia Abramowska <z.abramowska@samsung.com>
Date: Fri, 16 Sep 2016 12:16:43 +0200
Subject: [PATCH] Cynara: Move Cynara helper credentials to global commons

Change-Id: If60a51afb801e75f300250f2e1244ad7f05b5098
---
 src/common/CMakeLists.txt                                             | 4 ++++
 .../cynara_test_helpers.cpp => common/cynara_helpers_creds.cpp}       | 4 ++--
 .../common/cynara_test_helpers.h => common/cynara_helpers_creds.h}    | 4 ++--
 .../cynara_test_helpers_dbus.h => common/cynara_helpers_dbus.h}       | 2 +-
 src/cynara-tests/CMakeLists.txt                                       | 1 -
 src/cynara-tests/test_cases_helpers.cpp                               | 4 ++--
 6 files changed, 11 insertions(+), 8 deletions(-)
 rename src/{cynara-tests/common/cynara_test_helpers.cpp => common/cynara_helpers_creds.cpp} (98%)
 rename src/{cynara-tests/common/cynara_test_helpers.h => common/cynara_helpers_creds.h} (96%)
 rename src/{cynara-tests/common/cynara_test_helpers_dbus.h => common/cynara_helpers_dbus.h} (96%)

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 994fee1..4e1055f 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -8,6 +8,9 @@ PKG_CHECK_MODULES(COMMON_TARGET_DEP
     sqlite3
     libgum
     glib-2.0
+    cynara-creds-socket
+    cynara-creds-dbus
+    cynara-creds-gdbus
     REQUIRED
     )
 
@@ -28,6 +31,7 @@ SET(COMMON_TARGET_TEST_SOURCES
     ${PROJECT_SOURCE_DIR}/src/common/synchronization_pipe.cpp
     ${PROJECT_SOURCE_DIR}/src/common/timeout.cpp
     ${PROJECT_SOURCE_DIR}/src/common/temp_test_user.cpp
+    ${PROJECT_SOURCE_DIR}/src/common/cynara_helpers_creds.cpp
     )
 
 #system and local includes
diff --git a/src/cynara-tests/common/cynara_test_helpers.cpp b/src/common/cynara_helpers_creds.cpp
similarity index 98%
rename from src/cynara-tests/common/cynara_test_helpers.cpp
rename to src/common/cynara_helpers_creds.cpp
index ffb9628..dc1c904 100644
--- a/src/cynara-tests/common/cynara_test_helpers.cpp
+++ b/src/common/cynara_helpers_creds.cpp
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 /**
- * @file        cynara_test_helpers.cpp
+ * @file        cynara_helper_credentials.cpp
  * @author      Aleksander Zdyb <a.zdyb@samsung.com>
  * @version     1.0
  * @brief       Helpers for cynara-helpers
@@ -26,7 +26,7 @@
 #include <cynara-creds-socket.h>
 #include <cynara-creds-gdbus.h>
 
-#include "cynara_test_helpers.h"
+#include "cynara_helpers_creds.h"
 
 namespace CynaraHelperCredentials {
 
diff --git a/src/cynara-tests/common/cynara_test_helpers.h b/src/common/cynara_helpers_creds.h
similarity index 96%
rename from src/cynara-tests/common/cynara_test_helpers.h
rename to src/common/cynara_helpers_creds.h
index d790fe3..cafe423 100644
--- a/src/cynara-tests/common/cynara_test_helpers.h
+++ b/src/common/cynara_helpers_creds.h
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 /**
- * @file        cynara_test_helpers.h
+ * @file        cynara_helper_credentials.h
  * @author      Aleksander Zdyb <a.zdyb@samsung.com>
  * @version     1.0
  * @brief       Helpers for cynara-helpers
@@ -28,7 +28,7 @@
 
 #include <cynara-creds-commons.h>
 #include <cynara-error.h>
-#include <cynara_test_helpers_dbus.h>
+#include <cynara_helpers_dbus.h>
 
 namespace CynaraHelperCredentials {
 
diff --git a/src/cynara-tests/common/cynara_test_helpers_dbus.h b/src/common/cynara_helpers_dbus.h
similarity index 96%
rename from src/cynara-tests/common/cynara_test_helpers_dbus.h
rename to src/common/cynara_helpers_dbus.h
index 46c827e..19c1b24 100644
--- a/src/cynara-tests/common/cynara_test_helpers_dbus.h
+++ b/src/common/cynara_helpers_dbus.h
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 /**
- * @file        cynara_test_helpers_dbus.h
+ * @file        cynara_helpers_dbus.h
  * @author      Aleksander Zdyb <a.zdyb@samsung.com>
  * @version     1.0
  */
diff --git a/src/cynara-tests/CMakeLists.txt b/src/cynara-tests/CMakeLists.txt
index 6fa7aa5..7a42d65 100644
--- a/src/cynara-tests/CMakeLists.txt
+++ b/src/cynara-tests/CMakeLists.txt
@@ -47,7 +47,6 @@ SET(CYNARA_TARGET_TEST_SOURCES
     ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_cynara_mask.cpp
     ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_env.cpp
     ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_file_operations.cpp
-    ${PROJECT_SOURCE_DIR}/src/cynara-tests/common/cynara_test_helpers.cpp
     ${PROJECT_SOURCE_DIR}/src/cynara-tests/plugins/plugins.cpp
     ${PROJECT_SOURCE_DIR}/src/cynara-tests/cynara-test.cpp
     ${PROJECT_SOURCE_DIR}/src/cynara-tests/test_cases.cpp
diff --git a/src/cynara-tests/test_cases_helpers.cpp b/src/cynara-tests/test_cases_helpers.cpp
index 5e0f1cd..06aa14d 100644
--- a/src/cynara-tests/test_cases_helpers.cpp
+++ b/src/cynara-tests/test_cases_helpers.cpp
@@ -40,9 +40,9 @@
 #include <tests_common.h>
 #include <uds.h>
 #include <passwd_access.h>
+#include <cynara_helpers_creds.h>
+#include <cynara_helpers_dbus.h>
 
-#include <cynara_test_helpers.h>
-#include <cynara_test_helpers_dbus.h>
 #include <cynara-creds-gdbus.h>
 #include <cynara-creds-self.h>
 
-- 
2.7.4