Fix coding rule

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

diff --git a/src/pkg_upgrade/src/pkg_upgrader.cc b/src/pkg_upgrade/src/pkg_upgrader.cc
index b3e553bcadec8bddc7a2fb333ab00be0f9b479b0..4442bee54ce39c98a26b715007f8fc67394e5eee 100644 (file)
--- a/src/pkg_upgrade/src/pkg_upgrader.cc
+++ b/src/pkg_upgrade/src/pkg_upgrader.cc
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <iostream>
+#include "pkg_upgrader.hh"
 
 #include <pkgmgr-info.h>
 
-#include "pkg_upgrader.hh"
+#include <iostream>
 
 namespace common_fota {
 

diff --git a/src/res-copy/src/condition_validator.cc b/src/res-copy/src/condition_validator.cc
index 6c8d458b253e8c57e17a8258c05ea7c69d5b8da3..9c1d1b93ac2083ef66ed12f9183b534bbfac99dd 100644 (file)
--- a/src/res-copy/src/condition_validator.cc
+++ b/src/res-copy/src/condition_validator.cc
@@ -17,13 +17,15 @@
 
 #include "include/condition_validator.hh"
 
+#include <sys/stat.h>
+
+#include <pkgmgr-info.h>
+
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/system/error_code.hpp>
 #include <tzplatform_config.h>
 
-#include <sys/stat.h>
-
 #include <iostream>
 #include <list>
 #include <string>
@@ -32,8 +34,6 @@
 #include "include/request_type.hh"
 #include "include/res_path_info.hh"
 
-#include <pkgmgr-info.h>
-
 namespace bf = boost::filesystem;
 
 namespace {
@@ -153,7 +153,6 @@ ErrorType ConditionValidator::CheckCopyRequest(
       res_size += GetDirectorySize(res_path);
     else
       res_size += boost::filesystem::file_size(res_path);
-
   }
   LOG(INFO) << "Required size for resource: " << res_size;
 

diff --git a/src/res-copy/src/param_checker.cc b/src/res-copy/src/param_checker.cc
index a34d37cd7689c3fcf739cdd2a9e807f2937cbef2..e583ca3f5a69411b9fcd949a5146ef9fd35c94d3 100644 (file)
--- a/src/res-copy/src/param_checker.cc
+++ b/src/res-copy/src/param_checker.cc
@@ -17,21 +17,21 @@
 
 #include "include/param_checker.hh"
 
+#include <pkgmgr-info.h>
+
 #include <boost/exception/diagnostic_information.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/program_options.hpp>
 #include <boost/system/error_code.hpp>
 
+#include <string>
+#include <iostream>
+
 #include "include/logging.hh"
 #include "include/request_type.hh"
 #include "include/res_path_info.hh"
 
-#include <pkgmgr-info.h>
-
-#include <string>
-#include <iostream>
-
 namespace bs = boost::system;
 namespace bpo = boost::program_options;
 

diff --git a/src/res-copy/src/request_handler_invoker.cc b/src/res-copy/src/request_handler_invoker.cc
index a0da08d6283cb42bc629e2436f1dbaad7a506f63..52bf4e4b663e9310cffb5de3dcac444f73125202 100644 (file)
--- a/src/res-copy/src/request_handler_invoker.cc
+++ b/src/res-copy/src/request_handler_invoker.cc
@@ -17,10 +17,10 @@
 
 #include "include/request_handler_invoker.hh"
 
-#include <iostream>
-
 #include <tzplatform_config.h>
 
+#include <iostream>
+
 #include "include/abstract_request_handler.hh"
 #include "include/condition_validator.hh"
 #include "include/copy_request_handler.hh"

diff --git a/tests/mock/os_mock.h b/tests/mock/os_mock.h
index 6de13f770fe7863e031959c7e2fe3fe9a19cb9c3..93b2b680fc99e834c9992ba229a8644aac886c6f 100644 (file)
--- a/tests/mock/os_mock.h
+++ b/tests/mock/os_mock.h
@@ -35,7 +35,7 @@ class OsMock : public virtual ModuleMock {
   MOCK_METHOD2(chmod, int(const char*, mode_t));
   MOCK_METHOD3(lchown, int(const char*, uid_t, gid_t));
   MOCK_METHOD3(smack_setlabel, int(const char*, const char*, smack_label_type));
-  MOCK_METHOD2(execvp, int(const char*, char* const []));
+  MOCK_METHOD2(execvp, int(const char*, char* const[]));
 };
 
 #endif  // TESTS_MOCK_OS_MOCK_H_

diff --git a/tests/mock/pkgmgr_info_mock.cc b/tests/mock/pkgmgr_info_mock.cc
index 2577c33d3f8930ab1f06f81d5d439c2fb4da5597..f73cb5bb257a287001f9e577e2852a5101b6715f 100644 (file)
--- a/tests/mock/pkgmgr_info_mock.cc
+++ b/tests/mock/pkgmgr_info_mock.cc
@@ -71,4 +71,4 @@ extern "C" int pkgmgrinfo_pkginfo_destroy_pkginfo(
     pkgmgrinfo_pkginfo_h handle) {
   return MOCK_HOOK_P1(
       PkgMgrInfoMock, pkgmgrinfo_pkginfo_destroy_pkginfo, handle);
-}
\ No newline at end of file
+}

diff --git a/tests/unit_tests/pkg_upgrade/src/test_pkg_upgrader.cc b/tests/unit_tests/pkg_upgrade/src/test_pkg_upgrader.cc
index 0dfb6222d68ad30c928c1fb8eb18e741bbe67a05..66248eaa4968e3fdedd019c48ee3dab7cfa78666 100644 (file)
--- a/tests/unit_tests/pkg_upgrade/src/test_pkg_upgrader.cc
+++ b/tests/unit_tests/pkg_upgrade/src/test_pkg_upgrader.cc
@@ -58,8 +58,8 @@ class PkgFinderTest : public TestFixture {
   }
 
   void SetOldPkgInfo(const char* ro_pkg_id, const char* ro_pkg_type,
-      const char* ro_pkg_version, const char* rw_pkg_id, const char* rw_pkg_type,
-      const char* rw_pkg_version) {
+      const char* ro_pkg_version, const char* rw_pkg_id,
+      const char* rw_pkg_type, const char* rw_pkg_version) {
     static int k;
     pkgmgrinfo_pkginfo_filter_h dummy_filter = (pkgmgrinfo_pkginfo_filter_h)&k;
 
@@ -106,7 +106,8 @@ class PkgFinderTest : public TestFixture {
         .WillRepeatedly(Return(0));
 
     finder_.SetManifestDir("./tests/unit_tests/pkg_upgrade/data/packages/");
-    finder_.SetPreloadRwListPath("./tests/unit_tests/pkg_upgrade/data/rw/list.txt");
+    finder_.SetPreloadRwListPath(
+        "./tests/unit_tests/pkg_upgrade/data/rw/list.txt");
   }
 
   PkgFinder finder_;
@@ -179,14 +180,13 @@ TEST_F(PkgUpgraderTest, Upgrader_RO2RO_RW2RW_HIGH_VERSION) {
               std::string cmd = GetCmd(argv);
               cmds.push_back(std::move(cmd));
               return 0;
-            })
-        );
+            }));
 
   ASSERT_TRUE(upgrader.Process(&finder_));
   const auto& success = upgrader.GetSuccessList();
   const auto& failure = upgrader.GetFailureList();
 
