Change prototype of some functions

- Add GetUID() function to ParamChecker to get parsed UID properly.
- Change SendFail() to accept error type as parameter.
- Remove parameter of EventSignalSender constructer. and add setter functions.

Change-Id: Iedde81894c25afde769ff89a55a4725706fa6bbf
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/src/rsc-copy/include/event_signal_sender.hh b/src/rsc-copy/include/event_signal_sender.hh
index dd4fd43..3e42451 100644 (file)
--- a/src/rsc-copy/include/event_signal_sender.hh
+++ b/src/rsc-copy/include/event_signal_sender.hh
@@ -19,16 +19,19 @@
 
 #include <string>
 
+#include "include/error_type.hh"
 #include "include/request_type.hh"
 
 namespace rsc_handler {
 
 class EventSignalSender {
  public:
-  EventSignalSender(std::string pkgid, ReqType req_type);
+  EventSignalSender() : pkgid_(""), req_type_(ReqType::REQ_TYPE_UNKNOWN) {};
   bool SendStart();
   bool SendOK();
-  bool SendFail();
+  bool SendFail(ErrorType error);
+  void SetPkgID(std::string pkgid);
+  void SetReqType(ReqType req_type);
 
  private:
   std::string pkgid_;

diff --git a/src/rsc-copy/include/param_checker.hh b/src/rsc-copy/include/param_checker.hh
index 10c5ca8..17a85f3 100644 (file)
--- a/src/rsc-copy/include/param_checker.hh
+++ b/src/rsc-copy/include/param_checker.hh
@@ -30,6 +30,7 @@ class ParamChecker {
   ParamChecker(int argc, char* argv[]);
   ReqType GetRequestType();
   std::string GetPkgID() const;
+  uid_t GetUID() const;
   const std::list<RscPathInfo>& GetPathList() const;
   bool Validate();
 

diff --git a/src/rsc-copy/src/event_signal_sender.cc b/src/rsc-copy/src/event_signal_sender.cc
index f4abe30..81fbafe 100644 (file)
--- a/src/rsc-copy/src/event_signal_sender.cc
+++ b/src/rsc-copy/src/event_signal_sender.cc
@@ -20,29 +20,35 @@
 #include <iostream>
 #include <string>
 
+#include "include/error_type.hh"
 #include "include/request_type.hh"
 
 namespace rsc_handler {
 
-EventSignalSender::EventSignalSender(std::string pkgid, ReqType req_type) :
-  pkgid_(pkgid), req_type_(req_type) {}
-
 bool EventSignalSender::SendStart() {
   std::cout << "EventSignalSender::SendStart" << std::endl;
 
   return true;
 }
 
-bool SendOK() {
+bool EventSignalSender::SendOK() {
   std::cout << "EventSignalSender::SendOK" << std::endl;
 
   return true;
 }
 
-bool SendFail() {
+bool EventSignalSender::SendFail(ErrorType error) {
   std::cout << "EventSignalSender::SendFail" << std::endl;
 
   return true;
 }
 
+void EventSignalSender::SetPkgID(std::string pkgid) {
+  pkgid_ = pkgid;
+}
+
+void EventSignalSender::SetReqType(ReqType req_type) {
+  req_type_ = req_type;
+}
+
 }  // namespace rsc_handler

diff --git a/src/rsc-copy/src/param_checker.cc b/src/rsc-copy/src/param_checker.cc
index e7c6322..d6ef222 100644 (file)
--- a/src/rsc-copy/src/param_checker.cc
+++ b/src/rsc-copy/src/param_checker.cc
@@ -76,6 +76,10 @@ std::string ParamChecker::GetPkgID() const {
   return pkgid_;
 }
 
+uid_t ParamChecker::GetUID() const {
+  return uid_;
+}
+
 ReqType ParamChecker::GetRequestType() {
   return req_type_;
 }

diff --git a/src/rsc-copy/src/rsc_handler.cc b/src/rsc-copy/src/rsc_handler.cc
index f7c8ecb..9c64fbd 100644 (file)
--- a/src/rsc-copy/src/rsc_handler.cc
+++ b/src/rsc-copy/src/rsc_handler.cc
@@ -33,8 +33,9 @@ bool RscHandler::Init(int argc, char* argv[]) {
     return false;
   }
 
-  rsc_handler::EventSignalSender signal(
-      option.GetPkgID(), option.GetRequestType());
+  rsc_handler::EventSignalSender signal;
+  signal.SetPkgID(option.GetPkgID());
+  signal.SetReqType(option.GetRequestType());
 
   rsc_handler::RequestHandlerInvoker handler(option, signal);
   if (!handler.Validate()) {

diff --git a/tests/unit_tests/rsc-copy/src/test_param_checker.cc b/tests/unit_tests/rsc-copy/src/test_param_checker.cc
index 04d1d76..e1e1c93 100644 (file)
--- a/tests/unit_tests/rsc-copy/src/test_param_checker.cc
+++ b/tests/unit_tests/rsc-copy/src/test_param_checker.cc
@@ -79,6 +79,7 @@ TEST_F(ParamCheckerTest, CopyRsc) {
   EXPECT_EQ(checker.GetRequestType(), rsc_handler::ReqType::REQ_TYPE_NEW);
   EXPECT_EQ(checker.GetPkgID(), "org.test.targetpkgid");
   EXPECT_EQ(checker.GetPathList().size(), 1);
+  EXPECT_EQ(checker.GetUID(), 5001);
 }
 
 TEST_F(ParamCheckerTest, RemoveRsc) {
@@ -91,6 +92,7 @@ TEST_F(ParamCheckerTest, RemoveRsc) {
   EXPECT_EQ(checker.GetRequestType(), rsc_handler::ReqType::REQ_TYPE_REMOVE);
   EXPECT_EQ(checker.GetPkgID(), "org.test.targetpkgid");
   EXPECT_EQ(checker.GetPathList().size(), 1);
+  EXPECT_EQ(checker.GetUID(), 5001);
 }
 
 TEST_F(ParamCheckerTest, DeleteRsc) {
@@ -103,6 +105,7 @@ TEST_F(ParamCheckerTest, DeleteRsc) {
   EXPECT_EQ(checker.GetRequestType(), rsc_handler::ReqType::REQ_TYPE_UNINSTALL);
   EXPECT_EQ(checker.GetPkgID(), "org.test.targetpkgid");
   EXPECT_EQ(checker.GetPathList().size(), 0);
+  EXPECT_EQ(checker.GetUID(), 5001);
 }
 
 TEST_F(ParamCheckerTest, EmptyPkgID) {