Fix send resource signal api

Related:
 [slp-pkgmgr]https://review.tizen.org/gerrit/#/c/platform/core/appfw/slp-pkgmgr/+/263354/

Change-Id: Id05fd4759ac9cdb1dfe5eee81ce47b6a66c8a45b
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>

diff --git a/src/res-copy/src/event_signal_sender.cc b/src/res-copy/src/event_signal_sender.cc
index f82ee4c6c8bdd1e002372fb64438a17fb9b07300..c87a005bfe54037383b3639b91883cc29897178a 100644 (file)
--- a/src/res-copy/src/event_signal_sender.cc
+++ b/src/res-copy/src/event_signal_sender.cc
@@ -47,13 +47,13 @@ bool EventSignalSender::SendSignal(const char* status, ErrorType error) {
   pkgmgr_res_event_info_set_error_code(event_info.get(),
       static_cast<int>(error));
 
-  if (pkgmgr_installer_send_res_copy_signal(installer_.get(), pkgid_.c_str(),
+  if (pkgmgr_installer_send_res_signal(installer_.get(), pkgid_.c_str(),
       status, event_info.get()) != 0) {
     LOG(ERROR) << "Fail to send resource copy signal";
     return false;
   }
 
-  if (pkgmgr_installer_send_res_copy_signal_for_uid(installer_.get(), uid_,
+  if (pkgmgr_installer_send_res_signal_for_uid(installer_.get(), uid_,
       pkgid_.c_str(), status, event_info.get()) != 0) {
     LOG(ERROR) << "Fail to send resource copy signal for uid " << uid_;
     return false;

diff --git a/tests/mock/pkgmgr_installer_mock.cc b/tests/mock/pkgmgr_installer_mock.cc
index 6835dbae0b5b13cbab1a11bdb698aa666ce22d9c..1c697c4b08f53f407b46e68177ee0a36ba1e601c 100644 (file)
--- a/tests/mock/pkgmgr_installer_mock.cc
+++ b/tests/mock/pkgmgr_installer_mock.cc
@@ -18,16 +18,16 @@
 #include "mock/pkgmgr_installer_mock.h"
 #include "mock/test_fixture.h"
 
-extern "C" int pkgmgr_installer_send_res_copy_signal(pkgmgr_installer *pi,
+extern "C" int pkgmgr_installer_send_res_signal(pkgmgr_installer *pi,
     const char *pkgid, const char *status, pkgmgr_res_event_info *event_info) {
   return MOCK_HOOK_P4(PkgMgrInstallerMock,
-      pkgmgr_installer_send_res_copy_signal, pi, pkgid, status, event_info);
+      pkgmgr_installer_send_res_signal, pi, pkgid, status, event_info);
 }
 
-extern "C" int pkgmgr_installer_send_res_copy_signal_for_uid(
+extern "C" int pkgmgr_installer_send_res_signal_for_uid(
     pkgmgr_installer *pi, uid_t uid, const char *pkgid,
     const char *status, pkgmgr_res_event_info *event_info) {
   return MOCK_HOOK_P5(PkgMgrInstallerMock,
-      pkgmgr_installer_send_res_copy_signal_for_uid,
+      pkgmgr_installer_send_res_signal_for_uid,
           pi, uid, pkgid, status, event_info);
 }

diff --git a/tests/mock/pkgmgr_installer_mock.h b/tests/mock/pkgmgr_installer_mock.h
index b120bfcd30973f03b0a624103086d68dae25d41d..617d18e487a4d02d14a00dfe21a21e4b5418c2bc 100644 (file)
--- a/tests/mock/pkgmgr_installer_mock.h
+++ b/tests/mock/pkgmgr_installer_mock.h
@@ -27,9 +27,9 @@ class PkgMgrInstallerMock : public virtual ModuleMock {
  public:
   virtual ~PkgMgrInstallerMock() {}
 
-  MOCK_METHOD4(pkgmgr_installer_send_res_copy_signal,
+  MOCK_METHOD4(pkgmgr_installer_send_res_signal,
       int(pkgmgr_installer*, const char*, const char*, pkgmgr_res_event_info*));
-  MOCK_METHOD5(pkgmgr_installer_send_res_copy_signal_for_uid,
+  MOCK_METHOD5(pkgmgr_installer_send_res_signal_for_uid,
       int(pkgmgr_installer*, uid_t, const char*, const char*,
           pkgmgr_res_event_info*));
 };

diff --git a/tests/unit_tests/res-copy/src/test_event_signal_sender.cc b/tests/unit_tests/res-copy/src/test_event_signal_sender.cc
index c8944199133e08bfdf630aaa83b0ceeaa973dc7c..72ca3c99d0fc40e1cc97c91a1caaa2ae804b8f2e 100644 (file)
--- a/tests/unit_tests/res-copy/src/test_event_signal_sender.cc
+++ b/tests/unit_tests/res-copy/src/test_event_signal_sender.cc
@@ -47,10 +47,10 @@ class EventSignalSenderTest : public TestFixture {
 
 TEST_F(EventSignalSenderTest, SendSignals) {
   EXPECT_CALL(GetMock<PkgMgrInstallerMock>(),
-      pkgmgr_installer_send_res_copy_signal(_, _, _, _))
+      pkgmgr_installer_send_res_signal(_, _, _, _))
       .WillRepeatedly(Return(0));
   EXPECT_CALL(GetMock<PkgMgrInstallerMock>(),
-      pkgmgr_installer_send_res_copy_signal_for_uid(_, _, _, _, _))
+      pkgmgr_installer_send_res_signal_for_uid(_, _, _, _, _))
       .WillRepeatedly(Return(0));
 
   pkgmgr_installer* pi = pkgmgr_installer_offline_new();
@@ -67,10 +67,10 @@ TEST_F(EventSignalSenderTest, SendSignals) {
 
 TEST_F(EventSignalSenderTest, SendSignalWithNullPkgMgrInstaller) {
   EXPECT_CALL(GetMock<PkgMgrInstallerMock>(),
-      pkgmgr_installer_send_res_copy_signal(_, _, _, _))
+      pkgmgr_installer_send_res_signal(_, _, _, _))
       .Times(0);
   EXPECT_CALL(GetMock<PkgMgrInstallerMock>(),
-      pkgmgr_installer_send_res_copy_signal_for_uid(_, _, _, _, _))
+      pkgmgr_installer_send_res_signal_for_uid(_, _, _, _, _))
       .Times(0);
 
   EventSignalSender signal(nullptr);