-  EXPECT_EQ(success.size(), 2); //RO2RO, RW2RW
+  EXPECT_EQ(success.size(), 2);  // RO2RO, RW2RW
   EXPECT_EQ(failure.size(), 0);
   EXPECT_EQ(cmds.size(), 5);
   EXPECT_EQ(cmds[0], "/usr/bin/tpk-backend --preload -y org.tizen.alarm"
@@ -216,14 +216,13 @@ TEST_F(PkgUpgraderTest, Upgrader_RO2RO_RW2RW_SAME_VERSION) {
               std::string cmd = GetCmd(argv);
               cmds.push_back(std::move(cmd));
               return 0;
-            })
-        );
+            }));
 
   ASSERT_TRUE(upgrader.Process(&finder_));
   const auto& success = upgrader.GetSuccessList();
   const auto& failure = upgrader.GetFailureList();
 
-  EXPECT_EQ(success.size(), 2); //RO2RO, RW2RW
+  EXPECT_EQ(success.size(), 2);  // RO2RO, RW2RW
   EXPECT_EQ(failure.size(), 0);
   EXPECT_EQ(cmds.size(), 0);
 }
@@ -243,8 +242,7 @@ TEST_F(PkgUpgraderTest, Upgrader_RO2RO_RW2RW_LOW_VERSION) {
               std::string cmd = GetCmd(argv);
               cmds.push_back(std::move(cmd));
               return 0;
-            })
-        );
+            }));
 
   ASSERT_TRUE(upgrader.Process(&finder_));
 
