Fix coding style

Change-Id: I7d20e0d97d0f042f1cb15c3c13515d22a4b2793c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5148ac1f02ff36d17a6d06c8a1cf684b3b94ddf6..5468c8320f2e00d0093701c4de499761537dea4a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,19 +25,19 @@ INCLUDE(ApplyPkgConfig)
 ADD_DEFINITIONS("-DPROJECT_TAG=\"CAPMGR\"")
 
 ## Find all needed packages once
-PKG_CHECK_MODULES(GMOCK_DEPS REQUIRED gmock)
 PKG_CHECK_MODULES(AUL_DEPS REQUIRED aul)
 PKG_CHECK_MODULES(BUNDLE_DEPS REQUIRED bundle)
+PKG_CHECK_MODULES(CYNARA_CREDS_DEPS REQUIRED cynara-creds-gdbus)
 PKG_CHECK_MODULES(DLOG_DEPS REQUIRED dlog)
 PKG_CHECK_MODULES(GIO_DEPS REQUIRED gio-2.0)
 PKG_CHECK_MODULES(GLIB_DEPS REQUIRED glib-2.0)
+PKG_CHECK_MODULES(GMOCK_DEPS REQUIRED gmock)
 PKG_CHECK_MODULES(JSONCPP_DEPS REQUIRED jsoncpp)
 PKG_CHECK_MODULES(MDG_DEPS REQUIRED capi-network-mdg)
 PKG_CHECK_MODULES(PKGMGR_DEPS REQUIRED pkgmgr)
 PKG_CHECK_MODULES(PKGMGR_INFO_DEPS REQUIRED pkgmgr-info)
-PKG_CHECK_MODULES(SQLITE_DEPS REQUIRED sqlite3)
-PKG_CHECK_MODULES(CYNARA_CREDS_DEPS REQUIRED cynara-creds-gdbus)
 PKG_CHECK_MODULES(SMACK_DEPS REQUIRED libsmack)
+PKG_CHECK_MODULES(SQLITE_DEPS REQUIRED sqlite3)
 
 FIND_PACKAGE(Boost REQUIRED COMPONENTS filesystem system)
 

diff --git a/packaging/capmgr.spec b/packaging/capmgr.spec
index fd256d9fb3cffee3c02f9a3c157d8d955e12d696..d9b9ace6d45025f2860eb95b7d2c41e054f0db23 100644 (file)
--- a/packaging/capmgr.spec
+++ b/packaging/capmgr.spec
@@ -16,21 +16,21 @@ Source1004: %{name}.tmpfiles.conf
 Requires(post): /usr/bin/chsmack
 BuildRequires:  boost-devel
 BuildRequires:  cmake
-BuildRequires:  pkgconfig(gmock)
 BuildRequires:  pkgconfig(aul)
 BuildRequires:  pkgconfig(bundle)
 BuildRequires:  pkgconfig(capi-base-common)
+BuildRequires:  pkgconfig(capi-network-mdg)
+BuildRequires:  pkgconfig(cynara-creds-gdbus)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gmock)
 BuildRequires:  pkgconfig(jsoncpp)
+BuildRequires:  pkgconfig(libsmack)
 BuildRequires:  pkgconfig(libtzplatform-config)
-BuildRequires:  pkgconfig(capi-network-mdg)
 BuildRequires:  pkgconfig(pkgmgr)
 BuildRequires:  pkgconfig(pkgmgr-info)
 BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(cynara-creds-gdbus)
-BuildRequires:  pkgconfig(libsmack)
 
 %description
 Tizen Capability Manager

