Change DBusAccess class name to ServiceManager

Change-Id: I38483087929620e12bcd2b68146b36de7a266d9c

diff --git a/tests/common/CMakeLists.txt b/tests/common/CMakeLists.txt
index dcf486f..b32f6ba 100644 (file)
--- a/tests/common/CMakeLists.txt
+++ b/tests/common/CMakeLists.txt
@@ -14,10 +14,10 @@ SET(COMMON_TARGET_TEST_SOURCES
     ${PROJECT_SOURCE_DIR}/tests/common/tests_common.cpp
     ${PROJECT_SOURCE_DIR}/tests/common/access_provider.cpp
     ${PROJECT_SOURCE_DIR}/tests/common/smack_access.cpp
-    ${PROJECT_SOURCE_DIR}/tests/common/dbus_access.cpp
     ${PROJECT_SOURCE_DIR}/tests/common/dbus_connection.cpp
     ${PROJECT_SOURCE_DIR}/tests/common/dbus_message_in.cpp
     ${PROJECT_SOURCE_DIR}/tests/common/dbus_message_out.cpp
+    ${PROJECT_SOURCE_DIR}/tests/common/service_manager.cpp
     ${PROJECT_SOURCE_DIR}/tests/common/memory.cpp
     ${PROJECT_SOURCE_DIR}/tests/common/db_sqlite.cpp
     ${PROJECT_SOURCE_DIR}/tests/common/fs_label_manager.cpp

diff --git a/tests/common/dbus_access.cpp b/tests/common/service_manager.cpp
similarity index 85%
rename from tests/common/dbus_access.cpp
rename to tests/common/service_manager.cpp
index 7290bbb..0240b91 100644 (file)
--- a/tests/common/dbus_access.cpp
+++ b/tests/common/service_manager.cpp
@@ -14,11 +14,11 @@
  * limitations under the License
  */
 /*
- * @file        dbus_access.cpp
+ * @file        service_manager.cpp
  * @author      Zbigniew Jasinski <z.jasinski@samsung.com>
  * @author      Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
  * @version     1.1
- * @brief       Implementation of SystemD control class over dbus API
+ * @brief       Implementation of systemd control class over dbus API
  */
 
 #include <dpl/log/log.h>
@@ -28,9 +28,9 @@
 #include <sstream>
 #include <unistd.h>
 
-#include "dbus_access.h"
+#include <service_manager.h>
 
-DBusAccess::DBusAccess(const char *service_name)
+ServiceManager::ServiceManager(const char *service_name)
   : m_conn(nullptr)
   , m_msg(nullptr)
   , m_pending(nullptr)
@@ -47,14 +47,14 @@ DBusAccess::DBusAccess(const char *service_name)
     connectToDBus();
 }
 