@@ -276,8 +274,7 @@ TEST_F(PkgUpgraderTest, Upgrader_RO_REMOVE) {
               std::string cmd = GetCmd(argv);
               cmds.push_back(std::move(cmd));
               return 0;
-            })
-        );
+            }));
 
   ASSERT_TRUE(upgrader.Process(&finder_));
   EXPECT_EQ(cmds.size(), 2);
@@ -302,8 +299,7 @@ TEST_F(PkgUpgraderTest, Upgrader_RW_DO_NOT_REMOVE) {
               std::string cmd = GetCmd(argv);
               cmds.push_back(std::move(cmd));
               return 0;
-            })
-        );
+            }));
 
   ASSERT_TRUE(upgrader.Process(&finder_));
   EXPECT_EQ(cmds.size(), 4);
@@ -321,7 +317,7 @@ TEST_F(PkgUpgraderTest, Upgrader_RW2RO_HIGH_VERSION) {
   Upgrader upgrader;
   upgrader.SetDbPath("./tests/unit_tests/pkg_upgrade/data/db");
   std::vector<std::string> cmds;
-  SetOldPkgInfo("org.tizen.test", "tpk", "1.0.0", // RO
+  SetOldPkgInfo("org.tizen.test", "tpk", "1.0.0",  // RO
       "org.tizen.alarm", "tpk", "1.5.0");  // RW
   // New pkg : org.tizen.alarm 2.0.0 (ro), org.tizen.new_rw 1.2.0 (rw)
 
@@ -332,8 +328,7 @@ TEST_F(PkgUpgraderTest, Upgrader_RW2RO_HIGH_VERSION) {
               std::string cmd = GetCmd(argv);
               cmds.push_back(std::move(cmd));
               return 0;
-            })
-        );
+            }));
 
   ASSERT_TRUE(upgrader.Process(&finder_));
 
@@ -356,7 +351,7 @@ TEST_F(PkgUpgraderTest, Upgrader_RW2RO_LOW_VERSION) {
   Upgrader upgrader;
   upgrader.SetDbPath("./tests/unit_tests/pkg_upgrade/data/db");
   std::vector<std::string> cmds;
-  SetOldPkgInfo("org.tizen.test", "tpk", "1.0.0", // RO
+  SetOldPkgInfo("org.tizen.test", "tpk", "1.0.0",  // RO
       "org.tizen.alarm", "tpk", "2.5.0");  // RW
   // New pkg : org.tizen.alarm 2.0.0 (ro), org.tizen.new_rw 1.2.0 (rw)
 
@@ -367,8 +362,7 @@ TEST_F(PkgUpgraderTest, Upgrader_RW2RO_LOW_VERSION) {
               std::string cmd = GetCmd(argv);
               cmds.push_back(std::move(cmd));
               return 0;
-            })
-        );
+            }));
 
   ASSERT_TRUE(upgrader.Process(&finder_));
 
@@ -389,7 +383,7 @@ TEST_F(PkgUpgraderTest, Upgrader_RW2RO_SAME_VERSION) {
   Upgrader upgrader;
   upgrader.SetDbPath("./tests/unit_tests/pkg_upgrade/data/db");
   std::vector<std::string> cmds;
-  SetOldPkgInfo("org.tizen.test", "tpk", "1.0.0", // RO
+  SetOldPkgInfo("org.tizen.test", "tpk", "1.0.0",  // RO
       "org.tizen.alarm", "tpk", "2.0.0");  // RW
   // New pkg : org.tizen.alarm 2.0.0 (ro), org.tizen.new_rw 1.2.0 (rw)
 
@@ -400,8 +394,7 @@ TEST_F(PkgUpgraderTest, Upgrader_RW2RO_SAME_VERSION) {
               std::string cmd = GetCmd(argv);
               cmds.push_back(std::move(cmd));
               return 0;
-            })
-        );
+            }));
 
   ASSERT_TRUE(upgrader.Process(&finder_));
 