diff --git a/src/unit_tests/CMakeLists.txt b/src/unit_tests/CMakeLists.txt
index 98363a32704a2da518c745b233b990d4b4c711d0..5b453e1e72126af2cc32bdf18b751d6f72e07623 100644 (file)
--- a/src/unit_tests/CMakeLists.txt
+++ b/src/unit_tests/CMakeLists.txt
@@ -16,8 +16,8 @@ ADD_EXECUTABLE(${TARGET_SMOKE_TEST} ${SMOKE_TEST_SRCS})
 APPLY_PKG_CONFIG(${TARGET_SQL_TEST} PUBLIC
   DLOG_DEPS
   GLIB_DEPS
-  SQLITE_DEPS
   GMOCK_DEPS
+  SQLITE_DEPS
 )
 
 APPLY_PKG_CONFIG(${TARGET_SMOKE_TEST} PUBLIC

diff --git a/src/unit_tests/capability_manager_test.cc b/src/unit_tests/capability_manager_test.cc
index 991317f7c7c1b80a43ea2ac966a0ea483b3155bf..4a8cbb120441ed1a4804b40f6f935428ecbe2d4d 100644 (file)
--- a/src/unit_tests/capability_manager_test.cc
+++ b/src/unit_tests/capability_manager_test.cc
@@ -1,8 +1,9 @@
-// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved\r
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved\r
 // Use of this source code is governed by a apache 2.0 license that can be\r
 // found in the LICENSE file.\r
 \r
 #include <gmock/gmock.h>\r
+\r
 #include "common/capability_manager.h"\r
 #include "mock/pkgmgr-info.h"\r
 \r

diff --git a/src/unit_tests/mock/aul.h b/src/unit_tests/mock/aul.h
index e903df4b181110c320fb9df696c7a23952c9d7d2..69367dfa2f908576219213dbe379b0d7c908dc77 100644 (file)
--- a/src/unit_tests/mock/aul.h
+++ b/src/unit_tests/mock/aul.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 

diff --git a/src/unit_tests/mock/aul_svc.h b/src/unit_tests/mock/aul_svc.h
index ca7a03f5dee0a79e19a0c855428d1ae8cf521912..01ec01c435d47a0ac832a60f42e85668885fe2c2 100644 (file)
--- a/src/unit_tests/mock/aul_svc.h
+++ b/src/unit_tests/mock/aul_svc.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 

diff --git a/src/unit_tests/mock/bundle.cc b/src/unit_tests/mock/bundle.cc
index bcec6cf1cec8ac955baa055bd8e49ec8601c934b..f0a794d5aaf90c3c4cc2603d378e8a4e7b8c392e 100644 (file)
--- a/src/unit_tests/mock/bundle.cc
+++ b/src/unit_tests/mock/bundle.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 

diff --git a/src/unit_tests/mock/bundle.h b/src/unit_tests/mock/bundle.h
index 9949aaf6fea26771f8b8393d0fca8267bfa311e8..bcadee063aed2106d19357a6ce452d99e32e8269 100644 (file)
--- a/src/unit_tests/mock/bundle.h
+++ b/src/unit_tests/mock/bundle.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 

diff --git a/src/unit_tests/mock/cynara-creds-gdbus.h b/src/unit_tests/mock/cynara-creds-gdbus.h
index b8b2405dd0f024e98a3294eb2a9203e56d1f20e0..1851fa056691d42a6efa30fd3e8155445de42242 100644 (file)
--- a/src/unit_tests/mock/cynara-creds-gdbus.h
+++ b/src/unit_tests/mock/cynara-creds-gdbus.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 

diff --git a/src/unit_tests/mock/dlog.cc b/src/unit_tests/mock/dlog.cc
index 588646fdac7f42d4ace7cdb76e8270b0837f75c0..be46c153ec78f78c88ceecace8828793bc22553f 100644 (file)
--- a/src/unit_tests/mock/dlog.cc
+++ b/src/unit_tests/mock/dlog.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 

diff --git a/src/unit_tests/mock/dlog.h b/src/unit_tests/mock/dlog.h
index b2d79a2b07c40cd66697075649804d2bd8ddc5cc..530c113016d66a5232cf4b033c3d55d22c59fa34 100644 (file)
--- a/src/unit_tests/mock/dlog.h
+++ b/src/unit_tests/mock/dlog.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 

diff --git a/src/unit_tests/mock/mdg.h b/src/unit_tests/mock/mdg.h
index eb21681970659074c75459ef37c67d1b8bdfc493..85bab8fcd33bbcacffb517498ecf289a04b7c7bb 100644 (file)
--- a/src/unit_tests/mock/mdg.h
+++ b/src/unit_tests/mock/mdg.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 

diff --git a/src/unit_tests/mock/mdg_internal.h b/src/unit_tests/mock/mdg_internal.h
index 920882adc1a195b462a27b1ca3cb9527c1985019..0167b7ff9a96500bd7dae4a1aae262cbed4ca7e7 100644 (file)
--- a/src/unit_tests/mock/mdg_internal.h
+++ b/src/unit_tests/mock/mdg_internal.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 

diff --git a/src/unit_tests/mock/mock.cc b/src/unit_tests/mock/mock.cc
index 3b1959dbf9ea283f8c5d9ea52af36a56279e4d48..fbe5e28eeeb938161275d36e3e0db24ca3aa73d3 100644 (file)
--- a/src/unit_tests/mock/mock.cc
+++ b/src/unit_tests/mock/mock.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 

diff --git a/src/unit_tests/mock/mock.h b/src/unit_tests/mock/mock.h
index 518a0485800c0b0474a3b896f899c0f31ccf726f..12fbe2c72cf0ca9ce842955528bb394c76dfe0a0 100644 (file)
--- a/src/unit_tests/mock/mock.h
+++ b/src/unit_tests/mock/mock.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 

diff --git a/src/unit_tests/mock/package-manager.h b/src/unit_tests/mock/package-manager.h
index 4f5da5997d1440e3a43da03e0cb647b37c5a4131..da7192e38e8d91b23ebb3c499327ed8c521c0fd5 100644 (file)
--- a/src/unit_tests/mock/package-manager.h
+++ b/src/unit_tests/mock/package-manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 

diff --git a/src/unit_tests/mock/pkgmgr-info.h b/src/unit_tests/mock/pkgmgr-info.h
index b426f62357ef8c2c314f3cb4b25c35a092eb1f9b..4dc1a25dec3425b26e8cea9acb8a94e39cdf7a9d 100644 (file)
--- a/src/unit_tests/mock/pkgmgr-info.h
+++ b/src/unit_tests/mock/pkgmgr-info.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 

diff --git a/src/unit_tests/mock/pkgmgrinfo_type.h b/src/unit_tests/mock/pkgmgrinfo_type.h
index b4d0d42496b4efe3ed97eac3091264faa48b295a..f62c98ee0d2f98ddf2758f5df8c12480626c2945 100644 (file)
--- a/src/unit_tests/mock/pkgmgrinfo_type.h
+++ b/src/unit_tests/mock/pkgmgrinfo_type.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 

diff --git a/src/unit_tests/remote_device_manager_test.cc b/src/unit_tests/remote_device_manager_test.cc
index 83f406192484dca3ff7a3a30c47dd193450fefd2..470c57a1c17e0407b7e58836e29b54ee2285c277 100644 (file)
--- a/src/unit_tests/remote_device_manager_test.cc
+++ b/src/unit_tests/remote_device_manager_test.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.