-void DBusAccess::connect() {
+void ServiceManager::connect() {
     m_conn = dbus_bus_get_private(DBUS_BUS_SYSTEM, &m_err);
     RUNNER_ASSERT_MSG(dbus_error_is_set(&m_err) != 1,
         "Error in dbus_bus_get: " << m_err.message);
     dbus_connection_set_exit_on_disconnect(m_conn, FALSE);
 }
 
-void DBusAccess::addBusMatch(const char *member) {
+void ServiceManager::addBusMatch(const char *member) {
     std::ostringstream rule;
     rule << "type='signal',"
          << "sender='" << m_dbus_systemd_destination << "',"
@@ -67,14 +67,14 @@ void DBusAccess::addBusMatch(const char *member) {
         "Error in dbus_bus_add_match: " << m_err.message);
 }
 
-void DBusAccess::subscribeSignals() {
+void ServiceManager::subscribeSignals() {
     newMethodCall("Subscribe");
     sendMsgWithReply();
     getMsgReply();
     finalizeMsgReply();
 }
 
-void DBusAccess::reloadDbusManager() {
+void ServiceManager::reloadDbusManager() {
     newMethodCall("Reload");
     sendMsgWithReply();
     getMsgReply();
@@ -82,14 +82,14 @@ void DBusAccess::reloadDbusManager() {
     m_runningJobs.insert(m_reloadingToken);
 }
 
-void DBusAccess::requestName() {
+void ServiceManager::requestName() {
     dbus_bus_request_name(m_conn, m_dbus_client_name.c_str(),
         DBUS_NAME_FLAG_REPLACE_EXISTING , &m_err);
     RUNNER_ASSERT_MSG(dbus_error_is_set(&m_err) != 1,
         "Error in dbus_bus_request_name: " << m_err.message);
 }
 
-void DBusAccess::getUnitPath() {
+void ServiceManager::getUnitPath() {
     newMethodCall("GetUnit");
     appendToMsg(m_service_name.c_str());
     sendMsgWithReply();
@@ -97,7 +97,7 @@ void DBusAccess::getUnitPath() {
     m_unitPath = handleObjectPathMsgReply();
 }
 
-void DBusAccess::newMethodCall(const char *method) {
+void ServiceManager::newMethodCall(const char *method) {
     m_msg = dbus_message_new_method_call(m_dbus_systemd_destination.c_str(),
                                          m_dbus_systemd_path.c_str(),
                                          m_dbus_systemd_manager_interface.c_str(),
@@ -106,7 +106,7 @@ void DBusAccess::newMethodCall(const char *method) {
         "Error in dbus_message_new_method_call");
 }
 
-void DBusAccess::appendToMsg(const char *argument) {
+void ServiceManager::appendToMsg(const char *argument) {
     DBusMessageIter iter;
 
     dbus_message_iter_init_append(m_msg, &iter);
@@ -116,7 +116,7 @@ void DBusAccess::appendToMsg(const char *argument) {
         "Error in dbus_message_iter_append_basic");
 }
 
-void DBusAccess::appendToMsg(const char *const *argument) {
+void ServiceManager::appendToMsg(const char *const *argument) {
     DBusMessageIter iter;
     DBusMessageIter subIter;
     int ret;
@@ -136,7 +136,7 @@ void DBusAccess::appendToMsg(const char *const *argument) {
         "Error in dbus_message_iter_close_container");
 }
 
-void DBusAccess::appendToMsg(bool argument) {
+void ServiceManager::appendToMsg(bool argument) {
     DBusMessageIter iter;
 
     dbus_message_iter_init_append(m_msg, &iter);
@@ -147,7 +147,7 @@ void DBusAccess::appendToMsg(bool argument) {
         "Error in dbus_message_iter_append_basic");
 }
 
-void DBusAccess::sendMsgWithReply() {
+void ServiceManager::sendMsgWithReply() {
     int ret = dbus_connection_send_with_reply(m_conn, m_msg, &m_pending, -1);
     RUNNER_ASSERT_MSG(ret == 1,
         "Error in dbus_connection_send_with_reply");
@@ -161,13 +161,13 @@ void DBusAccess::sendMsgWithReply() {
     m_msg = nullptr;
 }
 
-void DBusAccess::getMsgReply() {
+void ServiceManager::getMsgReply() {
     m_msg = dbus_pending_call_steal_reply(m_pending);
     RUNNER_ASSERT_MSG(nullptr != m_msg,
         "Error in dbus_pending_call_steal_reply");
 }
 
-std::string DBusAccess::handleObjectPathMsgReply() {
+std::string ServiceManager::handleObjectPathMsgReply() {
     DBusMessageIter iter;
 
     RUNNER_ASSERT_MSG(dbus_message_iter_init(m_msg, &iter) != 0,
@@ -183,7 +183,7 @@ std::string DBusAccess::handleObjectPathMsgReply() {
     return ret;
 }
 
-uint32_t DBusAccess::handleVariantUIntMsgReply() {
+uint32_t ServiceManager::handleVariantUIntMsgReply() {
     DBusMessageIter iter, iter2;
 
     RUNNER_ASSERT_MSG(dbus_message_iter_init(m_msg, &iter) != 0,
@@ -204,14 +204,14 @@ uint32_t DBusAccess::handleVariantUIntMsgReply() {
     return ret;
 }
 
-void DBusAccess::finalizeMsgReply() {
+void ServiceManager::finalizeMsgReply() {
     dbus_message_unref(m_msg);
     dbus_pending_call_unref(m_pending);
     m_msg = nullptr;
     m_pending = nullptr;
 }
 
-void DBusAccess::connectToDBus() {
+void ServiceManager::connectToDBus() {
     connect();
     addBusMatch("JobRemoved");
     addBusMatch("JobNew");
@@ -226,7 +226,7 @@ void DBusAccess::connectToDBus() {
     getUnitPath();
 }
 
-void DBusAccess::sendToService(const char *method) {
+void ServiceManager::sendToService(const char *method) {
     newMethodCall(method);
     appendToMsg(m_service_name.c_str());
     appendToMsg("fail");
@@ -235,7 +235,7 @@ void DBusAccess::sendToService(const char *method) {
     m_runningJobs.insert(handleObjectPathMsgReply());
 }
 
-void DBusAccess::sendMaskToService() {
+void ServiceManager::sendMaskToService() {
     const char *mask[] = {m_service_name.c_str(), nullptr};
     newMethodCall("MaskUnitFiles");
     appendToMsg(mask);
@@ -246,7 +246,7 @@ void DBusAccess::sendMaskToService() {
     finalizeMsgReply();
 }
 
-void DBusAccess::sendUnmaskToService() {
+void ServiceManager::sendUnmaskToService() {
     const char *mask[] = {m_service_name.c_str(), nullptr};
     newMethodCall("UnmaskUnitFiles");
     appendToMsg(mask);
@@ -256,7 +256,7 @@ void DBusAccess::sendUnmaskToService() {
     finalizeMsgReply();
 }
 
-uint32_t DBusAccess::getUIntProperty(const char *interface, const char *property)
+uint32_t ServiceManager::getUIntProperty(const char *interface, const char *property)
 {
     m_msg = dbus_message_new_method_call(m_dbus_systemd_destination.c_str(),
                                          m_unitPath.c_str(),
@@ -270,7 +270,7 @@ uint32_t DBusAccess::getUIntProperty(const char *interface, const char *property
     return handleVariantUIntMsgReply();
 }
 
-void DBusAccess::sendResetFailedToService() {
+void ServiceManager::sendResetFailedToService() {
     newMethodCall("ResetFailedUnit");
     appendToMsg(m_service_name.c_str());
     sendMsgWithReply();
@@ -278,9 +278,9 @@ void DBusAccess::sendResetFailedToService() {
     finalizeMsgReply();
 }
 
-DBusHandlerResult DBusAccess::messageHandler(DBusConnection *conn, DBusMessage *msg, void *t) {
+DBusHandlerResult ServiceManager::messageHandler(DBusConnection *conn, DBusMessage *msg, void *t) {
     (void) conn;
-    DBusAccess* self = reinterpret_cast<DBusAccess*>(t);
+    ServiceManager* self = reinterpret_cast<ServiceManager*>(t);
 
     if (self->isSignal(msg, "JobRemoved"))
         self->signalJobRemovedHandler(msg);
@@ -292,11 +292,11 @@ DBusHandlerResult DBusAccess::messageHandler(DBusConnection *conn, DBusMessage *
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
-bool DBusAccess::isSignal(DBusMessage *msg, const char *signal) {
+bool ServiceManager::isSignal(DBusMessage *msg, const char *signal) {
     return dbus_message_is_signal(msg, m_dbus_systemd_manager_interface.c_str(), signal);
 }
 
-void DBusAccess::signalJobRemovedHandler(DBusMessage *msg) {
+void ServiceManager::signalJobRemovedHandler(DBusMessage *msg) {
     DBusMessageIter iter;
     RUNNER_ASSERT_MSG(dbus_message_iter_init(msg, &iter) != 0,
         "Message has no arguments");
@@ -339,7 +339,7 @@ void DBusAccess::signalJobRemovedHandler(DBusMessage *msg) {
     }
 }
 
-void DBusAccess::signalJobNewHandler(DBusMessage *msg) {
+void ServiceManager::signalJobNewHandler(DBusMessage *msg) {
     DBusMessageIter iter;
     RUNNER_ASSERT_MSG(dbus_message_iter_init(msg, &iter) != 0,
         "Message has no arguments");
@@ -368,7 +368,7 @@ void DBusAccess::signalJobNewHandler(DBusMessage *msg) {
         m_runningJobs.insert(path);
 }
 
-void DBusAccess::signalReloadingHandler(DBusMessage *msg) {
+void ServiceManager::signalReloadingHandler(DBusMessage *msg) {
     DBusMessageIter iter;
     RUNNER_ASSERT_MSG(dbus_message_iter_init(msg, &iter) != 0,
         "Message has no arguments");
@@ -385,48 +385,48 @@ void DBusAccess::signalReloadingHandler(DBusMessage *msg) {
         m_runningJobs.erase(m_reloadingToken);
 }
 
-void DBusAccess::waitForRunningJobsFinish() {
+void ServiceManager::waitForRunningJobsFinish() {
     while (!m_runningJobs.empty())
         dbus_connection_read_write_dispatch(m_conn, -1);
 }
 
-void DBusAccess::startService() {
+void ServiceManager::startService() {
     sendToService("StartUnit");
     waitForRunningJobsFinish();
     sendResetFailedToService();
 }
 
-void DBusAccess::stopService() {
+void ServiceManager::stopService() {
     sendToService("StopUnit");
     waitForRunningJobsFinish();
     sendResetFailedToService();
 }
 
-void DBusAccess::restartService() {
+void ServiceManager::restartService() {
     sendToService("RestartUnit");
     waitForRunningJobsFinish();
     sendResetFailedToService();
 }
 
-pid_t DBusAccess::getServicePid() {
+pid_t ServiceManager::getServicePid() {
     return static_cast<pid_t>(getUIntProperty(m_dbus_systemd_service_interface.c_str(), "MainPID"));
 }
 
-void DBusAccess::maskService() {
+void ServiceManager::maskService() {
     sendMaskToService();
     reloadDbusManager();
     waitForRunningJobsFinish();
     sendResetFailedToService();
 }
 
-void DBusAccess::unmaskService() {
+void ServiceManager::unmaskService() {
     sendUnmaskToService();
     reloadDbusManager();
     waitForRunningJobsFinish();
     sendResetFailedToService();
 }
 
-DBusAccess::~DBusAccess() {
+ServiceManager::~ServiceManager() {
     dbus_connection_close(m_conn);
     if (m_conn)
         dbus_connection_unref(m_conn);

diff --git a/tests/common/dbus_access.h b/tests/common/service_manager.h
similarity index 91%
rename from tests/common/dbus_access.h
rename to tests/common/service_manager.h
index c295a29..a5d1908 100644 (file)
--- a/tests/common/dbus_access.h
+++ b/tests/common/service_manager.h
@@ -14,25 +14,25 @@
  * limitations under the License
  */
 /*
- * @file        dbus_access.h
+ * @file        service_manager.h
  * @author      Zbigniew Jasinski <z.jasinski@samsung.com>
  * @author      Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
  * @version     1.1
  * @brief       System service control class using dbus interface to communicate with systemd
  */
 
-#ifndef _DBUS_ACCESS_H_
-#define _DBUS_ACCESS_H_
+#ifndef COMMON_SERVICE_MANAGER_H
+#define COMMON_SERVICE_MANAGER_H
 
 #include <dbus/dbus.h>
 
 #include <set>
 #include <string>
 
-class DBusAccess {
+class ServiceManager {
 public:
-    DBusAccess() = delete;
-    DBusAccess(const char *service_name);
+    ServiceManager() = delete;
+    ServiceManager(const char *service_name);
 
     void startService();
     void stopService();
@@ -41,7 +41,7 @@ public:
     void maskService();
     void unmaskService();
 
-    virtual ~DBusAccess();
+    virtual ~ServiceManager();
 private:
     void connect();
     void addBusMatch(const char *member);
@@ -92,4 +92,4 @@ private:
     const std::string m_reloadingToken;
 };
 
-#endif // _DBUS_ACCESS_H_
+#endif // COMMON_SERVICE_MANAGER_H

diff --git a/tests/cynara-tests/common/cynara_test_env.cpp b/tests/cynara-tests/common/cynara_test_env.cpp
index ce606c8..166b123 100644 (file)
--- a/tests/cynara-tests/common/cynara_test_env.cpp
+++ b/tests/cynara-tests/common/cynara_test_env.cpp
@@ -16,7 +16,7 @@
 
 #include <cynara_test_env.h>
 #include <tests_common.h>
-#include <dbus_access.h>
+#include <service_manager.h>
 #include <memory.h>
 
 #include <sys/types.h>
@@ -151,9 +151,9 @@ void CynaraTestEnv::save()
     clear(m_dir);
     removeDirIfExists(m_dir);
 
-    DBusAccess dbusAccess("cynara.service");
-    dbusAccess.maskService();
-    dbusAccess.stopService();
+    ServiceManager serviceManager("cynara.service");
+    serviceManager.maskService();
+    serviceManager.stopService();
 
     m_dbPresent = cynaraDbExists();
     if (m_dbPresent) {
@@ -162,15 +162,15 @@ void CynaraTestEnv::save()
         copyDir(cynaraDbDir, m_dir);
     }
 
-    dbusAccess.unmaskService();
-    dbusAccess.startService();
+    serviceManager.unmaskService();
+    serviceManager.startService();
 }
 
 void CynaraTestEnv::restore()
 {
-    DBusAccess dbusAccess("cynara.service");
-    dbusAccess.maskService();
-    dbusAccess.stopService();
+    ServiceManager serviceManager("cynara.service");
+    serviceManager.maskService();
+    serviceManager.stopService();
 
     clear(cynaraDbDir);
     if (m_dbPresent)
@@ -178,8 +178,8 @@ void CynaraTestEnv::restore()
     else
         removeDirIfExists(cynaraDbDir);
 
-    dbusAccess.unmaskService();
-    dbusAccess.startService();
+    serviceManager.unmaskService();
+    serviceManager.startService();
 
     clear(m_dir);
     removeDirIfExists(m_dir);

diff --git a/tests/security-server-tests/security_server_clean_env.cpp b/tests/security-server-tests/security_server_clean_env.cpp
index df7a73b..94833c9 100644 (file)
--- a/tests/security-server-tests/security_server_clean_env.cpp
+++ b/tests/security-server-tests/security_server_clean_env.cpp
@@ -12,11 +12,11 @@
 #include <ftw.h>
 #include <unistd.h>
 
-#include <dbus_access.h>
+#include <service_manager.h>
 
 int restart_security_server() {
-    DBusAccess dbusAccess("security-server.service");
-    dbusAccess.restartService();
+    ServiceManager serviceManager("security-server.service");
+    serviceManager.restartService();
 
     return 0;
 }