Fix coding rule

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

diff --git a/test/unit_tests/mock/file_mock.h b/test/unit_tests/mock/file_mock.h
index baa8cff..b5b9958 100644 (file)
--- a/test/unit_tests/mock/file_mock.h
+++ b/test/unit_tests/mock/file_mock.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __MOCK_FILE_MOCK_H__
-#define __MOCK_FILE_MOCK_H__
+#ifndef TEST_UNIT_TESTS_MOCK_FILE_MOCK_H_
+#define TEST_UNIT_TESTS_MOCK_FILE_MOCK_H_
 
 #include <stdbool.h>
 
@@ -29,4 +29,4 @@ void fopen_mock_setup(bool flag);
 }
 #endif
 
-#endif /* __MOCK_FILE_MOCK_H__ */
+#endif /* TEST_UNIT_TESTS_MOCK_FILE_MOCK_H_ */

diff --git a/test/unit_tests/parcel_utils.cc b/test/unit_tests/parcel_utils.cc
index 952d023..93406fc 100644 (file)
--- a/test/unit_tests/parcel_utils.cc
+++ b/test/unit_tests/parcel_utils.cc
@@ -375,7 +375,8 @@ bool IsEqualApplication(application_x* applicationA,
   return true;
 }
 
-bool IsEqualApplicationsStructure(const std::vector<application_x*>& applicationsA,
+bool IsEqualApplicationsStructure(
+    const std::vector<application_x*>& applicationsA,
     const std::vector<application_x*>& applicationsB) {
 
   for (unsigned int i = 0; i < applicationsA.size(); ++i) {
@@ -493,7 +494,7 @@ package_x* GetTestPackage(std::string pkgid) {
       g_list_append(package->provides_appdefined_privileges,
           provides_appdefined_privileges);
 
-  package->dependencies = g_list_append(package->dependencies, 
+  package->dependencies = g_list_append(package->dependencies,
       GetTestDepInfo(pkgid));
 
   plugin_x* plugin = reinterpret_cast<plugin_x*>(calloc(1, sizeof(plugin_x)));

diff --git a/test/unit_tests/test_cert_db_handlers.cc b/test/unit_tests/test_cert_db_handlers.cc
index e1d14c2..13748cd 100644 (file)
--- a/test/unit_tests/test_cert_db_handlers.cc
+++ b/test/unit_tests/test_cert_db_handlers.cc
@@ -32,28 +32,28 @@
 
 #define TEST_CERT_DB "test.pkgmgr_cert.db"
 
-class CreateCertDBHandlerMock : public pkgmgr_server::database::CreateDBHandler {
+namespace psd = pkgmgr_server::database;
+
+class CreateCertDBHandlerMock : public psd::CreateDBHandler {
  public:
   CreateCertDBHandlerMock(uid_t uid, int pid)
-      : pkgmgr_server::database::CreateDBHandler(uid, pid) {}
+      : psd::CreateDBHandler(uid, pid) {}
 
   MOCK_METHOD0(Connect, bool());
   MOCK_METHOD0(GetConnection, std::vector<std::pair<sqlite3*, uid_t>>());
 };
 
-class CertSetDBHandlerMock : public pkgmgr_server::database::CertSetDBHandler {
+class CertSetDBHandlerMock : public psd::CertSetDBHandler {
  public:
-  CertSetDBHandlerMock(uid_t uid, int pid)
-      : pkgmgr_server::database::CertSetDBHandler(uid, pid) {}
+  CertSetDBHandlerMock(uid_t uid, int pid) : psd::CertSetDBHandler(uid, pid) {}
 
   MOCK_METHOD0(Connect, bool());
   MOCK_METHOD0(GetConnection, std::vector<std::pair<sqlite3*, uid_t>>());
 };
 
-class CertGetDBHandlerMock : public pkgmgr_server::database::CertGetDBHandler {
+class CertGetDBHandlerMock : public psd::CertGetDBHandler {
  public:
-  CertGetDBHandlerMock(uid_t uid, int pid)
-      : pkgmgr_server::database::CertGetDBHandler(uid, pid) {}
+  CertGetDBHandlerMock(uid_t uid, int pid) : psd::CertGetDBHandler(uid, pid) {}
 
   MOCK_METHOD0(Connect, bool());
   MOCK_METHOD0(GetConnection, std::vector<std::pair<sqlite3*, uid_t>>());

diff --git a/test/unit_tests/test_parcel.cc b/test/unit_tests/test_parcel.cc
index fce46d3..54461a2 100644 (file)
--- a/test/unit_tests/test_parcel.cc
+++ b/test/unit_tests/test_parcel.cc
@@ -189,12 +189,18 @@ TEST_F(ParcelTest, QueryParcelable) {
   parcel.WriteParcelable(origin_parcelable);
   parcel.ReadParcelable(&new_parcelable);
 
-  EXPECT_EQ(origin_parcelable.GetQueryArgs().size(), new_parcelable.GetQueryArgs().size());
-  EXPECT_EQ(origin_parcelable.GetQueryArgs()[0].first, new_parcelable.GetQueryArgs()[0].first);
-  EXPECT_EQ(origin_parcelable.GetQueryArgs()[1].first, new_parcelable.GetQueryArgs()[1].first);
-  EXPECT_EQ(origin_parcelable.GetQueryArgs()[0].second[0], new_parcelable.GetQueryArgs()[0].second[0]);
-  EXPECT_EQ(origin_parcelable.GetQueryArgs()[0].second[1], new_parcelable.GetQueryArgs()[0].second[1]);
-  EXPECT_EQ(origin_parcelable.GetQueryArgs()[1].second[0], new_parcelable.GetQueryArgs()[1].second[0]);
+  EXPECT_EQ(origin_parcelable.GetQueryArgs().size(),
+      new_parcelable.GetQueryArgs().size());
+  EXPECT_EQ(origin_parcelable.GetQueryArgs()[0].first,
+      new_parcelable.GetQueryArgs()[0].first);
+  EXPECT_EQ(origin_parcelable.GetQueryArgs()[1].first,
+      new_parcelable.GetQueryArgs()[1].first);
+  EXPECT_EQ(origin_parcelable.GetQueryArgs()[0].second[0],
+      new_parcelable.GetQueryArgs()[0].second[0]);
+  EXPECT_EQ(origin_parcelable.GetQueryArgs()[0].second[1],
+      new_parcelable.GetQueryArgs()[0].second[1]);
+  EXPECT_EQ(origin_parcelable.GetQueryArgs()[1].second[0],
+      new_parcelable.GetQueryArgs()[1].second[0]);
   EXPECT_EQ(origin_parcelable.GetDBType(), new_parcelable.GetDBType());
   EXPECT_EQ(origin_parcelable.GetOpType(), new_parcelable.GetOpType());
 }
@@ -222,7 +228,8 @@ TEST_F(ParcelTest, DepInfoParcelable) {
   parcel.WriteParcelable(origin_parcelable);
   parcel.ReadParcelable(&new_parcelable);
 
-  EXPECT_TRUE(IsEqualDepInfo(origin_parcelable.GetDependencyInfo(), new_parcelable.GetDependencyInfo()));
+  EXPECT_TRUE(IsEqualDepInfo(origin_parcelable.GetDependencyInfo(),
+      new_parcelable.GetDependencyInfo()));
 }
 
 TEST_F(ParcelTest, ParcelableFactory) {