Remove tracker.

[platform/core/test/security-tests.git] / tests / common / dbus_access.cpp

diff --git a/tests/common/dbus_access.cpp b/tests/common/dbus_access.cpp
index aead761..29ae356 100644 (file)
--- a/tests/common/dbus_access.cpp
+++ b/tests/common/dbus_access.cpp
@@ -51,7 +51,7 @@ DBusAccess::DBusAccess()
 
 void DBusAccess::connect() {
     m_conn = dbus_bus_get_private(DBUS_BUS_SYSTEM, &m_err);
-    RUNNER_ASSERT_MSG_BT(dbus_error_is_set(&m_err) != 1, m_tracker.str() <<
+    RUNNER_ASSERT_MSG_BT(dbus_error_is_set(&m_err) != 1,
         "Error in dbus_bus_get: " << m_err.message);
     dbus_connection_set_exit_on_disconnect(m_conn, FALSE);
 }
@@ -59,7 +59,7 @@ void DBusAccess::connect() {
 void DBusAccess::requestName() {
     dbus_bus_request_name(m_conn, m_dbus_client_name.c_str(),
         DBUS_NAME_FLAG_REPLACE_EXISTING , &m_err);
-    RUNNER_ASSERT_MSG_BT(dbus_error_is_set(&m_err) != 1, m_tracker.str() <<
+    RUNNER_ASSERT_MSG_BT(dbus_error_is_set(&m_err) != 1,
         "Error in dbus_bus_request_name: " << m_err.message);
 }
 
@@ -73,7 +73,7 @@ void DBusAccess::newMethodCall(const std::string& method) {
                                          dbus_systemd_object.c_str(),
                                          dbus_systemd_interface.c_str(),
                                          method.c_str());
-    RUNNER_ASSERT_MSG_BT(NULL != m_msg, m_tracker.str() <<
+    RUNNER_ASSERT_MSG_BT(NULL != m_msg,
         "Error in dbus_message_new_method_call");
 }
 
@@ -84,16 +84,16 @@ void DBusAccess::appendToMsg() {
     dbus_message_iter_init_append(m_msg, &iter);
     int ret = dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING,
         &dbus_systemd_srv_unit_mode);
-    RUNNER_ASSERT_MSG_BT(ret != 0, m_tracker.str() <<
+    RUNNER_ASSERT_MSG_BT(ret != 0,
         "Error in dbus_message_iter_append_basic");
 }
 
 void DBusAccess::sendMsgWithReply() {
     int ret = dbus_connection_send_with_reply(m_conn, m_msg, &m_pending, -1);
-    RUNNER_ASSERT_MSG_BT(ret == 1, m_tracker.str() <<
+    RUNNER_ASSERT_MSG_BT(ret == 1,
         "Error in dbus_connection_send_with_reply");
 
-    RUNNER_ASSERT_MSG_BT(NULL != m_pending, m_tracker.str() << "Pending call null");
+    RUNNER_ASSERT_MSG_BT(NULL != m_pending, "Pending call null");
 
     dbus_connection_flush(m_conn);
     dbus_pending_call_block(m_pending);
@@ -103,7 +103,7 @@ void DBusAccess::sendMsgWithReply() {
 
 void DBusAccess::getMsgReply() {
     m_msg = dbus_pending_call_steal_reply(m_pending);
-    RUNNER_ASSERT_MSG_BT(NULL != m_msg, m_tracker.str() <<
+    RUNNER_ASSERT_MSG_BT(NULL != m_msg,
         "Error in dbus_pending_call_steal_reply");
 }
 
@@ -112,12 +112,12 @@ void DBusAccess::handleMsgRestartReply() {
     DBusMessageIter iter;
 
     RUNNER_ASSERT_MSG_BT(dbus_message_iter_init(m_msg, &iter) != 0,
-        m_tracker.str() << "Message has no arguments");
+        "Message has no arguments");
     if (DBUS_TYPE_OBJECT_PATH == dbus_message_iter_get_arg_type(&iter)) {
         dbus_message_iter_get_basic(&iter, &object_path);
         m_jobID = std::strrchr(object_path, '/') + 1;
     } else {
-        RUNNER_ASSERT_MSG_BT(false, m_tracker.str() << "No job path in msg");
+        RUNNER_ASSERT_MSG_BT(false, "No job path in msg");
     }
     dbus_message_unref(m_msg);
     dbus_pending_call_unref(m_pending);
@@ -132,11 +132,11 @@ DBusHandlerResult DBusAccess::signalFilter(DBusConnection *, DBusMessage *messag
 
     if (dbus_message_is_signal(message, a->m_signal_interface.c_str(), a->m_signal_member.c_str()))
     {
-        RUNNER_ASSERT_MSG_BT(dbus_message_iter_init(message, &iter) != 0, a->m_tracker.str() <<
+        RUNNER_ASSERT_MSG_BT(dbus_message_iter_init(message, &iter) != 0,
             "No messages in reply");
 
         RUNNER_ASSERT_MSG_BT(dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_UINT32,
-            a->m_tracker.str() << "Argument is not integer");
+            "Argument is not integer");
 
         dbus_message_iter_get_basic(&iter, &id);
 
@@ -157,7 +157,7 @@ DBusHandlerResult DBusAccess::signalFilter(DBusConnection *, DBusMessage *messag
 
 void DBusAccess::handleMsgRestartSignal() {
     dbus_bus_add_match(m_conn, m_signal_match.c_str(), &m_err);
-    RUNNER_ASSERT_MSG_BT(dbus_error_is_set(&m_err) != 1, m_tracker.str() <<
+    RUNNER_ASSERT_MSG_BT(dbus_error_is_set(&m_err) != 1,
         "Error in dbus_bus_add_match: " << m_err.message);
 
     dbus_connection_add_filter(m_conn, signalFilter, reinterpret_cast<void *>(this), NULL);
@@ -192,9 +192,7 @@ void DBusAccess::sendResetFailedToSS() {
     getMsgReply();
 }
 
-void DBusAccess::restartSS(const Tracker &tracker) {
-    m_tracker = tracker;
-
+void DBusAccess::restartSS() {
     connectToDBus();
     sendRestartToSS();
     sendResetFailedToSS();