From: Junghyun Yeon Date: Mon, 23 Nov 2020 09:59:52 +0000 (+0900) Subject: Fix minor coding rules X-Git-Tag: submit/tizen/20201201.002159~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F248185%2F1;p=platform%2Fcore%2Fappfw%2Fpkgmgr-tool.git Fix minor coding rules Change-Id: Icd145f54daa5c8790369ec66845cf4270b100a0c Signed-off-by: Junghyun Yeon --- diff --git a/src/pkg_upgrade/src/backend_invoker.cc b/src/pkg_upgrade/src/backend_invoker.cc index d5db0f1..e5b6ea9 100644 --- a/src/pkg_upgrade/src/backend_invoker.cc +++ b/src/pkg_upgrade/src/backend_invoker.cc @@ -114,4 +114,4 @@ int BackendInvoker::XSystem(const char *argv[]) { return WEXITSTATUS(status); } -} // namespace common_fota \ No newline at end of file +} // namespace common_fota diff --git a/src/pkg_upgrade/src/pkg_finder.cc b/src/pkg_upgrade/src/pkg_finder.cc index 923378a..eded528 100644 --- a/src/pkg_upgrade/src/pkg_finder.cc +++ b/src/pkg_upgrade/src/pkg_finder.cc @@ -14,23 +14,23 @@ * limitations under the License. */ +#include "pkg_finder.hh" + #include #include #include -#include +#include +#include #include #include -#include - #include "logging.hh" -#include "pkg_finder.hh" #include "backend_invoker.hh" #define ASCII(s) reinterpret_cast(s) #define XMLCHAR(s) reinterpret_cast(s) -#define USR_MANIFEST_DIRECTORY tzplatform_getenv(TZ_SYS_RO_PACKAGES) +#define USR_MANIFEST_DIRECTORY tzplatform_getenv(TZ_SYS_RO_PACKAGES) #define PRELOAD_RW_LIST_FILE \ tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, \ "pkgmgr/fota/.all_preload_rw_list") @@ -72,7 +72,8 @@ PkgFinder::~PkgFinder() { xmlCleanupParser(); } -int PkgFinder::UnzipFileOnlyToPath(const char* dest_path, const char* unzip_to) { +int PkgFinder::UnzipFileOnlyToPath(const char* dest_path, + const char* unzip_to) { const char* unzip_argv[] = { "/usr/bin/unzip", "-joXqq", kOptZipFile, dest_path, "-d", unzip_to, nullptr }; return BackendInvoker::XSystem(unzip_argv); @@ -377,4 +378,4 @@ void PkgFinder::StrTrim(char *input) { return; } -} // common_fota \ No newline at end of file +} // namespace common_fota diff --git a/src/pkg_upgrade/src/pkg_upgrader.cc b/src/pkg_upgrade/src/pkg_upgrader.cc index 2987e93..f2216c8 100644 --- a/src/pkg_upgrade/src/pkg_upgrader.cc +++ b/src/pkg_upgrade/src/pkg_upgrader.cc @@ -72,4 +72,4 @@ int PkgUpgrader::CompareVersion(const PkgUpgrader& pkg) const { } -} // common_fota \ No newline at end of file +} // namespace common_fota diff --git a/src/pkg_upgrade/src/pkg_upgrader_factory.cc b/src/pkg_upgrade/src/pkg_upgrader_factory.cc index 0c8848e..baabfb6 100644 --- a/src/pkg_upgrade/src/pkg_upgrader_factory.cc +++ b/src/pkg_upgrade/src/pkg_upgrader_factory.cc @@ -55,16 +55,14 @@ list> PkgUpgraderFactory::Merge( unique_ptr(new SimpleUpgrader(*old_pkg, PkgOperation::UNINSTALL_KEEP_RW_DATA)), unique_ptr(new SimpleUpgrader(new_pkg, - PkgOperation::INSTALL)) - )); + PkgOperation::INSTALL)))); } else if (old_pkg->IsReadOnly() && !new_pkg.IsReadOnly()) { // RO to RW pkgs.emplace_back(new Ro2RwUpgrader( unique_ptr(new SimpleUpgrader(*old_pkg, PkgOperation::UNINSTALL_KEEP_RW_DATA)), unique_ptr(new SimpleUpgrader(new_pkg, - PkgOperation::INSTALL)) - )); + PkgOperation::INSTALL)))); } } else { // INSTALL @@ -104,4 +102,4 @@ const PkgContext* PkgUpgraderFactory::FindPkgById( return nullptr; } -} // common_fota \ No newline at end of file +} // namespace common_fota diff --git a/src/pkg_upgrade/src/ro2rw_upgrader.cc b/src/pkg_upgrade/src/ro2rw_upgrader.cc index 192ad67..4f36cf8 100644 --- a/src/pkg_upgrade/src/ro2rw_upgrader.cc +++ b/src/pkg_upgrade/src/ro2rw_upgrader.cc @@ -67,7 +67,8 @@ int Ro2RwUpgrader::UnzipXml(const std::string& pkgid) { return ret; } -int Ro2RwUpgrader::UnzipData(const std::string& pkgid, const std::string& dest) { +int Ro2RwUpgrader::UnzipData(const std::string& pkgid, + const std::string& dest) { std::string path = dest + pkgid + "/*"; int ret = UnzipFiles(path.c_str()); if (ret != 0) @@ -100,4 +101,4 @@ int Ro2RwUpgrader::UnzipPkgFromZip(const std::string& pkgid) { return 0; } -} // common_fota \ No newline at end of file +} // namespace common_fota diff --git a/src/pkg_upgrade/src/rw2ro_upgrader.cc b/src/pkg_upgrade/src/rw2ro_upgrader.cc index b1f200a..51fde37 100644 --- a/src/pkg_upgrade/src/rw2ro_upgrader.cc +++ b/src/pkg_upgrade/src/rw2ro_upgrader.cc @@ -43,4 +43,4 @@ bool Rw2RoUpgrader::Upgrade() { return true; } -} // common_fota \ No newline at end of file +} // namespace common_fota diff --git a/src/pkg_upgrade/src/simple_upgrader.cc b/src/pkg_upgrade/src/simple_upgrader.cc index 5ee0ef2..60285d3 100644 --- a/src/pkg_upgrade/src/simple_upgrader.cc +++ b/src/pkg_upgrade/src/simple_upgrader.cc @@ -29,4 +29,4 @@ bool SimpleUpgrader::Upgrade() { return false; } -} // common_fota \ No newline at end of file +} // namespace common_fota diff --git a/src/pkg_upgrade/src/upgrader.cc b/src/pkg_upgrade/src/upgrader.cc index 9e83b98..acbe832 100644 --- a/src/pkg_upgrade/src/upgrader.cc +++ b/src/pkg_upgrade/src/upgrader.cc @@ -83,7 +83,7 @@ class File { int fd_ = -1; }; -} +} // namespace namespace common_fota { @@ -116,8 +116,8 @@ bool Upgrader::Process(PkgFinder* finder) { PkgUpgraderFactory factory; auto list = factory.MakeList(finder); - for(auto& pkg : list) { - if(pkg->Upgrade()) { + for (auto& pkg : list) { + if (pkg->Upgrade()) { LOG(DEBUG) << "upgrade success (" << pkg->GetId() << ")"; success_list_.push_back(move(pkg)); } else { @@ -335,9 +335,9 @@ int Upgrader::MakeBackupDbs() { string cert_db_bck = cert_db_ + ".bck"; string cert_db_journal_bck = cert_db_journal_ + ".bck"; - if (BackupDb(parser_db_, parser_db_bck) == -1 ) { - LOG(ERROR) << "Fail to backup [" << parser_db_ << "] to [" << parser_db_bck << - "]"; + if (BackupDb(parser_db_, parser_db_bck) == -1) { + LOG(ERROR) << "Fail to backup [" << parser_db_ << + "] to [" << parser_db_bck << "]"; goto CATCH; } @@ -384,4 +384,4 @@ void Upgrader::RemoveBackupDbs() { RemoveBackupPath(cert_db_journal_); } -} // common_fota +} // namespace common_fota diff --git a/tests/mock/mock_hook.h b/tests/mock/mock_hook.h index 79831d7..843f77d 100644 --- a/tests/mock/mock_hook.h +++ b/tests/mock/mock_hook.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MOCK_MOCK_HOOK_H_ -#define MOCK_MOCK_HOOK_H_ +#ifndef TESTS_MOCK_MOCK_HOOK_H_ +#define TESTS_MOCK_MOCK_HOOK_H_ #define MOCK_HOOK_P0(MOCK_CLASS, f) \ TestFixture::GetMock().f() @@ -39,4 +39,4 @@ TestFixture::GetMock().f( \ p1, p2, p3, p4, p5, p6, p7, p8, p9, p10) -#endif // MOCK_MOCK_HOOK_H_ +#endif // TESTS_MOCK_MOCK_HOOK_H_ diff --git a/tests/mock/module_mock.h b/tests/mock/module_mock.h index 0934014..ba72d76 100644 --- a/tests/mock/module_mock.h +++ b/tests/mock/module_mock.h @@ -14,12 +14,12 @@ * limitations under the License. */ -#ifndef MOCK_MODULE_MOCK_H_ -#define MOCK_MODULE_MOCK_H_ +#ifndef TESTS_MOCK_MODULE_MOCK_H_ +#define TESTS_MOCK_MODULE_MOCK_H_ class ModuleMock { public: virtual ~ModuleMock() {} }; -#endif // MOCK_MODULE_MOCK_H_ +#endif // TESTS_MOCK_MODULE_MOCK_H_ diff --git a/tests/mock/os_mock.cc b/tests/mock/os_mock.cc index 009f4ed..4596274 100644 --- a/tests/mock/os_mock.cc +++ b/tests/mock/os_mock.cc @@ -37,4 +37,4 @@ extern "C" int fchmod(int fd, mode_t mode) { extern "C" int smack_setlabel(const char *path, const char* label, enum smack_label_type type) { return MOCK_HOOK_P3(OsMock, smack_setlabel, path, label, type); -} \ No newline at end of file +} diff --git a/tests/mock/os_mock.h b/tests/mock/os_mock.h index 64970b3..865213c 100644 --- a/tests/mock/os_mock.h +++ b/tests/mock/os_mock.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MOCK_OS_MOCK_H_ -#define MOCK_OS_MOCK_H_ +#ifndef TESTS_MOCK_OS_MOCK_H_ +#define TESTS_MOCK_OS_MOCK_H_ #include #include @@ -35,4 +35,4 @@ class OsMock : public virtual ModuleMock { MOCK_METHOD3(smack_setlabel, int(const char*, const char*, smack_label_type)); }; -#endif // MOCK_OS_MOCK_H_ +#endif // TESTS_MOCK_OS_MOCK_H_ diff --git a/tests/mock/pkgmgr_info_mock.cc b/tests/mock/pkgmgr_info_mock.cc index 2e0896b..3ed9a7a 100644 --- a/tests/mock/pkgmgr_info_mock.cc +++ b/tests/mock/pkgmgr_info_mock.cc @@ -59,4 +59,4 @@ extern "C" int pkgmgrinfo_pkginfo_get_version(pkgmgrinfo_pkginfo_h handle, char **version) { return MOCK_HOOK_P2(PkgMgrInfoMock, pkgmgrinfo_pkginfo_get_version, handle, version); -} \ No newline at end of file +} diff --git a/tests/mock/pkgmgr_info_mock.h b/tests/mock/pkgmgr_info_mock.h index 2c4e47b..64f145e 100644 --- a/tests/mock/pkgmgr_info_mock.h +++ b/tests/mock/pkgmgr_info_mock.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MOCK_PKGMGR_INFO_MOCK_H_ -#define MOCK_PKGMGR_INFO_MOCK_H_ +#ifndef TESTS_MOCK_PKGMGR_INFO_MOCK_H_ +#define TESTS_MOCK_PKGMGR_INFO_MOCK_H_ #include #include @@ -35,9 +35,11 @@ class PkgMgrInfoMock : public virtual ModuleMock { int(pkgmgrinfo_pkginfo_filter_h, const char*, const bool)); MOCK_METHOD3(pkgmgrinfo_pkginfo_filter_foreach_pkginfo, int(pkgmgrinfo_pkginfo_filter_h, pkgmgrinfo_pkg_list_cb, void*)); - MOCK_METHOD2(pkgmgrinfo_pkginfo_get_pkgid, int(pkgmgrinfo_pkginfo_h, char**)); + MOCK_METHOD2(pkgmgrinfo_pkginfo_get_pkgid, + int(pkgmgrinfo_pkginfo_h, char**)); MOCK_METHOD2(pkgmgrinfo_pkginfo_get_type, int(pkgmgrinfo_pkginfo_h, char**)); - MOCK_METHOD2(pkgmgrinfo_pkginfo_get_version, int(pkgmgrinfo_pkginfo_h, char**)); + MOCK_METHOD2(pkgmgrinfo_pkginfo_get_version, + int(pkgmgrinfo_pkginfo_h, char**)); }; -#endif // MOCK_PKGMGR_INFO_MOCK_H_ +#endif // TESTS_MOCK_PKGMGR_INFO_MOCK_H_ diff --git a/tests/mock/test_fixture.h b/tests/mock/test_fixture.h index db223f1..106f6a7 100644 --- a/tests/mock/test_fixture.h +++ b/tests/mock/test_fixture.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MOCK_TEST_FIXTURE_H_ -#define MOCK_TEST_FIXTURE_H_ +#ifndef TESTS_MOCK_TEST_FIXTURE_H_ +#define TESTS_MOCK_TEST_FIXTURE_H_ #include @@ -50,4 +50,4 @@ class TestFixture : public ::testing::Test { static std::unique_ptr mock_; }; -#endif // MOCK_TEST_FIXTURE_H_ +#endif // TESTS_MOCK_TEST_FIXTURE_H_ diff --git a/tests/unit_tests/src/test_main.cc b/tests/unit_tests/src/test_main.cc index c2eb730..5a9f91d 100644 --- a/tests/unit_tests/src/test_main.cc +++ b/tests/unit_tests/src/test_main.cc @@ -30,7 +30,8 @@ int main(int argc, char** argv) { ret = RUN_ALL_TESTS(); } catch (const ::testing::internal::GoogleTestFailureException& e) { ret = -1; - std::cout << "GoogleTestFailureException was thrown:" << e.what() << std::endl; + std::cout << "GoogleTestFailureException was thrown:" + << e.what() << std::endl; } return ret; diff --git a/tests/unit_tests/src/test_pkg_upgrader.cc b/tests/unit_tests/src/test_pkg_upgrader.cc index 1a13125..43f40c3 100644 --- a/tests/unit_tests/src/test_pkg_upgrader.cc +++ b/tests/unit_tests/src/test_pkg_upgrader.cc @@ -103,23 +103,35 @@ class PkgFinderTest : public TestFixture { }; EXPECT_CALL(GetMock(), - pkgmgrinfo_pkginfo_get_pkgid(_,_)) - .WillOnce(DoAll(SetArgPointee<1>(const_cast(old_ro_pkgid[0])), Return(0))) - .WillOnce(DoAll(SetArgPointee<1>(const_cast(old_ro_pkgid[1])), Return(0))) - .WillOnce(DoAll(SetArgPointee<1>(const_cast(old_ro_pkgid[2])), Return(0))) - .WillOnce(DoAll(SetArgPointee<1>(const_cast(old_rw_pkgid[0])), Return(0))); + pkgmgrinfo_pkginfo_get_pkgid(_, _)) + .WillOnce(DoAll(SetArgPointee<1>( + const_cast(old_ro_pkgid[0])), Return(0))) + .WillOnce(DoAll(SetArgPointee<1>( + const_cast(old_ro_pkgid[1])), Return(0))) + .WillOnce(DoAll(SetArgPointee<1>( + const_cast(old_ro_pkgid[2])), Return(0))) + .WillOnce(DoAll(SetArgPointee<1>( + const_cast(old_rw_pkgid[0])), Return(0))); EXPECT_CALL(GetMock(), - pkgmgrinfo_pkginfo_get_type(_,_)) - .WillOnce(DoAll(SetArgPointee<1>(const_cast(old_ro_pkg_type[0])), Return(0))) - .WillOnce(DoAll(SetArgPointee<1>(const_cast(old_ro_pkg_type[1])), Return(0))) - .WillOnce(DoAll(SetArgPointee<1>(const_cast(old_ro_pkg_type[2])), Return(0))) - .WillOnce(DoAll(SetArgPointee<1>(const_cast(old_rw_pkg_type[0])), Return(0))); + pkgmgrinfo_pkginfo_get_type(_, _)) + .WillOnce(DoAll(SetArgPointee<1>( + const_cast(old_ro_pkg_type[0])), Return(0))) + .WillOnce(DoAll(SetArgPointee<1>( + const_cast(old_ro_pkg_type[1])), Return(0))) + .WillOnce(DoAll(SetArgPointee<1>( + const_cast(old_ro_pkg_type[2])), Return(0))) + .WillOnce(DoAll(SetArgPointee<1>( + const_cast(old_rw_pkg_type[0])), Return(0))); EXPECT_CALL(GetMock(), - pkgmgrinfo_pkginfo_get_version(_,_)) - .WillOnce(DoAll(SetArgPointee<1>(const_cast(old_ro_pkg_version[0])), Return(0))) - .WillOnce(DoAll(SetArgPointee<1>(const_cast(old_ro_pkg_version[1])), Return(0))) - .WillOnce(DoAll(SetArgPointee<1>(const_cast(old_ro_pkg_version[2])), Return(0))) - .WillOnce(DoAll(SetArgPointee<1>(const_cast(old_rw_pkg_version[0])), Return(0))); + pkgmgrinfo_pkginfo_get_version(_, _)) + .WillOnce(DoAll(SetArgPointee<1>( + const_cast(old_ro_pkg_version[0])), Return(0))) + .WillOnce(DoAll(SetArgPointee<1>( + const_cast(old_ro_pkg_version[1])), Return(0))) + .WillOnce(DoAll(SetArgPointee<1>( + const_cast(old_ro_pkg_version[2])), Return(0))) + .WillOnce(DoAll(SetArgPointee<1>( + const_cast(old_rw_pkg_version[0])), Return(0))); EXPECT_CALL(GetMock(), pkgmgrinfo_pkginfo_filter_destroy(_)) .WillRepeatedly(Return(0));