@@ -424,7 +417,7 @@ TEST_F(PkgUpgraderTest, Upgrader_RO2RW_HIGH_VERSION) {
   Upgrader upgrader;
   upgrader.SetDbPath("./tests/unit_tests/pkg_upgrade/data/db");
   std::vector<std::string> cmds;
-  SetOldPkgInfo("org.tizen.new_rw", "tpk", "1.0.0", // RO
+  SetOldPkgInfo("org.tizen.new_rw", "tpk", "1.0.0",  // RO
       "org.tizen.alarm", "tpk", "2.0.0");  // RW
   // New pkg : org.tizen.alarm 2.0.0 (ro), org.tizen.new_rw 1.2.0 (rw)
 
@@ -435,8 +428,7 @@ TEST_F(PkgUpgraderTest, Upgrader_RO2RW_HIGH_VERSION) {
               std::string cmd = GetCmd(argv);
               cmds.push_back(std::move(cmd));
               return 0;
-            })
-        );
+            }));
 
   ASSERT_TRUE(upgrader.Process(&finder_));
 
@@ -459,7 +451,7 @@ TEST_F(PkgUpgraderTest, Upgrader_RO2RW_LOW_VERSION) {
   Upgrader upgrader;
   upgrader.SetDbPath("./tests/unit_tests/pkg_upgrade/data/db");
   std::vector<std::string> cmds;
-  SetOldPkgInfo("org.tizen.new_rw", "tpk", "2.0.0", // RO
+  SetOldPkgInfo("org.tizen.new_rw", "tpk", "2.0.0",  // RO
       "org.tizen.alarm", "tpk", "2.0.0");  // RW
   // New pkg : org.tizen.alarm 2.0.0 (ro), org.tizen.new_rw 1.2.0 (rw)
 
@@ -470,8 +462,7 @@ TEST_F(PkgUpgraderTest, Upgrader_RO2RW_LOW_VERSION) {
               std::string cmd = GetCmd(argv);
               cmds.push_back(std::move(cmd));
               return 0;
-            })
-        );
+            }));
 
   ASSERT_TRUE(upgrader.Process(&finder_));
 
@@ -494,7 +485,7 @@ TEST_F(PkgUpgraderTest, Upgrader_RO2RW_SAME_VERSION) {
   Upgrader upgrader;
   upgrader.SetDbPath("./tests/unit_tests/pkg_upgrade/data/db");
   std::vector<std::string> cmds;
-  SetOldPkgInfo("org.tizen.new_rw", "tpk", "1.2.0", // RO
+  SetOldPkgInfo("org.tizen.new_rw", "tpk", "1.2.0",  // RO
       "org.tizen.alarm", "tpk", "2.0.0");  // RW
   // New pkg : org.tizen.alarm 2.0.0 (ro), org.tizen.new_rw 1.2.0 (rw)
 
@@ -505,8 +496,7 @@ TEST_F(PkgUpgraderTest, Upgrader_RO2RW_SAME_VERSION) {
               std::string cmd = GetCmd(argv);
               cmds.push_back(std::move(cmd));
               return 0;
-            })
-        );
+            }));
 
   ASSERT_TRUE(upgrader.Process(&finder_));
 
@@ -538,7 +528,8 @@ class PkgUpgraderTestForInvalidDbPath : public TestFixture {
 
   virtual void SetUp() {
     finder_.SetManifestDir("./tests/unit_tests/pkg_upgrade/data/packages/");
-    finder_.SetPreloadRwListPath("./tests/unit_tests/pkg_upgrade/data/rw/list.txt");
+    finder_.SetPreloadRwListPath(
+        "./tests/unit_tests/pkg_upgrade/data/rw/list.txt");
   }
 
   virtual void TearDown() {

diff --git a/tests/unit_tests/res-copy/src/test_condition_validator.cc b/tests/unit_tests/res-copy/src/test_condition_validator.cc
index ffa46c58b8754d332b0c06cbd88f1f54e9bfb178..94e70726c7b3ee90ca80d313d22b3801e10f31de 100644 (file)
--- a/tests/unit_tests/res-copy/src/test_condition_validator.cc
+++ b/tests/unit_tests/res-copy/src/test_condition_validator.cc
@@ -47,21 +47,24 @@ class ConditionValidatorTest : public TestFixture {
   virtual ~ConditionValidatorTest() {}
 
   virtual void SetUp() {
-    EXPECT_CALL(GetMock<PkgMgrInfoMock>(), pkgmgrinfo_pkginfo_get_usr_pkginfo(_, _, _))
+    EXPECT_CALL(GetMock<PkgMgrInfoMock>(),
+            pkgmgrinfo_pkginfo_get_usr_pkginfo(_, _, _))
             .WillRepeatedly(Return(0));
-    EXPECT_CALL(GetMock<PkgMgrInfoMock>(), pkgmgrinfo_pkginfo_destroy_pkginfo(_))
-                .WillRepeatedly(Return(0)) ;
+    EXPECT_CALL(GetMock<PkgMgrInfoMock>(),
+                pkgmgrinfo_pkginfo_destroy_pkginfo(_))
+                .WillRepeatedly(Return(0));
   }
   virtual void TearDown() {}
 };
 
 TEST_F(ConditionValidatorTest, PkgNotExist) {
-  EXPECT_CALL(GetMock<PkgMgrInfoMock>(), pkgmgrinfo_pkginfo_get_usr_pkginfo(_, _, _))
+  EXPECT_CALL(GetMock<PkgMgrInfoMock>(),
+            pkgmgrinfo_pkginfo_get_usr_pkginfo(_, _, _))
             .WillRepeatedly(Return(-1));
 
   const char *argv[] = { "/bin/res-copy", "--uid", "5001", "--copy",
       "org.test.targetpkgid", "-p", "srcpath", "dstpath", nullptr};
-  ParamChecker checker(8, (char**)argv);
+  ParamChecker checker(8,  const_cast<char**>(argv));
   ConditionValidator validator(checker.GetPkgID(), checker.GetUID());
   res_handler::ErrorType ret = validator.ValidateCondition(
       checker.GetRequestType(), checker.GetPathList());
@@ -70,12 +73,13 @@ TEST_F(ConditionValidatorTest, PkgNotExist) {
 }
 
 TEST_F(ConditionValidatorTest, CopyPkgNotExist) {
-  EXPECT_CALL(GetMock<PkgMgrInfoMock>(), pkgmgrinfo_pkginfo_get_usr_pkginfo(_, _, _))
+  EXPECT_CALL(GetMock<PkgMgrInfoMock>(),
+            pkgmgrinfo_pkginfo_get_usr_pkginfo(_, _, _))
             .WillRepeatedly(Return(-1));
 
   const char *argv[] = { "/bin/res-copy", "--uid", "5001", "--copy",
       "org.test.targetpkgid", "-p", "srcpath", "dstpath", nullptr};
-  ParamChecker checker(8, (char**)argv);
+  ParamChecker checker(8,  const_cast<char**>(argv));
   ConditionValidator validator(checker.GetPkgID(), checker.GetUID());
   res_handler::ErrorType ret = validator.ValidateCondition(
       checker.GetRequestType(), checker.GetPathList());
@@ -86,7 +90,7 @@ TEST_F(ConditionValidatorTest, CopyPkgNotExist) {
 TEST_F(ConditionValidatorTest, CopySrcNotExist) {
   const char *argv[] = { "/bin/res-copy", "--uid", "5001", "--copy",
       "org.test.targetpkgid", "-p", "srcpath", "dstpath", nullptr};
-  ParamChecker checker(8, (char**)argv);
+  ParamChecker checker(8,  const_cast<char**>(argv));
   ConditionValidator validator(checker.GetPkgID(), checker.GetUID());
   res_handler::ErrorType ret = validator.ValidateCondition(
       checker.GetRequestType(), checker.GetPathList());
@@ -95,12 +99,13 @@ TEST_F(ConditionValidatorTest, CopySrcNotExist) {
 }
 
 TEST_F(ConditionValidatorTest, RemovePkgNotExist) {
-  EXPECT_CALL(GetMock<PkgMgrInfoMock>(), pkgmgrinfo_pkginfo_get_usr_pkginfo(_, _, _))
+  EXPECT_CALL(GetMock<PkgMgrInfoMock>(),
+            pkgmgrinfo_pkginfo_get_usr_pkginfo(_, _, _))
             .WillRepeatedly(Return(-1));
 
   const char *argv[] = { "/bin/res-copy", "--uid", "5001", "--remove",
       "org.test.targetpkgid", "-p", "", "dstpath", nullptr};
-  ParamChecker checker(8, (char**)argv);
+  ParamChecker checker(8,  const_cast<char**>(argv));
   ConditionValidator validator(checker.GetPkgID(), checker.GetUID());
   res_handler::ErrorType ret = validator.ValidateCondition(
       checker.GetRequestType(), checker.GetPathList());
@@ -111,7 +116,7 @@ TEST_F(ConditionValidatorTest, RemovePkgNotExist) {
 TEST_F(ConditionValidatorTest, RemoveSrcNotExist) {
   const char *argv[] = { "/bin/res-copy", "--uid", "5001", "--remove",
       "org.test.targetpkgid", "-p", "", "dstpath", nullptr};
-  ParamChecker checker(8, (char**)argv);
+  ParamChecker checker(8,  const_cast<char**>(argv));
   ConditionValidator validator(checker.GetPkgID(), checker.GetUID());
   res_handler::ErrorType ret = validator.ValidateCondition(
       checker.GetRequestType(), checker.GetPathList());
@@ -120,12 +125,13 @@ TEST_F(ConditionValidatorTest, RemoveSrcNotExist) {
 }
 
 TEST_F(ConditionValidatorTest, DeletePkgNotExist) {
-  EXPECT_CALL(GetMock<PkgMgrInfoMock>(), pkgmgrinfo_pkginfo_get_usr_pkginfo(_, _, _))
+  EXPECT_CALL(GetMock<PkgMgrInfoMock>(),
+            pkgmgrinfo_pkginfo_get_usr_pkginfo(_, _, _))
             .WillRepeatedly(Return(-1));
 
   const char *argv[] = { "/bin/res-copy", "--uid", "5001", "--delete",
       "org.test.targetpkgid", nullptr};
-  ParamChecker checker(5, (char**)argv);
+  ParamChecker checker(5, const_cast<char**>(argv));
   ConditionValidator validator(checker.GetPkgID(), checker.GetUID());
   res_handler::ErrorType ret = validator.ValidateCondition(
       checker.GetRequestType(), checker.GetPathList());

diff --git a/tests/unit_tests/res-copy/src/test_param_checker.cc b/tests/unit_tests/res-copy/src/test_param_checker.cc
index b76b45dcd862df66279abbd7d225d70d48b71015..ffbe9b9fc2bd894f42b1fd7ec40f21e440a577f0 100644 (file)
--- a/tests/unit_tests/res-copy/src/test_param_checker.cc
+++ b/tests/unit_tests/res-copy/src/test_param_checker.cc
@@ -50,7 +50,7 @@ class ParamCheckerTest : public TestFixture {
             .WillRepeatedly(Return(0));
     EXPECT_CALL(GetMock<PkgMgrInfoMock>(),
             pkgmgrinfo_pkginfo_destroy_pkginfo(_))
-            .WillRepeatedly(Return(0)) ;
+            .WillRepeatedly(Return(0));
   }
   virtual void TearDown() {}
 };
@@ -58,7 +58,7 @@ class ParamCheckerTest : public TestFixture {
 TEST_F(ParamCheckerTest, InvalidUIDTest) {
   const char *argv[] = { "/bin/res-copy", "--uid", "0", "--copy",
       "org.test.targetpkgid", "-p", "srcpath", "dstpath", nullptr};
-  ParamChecker checker(8, (char**)argv);
+  ParamChecker checker(8, const_cast<char**>(argv));
 
   EXPECT_EQ(checker.Validate(), false);
 }
@@ -66,7 +66,7 @@ TEST_F(ParamCheckerTest, InvalidUIDTest) {
 TEST_F(ParamCheckerTest, PkgIDNotGiven) {
   const char *argv[] = { "/bin/res-copy", "--uid", "5001",
       "-p", "srcpath", "dstpath", "--copy", "", nullptr};
-  ParamChecker checker(8, (char**)argv);
+  ParamChecker checker(8, const_cast<char**>(argv));
 
   EXPECT_EQ(checker.Validate(), false);
 }
@@ -75,7 +75,7 @@ TEST_F(ParamCheckerTest, CopyRes) {
   const char *argv[] = { "/bin/res-copy", "--uid", "5001",
       "-p", "srcpath", "dstpath", "--copy", "org.test.targetpkgid", nullptr};
 
-  ParamChecker checker(8, (char**)argv);
+  ParamChecker checker(8, const_cast<char**>(argv));
 
   EXPECT_EQ(checker.Validate(), true);
   EXPECT_EQ(checker.GetRequestType(), res_handler::ReqType::REQ_TYPE_NEW);
@@ -88,7 +88,7 @@ TEST_F(ParamCheckerTest, RemoveRes) {
   const char *argv[] = { "/bin/res-copy", "--uid", "5001", "--remove",
       "org.test.targetpkgid", "-p", "dstpath", nullptr};
 
-  ParamChecker checker(7, (char**)argv);
+  ParamChecker checker(7, const_cast<char**>(argv));
 
   EXPECT_EQ(checker.Validate(), true);
   EXPECT_EQ(checker.GetRequestType(), res_handler::ReqType::REQ_TYPE_REMOVE);
@@ -101,7 +101,7 @@ TEST_F(ParamCheckerTest, DeleteRes) {
   const char *argv[] = { "/bin/res-copy", "--uid", "5001", "--delete",
       "org.test.targetpkgid", nullptr};
 
-  ParamChecker checker(5, (char**)argv);
+  ParamChecker checker(5, const_cast<char**>(argv));
 
   EXPECT_EQ(checker.Validate(), true);
   EXPECT_EQ(checker.GetRequestType(),
@@ -114,7 +114,7 @@ TEST_F(ParamCheckerTest, DeleteRes) {
 TEST_F(ParamCheckerTest, EmptyPkgID) {
   const char *argv[] = { "/bin/res-copy", "--uid", "5001", "--copy",
       "", "-p", "srcpath", "dstpath", nullptr};
-  ParamChecker checker(8,(char**)argv);
+  ParamChecker checker(8, const_cast<char**>(argv));
 
   EXPECT_EQ(checker.Validate(), false);
 }
@@ -122,7 +122,7 @@ TEST_F(ParamCheckerTest, EmptyPkgID) {
 TEST_F(ParamCheckerTest, UnknownReqType) {
   const char *argv[] = { "/bin/res-copy", "--uid", "5001", "-p",
       "srcpath", "dstpath", nullptr};
-  ParamChecker checker(6, (char**)argv);
+  ParamChecker checker(6, const_cast<char**>(argv));
 
   EXPECT_EQ(checker.Validate(), false);
 }
@@ -130,7 +130,7 @@ TEST_F(ParamCheckerTest, UnknownReqType) {
 TEST_F(ParamCheckerTest, PathNotGiven) {
   const char *argv[] = { "/bin/res-copy", "--uid", "5001",
       "-c", "org.tizen.pathnotgiven", nullptr};
-  ParamChecker checker(5, (char**)argv);
+  ParamChecker checker(5, const_cast<char**>(argv));
 
   EXPECT_EQ(checker.Validate(), false);
 }
@@ -140,7 +140,7 @@ TEST_F(ParamCheckerTest, CopyRes_SrcPathTraverseAttack) {
       "5001", "-p", "data/../../attackpath", "dstpath",
       "--copy", "org.test.targetpkgid", nullptr};
 
-  ParamChecker checker(8, (char**)argv);
+  ParamChecker checker(8, const_cast<char**>(argv));
 
   EXPECT_FALSE(checker.Validate());
 }
@@ -150,7 +150,7 @@ TEST_F(ParamCheckerTest, CopyRes_DstPathTraverseAttack) {
       "5001", "-p", "data/normal_path", "../../attackpath",
       "--copy", "org.test.targetpkgid", nullptr};
 
-  ParamChecker checker(8, (char**)argv);
+  ParamChecker checker(8, const_cast<char**>(argv));
 
   EXPECT_FALSE(checker.Validate());
 }
@@ -160,7 +160,7 @@ TEST_F(ParamCheckerTest, RemoveRes_PathTraverseAttack) {
       "5001", "-p", "../../../attackpath", "",
       "--remove", "org.test.targetpkgid", nullptr};
 
-  ParamChecker checker(8, (char**)argv);
+  ParamChecker checker(8, const_cast<char**>(argv));
 
   EXPECT_FALSE(checker.Validate());
 }

diff --git a/tests/unit_tests/res-copy/src/test_request_handler_invoker.cc b/tests/unit_tests/res-copy/src/test_request_handler_invoker.cc
index be3ac620b54c713d5ffd1def1b8c48f463c7b569..deb1b580ebe1dae43fef22b6ea3358d0194ddb45 100644 (file)
--- a/tests/unit_tests/res-copy/src/test_request_handler_invoker.cc
+++ b/tests/unit_tests/res-copy/src/test_request_handler_invoker.cc
@@ -60,17 +60,16 @@ class RequestHandlerInvokerTest : public TestFixture {
 TEST_F(RequestHandlerInvokerTest, CopyType) {
   const char *argv[] = { "/bin/res-copy", "--uid", "5001", "--copy",
         "org.test.targetpkgid", "-p", "srcpath", "dstpath", nullptr};
-  ParamChecker checker(8, (char**)argv);
+  ParamChecker checker(8, const_cast<char**>(argv));
 
   RequestHandlerInvoker request_handler_invoker(checker, signal_sender_);
   EXPECT_EQ(request_handler_invoker.GetHandlerType(), "copy");
-
 }
 
 TEST_F(RequestHandlerInvokerTest, RemoveType) {
   const char *argv[] = { "/bin/res-copy", "--uid", "5001", "--remove",
         "org.test.targetpkgid", "-p", "", "dstpath", nullptr};
-  ParamChecker checker(8, (char**)argv);
+  ParamChecker checker(8, const_cast<char**>(argv));
 
   RequestHandlerInvoker request_handler_invoker(checker, signal_sender_);
   EXPECT_EQ(request_handler_invoker.GetHandlerType(), "remove");
@@ -79,7 +78,7 @@ TEST_F(RequestHandlerInvokerTest, RemoveType) {
 TEST_F(RequestHandlerInvokerTest, UninstallType) {
   const char *argv[] = { "/bin/res-copy", "--uid", "5001", "--delete",
         "org.test.targetpkgid", nullptr};
-  ParamChecker checker(5, (char**)argv);
+  ParamChecker checker(5, const_cast<char**>(argv));
 
   RequestHandlerInvoker request_handler_invoker(checker, signal_sender_);
   EXPECT_EQ(request_handler_invoker.GetHandlerType(), "delete");
@@ -88,7 +87,7 @@ TEST_F(RequestHandlerInvokerTest, UninstallType) {
 TEST_F(RequestHandlerInvokerTest, CreateDirType) {
   const char *argv[] = { "/bin/res-copy", "--uid", "5001", "-D",
         "org.test.targetpkgid", "-p", "newdir", nullptr};
-  ParamChecker checker(7, (char**)argv);
+  ParamChecker checker(7, const_cast<char**>(argv));
 
   RequestHandlerInvoker request_handler_invoker(checker, signal_sender_);
   EXPECT_EQ(request_handler_invoker.GetHandlerType(), "createdir");
@@ -96,7 +95,7 @@ TEST_F(RequestHandlerInvokerTest, CreateDirType) {
 
 TEST_F(RequestHandlerInvokerTest, InvalidType) {
   const char *argv[] = { "/bin/res-copy", "--uid", "5001", nullptr};
-  ParamChecker checker(3, (char**)argv);
+  ParamChecker checker(3, const_cast<char**>(argv));
 
   RequestHandlerInvoker request_handler_invoker(checker, signal_sender_);
   EXPECT_EQ(request_handler_invoker.GetHandlerType(), "");