From e21f1383ac2b2c2a787d0787a7b927b1f820eed9 Mon Sep 17 00:00:00 2001 From: Sangyoon Jang Date: Tue, 10 Oct 2017 23:00:13 +0900 Subject: [PATCH 01/16] Fix smoke test We don't need to validate pkgid of appdefined-privilege for client. Change-Id: I5ee7f12398e682a1071d92c37091025573c12f2d Signed-off-by: Sangyoon Jang --- src/unit_tests/manifest_test.cc | 5 ----- .../config.xml | 5 ----- 2 files changed, 10 deletions(-) delete mode 100644 src/unit_tests/test_samples/manifest/ManifestTest.AppDefinedPrivilegeElement_Invalid_NoPKGID/config.xml diff --git a/src/unit_tests/manifest_test.cc b/src/unit_tests/manifest_test.cc index 90c9ed6..051d2f3 100644 --- a/src/unit_tests/manifest_test.cc +++ b/src/unit_tests/manifest_test.cc @@ -223,11 +223,6 @@ TEST_F(ManifestTest, AppDefinedPrivilegeElement_Invalid_NotURI) { ASSERT_FALSE(runner.Run()); } -TEST_F(ManifestTest, AppDefinedPrivilegeElement_Invalid_NoPKGID) { - StepParseRunner runner(GetMyName()); - ASSERT_FALSE(runner.Run()); -} - TEST_F(ManifestTest, AppDefinedPrivilegeElement_Invalid_OverLength) { StepParseRunner runner(GetMyName()); ASSERT_FALSE(runner.Run()); diff --git a/src/unit_tests/test_samples/manifest/ManifestTest.AppDefinedPrivilegeElement_Invalid_NoPKGID/config.xml b/src/unit_tests/test_samples/manifest/ManifestTest.AppDefinedPrivilegeElement_Invalid_NoPKGID/config.xml deleted file mode 100644 index 4cb239b..0000000 --- a/src/unit_tests/test_samples/manifest/ManifestTest.AppDefinedPrivilegeElement_Invalid_NoPKGID/config.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - -- 2.7.4 From ed442f20db110d4754826bd523026254bf35b72a Mon Sep 17 00:00:00 2001 From: Sangyoon Jang Date: Wed, 11 Oct 2017 21:34:21 +0900 Subject: [PATCH 02/16] Release version 0.7.3 Changes: - Fix appdefined privilege parsing - Fix smoke test Change-Id: Iebcf9a186cdd05a5955cce40cf76ffe20776a5af Signed-off-by: Sangyoon Jang --- packaging/wgt-backend.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/wgt-backend.spec b/packaging/wgt-backend.spec index 45e107b..aaa8808 100644 --- a/packaging/wgt-backend.spec +++ b/packaging/wgt-backend.spec @@ -1,6 +1,6 @@ Name: wgt-backend Summary: Application installer backend for WGT -Version: 0.7.2 +Version: 0.7.3 Release: 1 Group: Application Framework/Package Management License: Apache-2.0 -- 2.7.4 From 8177294c286d2c288ad48855ee2057f833dd7da3 Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Tue, 17 Oct 2017 11:40:02 +0900 Subject: [PATCH 03/16] Fix static analysis issue - Check if new operator has failed. Change-Id: I840874abdac89bb91f6e5aca26df2ac265a541ac Signed-off-by: Junghyun Yeon --- src/wgt/step/configuration/step_parse.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/wgt/step/configuration/step_parse.cc b/src/wgt/step/configuration/step_parse.cc index aa62f48..0fe8083 100644 --- a/src/wgt/step/configuration/step_parse.cc +++ b/src/wgt/step/configuration/step_parse.cc @@ -200,7 +200,11 @@ bool StepParse::FillIconPaths(manifest_x* manifest) { GetManifestDataForKey( app_keys::kIconsKey); if (!icons_info) { - icons_info.reset(new wgt::parse::ApplicationIconsInfo()); + icons_info.reset(new(std::nothrow) wgt::parse::ApplicationIconsInfo()); + if (!icons_info) { + LOG(ERROR) << "Out of memory"; + return false; + } } wgt::parse::LocalizedApplicationIconsInfo localized_list = wgt::parse::GetLocalizedIconList(*icons_info, widget_path_); @@ -867,7 +871,11 @@ common_installer::Step::Status StepParse::process() { return common_installer::Step::Status::MANIFEST_NOT_FOUND; } - parser_.reset(new wgt::parse::WidgetConfigParser()); + parser_.reset(new(std::nothrow) wgt::parse::WidgetConfigParser()); + if (!parser_) { + LOG(ERROR) << "Out of memory"; + return common_installer::Step::Status::CONFIG_ERROR; + } if (!parser_->ParseManifest(widget_path_ / kConfigFileName)) { LOG(ERROR) << "[Parse] Parse failed. " << parser_->GetErrorMessage(); return common_installer::Step::Status::PARSE_ERROR; -- 2.7.4 From 4160fc656c905e15a179dc4c758b774a4a428c31 Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Thu, 14 Sep 2017 10:31:17 +0900 Subject: [PATCH 04/16] Change behavior of trust anchor - Trust anchor certificate dir has fixed so it will not defined at manifest. - Remove get/set codes about certificate directory. - Enable trust-anchor on hybrid package. Please note that if both tpk and wgt package have trust-anchor node, wgt's setting will be appliced. Related changes: [pkgmgr-info] : https://review.tizen.org/gerrit/149784 [app-installers] : https://review.tizen.org/gerrit/149836 [tpk-manifest-handlers] : https://review.tizen.org/gerrit/150060 [wgt-manifest-handlers] : https://review.tizen.org/gerrit/150136 Change-Id: Ie110eb1b52695c985495f03b834c9bfd9e5bf960 Signed-off-by: Junghyun Yeon --- src/hybrid/hybrid_installer.cc | 22 +++++++++++++++++ src/hybrid/step/pkgmgr/step_generate_xml.cc | 1 + src/wgt/step/configuration/step_parse.cc | 4 ---- src/wgt/step/pkgmgr/step_generate_xml.cc | 6 +---- src/wgt/wgt_installer.cc | 37 +++++++++++++++++++---------- 5 files changed, 48 insertions(+), 22 deletions(-) diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc index 5a6e342..2a28e39 100644 --- a/src/hybrid/hybrid_installer.cc +++ b/src/hybrid/hybrid_installer.cc @@ -70,6 +70,8 @@ #include #include #include +#include +#include #include #include @@ -148,6 +150,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::INSTALL); AddStep(); AddStep( ci::Plugin::ActionType::Install); @@ -201,6 +205,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::INSTALL); AddStep(); AddStep( ci::Plugin::ActionType::Upgrade); @@ -229,6 +235,7 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep(); AddStep(); AddStep(); AddStep(); @@ -285,6 +292,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); AddStep(); AddStep(); AddStep( @@ -351,6 +360,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::INSTALL); AddStep(); AddStep( ci::Plugin::ActionType::Install); @@ -403,6 +414,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); AddStep(); AddStep( ci::Plugin::ActionType::Upgrade); @@ -434,6 +447,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); AddStep(); AddStep( ci::Plugin::ActionType::Install); @@ -468,6 +483,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); AddStep(); AddStep( ci::Plugin::ActionType::Upgrade); @@ -488,6 +505,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::INSTALL); AddStep(); AddStep( ci::Plugin::ActionType::Install); @@ -513,6 +532,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); AddStep(); AddStep( ci::Plugin::ActionType::Upgrade); @@ -535,6 +556,7 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep(); AddStep(); break; } diff --git a/src/hybrid/step/pkgmgr/step_generate_xml.cc b/src/hybrid/step/pkgmgr/step_generate_xml.cc index 00e4e5d..89772c2 100644 --- a/src/hybrid/step/pkgmgr/step_generate_xml.cc +++ b/src/hybrid/step/pkgmgr/step_generate_xml.cc @@ -34,6 +34,7 @@ const std::vector kBlackListNodes = { {"profile"}, {"privileges"}, {"provides-appdefined-privileges"}, + {"trust-anchor"}, }; const std::vector kNeedMergeNodes = { {"manifest"}, diff --git a/src/wgt/step/configuration/step_parse.cc b/src/wgt/step/configuration/step_parse.cc index 0fe8083..05a3b5d 100644 --- a/src/wgt/step/configuration/step_parse.cc +++ b/src/wgt/step/configuration/step_parse.cc @@ -592,10 +592,6 @@ bool StepParse::FillTrustAnchorInfo(manifest_x* manifest) { if (!trust_anchor) return true; - std::string certs_dir = trust_anchor->get_certs_dir(); - if (!certs_dir.empty()) - manifest->pkg_certs_dir = strdup(certs_dir.c_str()); - std::string use_system_certs = trust_anchor->get_use_system_certs(); if (!use_system_certs.empty()) manifest->use_system_certs = strdup(use_system_certs.c_str()); diff --git a/src/wgt/step/pkgmgr/step_generate_xml.cc b/src/wgt/step/pkgmgr/step_generate_xml.cc index 404b5c8..91d9f56 100644 --- a/src/wgt/step/pkgmgr/step_generate_xml.cc +++ b/src/wgt/step/pkgmgr/step_generate_xml.cc @@ -677,14 +677,10 @@ void StepGenerateXml::GenerateShortcuts(xmlTextWriterPtr writer) { } void StepGenerateXml::GenerateTrustAnchor(xmlTextWriterPtr writer) { - if (!context_->manifest_data.get()->pkg_certs_dir || - !context_->manifest_data.get()->use_system_certs) + if (!context_->manifest_data.get()->use_system_certs) return; xmlTextWriterStartElement(writer, BAD_CAST "trust-anchor"); - xmlTextWriterWriteAttribute(writer, BAD_CAST "pkg-certs-dir", - BAD_CAST context_->manifest_data.get()->pkg_certs_dir); - xmlTextWriterWriteAttribute(writer, BAD_CAST "use-system-certs", BAD_CAST context_->manifest_data.get()->use_system_certs); diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc index 3a8956b..130c597 100755 --- a/src/wgt/wgt_installer.cc +++ b/src/wgt/wgt_installer.cc @@ -80,7 +80,6 @@ #include #include #include -#include #include @@ -233,7 +232,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::INSTALL); AddStep( ci::security::StepPrivacyPrivilege::ActionType::Install); AddStep(); @@ -283,7 +283,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); AddStep( ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); @@ -342,7 +343,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); AddStep( ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); @@ -393,7 +395,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); AddStep( ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); @@ -455,7 +458,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::INSTALL); AddStep( ci::security::StepPrivacyPrivilege::ActionType::Install); AddStep(); @@ -502,7 +506,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); AddStep( ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); @@ -531,7 +536,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); AddStep( ci::security::StepPrivacyPrivilege::ActionType::Install); AddStep(); @@ -564,7 +570,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); AddStep( ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); @@ -609,7 +616,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); AddStep( ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); @@ -640,7 +648,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); AddStep( ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); @@ -659,7 +668,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::INSTALL); AddStep( ci::security::StepPrivacyPrivilege::ActionType::Install); AddStep(); @@ -684,7 +694,8 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - AddStep(); + AddStep( + ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); AddStep( ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); -- 2.7.4 From bfbcb071cd2bfec45d1c83ebab42fd5225c6b104 Mon Sep 17 00:00:00 2001 From: Sangyoon Jang Date: Fri, 13 Oct 2017 16:54:21 +0900 Subject: [PATCH 05/16] Add smoke test for extended storage installation Change-Id: I4a222b770cffe7a70b69143a4893beb7a38317e3 Signed-off-by: Sangyoon Jang --- src/unit_tests/smoke_test.cc | 12 +++++++- src/unit_tests/smoke_utils.cc | 31 +++++++++++++++++++-- src/unit_tests/smoke_utils.h | 11 +++++++- .../test_samples/smoke/InstallExtendedMode.wgt | Bin 0 -> 37975 bytes 4 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 src/unit_tests/test_samples/smoke/InstallExtendedMode.wgt diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc index b55392a..bf44401 100644 --- a/src/unit_tests/smoke_test.cc +++ b/src/unit_tests/smoke_test.cc @@ -571,7 +571,7 @@ TEST_F(SmokeTest, InstallExternalMode) { bf::path path = kSmokePackagesDirectory / "InstallExternalMode.wgt"; std::string pkgid = "smokewgt35"; std::string appid = "smokewgt35.web"; - ASSERT_EQ(InstallExternal(path, PackageType::WGT), + ASSERT_EQ(InstallWithStorage(path, PackageType::WGT, StorageType::EXTERNAL), ci::AppInstaller::Result::OK); ValidateExternalPackage(pkgid, {appid}); } @@ -794,6 +794,16 @@ TEST_F(SmokeTest, SharedRes30HybridDelta) { ASSERT_FALSE(bf::exists(root_path / pkgid / "shared" / "res" / "SHARED-WGT-1")); // NOLINT } +TEST_F(SmokeTest, InstallExtendedMode) { + ASSERT_TRUE(CheckAvailableExtendedStorage()); + bf::path path = kSmokePackagesDirectory / "InstallExtendedMode.wgt"; + std::string pkgid = "smokewgt44"; + std::string appid = "smokewgt44.web"; + ASSERT_EQ(InstallWithStorage(path, PackageType::WGT, StorageType::EXTENDED), + ci::AppInstaller::Result::OK); + ValidatePackage(pkgid, {appid}); +} + } // namespace common_installer int main(int argc, char** argv) { diff --git a/src/unit_tests/smoke_utils.cc b/src/unit_tests/smoke_utils.cc index 41c777d..3730ad0 100644 --- a/src/unit_tests/smoke_utils.cc +++ b/src/unit_tests/smoke_utils.cc @@ -585,13 +585,37 @@ bool CheckAvailableExternalPath() { return true; } -ci::AppInstaller::Result InstallExternal(const bf::path& path, +bool CheckAvailableExtendedStorage() { + bf::path extended_path = bf::path(tzplatform_getenv(TZ_SYS_EXTENDEDSD)); + LOG(DEBUG) << "extended_path :" << extended_path; + // TODO(jeremy.jang): It should be checked by libstorage API. + if (!bf::exists(extended_path)) { + LOG(ERROR) << "Extended storage not exists!"; + return false; + } + return true; +} + +ci::AppInstaller::Result InstallWithStorage(const bf::path& path, PackageType type, + StorageType storage_type, RequestResult mode) { int default_storage = 0; + int storage = 0; + switch (storage_type) { + case StorageType::EXTERNAL: + storage = 1; + break; + case StorageType::EXTENDED: + storage = 2; + break; + default: + LOG(ERROR) << "Unknown storage type"; + break; + } vconf_get_int(VCONFKEY_SETAPPL_DEFAULT_MEM_INSTALL_APPLICATIONS_INT, &default_storage); - vconf_set_int(VCONFKEY_SETAPPL_DEFAULT_MEM_INSTALL_APPLICATIONS_INT, 1); + vconf_set_int(VCONFKEY_SETAPPL_DEFAULT_MEM_INSTALL_APPLICATIONS_INT, storage); const char* argv[] = {"", "-i", path.c_str(), "-u", kTestUserIdStr.c_str()}; ci::AppInstaller::Result result = @@ -607,7 +631,8 @@ ci::AppInstaller::Result MigrateLegacyExternalImage(const std::string& pkgid, const bf::path& legacy_path, PackageType type, RequestResult mode) { - if (InstallExternal(path, type) != ci::AppInstaller::Result::OK) { + if (InstallWithStorage(path, type, StorageType::EXTERNAL) != + ci::AppInstaller::Result::OK) { LOG(ERROR) << "Failed to install application. Cannot perform Migrate"; return ci::AppInstaller::Result::ERROR; } diff --git a/src/unit_tests/smoke_utils.h b/src/unit_tests/smoke_utils.h index b709b19..b87da34 100644 --- a/src/unit_tests/smoke_utils.h +++ b/src/unit_tests/smoke_utils.h @@ -143,6 +143,12 @@ enum class PackageType { HYBRID }; +enum class StorageType { + INTERNAL, + EXTERNAL, + EXTENDED +}; + ci::RequestMode ParseRequestMode(int argc, char** argv); bool TouchFile(const bf::path& path); @@ -226,8 +232,11 @@ ci::AppInstaller::Result InstallPreload(const bf::path& path, PackageType type, bool CheckAvailableExternalPath(); -ci::AppInstaller::Result InstallExternal(const bf::path& path, +bool CheckAvailableExtendedStorage(); + +ci::AppInstaller::Result InstallWithStorage(const bf::path& path, PackageType type, + StorageType storage = StorageType::INTERNAL, RequestResult mode = RequestResult::NORMAL); ci::AppInstaller::Result MigrateLegacyExternalImage(const std::string& pkgid, diff --git a/src/unit_tests/test_samples/smoke/InstallExtendedMode.wgt b/src/unit_tests/test_samples/smoke/InstallExtendedMode.wgt new file mode 100644 index 0000000000000000000000000000000000000000..677b33797466dc7939aa22384ece1e8f20a8ad2d GIT binary patch literal 37975 zcmaI7Q*b8C^EMpYHaFVX*;sdMCmY+gZEkGawr$&X?$~&r-`RKa|GH|XdTOQ*=Bl2q zo`!-nI0Oa=3=9lNoxQ9y$p42h{^Jc?oXzbV>76XhYz>@U98DP9ZLGUB)@wGo(0pFh zAz)9&C7L{~eu0+x)K?8Rw4?@9O>ewR>j^mi^ZKCl@$zI~+D3+w$lz5C8&;;fd-xLz z*Ls<`x1D4L_&ENmzO2|KF((+6Cx0%tCW8qvzzIa2W9hd$JRAIQ>-st7JL~+r&dccc zkPqcW`Av4VxrF?4Tl3hwlFyi8C> z=1UpZZs$1tRMLYX2N^$b>nsuEO-##I8FmYU{|o z+?-q3AXq>kf2LC90cq89^UZqo_UBrDgwtCx8}}9$zCR+?cA(IlBz8hlT)LEhS$p6x z)F|WV8nFy6mXC0)Nbaic*@zxc;N@13y?@}6@M|w1snZT?b?4sD&BlximDD`Aa*Lua z5_z_}gxM5iZL~6vZJS)6#W3_h5BD-Z=H{a-O!q6MMNe;CNMP~`5AAWS9NXVV7z_yh z^-wUKATaG=CJ7;y$+g`U$d47;GLS00!r`!bqum(cG{p(fuO4=t##`;q`S@J&fP?SL z+!380IQU}#JU4D&4(Fcv+k%2%UVeY{))5yRe{~) z$zIQHs{nD5(oWCy``;Lr@SL5;YeEp}QU8I*-Qc5qou3n4)r5~*zLt9s^k}p~b(#{w z1j-<45aB3LsTzRhH)=EV<+n?ARtkUdXZa_MHi1VvIQXx5!45!h+=XqOl~luUEXW&s z(zR3G!0u3RwMbsU8sxtCA8di^-+Ghy?5wT&#&USf$oB;)>!-ofL7guFGw2PP(+ZrJy4A^#Z9MP%z`k9e6IwopYLQ10tTL`|44vdaQy(J| zP*wqO|daoLBi>oV|qi2%=fEiysyUNjG~%A zQ(rl>f`}%ty-h7y$0+c&Zc)E*ecG&XKVvROG>J}-felA|Tfec|=pbPP?`(p(wBIOZ zJrh=HS*S1i_7}zDFU3b{Mg2F_8zY&Oet9FbHTfi@*j>J)UxAAa$zkP2M_1xf&5-rZ zubX?>eVkJMk=8g8ytMxRDEbsBQwL#Q4sS%6jw!5`Z7d>?1lT@YvU01%jMOT4-V${o zyuhUY4zN*422tycE*h_1!{FJ}Q}V+)S^q2fgCP{zzBLwYLmvWeIRmX;pIB{hbj2-| zxr{n94ex{_Dl{Zd4Gqs<3c9puOS&~izlAG7s7flm!BE_IcO6)Kz{gNKz+ zPQXDA>Eu+mFswuTXK5u%bDe*^JCRf?Zvp}2(!7UKAGv&}C(6tnV`bv39(<-esMKK# zrBlJ$y>1<^=}!?-Z9p<3fO!JbGD}wlj3`UmT&TgomR^sQfUikj%4Jc3Z0FJWQdMw0p!Q(!xYvJT!JL)oC`XRHr%XlG#pW zHEKiW*l11&mwm#p<)6jXixD~Ti6UvfB6g!PX{|ApE^z|f_WX@b=W7gV;S{b>X(7rD z+U}Z0@;ItH{c>dSn|6n0@CUSH&u=BE73_qOt3(OdydZSc;wSo;^+6c)I3}>jI=wSF zZ&|lW;sGZLvUf^eM}lUm{qmJ_Ux0kFjm0wNFckynPGW4DS+P}mF8(zpIhGEllJhun zkUSqO#^>+3H|HNfp5H%VwK#(NA1TsGaiq6DA#@*ZCwj9WsMR2rZ+i6O#j^g1{X1+N zsjrhV{yObSV;|qVPutHu$8t15sTjMvUh~N}8PyP`=W+c)p@m&g<+>HxTw>-JR-B%L zDN-kc2Hhz(l6bSW($AIVz&I9mQc%n+o5Iw%5)M_8-iws2oOE}qBvYnNxNLH-fIX-% zb4L8X*JNh2YCPpV$d3rDkJfWZ$zL98w zRhb8hQ%1Cje{%arLxudk7Uo#R5Cg7yH>y+f~>1y(>@~DjBW*cm9{f`(T$n@I!hL~M2ZBiV)zDMPzVj& zI1i)6L69T*)6%!X^DFKB^<99q$L%M#+t&NDBuJ?)T_i~Qck(HGEWSc{YwPIuGV@ED znzc0xYd~2@Y)!Ss?)s&X66B^$T?x2^oC=LopwChvOw-E{+o4)m3JKQ71@`{F zj8sQfXztssv)@3IW8iRN!y_?@(8m|(K4)+BchRkvuh6RoAEPIvrEdfJi018g_6>*P z96jVUF%bbjV~MYF&+Lcp#*%@BM&1x*GGIq?&s^M-z<&OMoV={cYi_*J3aAwFT%9*+xdQY zxTxdCLS_#kP2JA_CxR=4m)uwy#zTX>pco~T6S7c!Iznpsh0rqD+>#@5C6}btq7xJM zIqOL(R|S3*#0-=l8bP05trxL<9H8MPo{knJv`Rp;MIAftO6v=f911c;1J8NW*vE1K zvJ?pcqvcE}zM$81PUX2;Ggq{>#U(>wcH{}WPsYjF!`g)5KQ1P&Uv7vA zK@|8EDM4!sf%%K!e6=ltvwlUkU}>^}`!~=JAuk_Ocq38 z&gh-NhM?fRkZ&SnWU2X5+1~H+MuZu~N6cprD6cyTox(*9hu>n^x*ShW{WF;*`&RA~ zdv`y$1l8&Lwn=?cZMbU~kcCy9uzXoOu#C%x2-fVIbIknI37h9o`mlg8$bvZ0)H4R zk_=0?9{zXWF(xJ^>l2_H@YSPnGXAhoilp>)00~ zh&$9lO#q}GC-^PSx3Sj7wwnO6%f=FRPTITmN0MhNkIp9SO&jUCd z&+ihlsvI_xez!hXP9C^jAYSClM1GdY0n2>j>oygknSt*;EB6xs{I3JB1 z1eARA+&xUPlAPis?(Vjp`GB4_)6;oYd2Z==5Vyv6d{6mO=r;dSTy^HGWejz0FTF&l zO)gjbHrv_hHQQbPSCo`aRGkYc(E1cN+@)_*40?#)?bT|Pe)EoRt~>GQ9Q4?URpJ(% zX7kdW^u8>TfeSQWDD`pNRA|K&ioc%_FP|hei8mc7VBFk-mwsgWo-2&Q7~H-#@ZQQi zWi=QfJ5;Z=-0Pn;3}lz)4>;=^Jw@=R^6WOSjtm`i_PX_)Jxe$pfYJc@6ZZ$I#=C2E5 z_zySqHueqe-p0s>TNVl{b7eufc&=j(TZWJ>GiT3^S&SmDGuPn0(2e*~KjpWf(O2I} ztoP96u|7=q7UDQhPf}8nvO0|9FM`mKVtuzcELPhd=T}NEch79fEB`!fwy&`A z2=F@9?YNt+?q9n3Vmmx4zqk>N3kbN?nIx8OqouDq&R)k^6D6Xkc+2-W5hH5c8n~PS zwR%$DEk1YF(4R+VFex%ze4;uAS zPpuI*FRJFJ9G!CCa-z8DaCcwtPh`8|7N3_f`2^TQ9^+zB%F^A3q0Wb#C&>-=3-w(7 z+4l^}Hu{})*G(BWpC54B0CYpS*?Hdk?=&^y_7Gq8Nt{NfaQ?lZmHFOT*pAZUIr$Ex zbGC!8g!#fyQMD%z-A$usk)Rgug-Z};-^u%%mi}!1%=ViceobBc1rER6?l+#Go;%*> zwI(_ElTbQM_p3L(jF-2%&4mV|%G_H%zE-=9@7QzfjCR-c2j|fupH5}J9{PEoox(6* z+qaWS~lYQ4aXZ-=R96;{kz7l=)w-pE=Hu@@eBj6p zqjJV+cU-<#4XNZ6SB>LlbG(_Tf9dIQohxH_!K!theK&k6Q;oV|=;i#}k)-wV5%5|r z0+z;Jy_MVDnlyk59b@MZI)loVN?oZ z=Shq0)&}bXSs{ST5rNwU@Cf|g-Pg;*)>>K*{kJbn{8m2J%K)MmKTgvnaO7IzCe!(h zwX15YmYQ3=dXKd(gGy{O`Hio|=9peP?RJ{0(gkG(4=YZ&_1E`c$+%#-jV8D2n@Eq% z)9#+*r=R9$ho_wE%SP_|fH6+p*WB1iA7>r)o;4*vT}e$ksxB33AnmaDG&DAs~~me2b+8J#@}t46Qw za^l59K+U<*y}{7+yBCS-ht~J*OGlTh7PnlrZ=A`+m&6#h{tohQdn4 zU?CwtZa3v=sqC(-o+{_QrTOkg&+JcSo1FvjCL|jkNbJ_;^hU+cRy-ncrnp4_4?~jGFQ{B*MamS?K1cQoqz2sRDG*zy-}=p6If_=8g1d*wfI@H z78S6~-F?lNPNJ48*Ut58ma+vhg(zYr-aq?Q+Fadl*b zZU<_3*fmW1=f#-aZXRdnk1^)c)*q(!(T<(j?yOTq0&DY^8y^ON$M2`F7+7UF zBt0LK$IoUvYrBUD9r(Ns}Ny7GTISlKx zcq8urL%!moG7t!B9qT$iC; z<5X7#`*{1|F^ah7eNc0C3X4%pF7k@$kBiW9pb$JzN8k500lF1IVC%*Gxp+XGF6cq) z)i-FGXdxELX&j2%>zpqaQFRb1=5OB;Bo0BQoY5_ z-NkTw_;z@k6|Tn4?@cS5@8jrz$Oo=Py_cog)=o!OQKBDzc2tuU$!0p6NWI>4^Va6D zrd0bpH&c!2!?+jP=B>2mr1#GspZ9+khi^fb+NRw;OV5(i+PiFnTeT-do~s|*_rtAE z*Yk(ky{FaK^t21H{H{&Y2MU{XvxvfSMR=b*v#i?Om zX{~mvJ!QMTe&y1o^{YTuz4bqQex66mCV-wnY27H_#_F$#_gt$RzLo)AM(Z8kPTd!i z=Hq#W>xb|j+^@5ER5#ErG%8-GupKf1rTEyVq$4?#VBVNtlB79G5xL5&4GKK#GQ z^%nZR)+Z0yU3uD{dfgYz*|d1$b$Bh;=>O%ex0By+d`oa_`YC?cah3isg2xAhb|Ssh zYb%lLSsJ8D)jo5b|n%6>gR&SVwNo7u} z3ET5pHETFoU0Nb1>}HR6VZ@)$f9tWm|I8;<_?H=gjEs(cup=Y)4(4$_uADn(H*48c zMMXu0b$0T!wYLXUR>H>v^_g(ajNz^juO6W`5|7)Y*h34c)kwG3<;5CZfiqu za&d@(zkOMRfPnB%O~o!Q%E-X$P)|e>-?JB~5WPiVYq{IKW9{Ad_$K(l?H8MHLm-fc zWBab2n6R>MZdlN@tC(falo8OQrv0E}Wo^_3ef{o*#sB;(?x<}I^)8RKw8=FfeCHCl&hXl>M~HJLq)7#(u;Kze47G9>Fk1a&ee=2{P_kE0K!JRh0zhhaxx)hb zV2yOPOE+8X{(k2|yby!_9yNtc10QK?>*$g&HuiRRce?#$eX~$3tsul5nHogKUQhmW zbH(2^a#T{)&%4YLA{mom0_;;}zUlAp$Iv&PJ)LCOyHoM$zU#L6+v;2E|IylT{Ntp6 z2{|^$NKp)(KY`5K-Sw}Kj2xtSwV{Cpj0CcA%}nwZd)ym^sEne#6w-z@yr;aZXmXxH??s7gSn=jMdZLzuJ^kZNC78f#ETCY&0&E;@# zfal}o1x7?ftf2fwp2_AB=ZP(4n#VvDI-F(pQZAv(w>GjykMnhlg^pW^Q0VzIs?(t< zY@yDeX>GXMyT_QeGgrFH3h0G~mRC{1_=A^MS2ib?R8A~^dcv=(p`r1lu6XT-paQAj zv+MiiiL&V^si3bf<1Px3gn_MWlL8$AEe=%|ZHfDVNdqZMOa*ug2?T!426$Pcoi*c? zN&cYz_R|tP=G^EkfE}6?rxaQ5+xtO6Cfap#&t2=kax;fB_?S&iK?Br%THEMcx9RY> z-3&6{0l{chp?)Y`FIn{W^2{WRI7UTBhw?(xye=>xlYj)exchwk-eF9$C_st6-MZa< z594O))H~KEvgT_fentim8yPYUYgeYfWV810lkG$1t+${(zV9DQM^F@EFBTI>< zL4Urcdwqmg-O@3|VrHsw7#YJAaWkX=i~TrofXr+9=~8-O(T&&U*Jf^Vqu(VRqDLD8 z8QB0&z0ZOav0knaePQAL)q3L+{4b};JMs)5%#Km;YJ!xg)Bs{KsW%5JplVtx!1M?{ z4?ae8GX9esqj-27geP0MapS7OcA$h;_TcN&P81MRZ|Ta2-(<~n=t8jfx>Il5m-w9? zzaYSVV61lHbF^dWSo>7lC;X!hDuqGz!{K1V2?Y)5LU96jbb2~JKV9a}sr))Wyhd27 z8o5Khl3oQ~uRIqpOFg!9>{^HD^G~UCI}%**PSrtUJqa}ErBTi_2=GWy?}mD9oTK{C zpth9c!76UbTFBz|{%8>%5kYFRfEXPozjknNz>>73e5Vdl`9ljLDJv=-FJmR;@Zzgx0a5(;u z+<#2|Fx0*KVb86tt@)Q>&1VJ$iTqR0Jw7_(3fR{~VZ=_KGPX{2!Lk$9KRt9?8Gpq+ zrYZz+66M7}@&N7f_J+xG-RqpHVFH6lL!g4L8uR^Ap<-0q6`fjd%E1M&OiI_RieU+Z z{?HK;0xj0a*3A_ybA|uIxwl)a@zq<15fT>WH9FL^g@T5*)jv3x9m@-a!ibNG(lc)@ z8daEPkrK_~A&;DypRcm$gLCvkfXq;|OOHYKZuLthPmc{rs(F(D4bz}mv+9-Pca$Aq zKR%tepfPaupPei5E)k{Kx;~fF34$m(VX(F2(Ipg_R=i>5ch!B-SED}~;sQN${TFh7 zzmU#XIAJK`$mT!qAP>QM<~DM7-mxj?J)Sg0whTHs|1jAQaGjAqeZP3vHE+$E*}c`K zaH1S{rW9H56}lF4U+7t#07(g!a>%APbsw)ECL5hx?kLs-RTB05J3A;iD0A%jI-SII zem_<1g*mH+qp8hsavQsv~b3n0%zJ<@r ze&ptwi7tr1+pv~kX`?b(e44dNaGId2*#r(A`!fTD+bH0n$J+Z4By_}UtzXwt=LG;n z`!RfUwvij;$qCEkG$nn1_4fIGv-Vy5kmM~XC#7)cSA>O)ay|Y#Iz47L%#FT|d@jAh ztNnGiLHaO5GHJ3=zDpR_#}OC1SKg|KWYuDUcT|RkZoX=H2K|A!EeN8JGYBj|)^uKr zqD1iP&48BdiVK*C!gDwYQy+*IRPd;%<&2^D%Ify{Xo(wVe;~f&{ZdS?xZGqcj_VBj zm`Xb{mjzA8?<%3<#&A!WoJ7wF1VHlxb41?4Mo%QS_j!I)?puy@Ar-msnga=<#(gEJ1tZ~ zjv1jb*9BEnl4_$WCkw{HVOkd!7Q`59O*bQ08N0gnXQO(p6wKM|t1b(JkvD~ahT!O6 zmUaYFQ3#P07w2rA!G@0DSeVKZbh|E%ZQ>LugDWc$5JL zT57t_4wK20@klZ2k4Zt*wHneE+02l9Qc`-2+tf7@UDt3qJ17z_4_)vi7dR!19qiOC zbXRTiS__gSQvkZkDO00GxvGGv|-E#;FOZ}jEFAEaCZrlVCv+A-3}^n@XBmzMX$Coq z1Gz7@-z;^4oASNNM3Pt!qv8}mOw7`txcm z)^zb86di#x(xAVncr1CW=kL9i5WCf>Yg6P%C zENy7Fl!gAytEyag{G3zAE?UgP_JP4c#HW#WqZUtN2PCSR|#(JV3~U&qG)aC%_6f=z8Gsc+WMU^m+C*y+yxwa)T&d@wHdSht{&} zE{KU_s1Ck1zGuB}5H@sA4nox;V&a>!=n9Ae1>b!Y1fd*!<2MkzhY0d9{G}FFntE#U zrKBVVl#&0Dn|5911QZ8*>cYXnK@=(F0QQJ6zcMUyuqlJy(j!VZvZ#hnpvT*fcQLtT~&DGEaA z2dFdJ%U&YtbY_99ZcpalT+zG}Aan{TLqf;EP}+fx5s*^5F|@lE&E0r=V-f6{Um ztLXIlei7Z@-9?CGst~aAdZB=ihyqcZ7IrK8XQAXZ9!`vxI)!A6QKBU~pgJ37{5i&^ z^A`_yTj~pQegp9MK-0CG6;iBA>2UZWS0x$`<9wlYy6Bj!E*kA;E|6>)Lh;uaYH#lv zVzQms%}Ghd2z%bHd3js%k*19O+r#2}Pj0|WgNUk(#bX0lpF9UB5xAk1*AG`wKX0yK zbYg4#I|ymBDB%mW=6Qx+vL$%wv=$Z@X=~ha`H_L^-Cp(4T2B=!mQ1`suu?dnqqJNF zr(vtcZ-Q1kPGoY55$onGnOKF};NW0+3uPhV$_0CsKB;@|7MQ_euYuz`Ow(eZ6ujyp zpp=AS)FV>Y1Vt+NL%=Vre=(&b&Lgm7N%B%iKbHLO3QJyALM z>5dd9(f5AfLQgL*;DyP~WntJ;xTwNh5jc^cvDoIT<*Bva$JA=id;m=H7!8$9TL z+yEZ&=NjdWBe}leZHxqvRVqKo7KWhgMp2oqa8~hGe(xbNC*QsLoX?TTMRHV!e+Jax zs`A`>>v?T1)iRGNGMKzvhhGJc5CQ{yc)M$fo|!$XlrC?7xga}wQYEKPLApjUTo#n*?E zfT@pxTxF$)a@kOoz^d_KNTK2ml&Rb~P}eNFFnE(y61FL57z6I#u6rMOoKP|-UY_(r zn~Z@}xG3gOOo?EVAmKe0>t+s>%v$A-=7jzQj;5t57ck9pG$3T~ zE7W`3uA@cZ;2L4X9SC4vDu3&$J&~`9J)GkUyM|mJ@&zqjyKo8FJawdmg@q+tU0rF2 zO{tVB7=E!iI|>T=gNnySR}76o`ie%OPkq|GncX&0coWeO<447aV4dlUBmE)VyN0vM zxrR%b;4Z6V2_(|-4c0;&@w{z!h3X)9ML}y$J-3_h9s$7=;qtKD>lXfW;W#7Giw8Yr zToTgYN;sx|nU5)TS{vmmxWWsIly#D6!lQEGrcsR$u!Ugiq^g2!{bs(&f*1)o?P?S2dU?`}}e-%dNrlTYP&^SxvCIGv0xC_x4)w$?89FC0T zPKA!^9#;v^K71oKjMcU-k@IEA?R+*TR=PO4{BM4M=X%|Yoj&D7HS!@onj-2sb?jcj zpihisa=6Vv2G*FB^dQ{lv`2I;K@}-oJTk9)6*c^!3cNRu#8N(rEQs->f2Y`DCCW67 z_G-2VMmZ%Lf>=0T%djTRSql(qNyFG|MX*s5B*l)X@3?32$8`#P>y>EqW}{fZeb_B< z0?6;*f$o*PUp!Vlluq(oG5(3_$^)`YwCUh+&=_D7bpvKQgzWr`xQfajy5rO9*GGcYh9 zzafJk!Ycn~)_au|H6yp73du;nEre$YE?|dUrx583Vp+-xh?c^fSqw+Z4?t_i+vjB~ zP$1Gb-i9LfgYmNDfIuMh66rxHRNJ{4#4#7pBaR6xJ=O5llH0|B_VL>>Js`(;Rg6&? zjw3q38oGpmYLM04nV^gTOvlz68+VsIu`tfYIOUoD#Urf&Fhvs!5T!8aTp-+-GVp6& z(dRNVWSGaC@WRSDolFIsoJNwYG@>sFqIfBWa5t;Oa#Lcb1ukhYFWBp|bI*=zSF0tp z=dHC3Wp%otsaU^;wn%0zB(-Zw?iN$$Wn?Es-Z!aMs`(b7Z?ZCmny22gpz(|r+EBsZ zISQPKkY(i^5DSyW-GeOKe$sVxzNW*PezN{W6c`;DQSz8D%ea$+TS@ESMn@oa#U5(4 zk^U->aY`{+tS@JAAk*UT=-pqXSJ2j$LJ#$_Y{)-uS5>KWg=n(C{H;2LLxlr}X=#E1 z8>3kRRv=cvn-Jhu4)J?+s&rTwr&TG+a;U{1Q&O+lZoQ$HII%Jsqe(P&`{w$v+Dy~f z(3n`>;Wh6S`*hws(BCUJFk>K5A<+fIGWG__NU|sK>!49Xg%9rzCP@N!N=`(OdEh?- z33aFPJ1XA(3WTxylZE%T4;+KdSp4U#p`}cpJkU!04O9SZI(|g&C zAop6kh}hc)$xOJz>wSXYvPOvNmF+^N+#2;|Tz`57L&%s+fMFY-hk4|=4q*LduLZ;3 zhUnK~QV*8=4I@^XVgBLfcuEE2&nfE0 zf9;7`kYtL@`qG?GqDS3=%Bd&!bx5=Q8&c~XPWtyBjO}kl#l)0WCdJBNelx1Cq3#|( zt?GrX>UvFET;|Is``P6f4trzkR!!ybW%48E2HAUkfvC`B8| z27N9~B)PF$R5+e z`1VSVTp?Gv=w?vS#g#sdfhbnpwC}~?&(OkJtcLg7&`HIqDXaxV#2(}9JsM(iSz4d} zl~!Xc%4#OZ8iMShy#dzv^Y7WBs2y4qUOedU&Htjn$S>PtZ88@LhST7_4*1tXJC z8~4YPG^6_EsR-^zY+NMdWMp|h|8*bSe4)rWdtp?7liAMM!E0tbP9a(}GgEgIGZ+?onI|bJp8qJV0 zp$`%_3uiU8&?MY*Kx)IaxS^~m6GNQ+kgQEe_oaBDutAQ3+#~Zuy8vv=gx2^B5{gxkaMf>~MAj+0Ru%Z~H${27ga@i^b>z@<-OAZ2S zov@%Utv}}QEPYQycKTdy3kg%AH|;TN!MeITO2-l<8&RVcizWR>}AF5%B%ruE!b9WGR zDX2)tAkXZ)$pgooz|Xx5SX$`bh1vT53u^U_KoR$}_U|1CT`jK+=}r$BpK;CS5*S6K*BFe6iS5i*{spqKC#4KVW({rg}LdWkeNc7f-kQZ^B9;h z8Q#SLPMcZ6t%=~W6M48~8F0%QfLGyk*yXV0v5Gi7oGq2~^Z(G%&}?z4V5l2-ooB}b zXWSV=UP!6Wl*JfO6x>h?8hnF67!9R#DDF9}po4+$*rJ#>0p>xtWFlY|xuo@bcJaS8 zpL3=vhpAW}c7B!I-r<6L+TH0|ca9tLD`{(cPcf_3&i^`dVELP`@@&6@J6n3lyf;nt z?Ef`09xFBK8p3V!`@aO%f!aemgCuP`nOHa0Zo5w3uZ z24cPtC<-3_`O=UiG-pQbF(ETc%ETiU2j-{~dQUJ|EhtYT@a)6Neu?{laSW?)^;{Lv zG5v3xrOt^K6Lv0?mAf^#0-QMqpoYahTafk?@2KuDqqh?_mJ^8FU&=8!o=A0mcC%cG z?R>M9ej~$Qaoy$jSU*Y>bT}HPj2`lbGG6HwQ8q<3lS8pM+O32{f2s#-nr3Oj>+wwJ z<@@V{C%L{t`ZPZ|mv-vYo7tpVrZY9caPt&X|vh#hfn(q;g9=m-r}DI<8ibN3z<#P=gF<; z&rm<)@}K=M;!vtwZ!{<*g0iAVCkBNeS`2j+k@aDC1vw2mei5t}T2|!DhGCN}i6zc8 zyX~#*dirEz1$uzga(pUG-^jh32XnUqf$R*byCb8vMFlWMCQgW^>i6LZR3X@6-w8|tM zpdM1#tkC$yeq^q$FoL{Kk%#^2(GHlUQ$q!cRZz7xEnt>WPJL)tt7}aT6N@8)JXaed zRX9Iv^ft0{HRg-R!i-r(7{S>Cl-U1OcLv5s-VtmhyCYBNUcGYIY|MfB&_4xlR-Q zHED{Ho4=HBZ^DAf=+69C(lj?x7snT3Uci%=a4O%13zr781@&nniBk9ri&iDHCCt-t zs6dVS5(USbv&4IE7m!NsN|u2&rk21*J_kd$A~!ZRmiKa-?t$dzkgcq1SbB(BUjMh% zR&H8@PI?oA{Vwmo>wt%XifVAB`fs*Yg_fq1N``7Z^Q|0yaD(Jl_g6;3-fJG0-aJ0pc;q{(M5>DIM(6BuQVFrmSp*Fk?JSetP z8G=bHjBf)GsHmmB$(+OJIw1tYG_LXZnWeIHp?)Mx3P)dhP9^|%OG*Y^i6k&m8(e4@ zSoU_Xr{o3gASN?4bl3=G?8;%+%3Xyy;c@QwDu~?^Uq~k)HbRsY8TiJH!-y>$A$zYgV|lF(zhn#P1Ap1vAt_9%T;^qgln)C@Vcz11n{%;+1OA zX*gO3>j}j~%RRocSg#gS*+k#f)s2be)%fs=^!lPOez63b+-?0%L@k`=LGIZ)G-1(@ z%$-FhH>UY-nk&I~nVCr^{GK^GYw13;XUuXq-K{<^`O6Vj``Q^>yA`Cmy{{~xUaJwT zZu>^UaY51bQor3K!2G71T3Gtm9TB3@dG*<4!d344wX$m9q_0?TMTDmYP@+y5+ z88sWnoydfN9!+=(tB6H2zQcUx?u4k8>s~NlDYVD%*&C`N8gkNF-l0K=KJyETBG&n? z-Rbn?3{!~%)zay79-C@%I2@9ha$JxoLnR4`M_5_#(6BV3uM5%AtYOjCDcD&n{#Xlx z1iuUubY(R&kFtu~U7OyqgnF#P-Owx_K?DHZte=$7_H?-#w~<8Go<7cbvN?>X$=;x+ zQlS84sExs2X|-BYrJ$O~PGHPI{fynvh7n^oL<1PiMiv3X8y=Y%fu8TZ3l;)05?3g z!G0I3WP-aR<{vm=gLG|Y2AJ94Lel(cr*#JI#Bf8->0%BCaCIcyYkY-rQ}{sGXcvjH zg<#QX2+kJfrpZo`C+~~$wb-1_WY_(dA-4P|h-)<(jZON;rwvPZrfmTiHSJlr677c$ z4dw`@lBUqYQbUFoLid_YOdwltHSen$UKvUwm6qWZ(h3O5};$jSMx?CY+nY*EhWg zZ_J_>oo$Fe(^CiQew7Cb4%JsAnV7Yj0O+}&pl!;g22XHI$C}0 z+5@pBDj`P*N<#?qs@2V=3Jy9H5C)C{Z_mQ>FP9BPvvh35WHPH>604bpr*k^gfR=;L zB$mS~#2r1cyx@Xi<>Xiof(MGG&~jFusYV&|3YG{4QeBfi%hSHz$dtx|IT3P-l8iPc zm|kraT$?jc%q(o^BxjEG51P_p5D7gq44BV$Ue1_v(D3zk|Mp>4fJd3%Jp_T>szj&}vk;|<*zXh7lqe=pu6kAo&SMtzIw(&(lOzM+ zFX-MuYG%JyMGd9^I@liw49NAkIBJjKN*I{JgDNTmeej8UQAjPyJ}`Ilw`|pkSH(u1 zJiO&d(keh5c_F#1DZ8F?%aR`UTzZ;fH67SFv|t%PnSF_T)*V4D`~j7R&Qj{#nd2S zja>;jFpi~IdFP78HRzv zX)6!f&2FFooUea+5|d?CC(Pu7L2w1Yx`lNOIh_v%_dD9Y{K}g=Gr3eSU9Bo*tGeYX zJ+{v8zmlJVhK7bhjHSFj!Klj0%|yD+=-hPF#$|VsWtNS!k*R_^^Vh;wD&y0W!Ssen z1;Atd{lq0(wq7YG*S+E|%0N7-c+f7>X*?~~RQi;@Mq>yFGksBob<}1bMhLV_dMVt-~L+khE)yw62*r30=&6w+E!`&Jr{r zf7%X474;JF;XJ?KMPhnzILD+}<3d8TWRGh|Ynhxd8$; zQqh%HZhx^vgO_f9wZ@FM5fKUVTa)fX7ODb4+qjn4`xdmA0V`#I3hVCJ&$#b?H^Jxd z;r34%K|TB7TA=tUSz^EN5siVBJ|zfQxG7jwde$IeKYM4wb~d$XFyJH9BQRp^rcug> zBwyUmEVmv+pxK0P7>81k2D9)N#-Hp_w7B#o$}}yOvB7_@T0oZCgeuB>4VlPUkz-Xy zZw^2qqSovlcZzYw(X>Yi8--tPB5`; zdt%$RGchLS#Ma;6x%ux-)oE5=bnULLz20}NNBj0(y`q8_!tZjfO@eXdyh#U1k>C4u zV|RiRG8>Lq#@;|OZ@5dn0iC}=(rZ~Sw5v0@%L1k{XhftrgE3YApf*-BD&$|%-e?epPC8>>uev55 zXOnV6JBx)G_E+cp-##zvd@|A)WlHY-qQKBwFZTeLaBU}}(IM#9ZqA=vtJ>8eH<15A zlQ#SlYjh}&7;lW2jWYyT4Pz9obgDZg+8f3f2M5K7ijP04jong8)f_Vxb?$9$ z)nW~cx+Jwj)gpQpjLi~+p|A$U14Z)^W zyyBG6zq3!w>w<_V6U%zICaLo(5YlNo+->vpk3$$X2Uk<~5$2a-5m=eiA9^b?-)a_yA_dK5Gm2G4thv1RntWYDL$Ac z%3024zw52$(-=NcFsYytXur!eTg+ng?{2q><_&2*+b-Ilxr?t=Vp&nMZ`-gy^yil# zzHLRzt+D6%e|oKYkijZS4)LPrHX*B79Usst)%WQ)x~!b(aW)CDHaI)s+M_XSNAA8w zUip`{udHNUtkkaf7Qs|}s432z9vmF#krk~^q+Z3Vn5ZUrFihxiH7_Nbfb&96C}bmu zdzkz?6#&%@;E2lx+$%UFg<4q7BIscvn=wUS!;DG>KB+&0v;!%94Z%G71O7^EvK`dy zmdqo6KbBgCmO0r(Zn3&gr-Oru(a)DahOOvE!!N~{R&gdgb$-g6G-Uh3>$d=O!dm0a z)yYs7%}vTmO3Il;^b%Z|r_ppe+{(N69+cN&5sxvO5K*~<8i(jx()%gEZO9oCPg#T& zeZkBAXy1mli242iMH95cT?(7~4z#j8bAa zB3DFV&5b}S_;gWTKN^=^nufq2xQOX8Hd9RvGb-k4A1u+`qT~B*MxlweD|Q2#Tceha z_6>3qKwIy-%0+~eG}p(o>>VZ@?6m5lJNOHxR5~& zcRDAVwFpz-c<;&0`t78*BdKAqW=_b&0z+Msm&FY?i7-`3x-|om*2cW1F}cmOj*;tR0Wq%g>{d9>UZGjQuug+V?&(i_bbgK$vQMuvMpOSP_4nN z4P5&cx7i*dvf^kj9eGw~Ru9PV`)xAl*ewJmjAX=KL1~I+rt}-RdDsc`Wq+LbGJylY z#j)a0Q169J^w3|6SZhNmaT>Yy_(L-2``&hSCgkwl8I9(3MpY`&YItjW_9WD1h}3OF zknZc_%ktXJhk_GVG)H#e9&NosyX-&D8Whn(4a|a`FOtB zpHz5wXz#-v@EzxN%Hggj$WDK((TI;+aj!30Yf7uuMmmuK+Qb*k_5I9Ao^a9jl}3hC zT`A|o#Y^w0(Xl|LdB?XzEV>YI+Jnkz5jUI<9>}23@JRD2UX5kQ#QOfZBHsoB!e%o^ zFe3AsQ6}7S*);+mFJ$AVgT^Dh>P4q({RR(u28^8J2>Dx()KXdJE1rqb{MfzvY^kD5 zCDSDTtf}31q+c?ch%qzD0nC%WOjZ2s1k z?ZF0$I$+H78wYfg)v10&ww9YK^e^)F741AssFVf7s`^rU za8CSA;I$cQo;5R$=!V2~ZA2q(rc}t>3)5hW)YM@(8tj56?`Rl8uPU6?%x==qU5i(z z?;r7w^TTY~21ntlR3>+vNJzS*i`LSvRmwoODaQ}@0d^ykedv?&1>n3dr!0L+xIoil zaO#!9v5G8P%U$P0_1-X2Ca1M8ik9fWs-HEZ$Sw2J{sCt)z0{b7NYe&%@c^*h$d{t zsCQ|S$Omd~08KoCtSpYw#$gx-1p9OyLN|l%;&Za3wHasj_n;u?M2v|l*Mr2XlC*|mrRDeL$rBuZ{T`?m z@eE=k&D6cx2P-n_)nI#YD46Nf3xifvdQ`HO24Nwn{dbGyEaqvY>gQIAjeJ`JGdbm& zZ55x_UFUc=F|8+NMMrKFcwA3Vk;#V*+3z(-C)1$UBF>@1Rj{8wNkv7Kx&3v1F&uIj zP^s3dOm20~`J@eyi`tDAPutx}X=6e(NhtfAxv8pI!Hp!j?vC>^GBLyEUI#Fr z`3M*@*)_L^mHu=eiRR(}1!=Ucs)>1f)~p>01pVdeDtF(?s6Cwsgb!r!ztpS&Q9puX zzmZ~k)K73<1>M_j5e0<`u8%>lj?oU$%I`8nZ-OzWr&g!DJ5&5R&^B$IV#!b zPco__ZXm66Ycb7uGSxr>6_>+y7kfbyRzrmD8d-xagkDQDPWKO`sTgeGq8cH_QER6N z8ko#f)l|<4*G&F7Fh1{Cg>)xrz5}!s^19P7Gt}K1A}!mrQhH`>0hZ?TU!J zR&Kp_S3HSsjvr1!sE_`xWlKs-4Sw3~E1|Spx;G(+W&nqf%TH2eUJHN91nIbh*>hRx zwg_3dhL|7oDpk)RF%elWtS16pCk;ze)Ps;~yN0_xkfWiT?$l%MOZzn&{TrCOMt6#1 zYjx;BkdQR#X{bGg|-ExE(Z&gv(pj zPtA%8!S_g-zrh173x+OXxF$E+#>CsliCDmP^E$o1bBEvXXKb zSP{6ogi*j?me&enDR5O<;yA4KZRAce8JfIc;%vJTe8LsWd0TP&4R~>-Yt}hqv3W*7 z{UnV>DGma`u+dBQjpiFEq8j_LN2BdDv<3}1#eZ7iTKYkf`kpb=*$5J1N~J*Wqmf4~ zO9`7)!+8^_QZk~D%wyY1bz)g4DJ<{m`VnC+pvgrO zcECS%kV+v?Lu%ciX;4Z@l^Cxgd?`+Vy>O9}@3V$nu7AoH%oD?;fXf@KGqSQe5vuSl zn94SiQ5w?X33YrsWI+7D5a-OCDEo^)i^1L!$P1q6VJHyF3l9%xJTU8+Fv!kRl~mSt z1HQ+)ll7otO`{&$nkB&RVG#caL0%)OT${{>2Zm^Di*2a+GwW)9=Ncq~yfd#ih%|OB zFD~{(onLSm_kEEURVOM(1l{0}k+-C1xMZgvC~d-R3Dpx2%oM@uSB+IMN?;=KRvUh^ zHpc>7- z7VZ3jW#pcuh-pa8vyZ3Os@f@j^PJ+%Q}$z5Gf2rQL?&MOg%t8xozHeSZphL$JUZ&H z7=R<~9@CbcmMKg6Jz&b+mae{>c3Pt}y?k76Ek7PwGivtx;x`H9b_(Vu@icP_3t>qG zl6_()rgv%4!^_pj%MD?1j;+?YyJC&UOY=r@Ag#7F)kJlZv}s!5m1guG%QIeUNO5;& z>Ya1=_*x5d^Pk@A{P!RO7%T|uCoN#Em&8UxEz}BXu>HWSZ(IgTtG0KepO8^S^98Pz z7!#dLCsT1Uqh*mO8#m41#*B=@h5UoU^Zz^s|A-5!cxUa9QEN1x_Kg^CMAbZ?j9I*% zblHj)lT7(h%%c6TQfK~Dw?vO~v;!~P8u3r$FD0W^VL;NMQ{i6?2*$eCE00fq3^jOu zBBg*F*`Bb--#*6HVMys&>UJvh99wE!xisv{?;UJ&&sTdSnA7x?%kB|05)RosPQK&4 zllEU|`L}BLxVX3?7i+V!Ww9j4eLN-_LywoG#Cr%!a%?;`HZ*7ikOys>f8q1LfQ~(ui0SnP2L6Q0@KTi8TysR1 z41D@P1EyPaTQAY7Rt)iBA3RZyH6Ed{^s4qXt$#s+0vaIHVVDXwF(CfA9H=1_82r)_ zQ$O1LDmqe7byhh-Lx)8~^iv6tXvwr^%Q!;k$^tq4?ud~qf*H??ii*U2eSLGO2tB!Z z38PBmGZ~+`*Veel+)!+X7~%;0L3Ya5_o)na96pF+FrMytb!qjP`FvD~5?@#82r0wY5*U{mGCk1sor(t#FQ=6t6F?4uV&Ezld+XQW+M zxM52a>>rTHO^S}HGc0paY}&4Tq@%rGIciDf5eecTcVc292In0*R*ST9Kh#8=OL&}o8k|iEp<7eJn{y% zG|L)TL<9t9%xl{V%dar^WDK?XmUsU}sZ|o-n465m1Zw*NihU_h^N=9<%B zV60EF5~6CJ*_VD6t{9qs><}ep=An+Wo%+C&*u!lb`ne2k`$(KI$Sf#=L;_Gr3MHft zvZ2sHA1N9@0t5f6j~xH~kC~c(i!SXI_T&3~Q%`y}Im^F0&i<@p?~MEKN=rS=8Kwmn#MsK0(mJgtHtd7`DTq= zD!MNK9P%0@rxF*E9*rfOZ+Ed6?Qp-0WYX`*S1nVVd3(j(S)2uFjUya-USL3E&rrEa z5eb;NQVyTnWIC$}nI}{3ozsse|K-PF>>p}`e6E%rPR8%S@Bp@8_~*0AS^^6I94EBI z4|+>q#Q+Qn=sDk-yh^w8Kga`Ia4w|LQ@ic3$aqURc3zvG&q`ZjP{k}xYSA*Rr!DlU!Na?t0SYA#iKnD0_v!v_o)Wm zQ7EtPceDD0Hju@C3dF#cA(ND z2gAM*lL+!ide<%vZV_1bSWIO9EWP@zcjl7B=v!U7!CEu5XW-%FwP9_x( zMcU;QuowRPo5jf zt+BJ`9i~2d(&u(xU+3g7ed_sDEYtQr+GUb6s9{`8P9+ z=TmlHA|vi9qQQ2prUKZXZ6A5Zz-&FqhF(iqx}Pej3W&)u8F?GBq3yzi(noV+WYVu# zwxU^puU|^4U$BHqAH=SkE`u*spff1W72!?m=w^CVVs!DoeY#JCP$@4gEbI#%v@J0n z*WR|>z;%odYXY=oOkYNm<2Mh+VkGT%il9L9k0s_nx#H@Ti1_LSy!r7npab?Z^fm0K#6Gz&*~N*HW&361Aj=4Et5Zf+J0(s( zn}kokL!LOhu6s+p$!O`EbR0glg^4&t2~a((6WO?#&Zu#6T9iuba=qClpztoE#(&j@ z$KZztqywdYn1{Q7tH_(>)3@^WE7&F8YjV725u2We24WU&E+|MQ=3mZ1{jnHTpupWD zCrVsd%w^B6{Qnjiu8b1!bp@i$d*S$|lb=UUaH%8od|yf7lI0zLg$y=*iEHir0=VJV zAHzKTkHwiSeZE3F-ntcR8eVS6kr2615bt}k)L6Z z*L%`X;FmUTb!b}&#p*E1VPf$1b9g(IeIEz~Qe0tY?b@Q!xV8o>b^q;8+kI2EdxPwv z&iA9SeKVbXDrdBmR@ zAlo>~&_Zq-n(@o5v7;bDa6XYO zkm&lJDbXLRZ_mn$%HqWwzOBJ9X}5=VGE^Uq8#}-U)<8 zGejf8ikOxuyrP8dU|glgi{_H^E26i9MKoONhp%-`y_ z$-3Ix3SLB!$E-7CU!n>KtfA$u+vKaxiHG8Y@uQo#ebamiL&9at{cdg$Zcw#mmkT^>%`6Ek$F8&Of z;39<~L!mXI)AqmJ4@8`u%5SA*Q2dmD9*9ih&U$>Q&>dNnKxkyfOjW;^u z@fpt=hhU_Gt*~FcnL+Ln`AeegHtNgd1%3?jc*-g(2FBsAl8vL32TDBz2HDz2nQKu~ z40il{!L(M|gqU4*#mMx6fi7g`QMe0oM}EQ5m+q(JR(7?5kz<&Y$iU==Zp!i$6RD&_ ze{nVDGSE&uiZd#`<9IRBUDZy1WVdHyFR4f7xNGnEg9~xT-g87AXI2@pr2>KMlKl7n z=Bi;c-~a2gTWe@a9)1LQYIDKj1BFmj1Br+WNzmLbz`_zC5-95j)r3lHNh&lK$R(XbR!RG-9G_Z3jvXdppkJB*b=&-`Yq4^R+qoPMX&2w(xudRY5;hBFC2iLAgz*| zKg|;Zp>mAIrzGNno=^#gwu`{f6HDf_q9X7KBgZ@&Z%P43(cF?aZIk~QcIFHYK*|jx z47L*9&*qD}3C>B1lC$~+^KIbb_dY9&Fh7l zv0lhac;ay9~tG<;V`c;Nu) zr^^UZ@i1O`Z)%0~0Fc(%XuHcRJT6XJObh~~6$}F@`i)+0549T2WA427OM$CxPUMQj ztD*Y%D+T*ab~FGdg4}S`Yl%|%M{kr|T(WtUfyb8>71B?-Oo=HEIZJbDBWad?xa9JT zyn0tk2K;M>KuW=q0Z`NUeY2sjYlyPZBO}HIUzrW%+IW2R`MKno^c~-*Bt@cB0^%Oog_bE5lhdBf=w-5gXdo;q)w05%A9o{&c#*}40SAln6(bx zOg8T?Q0Mvg{pF6w;~xR25j|)H=}Y$pLJ-@0UmCi4qAN9-_OFD^j7AGwyEuHA1wK$n ze@H~SrmK=oA0Iw%-yQv+$dTlWv~YqEaN@o}-#^m)MUpN+d%CR@wRj z4I?XlFG;51l0gi*Egpx8LKC&)gidanFH$PUho}1u)J07g?f8EQ5()X9v|jbR&D8rm z{rmfGtFz7js-|%#bPyYD!H!(u$EC>c8)+3&Ydi!QY4{xa<2yIzl%&8kZSZVzjMxV=Bu!8J zreuZEeOp8_B1c_gC%HfpD_3b^B+Kb{`C7{)xvhy*=E|Jdj?d3&olhb`?_d?Btx}Mb z#s(VirZdK7$(1gI)>BW9;Jd17LQ2XZ59|3Oq}q!d+Xz!cIfpIxMC@wV_af*f8KVsf zqm2Uq4Ow*MwnZUiBGY#>qfFaZkh+msFZrYcE7u-h+35b~v4CW;OT7L| z$TU&dbef9cJSGNapB#eWAyl0lJ^OVr*yCmgLsyd!Vy(l}$VOJ<&3OL!&pFqeV#b7{ z;Bq_wv5}5eE_jjwUQxt=L%oO@36RhAeK^XvWvp+uP0R~)+$%!qE8!G)r7WoAi*9&K z*emq8$HJz%>U&V(vl$EGxt{&qq?R&2z42s7;m13S1A~D~sI`ff2`zh&Q%iJ7#&dxi zrY3Mn*CTn&=5`+^5u$iRK!|w9itD73ok3QU8H=Cd04UYAM;rqhug_qNR!em~JtpmZ z<9%T{i@5R?7g;RQ3!?OB*X-K^GU8=rBF6z*w}%xCE~UJ&4UHLw@L{@EbXtcx=V4v6 z#-Lapkf7Kxy9(uS|0IQa*9tvO?(euKnJ+&b(sl&*s|2s@)%u9sa9=e@B(&PiFqYmO9799jh75Jyb9aO8=h9;0Zey69m$& zs9YeB!7iUJ)wYS!u3hwNS>4Xm2!wobTJ5)-34Sx=Ct&79ufizp^QfI91?%K}a}(Lq zPwsfvjRS_NSUc?W#DLOmc%()a()H%x_CTG;&_Djs9dCt(={hr-k7+73oDRei>DL3t zGg;WWcbD#f5Se#6ngGnG&d7zE73H5VZqg`u200POD_cYK=MHWw&G<-m8TMt=ibu~CMKg5#n7HEV@@<&U6dpXmi=?M#cRV$bX^_JFhe z#Tw*wEF{;|kX6T^7UN+A>dR7gySiu3zj9ax=Uf2bhO6TqCTxp4zS}%X#wbsEPR=C` ze;|H9@>Y{Px5`UYGu&ktObX1E$eNK4QOe+&1uENBA*5FMP%T+hh(1}ES(^SRfZjg; ztO7}Z-uc;h57^a0is%qQ(9`QJPK3vDKzP!?%+>dwp41UY}v)Cjsm^5#76y2a3S`NMQcQDKZ1P3TyarYZ%lWHZ`Z@gdp)sH3; zT=)@w7_zR43zfX$`0?tt+2%BO3dI3o`3tAlHNho`FDdmb4_SOzR99Il6qRy>mEZK8 zk8-U*6Xg!kFa%p)Dx!^^hTK`pY1mCo+Y55GYP=7TEUY$?pr@TxJ~2l3S^3~PiO@sY z<4Kctl*9muwc zhDW*Fq|sjI!$=d&T7%(cn-v08RI4x)Lg&6e>!c>ecd=VH_q)sJy(mT3$$-R}GV&qp zUW6e7F;?)ZVla)LYn*E6eYv0qpwB>YYUmtdbtB7u@1uI{*>Zz%Y28Wp;JRk)uV65| zVRe#X!R394^t!(D57IMlri26qEv9_b?+$MtPDbp}QWIwLi7s5%@Y0 zmYonyx8<-A2LW+ZM^2ApwpD4pb@tst=;=E)h)0=sD$V$*iU5yeg4|!2oj?j@yHcZH zu38rR)n?vDm2R4qnyckpNbAWVWFZ-d=^TUIMH%T4@;!Iw(>)bZ>*Qkbda5(P*E9`G zL+qd~ddw)~a7CH&ZwCcFcd&kjrzDt<>cMr+wDxl!b(ovSwrCQj^gNq0laAkEH)DEE z&~i2iwRskGN)m&fgk8nbtfMfYrTCsWO(eg_%+k;Dt#7JS@_>L@IqV<#ML^muu$Y>2 z-39xhL~~jDCq}chWRb>3O{@vX19|-syT_oxJytAoVLV0J35T;LS~i=`I=Dj%muNu4 zkAXY#N^%~|(daI7O-4pW(5?}7N*)Mm{yhS!ZeBz%a=f8P(R;<9s|tnOQ=)n!siEqq zL-c16It|e44CE&;+|B-eFs_w1zw>0uaINk|)e=(Ol)`O0D($;4Vy#v=v+t20!~<=e z!A3#~G6~mlb8vCI;*SW0#V0?W=4|tzmbyK7!j2ZFdI`1XmFI2h++mVRf&Z#eM zCk`iY_nj^mB!#syP1Bv^GlqF2co*s3ZuUn%#!-mZxah!`Z|_eR6;ljiz?`$C^Kn|I ztfO^9Lh}>tl4q=cC`kn3o+_HAi{TSe9Z_VG{rM0|yS&5CFaD*e5j&((+8IgEn zB5Gx=gwMsDwFN7gCUgd)!e$*v7T3iCA^_^7OpXh-V|B|fS?D&5mcn!!2=ccvQosyl_ciX!NWE?EAo$F@Ej(Rir<+mZ()~if z$`Ct3g-UIlvP}UbCAZw)-xG}FDjjz~`{*+n&M2HahUDZwr0wJ%jkTArF{1j#kY#;#P{eer9iV{l)dgPlpSn>g@j+x^e03LnB`Ena2BQ-8-)beWW@}3u} zZGe>eMju#qAU9OGCO~o@x*YqD3>T${Aft#nuq||AvbJ!dfu4rs*W847YGDq6%j^9q z`lR~{YoiR;q4{41(2s3g-%{ye`^~g5S1|N-6gO%zQRA$tl+O`Hx#V zu6;TfCN6G7wQegJ=L65tO!nXCFVN%zJLiUP&pv4n){cp88?P_`H)-MmM&&@2#eWKJ zr@x$3f4r>at`{(YA!W9g6NBqHX|#mg)$tF;z`d$s>a z;EG59$Ek`5#2{3}%5ZToq?bD?+qUkAcR=zWEGwgNuzyD23?fXXaRW8Y)`VwZA4fkq z7cUsVqGW^3(tlon<*8E8J2xODuyw@;_aPJPA(G`x68y{yJaVB-L>*m99W{RfUb!TV zMY1Q{xZXI5X)i|cgK*7gYS&c=v7^I1Z@2nKFOij%)lXVeg$CRv$G>7>q);I{W_4wQ zG}^Yz;D5(vlYvgAKJ{bX}YqCet2WGN5}S3od5l@ zq^NPKEugBG8oSciEPl%uk^|K?YJLr(^2*IZrj4h8h_?pL!%`$Y#F82K85 z#3&j{FwD5_fI>v({JEezxEy~XOzEoYQKTRVS(As{T~~jOKKQu1Tn3V_0kD<5NT#q9tM5<=P1f$oj$h@NCZ0O9HGv@uC zAP!^30`K~=B~hC|3YEry*#E@la3Tf8gtpR@AtMXBFCED#CU)+seCac2K z-8;*Vs`6PUg1qN>&5q#l+m`6Je6Y-ja4*A&)hu!>grb_=49v8fgGhOZCCUiZG-Xj7 z$$U9PWl9369BDN0irsgYG2yGKA*TA1#W7)aWN2#QQ5$_2J`@tmM?O?eGon!*U$qRA z&?EfXgLsOTtWh&vrCfniFiCQH+7eUjeX@OW6D%_&oA^?OvyN{;a;L?_uJ)7FM3#+| zS_#~9`Pv^$E6;HR0pp5aNECro%15GWop^4a5Ge$woxyT2%4SgIiBU{&MKeW~Q@p~; zq)>8Nm~8x8;FWz#7#JCjP${p>kIbJ<8JAqpqNVl85*ft=4T9#V+#9klWcdiGnaDWW zBRE)aEOaMY+Z2{iv50{!)+s%|Sz0c4qHu)OWg%%_0%DS9%n8SYeD;#-oz;vnp82I* zh&$%e4EC^yfVzxg0^9#63?cJH04Jd7h*7s-fNTVGx(v`jq~wWAtK=^vIHU$}?o%MZ zRU*7-sryd-OeScT?pu#=hHTl*AZjEenYuv(vhza>Q&3P*!GH*!JN{e~uAd`*52FK9 zS4r@uG-gYh%5Hu80b1aysqNsU3`IA*0Kg2+HO{&LpJvKvvPy)Y^4*`J4lJ?nzQOo?Dk0DX^cG8_MeQ{RKtF6k606!U%8FX7k6S90FU+ENzBB ztfIpS^ORHHjOZgs6!EcEI8*SOAyK`fDObPY9+9|+9YqJk-Lxm6GLDTs#yE?81t!j`53Xbx)ypA**;1kjy9)p zTAg(#STi){n}gJg(7DPi#9sM z4D3i8T3oo)tOCb<+CAB}K_JmNbEe_ilDY}j$f(XDbW?qo*DlX()IDadBb+4JH#lV< zl^_x1jX<_vEd^>jF>t4JB+cRCGUq&9&ks7TnO%gF+!rIio02})3sQ@w5MaT{&J@a0F>=^ylSQ_OKKzYx_$(upc%0Vxpm5;W(-^PPp~dm4in^u;(Q25n6-)5jR{cop4**(^ zA+g4lP|Q@8w$LuyVH;VLlhcfAq&rOOO+|+1s)?>{^CtQ?a6XG0%^scs#x+Ow)+s62 zO&zqWTS;bLT(lT_Kw8mZ@pL&i6K*vXWzo+2R(iu3Y72qD-53IuPRmdflF7fx>?#g$ zlfrxk6TQMD&XAQKq(E8Oo2;M_gpiql^Vz$#??baE@7O|wkrmx5g}zsAaHmaT$%d=~ zc6-+Y+~+Kw^WfQn9xCg;(48%IVh7I=iqyOHUO(Akpzn&{qqD4}$++y1&JCZ!MIfzw zri|iFw0p@NXD-=)!5Cd8daZVt^UjnI3{^82oB)MoTGjxm2$}ekg@uLLZ6@13Kv+}} z=*R|Hs&WGNQ;CBzjD*WzH)X<6J(& zIcoRL)c;y%gd@j3gHk|Qw6tqykhBurdkAYU+CvmUc1eG;U2Z3%lM)clTJ$~+`%#>; zI`g_YVqWSG3{ef0ZAf;B0Q)+W?#VVmi{-60ZWycPtG>#55I*btloHIlOC{6T{6-{j z!joqR1u?CMW!MmXv3GMn>pazfnuO?%m87o2y<`TNeQrD=lX`juafj0}^L1!nq+oMd(#-p?^lW%#B|1*8=L-xYzwPjsVcACKynth@LWNAp!p0BfMdqVYI$4l zu6%N{38}=z3?aFlC5%uyM}D-NAkhsIrbZ;8{>==>xo_MNaneyDrZ#8xpx$ywC^>u; zQt8=1fRhb(>n&LL`)?;*!b1&kCwwMcufR7pZhPk&G zniaT^5n_@4h%jZtJtK^CSBiWmVjUy!KkNr2c)*=A3I?c{1{=9TL8OJJO)z#`niWh> z(%*WvNg_Xx%qPTJL)S8J2<7XV6o#NeQeaBATp4f=Vem?BK%$Qs-c{Po_5Q~O4?wt~ z$my%Z1QnqI2w(86pCmcR$_+y8&2fyr%1HHJcd7*nhR)GS|BVm`8h|i(WA43~Ev2`1uI* zBamk8L4%{B1j*qBTI@EQ14a_jw0~D7O;xEwauH|9xTc{vK3=p3kXTj6fA`VH5%j*d zbZ}p7gGP`ld#M(2r4uV!h!>_?wt+Af%Hz$a%ZD(8>&N$i$WxHH-pME=X`{q7H#X|E zNQU^eV?PA!ncHHFU2AHFoeq5Tz(-HVv?fGE;|UsBQIJE|sBtycH9t~6_TU(!8o^~e zIm3vuqH~yf2N4-00s6kC5iQ86Gd`dIfTiD2+FT!jbdd{3#f9Os2#bZ?8sSu6 zSQzvqSbSMjRau#laa1+V=-4B5o9}2-zQS+0Z^(XKK-KI#D+^Zp2c|~p^ybmcJ^g&Y z^erdDNjcfLSw3?239YHjRxr2BmOfbI%mVMhBOyc=qMfv-rLNk;M(=6VKh0qQj>9k0 z$ahq5VJbrT_mAYw?e$SNd-?5S!qmtmM|sXw2k#uo*=eEZp_qB+oIyGYqB-Z#%k1pP z#0pxcKN5E}g6jsQW?O`StVFGTCn_?3;vG?H=a&<@`y$%?nWcda@Qva$2f^nNm*0@$wr?3cFI z2uD-7A$%VrWE@8X6U+)8Rht8%MES^?h+ROUFaHZxxC1I)|Tp2Fa@YQ&?lV|W{d=vJ^18?vazH~3WM+W z22>z$N-Q!>%>ib59PYJXEdWYb2g$WheC5A3vN-EZQZd(@5HoIH@qJzONdNo0}($SJtt>Uw?S8TZwW}Zpv9HSYbt|l#`{+Kes{3h}&0B%rHxa8rw^Xq-6gD+`y)k_Twr%)o=4(0pp09l~!nD6F z*|tYNUH}joDdZDjmOC9erT=ENDkp{SyNg;JQrSbA_>M$*Oc5DLft5b3_R4b$6pVxb zNMMma=09Iw((uZFoo7KQz47>x1)S!jmZH&^$5b&p17S3UZn`?;(oxLct2SIna({T^ z&Cc(2Jyxx<8-v0h@%nwO>#-GD8VduSy_f9$FB_lv-V01>zdTV=uGVa}!8CW@zVQP_>r)Yh0@Pm=?h9OXOs1YW)R?=vEr>F>$|0L&C zl7|^--m24#xD1me%_9kt>O;qWxa=3IRre@kPT7!JE|X*ZJv6f*@R7Zc)OpA4LiNX+ zUBs9x`GUCb4qVJxEm2^jrkNIP)J-hS(Rj}l+xfEY^UX)Dlc)6$J{6pd)+fHljnYib zbITscRXF`!M*9rFFW1x457akKJAG(ZtHl9hV)im0$J+ zLv|O|SK@hJx`s|kyV@$s!nRcS{R?-S#dE0+7K1$c}b`_(CX812v4#m7R86ol#_ zMwr;eg;VcIFovVhbtYrnhj0ioEm|^rT23SN*FY3Qw@_;M%9_9HDe{Vc(D)JJIVbb=bEcbW!^hAfQo9quvX2589qB7_I?|O@a`V5OQh{+!3$!awR*m}4wOrh z5roQ}N60jxIq!D;blsL`8{mp|9oXdQ+ga2%{uwWz_m%uWokfTdC?KJZBN@cY!5K1$fGaebw~EygvR%Y7em>g?lTOA66EMUmA!s0>Xsp%k zXN_xA>!H@gkz@buUf#}qU%y@Sw6f{|OO2(*E-6T4smcb^u%3a(h>;ToCms|~jU(wT zeuAd#X66$E!#{y$Fdk=;T~p#u%4T42;R{vxLnpjpSljQ~$+UA>QO@bdDWu~=L>%cS z0syOw>Sn$yso#3w^ZN_>b0XC3>vz&fzl4Mrref56+v~yt@eG+mm!zPqi863NbaDrdBjf6eB3Qz|KQX*9{1f*d1$;}D|8bfIHYcsTXgHKXNNcTIvDVrXk zV3bh&Y(YT$b1Az1S)I=7lB!x(ybqtM@p8u}sARHMCA(-|p5h3RN0IAM6}mdgVRa{M zOgu_>yW?fzZjF!AdQ-;CAW$6Vk6q^qfCa^jsMO^Gsxtd?%bR;MV>0t+UJ+v4da<;+7t5ekSh<@U+yHWTv;jDa#l&RK1KgRqZa-|Df-wfCNkxxYUM;YZNKH~ zFAb-Pw<K=_ec~w!F6wWy=N^-28G=nZ^$E7DS$o$5eQL~nChfZfXuy=WXd4+=0Diwpr znUd=|$+*Ez*>|D7E&?>6C8P^MmY$IycM{P*txnGTw&DryBaicV*5KMj6Cg;AR7n@0 zj?p)PU`PpFM+TvFGGzj%(noa>W^v6Vz-kJRip`2d$>|oZRm7c&5%r?Yx#@iEB$_r( zns>dU z8FHk{RDkAl`g&KML6h+(v(eLk8TYtX)c{27fao2QVRA0a6l2Bw%`S{&^uEX$q0pd# zI@Hha)5X88qt~P23p(fM+3*;3ngc)AJV-P$MA}%Vvenc^Za7Qoz364Nxbmca>|W48v5kXCOLD9~jSjK5+4#RM?+~>7XNY^8k^mZL zQj{=w^^Ji`u0ch#jd!YOG59RF>FwJ4ZwZmj12 ztL!?1qFS~tk|d5J8375Ba|X#lat1|mhGBpia!w+W1j)h-89@;N$r%~R8OfOe$zg~J z3MhQTz4yKAwZ8YN-tIcpb*g*q?z8*+Slv~tcUn$6p+?ISX~tyLNb=`4FBM&m-N_Qe zJooz4w&p@%)rXPc)^%MuW+IlEA7?1I_cP=U&B}U)lroLEe#nO9_W%@bMO0fC1 z@)IZUaQMffpXWYr%bi-n@>?__=wIfYXI`q0<-3Vk$ zB%2+`TP)O|KWoIa3Y|_ggXs zF;$pXd0;W=mI})kx?b9T9DDIFJvG#op{RKg@5{~FvaOmIrhU)C@ zl?cthWpV|-io7%x!*?!?Uhqf}s@LQMesKZUu=FfU$KOBw&LK9kccVtSl^}Iv*FR{_ zrg8gIvDFVG&90r`6C_lEwf;M~D(l|Ce0*I32+Jj$jvXve{a}$zR}?HuX$VQ*{b}nQ z9{ROgy{32Vds=r;hG}0fj~;(mrL938iW~L=*CwDs;BkfR_F2#uE`hF^yes~>D^eVXS8!J2i6pJ6(?SS1 z%3DollR5vaQ62Wh^t}5CtlWFaYE{B>X+iVbWNsHQ4=`PBiI_eRExXEXaktkE$0f$? zRVso3h&I^2G@5^K!;-0&Z^F;W2)3v{7%&owfLslgWM0yU@xoGL4|ud^x-6Vet;Cj5 zogZ=gUzE+=9#kRqqv5wN#wS?<(acVT1}1G@Rq;GnV=1-nh!j|XX%Xew-tr~C~Ajt%uE4tLQU zh$DRZqWW^Kh34RZoZ5*=T1tVoK`9G91b6YS*>(}5XslGf(v{2ApdCtEb^Uzb@4eXp z$EEYYMK?XwXTH;klE>xY;(pJJN-^NvX}oDXgWru&^fp(8eStxjLb9te$5|KM$IVi> z30?H5{tMG5)2G)Zx9X>?e(j#N5GKL3HUvXWN&CTj1*@mmnW+afa=k#?@D9$}YpJRm^BFRX&hE<)Z!WpvHY+J7cV?-s z_n;efgmH{1IumXsG*Zc3PA%MFm;%&~S)6HiGAB<+TJERFeqUlcdiO&PX&x6}O5ORAd$4#=@B5Rx*%UE+0E1ZA z%{7g|G^$VB5OvJCyY(h(1+>N`M@N#cR%rBHYiHQDi6bUuVods;u1(m-1m=sHd&2wg zNMMSX5dDy<6ygBi9s(4(g{YDW+b27?f$6oVB3KnfW++a?{pu1&;W>j(4X!*MRvF!q zinm-PypFRpf4MC`I{UXEIwksljx!cI&QAZEAn1B&&=80<7|QG98JyGxZRaP7Jdlc* zq{AcO^3@fApfe)5XujeD>SNu7v?~y#79YqInX(f>WRy-fe;`5*)IbjOG}$z8dCXXS zE*0h2yForrocW)4N#p>c_(gT$W0+tMW={$ATkXwoUrdf_BDbhHEyrEmf{2L9<*n#| zT1(qWH@KdCo95ux@%!9OJhOZChWvgOM7*(^ZzHo-va;_az@CzHY4hqcr9}bg>d939xx;E0Ko58KDR#B%bx4U1i_x)V>Pv zUSWhna!87XD6;!d?^T%ttiU5usNqOc><1~u`;O;i&E_gUcT;c#?1c+>yTUJY4sJGk z4`zD>XYchC8h^PT3_sLaNeDx9g)bzp*e=MYo|oREirm;r)s;TSyj~((04+isy+pqM zb%_Azczc3DP-`!54|@S#KZwf*qrT+Kev-v6?^Aw8FDyVg%~}9;vP?4#@XUZ@ZD++d3)>3u45P|@^DVMsf}ZDHV?`6m5662PoqzrocK zNKV{ORC1V*MQPGvUkQv+voHoF+HZYO@xJSCBBeAEq+Cioq@I* zg8FF587XXqERTvGR4^LVD*2?*oi6C*^+ULkWt$WG;rMEF^??LCvZHjH>(BI^?3tq7 zS&Z$-aoZblVx^l(bw?}S1gxlw2I4s|PUzgD1h z)u|_WW<<7U=>li7%0F(^j4X6S83hdwa3h+^(;ZCwjo}Z=DX-FdsqXb|nyv>F06SlH z#U4+7U9!4b1d15dysrByKphbV5F6Ex>k6;k_1BS%@y}!b5`RoNW?h#TO2>q9o!%Sh zIx!bj7SjtiC80(UqAxm+>VS0?fbTc~vfd;f4KsmXN+aWDYo^TUvy6%NdE4dH>XU*+ z8^z`2H%>K3RJ20`az-AAm8MejlctLJi889Rj@}ul!+`ZtEEsi2Yss2P0Ho{nsH^Qs zhqv{N`gZ5|viI&hmFU_2J%viQq+9V1}99&N4{L-l1bo_2n3jX2>%8HQiH*2yfv(-geu zy*Ofqdd9-|1Pr_2SvjL+#i>O6D7!mv$9Qf5TJqm{-lb})_8m49o|iWaHr)7ODB9^4 zv@qJrc;`b$Wy`xy3cX>Qp3j`;SIy-}SCMeOV@0QB3YHIs4RV)nFy=%N1L%BdE71ir z0Q|EGn%lhsx0ygtv-rSmV%YOfbN*HXy6F;BLjk?6?(p=ti{5+z$X$z5rg)_)%g*Hj zM!693@Fk)f_-8Z>f}MGn#zZ0HPkE?|3~kKvm;->zO!XWO?Cu$pl@Gr!zWIb=-T7S6 zyYHM+<^56O;2mXwA`Se>IEU}@Z!sc$+~9W!T89}SppXWY-EdHVppWvFpFaP~9lKf% z_LA&Zw>=vvdUlT-8YNkQnVV}Ai@G4>htBGcd;A;&zL*7c`BgyPf#gaG@WQT=pG!bt z;*K9e=I*S2g}K(-FMf;UH*@W{__LKuG6v!$v9hXI5TLgOoJVpvsO+h1@<7`zCMyAn zqPIeXV+A9Q@!0hz4_zli5Zh!%y)mLn(#?=StGVpvsbF6)$F-S%W6PH zgPzpZ@CR_rAlGALlziLDbIN2WE$jH*7Rm`@G(x#Xpf{bSxAr|aTO za{!{=3~R>u96h+sn_xz6g*}&v`D}nvPPD?Hj9Q{;%2#0(72g&%h8Gw;L{s667rC!| z2|ur29O@7*oLn1>o2OVckCdW&+VpA2$pbJyz)0%#;r@J#|L5Cbkne+8lak%d zuO=Mf_zFvGB*9LCu^jcpsgr`yimrX7^RXs$Vp}yrQe6X)uL|c_k6t~J+EHZYIUet3 zSrpuxI;VIvqt`O8z3T#g9V-%{?2`x-rg!HI9wbPjrA!m=NBH_qg`HZYcoGi-4R3a| z(OwwOV}0x-552)sE|5mOYoVtss76|>XJ!~tWvI*UnAE`a+DL(y3kg+o>B7!lIvfvP z#u5^lgdo~_0>vGMq7zVB4eZqn{dsOS?zpekdxf;^-Nw{dv0Q2w%8N*abD0PSs+d24 zKi6T8wsPKU*rS}VLA@Rq*eHbAh;^*DpRpt)P#1p!8Bn**pUjj5(p|XEmzVX{?rug! z&QE-^t<#GQIEvaCYX3paIV6#wULK_6W(jL>o$5#rJy`96IkL}d zp(nFqxz(^OQVBf^v{2_eULwAPtkPA_NV4#wkm~F6yW2rb({p z;0;VN3^EKnJUomFH!Y3z(2lZGbekT!jSS5;{%O|UUXHFFJpZO3*9_!$58aCfKY?f_ zbAo>UVEq4fA&!rMVe1NY0E7NN+;ulJ`T4`J|EmA2o}k^>dV2ExK2lhUOYR}T8m rflmGe{KfNs$Nl<0T{G0b%|7OLzN)K%bA2HI1|hn*p=URmbp7^!Uz}Wy literal 0 HcmV?d00001 -- 2.7.4 From b6b064851415758a249944812fbc31da76f55401 Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Tue, 17 Oct 2017 15:56:44 +0900 Subject: [PATCH 06/16] Release version 0.7.4 Changes: - Fix static analysis issue - Change behavior of trust anchor - Add smoke test for extended storage installation Change-Id: I06e50d6cefbe861e59b70145a476dbbd48236f29 Signed-off-by: Junghyun Yeon --- packaging/wgt-backend.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/wgt-backend.spec b/packaging/wgt-backend.spec index aaa8808..03eb167 100644 --- a/packaging/wgt-backend.spec +++ b/packaging/wgt-backend.spec @@ -1,6 +1,6 @@ Name: wgt-backend Summary: Application installer backend for WGT -Version: 0.7.3 +Version: 0.7.4 Release: 1 Group: Application Framework/Package Management License: Apache-2.0 -- 2.7.4 From d89ab97f406c76b2e98542db1b8010d84f692e65 Mon Sep 17 00:00:00 2001 From: Seungha Son Date: Mon, 23 Oct 2017 16:56:34 +0900 Subject: [PATCH 07/16] Add privacy privilege step for hybrid Signed-off-by: Seungha Son Change-Id: Ia90177a7fdcec552183b496e48436b42e947c747 --- src/hybrid/hybrid_installer.cc | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc index 2a28e39..2df59cc 100644 --- a/src/hybrid/hybrid_installer.cc +++ b/src/hybrid/hybrid_installer.cc @@ -63,6 +63,7 @@ #include #include #include +#include #include #include #include @@ -152,6 +153,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep( ci::security::StepRegisterTrustAnchor::RegisterType::INSTALL); + AddStep( + ci::security::StepPrivacyPrivilege::ActionType::Install); AddStep(); AddStep( ci::Plugin::ActionType::Install); @@ -207,6 +210,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep( ci::security::StepRegisterTrustAnchor::RegisterType::INSTALL); + AddStep( + ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); AddStep( ci::Plugin::ActionType::Upgrade); @@ -236,6 +241,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep( + ci::security::StepPrivacyPrivilege::ActionType::Uninstall); AddStep(); AddStep(); AddStep(); @@ -294,6 +301,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep( ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); + AddStep( + ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); AddStep(); AddStep( @@ -362,6 +371,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep( ci::security::StepRegisterTrustAnchor::RegisterType::INSTALL); + AddStep( + ci::security::StepPrivacyPrivilege::ActionType::Install); AddStep(); AddStep( ci::Plugin::ActionType::Install); @@ -416,6 +427,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep( ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); + AddStep( + ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); AddStep( ci::Plugin::ActionType::Upgrade); @@ -449,6 +462,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep( ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); + AddStep( + ci::security::StepPrivacyPrivilege::ActionType::Install); AddStep(); AddStep( ci::Plugin::ActionType::Install); @@ -485,6 +500,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep( ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); + AddStep( + ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); AddStep( ci::Plugin::ActionType::Upgrade); @@ -507,6 +524,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep( ci::security::StepRegisterTrustAnchor::RegisterType::INSTALL); + AddStep( + ci::security::StepPrivacyPrivilege::ActionType::Install); AddStep(); AddStep( ci::Plugin::ActionType::Install); @@ -534,6 +553,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep( ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE); + AddStep( + ci::security::StepPrivacyPrivilege::ActionType::Update); AddStep(); AddStep( ci::Plugin::ActionType::Upgrade); @@ -557,6 +578,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep( + ci::security::StepPrivacyPrivilege::ActionType::Uninstall); AddStep(); break; } -- 2.7.4 From 21c629b678bc7b10df62772870d4d2f95171a062 Mon Sep 17 00:00:00 2001 From: Seungha Son Date: Tue, 24 Oct 2017 16:19:21 +0900 Subject: [PATCH 08/16] Release version 0.7.5 Changes: - Add privacy privilege step for hybrid Signed-off-by: Seungha Son Change-Id: I741802cbd47ad8c7abc77364c47e444a0504a71e --- packaging/wgt-backend.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/wgt-backend.spec b/packaging/wgt-backend.spec index 03eb167..3ecc970 100644 --- a/packaging/wgt-backend.spec +++ b/packaging/wgt-backend.spec @@ -1,6 +1,6 @@ Name: wgt-backend Summary: Application installer backend for WGT -Version: 0.7.4 +Version: 0.7.5 Release: 1 Group: Application Framework/Package Management License: Apache-2.0 -- 2.7.4 From 00e96944e943a5605f28ef919b63006c70fe07bd Mon Sep 17 00:00:00 2001 From: Damian Pietruchowski Date: Wed, 23 Aug 2017 14:01:03 +0200 Subject: [PATCH 09/16] Apply new library for smoke utils Wgt-backend and tpk-backend have common util functions for smoke tests. They should be exported to lib in app-installers. Submit together: - https://review.tizen.org/gerrit/#/c/149136/ - https://review.tizen.org/gerrit/#/c/149601/ Change-Id: I405ee42332bc443fd9749e78008093280f9bbf57 Signed-off-by: Damian Pietruchowski --- packaging/wgt-backend.spec | 1 + src/unit_tests/CMakeLists.txt | 11 +- src/unit_tests/extensive_smoke_test.cc | 352 +++++++------ src/unit_tests/smoke_test.cc | 743 +++++++++++++++------------ src/unit_tests/smoke_utils.cc | 906 +-------------------------------- src/unit_tests/smoke_utils.h | 278 +--------- 6 files changed, 648 insertions(+), 1643 deletions(-) diff --git a/packaging/wgt-backend.spec b/packaging/wgt-backend.spec index 3ecc970..5725634 100644 --- a/packaging/wgt-backend.spec +++ b/packaging/wgt-backend.spec @@ -12,6 +12,7 @@ Source1001: wgt-backend-tests.manifest BuildRequires: boost-devel BuildRequires: cmake BuildRequires: gtest-devel +BuildRequires: app-installers-tests BuildRequires: pkgconfig(app-installers) BuildRequires: pkgconfig(manifest-parser) BuildRequires: pkgconfig(wgt-manifest-handlers) diff --git a/src/unit_tests/CMakeLists.txt b/src/unit_tests/CMakeLists.txt index 6b0aac1..37022f8 100644 --- a/src/unit_tests/CMakeLists.txt +++ b/src/unit_tests/CMakeLists.txt @@ -1,4 +1,5 @@ SET(DESTINATION_DIR wgt-backend-ut) +SET(TARGET_SMOKE_UTILS smoke-utils) # Executables ADD_EXECUTABLE(${TARGET_SMOKE_TEST} @@ -7,9 +8,9 @@ ADD_EXECUTABLE(${TARGET_SMOKE_TEST} smoke_utils.cc ) ADD_EXECUTABLE(${TARGET_SMOKE_TEST_EXTENSIVE} - extensive_smoke_test.cc - smoke_utils.h - smoke_utils.cc + extensive_smoke_test.cc + smoke_utils.h + smoke_utils.cc ) ADD_EXECUTABLE(${TARGET_SMOKE_TEST_HELPER} smoke_test_helper.cc @@ -43,8 +44,8 @@ APPLY_PKG_CONFIG(${TARGET_MANIFEST_TEST} PUBLIC # FindGTest module do not sets all needed libraries in GTEST_LIBRARIES and # GTest main libraries is still missing, so additional linking of # GTEST_MAIN_LIBRARIES is needed. -TARGET_LINK_LIBRARIES(${TARGET_SMOKE_TEST} PRIVATE ${TARGET_LIBNAME_WGT} ${TARGET_LIBNAME_HYBRID} ${GTEST_MAIN_LIBRARIES}) -TARGET_LINK_LIBRARIES(${TARGET_SMOKE_TEST_EXTENSIVE} PRIVATE ${TARGET_LIBNAME_WGT} ${TARGET_LIBNAME_HYBRID} ${GTEST_MAIN_LIBRARIES}) +TARGET_LINK_LIBRARIES(${TARGET_SMOKE_TEST} PRIVATE ${TARGET_LIBNAME_WGT} ${TARGET_LIBNAME_HYBRID} ${GTEST_MAIN_LIBRARIES} ${TARGET_SMOKE_UTILS}) +TARGET_LINK_LIBRARIES(${TARGET_SMOKE_TEST_EXTENSIVE} PRIVATE ${TARGET_LIBNAME_WGT} ${TARGET_LIBNAME_HYBRID} ${GTEST_MAIN_LIBRARIES} ${TARGET_SMOKE_UTILS}) TARGET_LINK_LIBRARIES(${TARGET_SMOKE_TEST_HELPER} PRIVATE ${TARGET_LIBNAME_WGT}) TARGET_LINK_LIBRARIES(${TARGET_MANIFEST_TEST} PRIVATE ${TARGET_LIBNAME_WGT} ${GTEST_MAIN_LIBRARIES}) diff --git a/src/unit_tests/extensive_smoke_test.cc b/src/unit_tests/extensive_smoke_test.cc index 34104de..ed51023 100644 --- a/src/unit_tests/extensive_smoke_test.cc +++ b/src/unit_tests/extensive_smoke_test.cc @@ -5,14 +5,16 @@ #include #include +#include #include #include #include "unit_tests/smoke_utils.h" +namespace ci = common_installer; -namespace common_installer { +namespace smoke_test { class SmokeEnvironment : public testing::Environment { public: @@ -20,40 +22,70 @@ class SmokeEnvironment : public testing::Environment { request_mode_ = mode; } void SetUp() override { - if (request_mode_ == ci::RequestMode::USER) { - ASSERT_TRUE(AddTestUser(kNormalUserName)); - } else { - kTestUserId = kGlobalUserUid; - kTestGroupId = kGlobalUserGid; - kTestUserIdStr = std::to_string(kTestUserId); - } - backups_ = SetupBackupDirectories(); + if (request_mode_ == ci::RequestMode::USER) + ASSERT_TRUE(AddTestUser(&test_user)); + backups_ = SetupBackupDirectories(test_user.uid); for (auto& path : backups_) - BackupPath(path); + ASSERT_TRUE(BackupPath(path)); } void TearDown() override { ASSERT_TRUE(request_mode_ == ci::RequestMode::GLOBAL || (request_mode_ == ci::RequestMode::USER && - kGlobalUserUid != kTestUserId)); - UninstallAllSmokeApps(request_mode_); + kGlobalUserUid != test_user.uid)); + WgtBackendInterface backend(std::to_string(test_user.uid)); + UninstallAllSmokeApps(request_mode_, test_user.uid, &backend); for (auto& path : backups_) - RestorePath(path); + ASSERT_TRUE(RestorePath(path)); if (request_mode_ == ci::RequestMode::USER) - ASSERT_TRUE(DeleteTestUser(kNormalUserName)); + ASSERT_TRUE(DeleteTestUser()); } + User test_user; private: ci::RequestMode request_mode_; std::vector backups_; }; +} // namespace smoke_test + +namespace { + +testing::Environment *env = nullptr; +void signalHandler(int signum) { + env->TearDown(); + exit(signum); +} + +smoke_test::SmokeEnvironment *dcast(testing::Environment* _env) { + return dynamic_cast(_env); +} + +} // namespace + +namespace smoke_test { + class SmokeTest : public testing::Test { + public: + SmokeTest() : backend(std::to_string(dcast(env)->test_user.uid)), + params{PackageType::WGT, false} { + params.test_user.uid = dcast(env)->test_user.uid; + params.test_user.gid = dcast(env)->test_user.gid; + } + protected: + WgtBackendInterface backend; + TestParameters params; }; -class PreloadSmokeTest : public testing::Test { - void SetUp() override { - ASSERT_EQ(kGlobalUserUid, kTestUserId); +class HybridSmokeTest : public testing::Test { + public: + HybridSmokeTest() : backend(std::to_string(dcast(env)->test_user.uid)), + params{PackageType::HYBRID, false} { + params.test_user.uid = dcast(env)->test_user.uid; + params.test_user.gid = dcast(env)->test_user.gid; } + protected: + HybridBackendInterface backend; + TestParameters params; }; TEST_F(SmokeTest, RecoveryMode_ForInstallation) { @@ -61,45 +93,49 @@ TEST_F(SmokeTest, RecoveryMode_ForInstallation) { std::string pkgid = "smokewgt09"; std::string appid = "smokewgt09.RecoveryModeForInstallation"; + std::string test_user_str = std::to_string(params.test_user.uid); std::vector args = - {"", "-i", path.string(), "-u", kTestUserIdStr.c_str()}; - CrashAfterEachStep(args, [=](int step) -> bool { + {"", "-i", path.string(), "-u", test_user_str.c_str()}; + backend.CrashAfterEachStep(&args, [&](int step) -> bool { if (step >= 1) { - bf::path recovery_file = FindRecoveryFile(); + bf::path recovery_file = FindRecoveryFile("/wgt-recovery", + params.test_user.uid); EXTENDED_ASSERT_FALSE(recovery_file.empty()); - EXTENDED_ASSERT_EQ(Recover(recovery_file, PackageType::WGT), + EXTENDED_ASSERT_EQ(backend.Recover(recovery_file), ci::AppInstaller::Result::OK); - EXTENDED_ASSERT_TRUE(CheckPackageNonExistance(pkgid, {appid})); + EXTENDED_ASSERT_TRUE(CheckPackageNonExistance(pkgid, params)); } return true; - }); + }, params.pkg_type); } TEST_F(SmokeTest, RecoveryMode_ForUpdate) { bf::path path_old = kSmokePackagesDirectory / "RecoveryMode_ForUpdate.wgt"; bf::path path_new = kSmokePackagesDirectory / "RecoveryMode_ForUpdate_2.wgt"; - RemoveAllRecoveryFiles(); - ASSERT_EQ(Install(path_old, PackageType::WGT), ci::AppInstaller::Result::OK); + RemoveAllRecoveryFiles("/wgt-recovery", params.test_user.uid); + ASSERT_EQ(backend.Install(path_old), ci::AppInstaller::Result::OK); std::string pkgid = "smokewgt10"; std::string appid = "smokewgt10.RecoveryModeForUpdate"; - AddDataFiles(pkgid, kTestUserId); + AddDataFiles(pkgid, params.test_user.uid); + std::string test_user_str = std::to_string(params.test_user.uid); std::vector args = - {"", "-i", path_new.string(), "-u", kTestUserIdStr.c_str()}; - CrashAfterEachStep(args, [=](int step) -> bool { + {"", "-i", path_new.string(), "-u", test_user_str.c_str()}; + backend.CrashAfterEachStep(&args, [&](int step) -> bool { if (step >= 1) { - bf::path recovery_file = FindRecoveryFile(); + bf::path recovery_file = FindRecoveryFile("/wgt-recovery", + params.test_user.uid); EXTENDED_ASSERT_FALSE(recovery_file.empty()); - EXTENDED_ASSERT_EQ(Recover(recovery_file, PackageType::WGT), + EXTENDED_ASSERT_EQ(backend.Recover(recovery_file), ci::AppInstaller::Result::OK); - EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); EXTENDED_ASSERT_TRUE(ValidateFileContentInPackage(pkgid, - "res/wgt/VERSION", "1\n")); - EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + "res/wgt/VERSION", "1\n", params)); + EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); } return true; - }); + }, params.pkg_type); } TEST_F(SmokeTest, RecoveryMode_ForDelta) { @@ -107,44 +143,48 @@ TEST_F(SmokeTest, RecoveryMode_ForDelta) { bf::path path_new = kSmokePackagesDirectory / "RecoveryMode_ForDelta.delta"; std::string pkgid = "smokewgt30"; std::string appid = "smokewgt30.RecoveryModeForDelta"; - RemoveAllRecoveryFiles(); - ASSERT_EQ(Install(path_old, PackageType::WGT), ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); + RemoveAllRecoveryFiles("/wgt-recovery", params.test_user.uid); + ASSERT_EQ(backend.Install(path_old), ci::AppInstaller::Result::OK); + AddDataFiles(pkgid, params.test_user.uid); + std::string test_user_str = std::to_string(params.test_user.uid); std::vector args = - {"", "-i", path_new.string(), "-u", kTestUserIdStr.c_str()}; - CrashAfterEachStep(args, [=](int step) -> bool { + {"", "-i", path_new.string(), "-u", test_user_str.c_str()}; + backend.CrashAfterEachStep(&args, [&](int step) -> bool { if (step >= 1) { - bf::path recovery_file = FindRecoveryFile(); + bf::path recovery_file = FindRecoveryFile("/wgt-recovery", + params.test_user.uid); EXTENDED_ASSERT_FALSE(recovery_file.empty()); - EXTENDED_ASSERT_EQ(Recover(recovery_file, PackageType::WGT), + EXTENDED_ASSERT_EQ(backend.Recover(recovery_file), ci::AppInstaller::Result::OK); - EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); EXTENDED_ASSERT_TRUE(ValidateFileContentInPackage(pkgid, - "res/wgt/VERSION", "1\n")); - EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + "res/wgt/VERSION", "1\n", params)); + EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); } return true; - }); + }, params.pkg_type); } TEST_F(SmokeTest, RecoveryMode_ForMountInstall) { bf::path path = kSmokePackagesDirectory / "RecoveryMode_ForMountInstall.wgt"; std::string pkgid = "smokewgt31"; std::string appid = "smokewgt31.RecoveryModeForMountInstall"; - RemoveAllRecoveryFiles(); + RemoveAllRecoveryFiles("/wgt-recovery", params.test_user.uid); + std::string test_user_str = std::to_string(params.test_user.uid); std::vector args = - {"", "-w", path.string(), "-u", kTestUserIdStr.c_str()}; - CrashAfterEachStep(args, [=](int step) -> bool { + {"", "-w", path.string(), "-u", test_user_str.c_str()}; + backend.CrashAfterEachStep(&args, [&](int step) -> bool { if (step >= 1) { - bf::path recovery_file = FindRecoveryFile(); + bf::path recovery_file = FindRecoveryFile("/wgt-recovery", + params.test_user.uid); EXTENDED_ASSERT_FALSE(recovery_file.empty()); - EXTENDED_ASSERT_EQ(Recover(recovery_file, PackageType::WGT), + EXTENDED_ASSERT_EQ(backend.Recover(recovery_file), ci::AppInstaller::Result::OK); - EXTENDED_ASSERT_TRUE(CheckPackageNonExistance(pkgid, {appid})); + EXTENDED_ASSERT_TRUE(CheckPackageNonExistance(pkgid, params)); } return true; - }); + }, params.pkg_type); } TEST_F(SmokeTest, RecoveryMode_ForMountUpdate) { @@ -154,31 +194,33 @@ TEST_F(SmokeTest, RecoveryMode_ForMountUpdate) { kSmokePackagesDirectory / "RecoveryMode_ForMountUpdate_2.wgt"; std::string pkgid = "smokewgt32"; std::string appid = "smokewgt32.RecoveryModeForMountUpdate"; - RemoveAllRecoveryFiles(); - ASSERT_EQ(MountInstall(path_old, PackageType::WGT), - ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); + RemoveAllRecoveryFiles("/wgt-recovery", params.test_user.uid); + ASSERT_EQ(backend.MountInstall(path_old), ci::AppInstaller::Result::OK); + AddDataFiles(pkgid, params.test_user.uid); + std::string test_user_str = std::to_string(params.test_user.uid); std::vector args = - {"", "-w", path_new.string(), "-u", kTestUserIdStr.c_str()}; - CrashAfterEachStep(args, [=](int step) -> bool { + {"", "-w", path_new.string(), "-u", test_user_str.c_str()}; + backend.CrashAfterEachStep(&args, [&](int step) -> bool { if (step >= 1) { // Filesystem may be mounted after crash - ScopedTzipInterface poweroff_unmount_interface(pkgid); + ScopedTzipInterface poweroff_unmount_interface(pkgid, + params.test_user.uid); poweroff_unmount_interface.Release(); - bf::path recovery_file = FindRecoveryFile(); + bf::path recovery_file = FindRecoveryFile("/wgt-recovery", + params.test_user.uid); EXTENDED_ASSERT_FALSE(recovery_file.empty()); - EXTENDED_ASSERT_EQ(Recover(recovery_file, PackageType::WGT), + EXTENDED_ASSERT_EQ(backend.Recover(recovery_file), ci::AppInstaller::Result::OK); - ScopedTzipInterface interface(pkgid); - EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ScopedTzipInterface interface(pkgid, params.test_user.uid); + EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); EXTENDED_ASSERT_TRUE(ValidateFileContentInPackage( - pkgid, "res/wgt/VERSION", "1\n")); - EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + pkgid, "res/wgt/VERSION", "1\n", params)); + EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); } return true; - }); + }, params.pkg_type); } @@ -187,11 +229,10 @@ TEST_F(SmokeTest, InstallationMode_Rollback) { std::string pkgid = "smokewgt06"; std::string appid = "smokewgt06.InstallationModeRollback"; - const char* argv[] = {"", "-i", path.c_str(), "-u", kTestUserIdStr.c_str()}; - TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [=]() -> bool { - EXTENDED_ASSERT_EQ(Install(path, PackageType::WGT, RequestResult::FAIL), - ci::AppInstaller::Result::ERROR); - EXTENDED_ASSERT_TRUE(CheckPackageNonExistance(pkgid, {appid})); + std::string test_user_str = std::to_string(params.test_user.uid); + const char* argv[] = {"", "-i", path.c_str(), "-u", test_user_str.c_str()}; + backend.TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [&]() -> bool { + EXTENDED_ASSERT_TRUE(CheckPackageNonExistance(pkgid, params)); return true; }); } @@ -201,18 +242,17 @@ TEST_F(SmokeTest, UpdateMode_Rollback) { bf::path path_new = kSmokePackagesDirectory / "UpdateMode_Rollback_2.wgt"; std::string pkgid = "smokewgt07"; std::string appid = "smokewgt07.UpdateModeRollback"; - ASSERT_EQ(Install(path_old, PackageType::WGT), ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); + ASSERT_EQ(backend.Install(path_old), ci::AppInstaller::Result::OK); + AddDataFiles(pkgid, params.test_user.uid); + std::string test_user_str = std::to_string(params.test_user.uid); const char* argv[] = - {"", "-i", path_new.c_str(), "-u", kTestUserIdStr.c_str()}; - TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [=]() -> bool { - EXTENDED_ASSERT_EQ(Install(path_new, PackageType::WGT, RequestResult::FAIL), - ci::AppInstaller::Result::ERROR); - EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + {"", "-i", path_new.c_str(), "-u", test_user_str.c_str()}; + backend.TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [&]() -> bool { + EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); EXTENDED_ASSERT_TRUE(ValidateFileContentInPackage(pkgid, - "res/wgt/VERSION", "1\n")); - EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + "res/wgt/VERSION", "1\n", params)); + EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); return true; }); } @@ -222,119 +262,123 @@ TEST_F(SmokeTest, DeltaMode_Rollback) { bf::path delta_package = kSmokePackagesDirectory / "DeltaMode_Rollback.delta"; std::string pkgid = "smokewgt01"; std::string appid = "smokewgt01.DeltaMode"; - ASSERT_EQ(Install(path, PackageType::WGT), ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::OK); + AddDataFiles(pkgid, params.test_user.uid); + std::string test_user_str = std::to_string(params.test_user.uid); const char* argv[] = - {"", "-i", delta_package.c_str(), "-u", kTestUserIdStr.c_str()}; - TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [=]() -> bool { - EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + {"", "-i", delta_package.c_str(), "-u", test_user_str.c_str()}; + backend.TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [&]() -> bool { + EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); EXTENDED_ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/MODIFIED", - "version 1\n")); - EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); - EXTENDED_ASSERT_TRUE(bf::exists(GetPackageRoot(pkgid, kTestUserId) / - "res/wgt/DELETED")); - EXTENDED_ASSERT_FALSE(bf::exists(GetPackageRoot(pkgid, kTestUserId) / - "res/wgt/ADDED")); + "version 1\n", params)); + EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); + EXTENDED_ASSERT_TRUE(bf::exists(GetPackageRoot( + pkgid, params.test_user.uid) / "res/wgt/DELETED")); + EXTENDED_ASSERT_FALSE(bf::exists(GetPackageRoot( + pkgid, params.test_user.uid) / "res/wgt/ADDED")); return true; }); } -TEST_F(SmokeTest, InstallationMode_Rollback_Hybrid) { +TEST_F(HybridSmokeTest, InstallationMode_Rollback) { bf::path path = kSmokePackagesDirectory / "InstallationMode_Rollback_Hybrid.wgt"; std::string pkgid = "smokehyb07"; std::string appid1 = "smokehyb07.web"; - const char* argv[] = {"", "-i", path.c_str(), "-u", kTestUserIdStr.c_str()}; - TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [=]() -> bool { - EXTENDED_ASSERT_TRUE(CheckPackageNonExistance(pkgid, {appid1})); + std::string test_user_str = std::to_string(params.test_user.uid); + const char* argv[] = {"", "-i", path.c_str(), "-u", test_user_str.c_str()}; + backend.TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [&]() -> bool { + EXTENDED_ASSERT_TRUE(CheckPackageNonExistance(pkgid, params)); return true; - }, PackageType::HYBRID); + }); } -TEST_F(SmokeTest, UpdateMode_Rollback_Hybrid) { +TEST_F(HybridSmokeTest, UpdateMode_Rollback) { bf::path path_old = kSmokePackagesDirectory / "UpdateMode_Rollback_Hybrid.wgt"; bf::path path_new = kSmokePackagesDirectory / "UpdateMode_Rollback_Hybrid_2.wgt"; std::string pkgid = "smokehyb08"; std::string appid1 = "smokehyb08.web"; - ASSERT_EQ(Install(path_old, PackageType::HYBRID), - ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); + ASSERT_EQ(backend.Install(path_old), ci::AppInstaller::Result::OK); + AddDataFiles(pkgid, params.test_user.uid); + std::string test_user_str = std::to_string(params.test_user.uid); const char* argv[] = - {"", "-i", path_new.c_str(), "-u", kTestUserIdStr.c_str()}; - TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [=]() -> bool { - EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid1})); + {"", "-i", path_new.c_str(), "-u", test_user_str.c_str()}; + backend.TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [&]() -> bool { + EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid1}, params)); EXTENDED_ASSERT_TRUE(ValidateFileContentInPackage(pkgid, - "res/wgt/VERSION", "1\n")); + "res/wgt/VERSION", "1\n", params)); EXTENDED_ASSERT_TRUE(ValidateFileContentInPackage(pkgid, - "lib/VERSION", "1\n")); - EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + "lib/VERSION", "1\n", params)); + EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); return true; - }, PackageType::HYBRID); + }); } -TEST_F(SmokeTest, DeltaMode_Rollback_Hybrid) { +TEST_F(HybridSmokeTest, DeltaMode_Rollback_Hybrid) { bf::path path = kSmokePackagesDirectory / "DeltaMode_Rollback_Hybrid.wgt"; bf::path delta_package = kSmokePackagesDirectory / "DeltaMode_Rollback_Hybrid.delta"; std::string pkgid = "smokehyb11"; std::string appid1 = "smokehyb11.web"; - ASSERT_EQ(Install(path, PackageType::HYBRID), ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); - const char* argv[] = {"", "-i", path.c_str(), "-u", kTestUserIdStr.c_str()}; - TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [=]() -> bool { - EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid1})); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::OK); + AddDataFiles(pkgid, params.test_user.uid); + std::string test_user_str = std::to_string(params.test_user.uid); + const char* argv[] = {"", "-i", path.c_str(), "-u", test_user_str.c_str()}; + backend.TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [&]() -> bool { + EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid1}, params)); // Check delta modifications - bf::path root_path = GetPackageRoot(pkgid, kTestUserId); + bf::path root_path = GetPackageRoot(pkgid, params.test_user.uid); EXTENDED_ASSERT_TRUE(bf::exists(root_path / "res" / "wgt" / "DELETED")); EXTENDED_ASSERT_FALSE(bf::exists(root_path / "res" / "wgt" / "ADDED")); EXTENDED_ASSERT_TRUE(bf::exists(root_path / "lib" / "DELETED")); EXTENDED_ASSERT_FALSE(bf::exists(root_path / "lib" / "ADDED")); EXTENDED_ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/MODIFIED", - "version 1\n")); + "version 1\n", params)); EXTENDED_ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "lib/MODIFIED", - "version 1\n")); - EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + "version 1\n", params)); + EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); return true; }); } -TEST_F(SmokeTest, MountInstallationMode_Rollback_Hybrid) { +TEST_F(HybridSmokeTest, MountInstallationMode_Rollback) { bf::path path = kSmokePackagesDirectory / "MountInstallationMode_Rollback_Hybrid.wgt"; std::string pkgid = "smokehyb09"; std::string appid1 = "smokehyb09.web"; - const char* argv[] = {"", "-w", path.c_str(), "-u", kTestUserIdStr.c_str()}; - TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [=]() -> bool { - ScopedTzipInterface interface(pkgid); - EXTENDED_ASSERT_TRUE(CheckPackageNonExistance(pkgid, {appid1})); + std::string test_user_str = std::to_string(params.test_user.uid); + const char* argv[] = {"", "-w", path.c_str(), "-u", test_user_str.c_str()}; + backend.TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [&]() -> bool { + ScopedTzipInterface interface(pkgid, params.test_user.uid); + EXTENDED_ASSERT_TRUE(CheckPackageNonExistance(pkgid, params)); return true; - }, PackageType::HYBRID); + }); } -TEST_F(SmokeTest, MountUpdateMode_Rollback_Hybrid) { +TEST_F(HybridSmokeTest, MountUpdateMode_Rollback) { bf::path path_old = kSmokePackagesDirectory / "MountUpdateMode_Rollback_Hybrid.wgt"; bf::path path_new = kSmokePackagesDirectory / "MountUpdateMode_Rollback_Hybrid_2.wgt"; std::string pkgid = "smokehyb10"; std::string appid1 = "smokehyb10.web"; - ASSERT_EQ(MountInstall(path_old, PackageType::HYBRID), - ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); + ASSERT_EQ(backend.MountInstall(path_old), ci::AppInstaller::Result::OK); + AddDataFiles(pkgid, params.test_user.uid); + std::string test_user_str = std::to_string(params.test_user.uid); const char* argv[] = - {"", "-w", path_new.c_str(), "-u", kTestUserIdStr.c_str()}; - TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [=]() -> bool { - ScopedTzipInterface interface(pkgid); - EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid1})); + {"", "-w", path_new.c_str(), "-u", test_user_str.c_str()}; + backend.TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [&]() -> bool { + ScopedTzipInterface interface(pkgid, params.test_user.uid); + EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid1}, params)); EXTENDED_ASSERT_TRUE(ValidateFileContentInPackage(pkgid, - "res/wgt/VERSION", "1\n")); + "res/wgt/VERSION", "1\n", params)); EXTENDED_ASSERT_TRUE(ValidateFileContentInPackage(pkgid, - "lib/VERSION", "1\n")); - EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + "lib/VERSION", "1\n", params)); + EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); return true; }); } @@ -344,10 +388,11 @@ TEST_F(SmokeTest, MountInstallationMode_Rollback) { kSmokePackagesDirectory / "MountInstallationMode_Rollback.wgt"; std::string pkgid = "smokewgt33"; std::string appid = "smokewgt33.web"; - const char* argv[] = {"", "-w", path.c_str(), "-u", kTestUserIdStr.c_str()}; - TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [=]() -> bool { - ScopedTzipInterface interface(pkgid); - EXTENDED_ASSERT_TRUE(CheckPackageNonExistance(pkgid, {appid})); + std::string test_user_str = std::to_string(params.test_user.uid); + const char* argv[] = {"", "-w", path.c_str(), "-u", test_user_str.c_str()}; + backend.TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [=]() -> bool { + ScopedTzipInterface interface(pkgid, params.test_user.uid); + EXTENDED_ASSERT_TRUE(CheckPackageNonExistance(pkgid, params)); return true; }); } @@ -358,36 +403,35 @@ TEST_F(SmokeTest, MountUpdateMode_Rollback) { kSmokePackagesDirectory / "MountUpdateMode_Rollback_2.wgt"; std::string pkgid = "smokewgt34"; std::string appid = "smokewgt34.web"; - ASSERT_EQ(MountInstall(path_old, PackageType::WGT), + ASSERT_EQ(backend.MountInstall(path_old), ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); + AddDataFiles(pkgid, params.test_user.uid); + std::string test_user_str = std::to_string(params.test_user.uid); const char* argv[] = - {"", "-w", path_new.c_str(), "-u", kTestUserIdStr.c_str()}; - TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [=]() -> bool { - EXTENDED_ASSERT_EQ(MountInstall(path_new, PackageType::WGT, - RequestResult::FAIL), ci::AppInstaller::Result::ERROR); - ScopedTzipInterface interface(pkgid); - EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + {"", "-w", path_new.c_str(), "-u", test_user_str.c_str()}; + backend.TestRollbackAfterEachStep(SIZEOFARRAY(argv), argv, [&]() -> bool { + ScopedTzipInterface interface(pkgid, params.test_user.uid); + EXTENDED_ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); EXTENDED_ASSERT_TRUE(ValidateFileContentInPackage(pkgid, - "res/wgt/VERSION", "1\n")); - EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + "res/wgt/VERSION", "1\n", params)); + EXTENDED_ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); return true; }); } -} // namespace common_installer +} // namespace smoke_test int main(int argc, char** argv) { - ci::RequestMode request_mode = ParseRequestMode(argc, argv); + ci::RequestMode request_mode = smoke_test::ParseRequestMode(argc, argv); if (getuid() != 0 || request_mode != ci::RequestMode::GLOBAL) { std::cout << "Skip tests for preload request" << std::endl; ::testing::GTEST_FLAG(filter) = "SmokeTest.*"; } testing::InitGoogleTest(&argc, argv); - env = testing::AddGlobalTestEnvironment( - new common_installer::SmokeEnvironment(request_mode)); - signal(SIGINT, signalHandler); - signal(SIGSEGV, signalHandler); + ::env = testing::AddGlobalTestEnvironment( + new smoke_test::SmokeEnvironment(request_mode)); + signal(SIGINT, ::signalHandler); + signal(SIGSEGV, ::signalHandler); return RUN_ALL_TESTS(); } diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc index bf44401..a16c667 100644 --- a/src/unit_tests/smoke_test.cc +++ b/src/unit_tests/smoke_test.cc @@ -2,15 +2,24 @@ // Use of this source code is governed by an apache-2.0 license that can be // found in the LICENSE file. +#include + #include #include +#include +#include -#include +#include #include "unit_tests/smoke_utils.h" +namespace st = smoke_test; +namespace bf = boost::filesystem; +namespace bs = boost::system; +namespace ci = common_installer; +namespace bo = boost::program_options; -namespace common_installer { +namespace smoke_test { class SmokeEnvironment : public testing::Environment { public: @@ -18,48 +27,126 @@ class SmokeEnvironment : public testing::Environment { request_mode_ = mode; } void SetUp() override { - if (request_mode_ == ci::RequestMode::USER) { - ASSERT_TRUE(AddTestUser(kNormalUserName)); - } else { - kTestUserId = kGlobalUserUid; - kTestGroupId = kGlobalUserGid; - kTestUserIdStr = std::to_string(kTestUserId); - } - backups_ = SetupBackupDirectories(); + if (request_mode_ == ci::RequestMode::USER) + ASSERT_TRUE(AddTestUser(&test_user)); + backups_ = SetupBackupDirectories(test_user.uid); for (auto& path : backups_) ASSERT_TRUE(BackupPath(path)); } void TearDown() override { ASSERT_TRUE(request_mode_ == ci::RequestMode::GLOBAL || (request_mode_ == ci::RequestMode::USER && - kGlobalUserUid != kTestUserId)); - UninstallAllSmokeApps(request_mode_); + kGlobalUserUid != test_user.uid)); + WgtBackendInterface backend(std::to_string(test_user.uid)); + UninstallAllSmokeApps(request_mode_, test_user.uid, &backend); for (auto& path : backups_) ASSERT_TRUE(RestorePath(path)); if (request_mode_ == ci::RequestMode::USER) - ASSERT_TRUE(DeleteTestUser(kNormalUserName)); + ASSERT_TRUE(DeleteTestUser()); } + User test_user; private: ci::RequestMode request_mode_; std::vector backups_; }; +} // namespace smoke_test + +namespace { + +testing::Environment *env = nullptr; +void signalHandler(int signum) { + env->TearDown(); + exit(signum); +} + +smoke_test::SmokeEnvironment *dcast(testing::Environment* _env) { + return dynamic_cast(_env); +} + +} // namespace + +namespace smoke_test { + class SmokeTest : public testing::Test { + public: + SmokeTest() : backend(std::to_string(dcast(env)->test_user.uid)), + params{PackageType::WGT, false} { + params.test_user.uid = dcast(env)->test_user.uid; + params.test_user.gid = dcast(env)->test_user.gid; + } + protected: + WgtBackendInterface backend; + TestParameters params; +}; + +class RollbackSmokeTest : public testing::Test { + public: + RollbackSmokeTest() : backend(std::to_string(dcast(env)->test_user.uid), + RequestResult::FAIL), params{PackageType::WGT, false} { + params.test_user.uid = dcast(env)->test_user.uid; + params.test_user.gid = dcast(env)->test_user.gid; + } + protected: + WgtBackendInterface backend; + TestParameters params; +}; + +class HybridSmokeTest : public testing::Test { + public: + HybridSmokeTest() : backend(std::to_string(dcast(env)->test_user.uid)), + params{PackageType::HYBRID, false} { + params.test_user.uid = dcast(env)->test_user.uid; + params.test_user.gid = dcast(env)->test_user.gid; + } + protected: + HybridBackendInterface backend; + TestParameters params; +}; + +class RollbackHybridSmokeTest : public testing::Test { + public: + RollbackHybridSmokeTest() : backend(std::to_string(dcast(env)->test_user.uid), + RequestResult::FAIL), params{PackageType::HYBRID, false} { + params.test_user.uid = dcast(env)->test_user.uid; + params.test_user.gid = dcast(env)->test_user.gid; + } + protected: + HybridBackendInterface backend; + TestParameters params; }; class PreloadSmokeTest : public testing::Test { - void SetUp() override { - ASSERT_EQ(kGlobalUserUid, kTestUserId); + public: + PreloadSmokeTest() : backend(std::to_string(dcast(env)->test_user.uid)), + params{PackageType::WGT, true} { + params.test_user.uid = dcast(env)->test_user.uid; + params.test_user.gid = dcast(env)->test_user.gid; } + protected: + WgtBackendInterface backend; + TestParameters params; +}; + +class HybridPreloadSmokeTest : public testing::Test { + public: + HybridPreloadSmokeTest() : backend(std::to_string(dcast(env)->test_user.uid)), + params{PackageType::HYBRID, true} { + params.test_user.uid = dcast(env)->test_user.uid; + params.test_user.gid = dcast(env)->test_user.gid; + } + protected: + HybridBackendInterface backend; + TestParameters params; }; TEST_F(SmokeTest, InstallationMode) { bf::path path = kSmokePackagesDirectory / "InstallationMode.wgt"; std::string pkgid = "smokewgt03"; std::string appid = "smokewgt03.InstallationMode"; - ASSERT_EQ(Install(path, PackageType::WGT), ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); } TEST_F(SmokeTest, UpdateMode) { @@ -67,24 +154,23 @@ TEST_F(SmokeTest, UpdateMode) { bf::path path_new = kSmokePackagesDirectory / "UpdateMode_2.wgt"; std::string pkgid = "smokewgt04"; std::string appid = "smokewgt04.UpdateMode"; - ASSERT_EQ(Install(path_old, PackageType::WGT), ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); - ASSERT_EQ(Install(path_new, PackageType::WGT), ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ASSERT_EQ(backend.InstallSuccess(path_old), ci::AppInstaller::Result::OK); + AddDataFiles(pkgid, params.test_user.uid); + ASSERT_EQ(backend.Install(path_new), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "2\n")); - ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "2\n", + params)); + ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); } TEST_F(SmokeTest, DeinstallationMode) { bf::path path = kSmokePackagesDirectory / "DeinstallationMode.wgt"; std::string pkgid = "smokewgt05"; std::string appid = "smokewgt05.DeinstallationMode"; - ASSERT_EQ(Install(path, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_EQ(Uninstall(pkgid, PackageType::WGT, false), - ci::AppInstaller::Result::OK); - ASSERT_TRUE(CheckPackageNonExistance(pkgid, {appid})); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::OK); + ASSERT_EQ(backend.Uninstall(pkgid), ci::AppInstaller::Result::OK); + ASSERT_TRUE(CheckPackageNonExistance(pkgid, params)); } TEST_F(SmokeTest, RDSMode) { @@ -93,47 +179,43 @@ TEST_F(SmokeTest, RDSMode) { std::string appid = "smokewgt11.RDSMode"; bf::path delta_directory = kSmokePackagesDirectory / "delta_dir/"; bf::path sdk_expected_directory = - bf::path(ci::GetRootAppPath(false, kTestUserId)) / "tmp" / pkgid; + bf::path(ci::GetRootAppPath(false, params.test_user.uid)) / "tmp" / pkgid; bs::error_code error; bf::create_directories(sdk_expected_directory.parent_path(), error); ASSERT_FALSE(error); - ASSERT_TRUE(CopyDir(delta_directory, sdk_expected_directory)); - ASSERT_EQ(RDSUpdate(path, pkgid, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ASSERT_TRUE(ci::CopyDir(delta_directory, sdk_expected_directory)); + ASSERT_EQ(backend.RDSUpdate(path, pkgid), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); // Check delta modifications - ASSERT_FALSE(bf::exists(GetPackageRoot(pkgid, kTestUserId) / + ASSERT_FALSE(bf::exists(GetPackageRoot(pkgid, params.test_user.uid) / "res" / "wgt" / "DELETED")); - ASSERT_TRUE(bf::exists(GetPackageRoot(pkgid, kTestUserId) / + ASSERT_TRUE(bf::exists(GetPackageRoot(pkgid, params.test_user.uid) / "res" / "wgt" / "ADDED")); - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/MODIFIED", "2\n")); + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/MODIFIED", "2\n", + params)); } TEST_F(SmokeTest, EnablePkg) { bf::path path = kSmokePackagesDirectory / "EnablePkg.wgt"; std::string pkgid = "smokewgt22"; - ASSERT_EQ(Install(path, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_EQ(DisablePackage(pkgid, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_EQ(EnablePackage(pkgid, PackageType::WGT), - ci::AppInstaller::Result::OK); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::OK); + ASSERT_EQ(backend.DisablePackage(pkgid), ci::AppInstaller::Result::OK); + ASSERT_EQ(backend.EnablePackage(pkgid), ci::AppInstaller::Result::OK); - ci::PkgQueryInterface pkg_query(pkgid, kTestUserId); - ASSERT_TRUE(pkg_query.IsPackageInstalled(ci::GetRequestMode(kTestUserId))); + ci::PkgQueryInterface pkg_query(pkgid, params.test_user.uid); + ASSERT_TRUE(pkg_query.IsPackageInstalled( + ci::GetRequestMode(params.test_user.uid))); } TEST_F(SmokeTest, DisablePkg) { bf::path path = kSmokePackagesDirectory / "DisablePkg.wgt"; std::string pkgid = "smokewgt21"; std::string appid = "smokewgt21.DisablePkg"; - ASSERT_EQ(Install(path, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_EQ(DisablePackage(pkgid, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_TRUE(ci::QueryIsDisabledPackage(pkgid, kTestUserId)); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::OK); + ASSERT_EQ(backend.DisablePackage(pkgid), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ci::QueryIsDisabledPackage(pkgid, params.test_user.uid)); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); } TEST_F(SmokeTest, DeltaMode) { @@ -141,96 +223,102 @@ TEST_F(SmokeTest, DeltaMode) { bf::path delta_package = kSmokePackagesDirectory / "DeltaMode.delta"; std::string pkgid = "smokewgt17"; std::string appid = "smokewgt17.DeltaMode"; - ASSERT_EQ(DeltaInstall(path, delta_package, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ASSERT_EQ(backend.InstallSuccess(path), ci::AppInstaller::Result::OK); + ASSERT_EQ(backend.Install(delta_package), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); // Check delta modifications - ASSERT_FALSE(bf::exists(GetPackageRoot(pkgid, kTestUserId) / + ASSERT_FALSE(bf::exists(GetPackageRoot(pkgid, params.test_user.uid) / "res" / "wgt" / "DELETED")); - ASSERT_TRUE(bf::exists(GetPackageRoot(pkgid, kTestUserId) / + ASSERT_TRUE(bf::exists(GetPackageRoot(pkgid, params.test_user.uid) / "res" / "wgt" / "ADDED")); - ASSERT_TRUE(bf::exists(GetPackageRoot(pkgid, kTestUserId) / + ASSERT_TRUE(bf::exists(GetPackageRoot(pkgid, params.test_user.uid) / "res" / "wgt" / "css" / "style.css")); - ASSERT_TRUE(bf::exists(GetPackageRoot(pkgid, kTestUserId) / + ASSERT_TRUE(bf::exists(GetPackageRoot(pkgid, params.test_user.uid) / "res" / "wgt" / "images" / "tizen_32.png")); - ASSERT_TRUE(bf::exists(GetPackageRoot(pkgid, kTestUserId) / + ASSERT_TRUE(bf::exists(GetPackageRoot(pkgid, params.test_user.uid) / "res" / "wgt" / "js" / "main.js")); ASSERT_TRUE(ValidateFileContentInPackage( - pkgid, "res/wgt/MODIFIED", "version 2\n")); + pkgid, "res/wgt/MODIFIED", "version 2\n", params)); } TEST_F(SmokeTest, RecoveryMode_ForInstallation) { bf::path path = kSmokePackagesDirectory / "RecoveryMode_ForInstallation.wgt"; - Subprocess backend_crash("/usr/bin/wgt-backend-ut/smoke-test-helper"); - backend_crash.Run("-i", path.string(), "-u", kTestUserIdStr.c_str()); + ci::Subprocess backend_crash("/usr/bin/wgt-backend-ut/smoke-test-helper"); + std::string test_uid_str = std::to_string(params.test_user.uid); + backend_crash.Run("-i", path.string(), "-u", test_uid_str.c_str()); ASSERT_NE(backend_crash.Wait(), 0); std::string pkgid = "smokewgt09"; std::string appid = "smokewgt09.RecoveryModeForInstallation"; - bf::path recovery_file = FindRecoveryFile(); + bf::path recovery_file = FindRecoveryFile("/wgt-recovery", + params.test_user.uid); ASSERT_FALSE(recovery_file.empty()); - ASSERT_EQ(Recover(recovery_file, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_TRUE(CheckPackageNonExistance(pkgid, {appid})); + ASSERT_EQ(backend.Recover(recovery_file), ci::AppInstaller::Result::OK); + ASSERT_TRUE(CheckPackageNonExistance(pkgid, params)); } TEST_F(SmokeTest, RecoveryMode_ForUpdate) { bf::path path_old = kSmokePackagesDirectory / "RecoveryMode_ForUpdate.wgt"; bf::path path_new = kSmokePackagesDirectory / "RecoveryMode_ForUpdate_2.wgt"; - RemoveAllRecoveryFiles(); - ASSERT_EQ(Install(path_old, PackageType::WGT), ci::AppInstaller::Result::OK); + RemoveAllRecoveryFiles("/wgt-recovery", params.test_user.uid); + ASSERT_EQ(backend.InstallSuccess(path_old), ci::AppInstaller::Result::OK); std::string pkgid = "smokewgt10"; std::string appid = "smokewgt10.RecoveryModeForUpdate"; - AddDataFiles(pkgid, kTestUserId); - Subprocess backend_crash("/usr/bin/wgt-backend-ut/smoke-test-helper"); - backend_crash.Run("-i", path_new.string(), "-u", kTestUserIdStr.c_str()); + AddDataFiles(pkgid, params.test_user.uid); + ci::Subprocess backend_crash("/usr/bin/wgt-backend-ut/smoke-test-helper"); + std::string test_uid_str = std::to_string(params.test_user.uid); + backend_crash.Run("-i", path_new.string(), "-u", test_uid_str.c_str()); ASSERT_NE(backend_crash.Wait(), 0); - bf::path recovery_file = FindRecoveryFile(); + bf::path recovery_file = FindRecoveryFile("/wgt-recovery", + params.test_user.uid); ASSERT_FALSE(recovery_file.empty()); - ASSERT_EQ(Recover(recovery_file, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ASSERT_EQ(backend.Recover(recovery_file), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "1\n")); - ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "1\n", + params)); + ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); } TEST_F(SmokeTest, RecoveryMode_ForDelta) { bf::path path_old = kSmokePackagesDirectory / "RecoveryMode_ForDelta.wgt"; bf::path path_new = kSmokePackagesDirectory / "RecoveryMode_ForDelta.delta"; - RemoveAllRecoveryFiles(); - ASSERT_EQ(Install(path_old, PackageType::WGT), ci::AppInstaller::Result::OK); - Subprocess backend_crash("/usr/bin/wgt-backend-ut/smoke-test-helper"); - backend_crash.Run("-i", path_new.string(), "-u", kTestUserIdStr.c_str()); + RemoveAllRecoveryFiles("/wgt-recovery", params.test_user.uid); + ASSERT_EQ(backend.InstallSuccess(path_old), ci::AppInstaller::Result::OK); + ci::Subprocess backend_crash("/usr/bin/wgt-backend-ut/smoke-test-helper"); + std::string test_uid_str = std::to_string(params.test_user.uid); + backend_crash.Run("-i", path_new.string(), "-u", test_uid_str.c_str()); ASSERT_NE(backend_crash.Wait(), 0); std::string pkgid = "smokewgt30"; std::string appid = "smokewgt30.RecoveryModeForDelta"; - bf::path recovery_file = FindRecoveryFile(); + bf::path recovery_file = FindRecoveryFile("/wgt-recovery", + params.test_user.uid); ASSERT_FALSE(recovery_file.empty()); - ASSERT_EQ(Recover(recovery_file, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ASSERT_EQ(backend.Recover(recovery_file), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "1\n")); + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "1\n", + params)); } TEST_F(SmokeTest, RecoveryMode_ForMountInstall) { bf::path path = kSmokePackagesDirectory / "RecoveryMode_ForMountInstall.wgt"; - RemoveAllRecoveryFiles(); - Subprocess backend_crash("/usr/bin/wgt-backend-ut/smoke-test-helper"); - backend_crash.Run("-w", path.string(), "-u", kTestUserIdStr.c_str()); + RemoveAllRecoveryFiles("/wgt-recovery", params.test_user.uid); + ci::Subprocess backend_crash("/usr/bin/wgt-backend-ut/smoke-test-helper"); + std::string test_uid_str = std::to_string(params.test_user.uid); + backend_crash.Run("-w", path.string(), "-u", test_uid_str.c_str()); ASSERT_NE(backend_crash.Wait(), 0); std::string pkgid = "smokewgt31"; std::string appid = "smokewgt31.RecoveryModeForMountInstall"; - bf::path recovery_file = FindRecoveryFile(); + bf::path recovery_file = FindRecoveryFile("/wgt-recovery", + params.test_user.uid); ASSERT_FALSE(recovery_file.empty()); - ASSERT_EQ(Recover(recovery_file, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_TRUE(CheckPackageNonExistance(pkgid, {appid})); + ASSERT_EQ(backend.Recover(recovery_file), ci::AppInstaller::Result::OK); + ASSERT_TRUE(CheckPackageNonExistance(pkgid, params)); } TEST_F(SmokeTest, RecoveryMode_ForMountUpdate) { @@ -240,134 +328,131 @@ TEST_F(SmokeTest, RecoveryMode_ForMountUpdate) { kSmokePackagesDirectory / "RecoveryMode_ForMountUpdate_2.wgt"; std::string pkgid = "smokewgt32"; std::string appid = "smokewgt32.RecoveryModeForMountUpdate"; - RemoveAllRecoveryFiles(); - ASSERT_EQ(MountInstall(path_old, PackageType::WGT), + RemoveAllRecoveryFiles("/wgt-recovery", params.test_user.uid); + ASSERT_EQ(backend.MountInstallSuccess(path_old), ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); - Subprocess backend_crash("/usr/bin/wgt-backend-ut/smoke-test-helper"); - backend_crash.Run("-w", path_new.string(), "-u", kTestUserIdStr.c_str()); + AddDataFiles(pkgid, params.test_user.uid); + ci::Subprocess backend_crash("/usr/bin/wgt-backend-ut/smoke-test-helper"); + std::string test_uid_str = std::to_string(params.test_user.uid); + backend_crash.Run("-w", path_new.string(), "-u", test_uid_str.c_str()); ASSERT_NE(backend_crash.Wait(), 0); // Filesystem may be mounted after crash - ScopedTzipInterface poweroff_unmount_interface(pkgid); + ScopedTzipInterface poweroff_unmount_interface(pkgid, params.test_user.uid); poweroff_unmount_interface.Release(); - bf::path recovery_file = FindRecoveryFile(); + bf::path recovery_file = FindRecoveryFile("/wgt-recovery", + params.test_user.uid); ASSERT_FALSE(recovery_file.empty()); - ASSERT_EQ(Recover(recovery_file, PackageType::WGT), - ci::AppInstaller::Result::OK); + ASSERT_EQ(backend.Recover(recovery_file), ci::AppInstaller::Result::OK); - ScopedTzipInterface interface(pkgid); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "1\n")); - ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + ScopedTzipInterface interface(pkgid, params.test_user.uid); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "1\n", + params)); + ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); } TEST_F(SmokeTest, InstallationMode_GoodSignature) { // pkgid: smokewgt08 bf::path path = kSmokePackagesDirectory / "InstallationMode_GoodSignature.wgt"; // NOLINT - ASSERT_EQ(Install(path, PackageType::WGT), ci::AppInstaller::Result::OK); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::OK); } TEST_F(SmokeTest, InstallationMode_WrongSignature) { // pkgid: smokewgt12 bf::path path = kSmokePackagesDirectory / "InstallationMode_WrongSignature.wgt"; // NOLINT - ASSERT_EQ(Install(path, PackageType::WGT), ci::AppInstaller::Result::ERROR); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::ERROR); } -TEST_F(SmokeTest, InstallationMode_Rollback) { +TEST_F(RollbackSmokeTest, InstallationMode) { bf::path path = kSmokePackagesDirectory / "InstallationMode_Rollback.wgt"; std::string pkgid = "smokewgt06"; std::string appid = "smokewgt06.InstallationModeRollback"; - ASSERT_EQ(Install(path, PackageType::WGT, RequestResult::FAIL), - ci::AppInstaller::Result::ERROR); - ASSERT_TRUE(CheckPackageNonExistance(pkgid, {appid})); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::ERROR); + ASSERT_TRUE(CheckPackageNonExistance(pkgid, params)); } -TEST_F(SmokeTest, UpdateMode_Rollback) { +TEST_F(RollbackSmokeTest, UpdateMode) { bf::path path_old = kSmokePackagesDirectory / "UpdateMode_Rollback.wgt"; bf::path path_new = kSmokePackagesDirectory / "UpdateMode_Rollback_2.wgt"; std::string pkgid = "smokewgt07"; std::string appid = "smokewgt07.UpdateModeRollback"; - ASSERT_EQ(Install(path_old, PackageType::WGT), ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); - ASSERT_EQ(Install(path_new, PackageType::WGT, RequestResult::FAIL), - ci::AppInstaller::Result::ERROR); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ASSERT_EQ(backend.InstallSuccess(path_old), ci::AppInstaller::Result::OK); + AddDataFiles(pkgid, params.test_user.uid); + ASSERT_EQ(backend.Install(path_new), ci::AppInstaller::Result::ERROR); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "1\n")); - ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "1\n", + params)); + ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); } -TEST_F(SmokeTest, DeltaMode_Rollback) { +TEST_F(RollbackSmokeTest, DeltaMode) { bf::path path = kSmokePackagesDirectory / "DeltaMode_Rollback.wgt"; bf::path delta_package = kSmokePackagesDirectory / "DeltaMode_Rollback.delta"; std::string pkgid = "smokewgt01"; std::string appid = "smokewgt01.DeltaMode"; - ASSERT_EQ(Install(path, PackageType::WGT), ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); - ASSERT_EQ(Install(delta_package, PackageType::WGT, RequestResult::FAIL), - ci::AppInstaller::Result::ERROR); + ASSERT_EQ(backend.InstallSuccess(path), ci::AppInstaller::Result::OK); + AddDataFiles(pkgid, params.test_user.uid); + ASSERT_EQ(backend.Install(delta_package), ci::AppInstaller::Result::ERROR); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/MODIFIED", - "version 1\n")); - ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); - ASSERT_TRUE(bf::exists(GetPackageRoot(pkgid, kTestUserId) / + "version 1\n", params)); + ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); + ASSERT_TRUE(bf::exists(GetPackageRoot(pkgid, params.test_user.uid) / "res/wgt/DELETED")); - ASSERT_FALSE(bf::exists(GetPackageRoot(pkgid, kTestUserId) / + ASSERT_FALSE(bf::exists(GetPackageRoot(pkgid, params.test_user.uid) / "res/wgt/ADDED")); } -TEST_F(SmokeTest, InstallationMode_Hybrid) { +TEST_F(HybridSmokeTest, InstallationMode) { bf::path path = kSmokePackagesDirectory / "InstallationMode_Hybrid.wgt"; std::string pkgid = "smokehyb01"; // Excutable for native app doesn't create symlink std::string appid1 = "smokehyb01.Web"; - ASSERT_EQ(Install(path, PackageType::HYBRID), ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid1})); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid1}, params)); } -TEST_F(SmokeTest, UpdateMode_Hybrid) { +TEST_F(HybridSmokeTest, UpdateMode) { bf::path path_old = kSmokePackagesDirectory / "UpdateMode_Hybrid.wgt"; bf::path path_new = kSmokePackagesDirectory / "UpdateMode_Hybrid_2.wgt"; std::string pkgid = "smokehyb02"; std::string appid1 = "smokehyb02.Web"; - ASSERT_EQ(Install(path_old, PackageType::HYBRID), - ci::AppInstaller::Result::OK); -// AddDataFiles(pkgid, kTestUserId); - ASSERT_EQ(Install(path_new, PackageType::HYBRID), + ASSERT_EQ(backend.InstallSuccess(path_old), ci::AppInstaller::Result::OK); + AddDataFiles(pkgid, params.test_user.uid); + ASSERT_EQ(backend.Install(path_new), ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid1})); + ASSERT_TRUE(ValidatePackage(pkgid, {appid1}, params)); - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "2\n")); - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "VERSION", "2\n")); -// ValidateDataFiles(pkgid, kTestUserId); + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "2\n", + params)); + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "VERSION", "2\n", params)); + ValidateDataFiles(pkgid, params.test_user.uid); } -TEST_F(SmokeTest, DeinstallationMode_Hybrid) { +TEST_F(HybridSmokeTest, DeinstallationMode) { bf::path path = kSmokePackagesDirectory / "DeinstallationMode_Hybrid.wgt"; std::string pkgid = "smokehyb03"; std::string appid1 = "smokehyb03.Web"; - ASSERT_EQ(Install(path, PackageType::HYBRID), - ci::AppInstaller::Result::OK); - ASSERT_EQ(Uninstall(pkgid, PackageType::HYBRID, false), - ci::AppInstaller::Result::OK); - ASSERT_TRUE(CheckPackageNonExistance(pkgid, {appid1})); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::OK); + ASSERT_EQ(backend.Uninstall(pkgid), ci::AppInstaller::Result::OK); + ASSERT_TRUE(CheckPackageNonExistance(pkgid, params)); } -TEST_F(SmokeTest, DeltaMode_Hybrid) { +TEST_F(HybridSmokeTest, DeltaMode) { bf::path path = kSmokePackagesDirectory / "DeltaMode_Hybrid.wgt"; bf::path delta_package = kSmokePackagesDirectory / "DeltaMode_Hybrid.delta"; std::string pkgid = "smokehyb04"; std::string appid1 = "smokehyb04.Web"; - ASSERT_EQ(DeltaInstall(path, delta_package, PackageType::HYBRID), - ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid1})); + ASSERT_EQ(backend.InstallSuccess(path), ci::AppInstaller::Result::OK); + ASSERT_EQ(backend.Install(delta_package), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid1}, params)); // Check delta modifications - bf::path root_path = ci::GetRootAppPath(false, - kTestUserId); + bf::path root_path = ci::GetRootAppPath(false, params.test_user.uid); ASSERT_FALSE(bf::exists(root_path / pkgid / "res" / "wgt" / "DELETED")); ASSERT_TRUE(bf::exists(root_path / pkgid / "res" / "wgt" / "ADDED")); ASSERT_FALSE(bf::exists(root_path / pkgid / "lib" / "DELETED")); @@ -375,130 +460,129 @@ TEST_F(SmokeTest, DeltaMode_Hybrid) { ASSERT_TRUE(bf::exists(root_path / pkgid / "res" / "wgt" / "css" / "style.css")); // NOLINT ASSERT_TRUE(bf::exists(root_path / pkgid / "res" / "wgt" / "images" / "tizen_32.png")); // NOLINT ASSERT_TRUE(bf::exists(root_path / pkgid / "res" / "wgt" / "js" / "main.js")); - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/MODIFIED", "version 2\n")); // NOLINT - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "lib/MODIFIED", "version 2\n")); // NOLINT + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/MODIFIED", "version 2\n", params)); // NOLINT + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "lib/MODIFIED", "version 2\n", params)); // NOLINT } -TEST_F(SmokeTest, MountInstallationMode_Hybrid) { +TEST_F(HybridSmokeTest, MountInstallationMode) { bf::path path = kSmokePackagesDirectory / "MountInstallationMode_Hybrid.wgt"; std::string pkgid = "smokehyb05"; std::string appid1 = "smokehyb05.web"; - ASSERT_EQ(MountInstall(path, PackageType::HYBRID), - ci::AppInstaller::Result::OK); - ScopedTzipInterface interface(pkgid); - ASSERT_TRUE(ValidatePackage(pkgid, {appid1})); + ASSERT_EQ(backend.MountInstall(path), ci::AppInstaller::Result::OK); + ScopedTzipInterface interface(pkgid, params.test_user.uid); + ASSERT_TRUE(ValidatePackage(pkgid, {appid1}, params)); } -TEST_F(SmokeTest, MountUpdateMode_Hybrid) { +TEST_F(HybridSmokeTest, MountUpdateMode) { bf::path path_old = kSmokePackagesDirectory / "MountUpdateMode_Hybrid.wgt"; bf::path path_new = kSmokePackagesDirectory / "MountUpdateMode_Hybrid_2.wgt"; std::string pkgid = "smokehyb06"; std::string appid1 = "smokehyb06.web"; - ASSERT_EQ(MountInstall(path_old, PackageType::HYBRID), - ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); - ASSERT_EQ(MountInstall(path_new, PackageType::HYBRID), - ci::AppInstaller::Result::OK); - ScopedTzipInterface interface(pkgid); - ASSERT_TRUE(ValidatePackage(pkgid, {appid1})); + ASSERT_EQ(backend.MountInstallSuccess(path_old), + ci::AppInstaller::Result::OK); + AddDataFiles(pkgid, params.test_user.uid); + ASSERT_EQ(backend.MountInstall(path_new), ci::AppInstaller::Result::OK); + ScopedTzipInterface interface(pkgid, params.test_user.uid); + ASSERT_TRUE(ValidatePackage(pkgid, {appid1}, params)); - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "2\n")); - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "lib/VERSION", "2\n")); - ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "2\n", + params)); + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "lib/VERSION", "2\n", + params)); + ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); } -TEST_F(SmokeTest, InstallationMode_Rollback_Hybrid) { +TEST_F(RollbackHybridSmokeTest, InstallationMode) { bf::path path = kSmokePackagesDirectory / "InstallationMode_Rollback_Hybrid.wgt"; std::string pkgid = "smokehyb07"; std::string appid1 = "smokehyb07.web"; - ASSERT_EQ(Install(path, PackageType::HYBRID, RequestResult::FAIL), - ci::AppInstaller::Result::ERROR); - ASSERT_TRUE(CheckPackageNonExistance(pkgid, {appid1})); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::ERROR); + ASSERT_TRUE(CheckPackageNonExistance(pkgid, params)); } -TEST_F(SmokeTest, UpdateMode_Rollback_Hybrid) { +TEST_F(RollbackHybridSmokeTest, UpdateMode) { bf::path path_old = kSmokePackagesDirectory / "UpdateMode_Rollback_Hybrid.wgt"; bf::path path_new = kSmokePackagesDirectory / "UpdateMode_Rollback_Hybrid_2.wgt"; std::string pkgid = "smokehyb08"; std::string appid1 = "smokehyb08.web"; - ASSERT_EQ(Install(path_old, PackageType::HYBRID), - ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); - ASSERT_EQ(Install(path_new, PackageType::HYBRID, - RequestResult::FAIL), ci::AppInstaller::Result::ERROR); - ASSERT_TRUE(ValidatePackage(pkgid, {appid1})); + ASSERT_EQ(backend.InstallSuccess(path_old), ci::AppInstaller::Result::OK); + AddDataFiles(pkgid, params.test_user.uid); + ASSERT_EQ(backend.Install(path_new), ci::AppInstaller::Result::ERROR); + ASSERT_TRUE(ValidatePackage(pkgid, {appid1}, params)); - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "1\n")); - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "lib/VERSION", "1\n")); - ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "1\n", + params)); + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "lib/VERSION", "1\n", + params)); + ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); } -TEST_F(SmokeTest, DeltaMode_Rollback_Hybrid) { +TEST_F(RollbackHybridSmokeTest, DeltaMode) { bf::path path = kSmokePackagesDirectory / "DeltaMode_Rollback_Hybrid.wgt"; bf::path delta_package = kSmokePackagesDirectory / "DeltaMode_Rollback_Hybrid.delta"; std::string pkgid = "smokehyb11"; std::string appid1 = "smokehyb11.web"; - ASSERT_EQ(Install(path, PackageType::HYBRID), ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); - ASSERT_EQ(Install(delta_package, PackageType::HYBRID, RequestResult::FAIL), + ASSERT_EQ(backend.InstallSuccess(path), ci::AppInstaller::Result::OK); + AddDataFiles(pkgid, params.test_user.uid); + ASSERT_EQ(backend.Install(delta_package), ci::AppInstaller::Result::ERROR); - ASSERT_TRUE(ValidatePackage(pkgid, {appid1})); + ASSERT_TRUE(ValidatePackage(pkgid, {appid1}, params)); // Check delta modifications - bf::path root_path = GetPackageRoot(pkgid, kTestUserId); + bf::path root_path = GetPackageRoot(pkgid, params.test_user.uid); ASSERT_TRUE(bf::exists(root_path / "res" / "wgt" / "DELETED")); ASSERT_FALSE(bf::exists(root_path / "res" / "wgt" / "ADDED")); ASSERT_TRUE(bf::exists(root_path / "lib" / "DELETED")); ASSERT_FALSE(bf::exists(root_path / "lib" / "ADDED")); ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/MODIFIED", - "version 1\n")); + "version 1\n", params)); ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "lib/MODIFIED", - "version 1\n")); - ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + "version 1\n", params)); + ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); } -TEST_F(SmokeTest, MountInstallationMode_Rollback_Hybrid) { +TEST_F(RollbackHybridSmokeTest, MountInstallationMode) { bf::path path = kSmokePackagesDirectory / "MountInstallationMode_Rollback_Hybrid.wgt"; std::string pkgid = "smokehyb09"; std::string appid1 = "smokehyb09.web"; - ASSERT_EQ(MountInstall(path, PackageType::HYBRID, RequestResult::FAIL), - ci::AppInstaller::Result::ERROR); - ScopedTzipInterface interface(pkgid); - ASSERT_TRUE(CheckPackageNonExistance(pkgid, {appid1})); + ASSERT_EQ(backend.MountInstall(path), ci::AppInstaller::Result::ERROR); + ScopedTzipInterface interface(pkgid, params.test_user.uid); + ASSERT_TRUE(CheckPackageNonExistance(pkgid, params)); } -TEST_F(SmokeTest, MountUpdateMode_Rollback_Hybrid) { +TEST_F(RollbackHybridSmokeTest, MountUpdateMode) { bf::path path_old = kSmokePackagesDirectory / "MountUpdateMode_Rollback_Hybrid.wgt"; bf::path path_new = kSmokePackagesDirectory / "MountUpdateMode_Rollback_Hybrid_2.wgt"; std::string pkgid = "smokehyb10"; std::string appid1 = "smokehyb10.web"; - ASSERT_EQ(MountInstall(path_old, PackageType::HYBRID), + ASSERT_EQ(backend.MountInstallSuccess(path_old), ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); - ASSERT_EQ(MountInstall(path_new, PackageType::HYBRID, - RequestResult::FAIL), ci::AppInstaller::Result::ERROR); - ScopedTzipInterface interface(pkgid); - ASSERT_TRUE(ValidatePackage(pkgid, {appid1})); + AddDataFiles(pkgid, params.test_user.uid); + ASSERT_EQ(backend.MountInstall(path_new), ci::AppInstaller::Result::ERROR); + ScopedTzipInterface interface(pkgid, params.test_user.uid); + ASSERT_TRUE(ValidatePackage(pkgid, {appid1}, params)); - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "1\n")); - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "lib/VERSION", "1\n")); - ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "1\n", + params)); + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "lib/VERSION", "1\n", + params)); + ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); } TEST_F(SmokeTest, MountInstallationMode) { bf::path path = kSmokePackagesDirectory / "MountInstallationMode.wgt"; std::string pkgid = "smokewgt28"; std::string appid = "smokewgt28.InstallationMode"; - ASSERT_EQ(MountInstall(path, PackageType::WGT), ci::AppInstaller::Result::OK); - ScopedTzipInterface interface(pkgid); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ASSERT_EQ(backend.MountInstall(path), ci::AppInstaller::Result::OK); + ScopedTzipInterface interface(pkgid, params.test_user.uid); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); } TEST_F(SmokeTest, MountUpdateMode) { @@ -506,45 +590,44 @@ TEST_F(SmokeTest, MountUpdateMode) { bf::path path_new = kSmokePackagesDirectory / "MountUpdateMode_2.wgt"; std::string pkgid = "smokewgt29"; std::string appid = "smokewgt29.UpdateMode"; - ASSERT_EQ(MountInstall(path_old, PackageType::WGT), - ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); - ASSERT_EQ(MountInstall(path_new, PackageType::WGT), - ci::AppInstaller::Result::OK); - ScopedTzipInterface interface(pkgid); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ASSERT_EQ(backend.MountInstallSuccess(path_old), + ci::AppInstaller::Result::OK); + AddDataFiles(pkgid, params.test_user.uid); + ASSERT_EQ(backend.MountInstall(path_new), ci::AppInstaller::Result::OK); + ScopedTzipInterface interface(pkgid, params.test_user.uid); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "2\n")); - ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "2\n", + params)); + ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); } -TEST_F(SmokeTest, MountInstallationMode_Rollback) { +TEST_F(RollbackSmokeTest, MountInstallationMode) { bf::path path = kSmokePackagesDirectory / "MountInstallationMode_Rollback.wgt"; std::string pkgid = "smokewgt33"; std::string appid = "smokewgt33.web"; - ASSERT_EQ(MountInstall(path, PackageType::WGT, RequestResult::FAIL), - ci::AppInstaller::Result::ERROR); - ScopedTzipInterface interface(pkgid); - ASSERT_TRUE(CheckPackageNonExistance(pkgid, {appid})); + ASSERT_EQ(backend.MountInstall(path), ci::AppInstaller::Result::ERROR); + ScopedTzipInterface interface(pkgid, params.test_user.uid); + ASSERT_TRUE(CheckPackageNonExistance(pkgid, params)); } -TEST_F(SmokeTest, MountUpdateMode_Rollback) { +TEST_F(RollbackSmokeTest, MountUpdateMode) { bf::path path_old = kSmokePackagesDirectory / "MountUpdateMode_Rollback.wgt"; bf::path path_new = kSmokePackagesDirectory / "MountUpdateMode_Rollback_2.wgt"; std::string pkgid = "smokewgt34"; std::string appid = "smokewgt34.web"; - ASSERT_EQ(MountInstall(path_old, PackageType::WGT), + ASSERT_EQ(backend.MountInstallSuccess(path_old), ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); - ASSERT_EQ(MountInstall(path_new, PackageType::WGT, - RequestResult::FAIL), ci::AppInstaller::Result::ERROR); - ScopedTzipInterface interface(pkgid); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + AddDataFiles(pkgid, params.test_user.uid); + ASSERT_EQ(backend.MountInstall(path_new), ci::AppInstaller::Result::ERROR); + ScopedTzipInterface interface(pkgid, params.test_user.uid); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); - ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "1\n")); - ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "1\n", + params)); + ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); } TEST_F(SmokeTest, UserDefinedPlugins) { @@ -555,10 +638,10 @@ TEST_F(SmokeTest, UserDefinedPlugins) { std::string location_privilege = "http://tizen.org/privilege/location"; std::string power_privilege = "http://tizen.org/privilege/power"; - ASSERT_EQ(Install(path, PackageType::WGT), ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); std::vector res; - ci::PkgQueryInterface pkg_query(pkgid, kTestUserId); + ci::PkgQueryInterface pkg_query(pkgid, params.test_user.uid); ASSERT_TRUE(pkg_query.PrivilegesForPkgId(&res)); ASSERT_TRUE(std::find(res.begin(), res.end(), call_privilege) != res.end()); ASSERT_TRUE(std::find(res.begin(), res.end(), location_privilege) @@ -571,9 +654,9 @@ TEST_F(SmokeTest, InstallExternalMode) { bf::path path = kSmokePackagesDirectory / "InstallExternalMode.wgt"; std::string pkgid = "smokewgt35"; std::string appid = "smokewgt35.web"; - ASSERT_EQ(InstallWithStorage(path, PackageType::WGT, StorageType::EXTERNAL), + ASSERT_EQ(backend.InstallWithStorage(path, StorageType::EXTERNAL), ci::AppInstaller::Result::OK); - ValidateExternalPackage(pkgid, {appid}); + ValidateExternalPackage(pkgid, {appid}, params); } TEST_F(SmokeTest, MigrateLegacyExternalImageMode) { @@ -583,69 +666,67 @@ TEST_F(SmokeTest, MigrateLegacyExternalImageMode) { std::string pkgid = "smokewgt36"; std::string appid = "smokewgt36.web"; bf::path legacy_path = kSmokePackagesDirectory / kLegacyExtImageDir; - if (kTestUserIdStr == kDefaultUserIdStr || kTestUserId == kGlobalUserUid) { - ASSERT_EQ(MigrateLegacyExternalImage(pkgid, path, legacy_path, - PackageType::WGT), ci::AppInstaller::Result::OK); - ValidateExternalPackage(pkgid, {appid}); + std::string test_uid_str = std::to_string(params.test_user.uid); + if (test_uid_str == kDefaultUserIdStr || + params.test_user.uid == kGlobalUserUid) { + ASSERT_EQ(backend.MigrateLegacyExternalImage(pkgid, path, legacy_path), + ci::AppInstaller::Result::OK); + ValidateExternalPackage(pkgid, {appid}, params); } else { - ASSERT_EQ(MigrateLegacyExternalImage(pkgid, path, legacy_path, - PackageType::WGT), ci::AppInstaller::Result::ERROR); + ASSERT_EQ(backend.MigrateLegacyExternalImage(pkgid, path, legacy_path), + ci::AppInstaller::Result::ERROR); } } -TEST_F(PreloadSmokeTest, InstallationMode_Preload) { +TEST_F(PreloadSmokeTest, InstallationMode) { ASSERT_EQ(getuid(), 0) << "Test cannot be run by normal user"; bf::path path = kSmokePackagesDirectory / "InstallationMode_Preload.wgt"; std::string pkgid = "smokewgt37"; std::string appid = "smokewgt37.InstallationModePreload"; - ASSERT_EQ(InstallPreload(path, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid}, true)); + ASSERT_EQ(backend.InstallPreload(path), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); } -TEST_F(PreloadSmokeTest, UpdateMode_Preload) { +TEST_F(PreloadSmokeTest, UpdateMode) { ASSERT_EQ(getuid(), 0) << "Test cannot be run by normal user"; bf::path path_old = kSmokePackagesDirectory / "UpdateMode_Preload.wgt"; bf::path path_new = kSmokePackagesDirectory / "UpdateMode_Preload2.wgt"; std::string pkgid = "smokewgt38"; std::string appid = "smokewgt38.UpdateModePreload"; - ASSERT_EQ(InstallPreload(path_old, PackageType::WGT), - ci::AppInstaller::Result::OK); - AddDataFiles(pkgid, kTestUserId); - ASSERT_EQ(InstallPreload(path_new, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid}, true)); + ASSERT_EQ(backend.InstallPreload(path_old), ci::AppInstaller::Result::OK); + AddDataFiles(pkgid, params.test_user.uid); + ASSERT_EQ(backend.InstallPreload(path_new), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); ASSERT_TRUE(ValidateFileContentInPackage(pkgid, "res/wgt/VERSION", "2", - true)); - ASSERT_TRUE(ValidateDataFiles(pkgid, kTestUserId)); + params)); + ASSERT_TRUE(ValidateDataFiles(pkgid, params.test_user.uid)); } -TEST_F(PreloadSmokeTest, DeinstallationMode_Preload) { +TEST_F(PreloadSmokeTest, DeinstallationMode) { ASSERT_EQ(getuid(), 0) << "Test cannot be run by normal user"; bf::path path = kSmokePackagesDirectory / "DeinstallationMode_Preload.wgt"; std::string pkgid = "smokewgt39"; std::string appid = "smokewgt39.DeinstallationModePreload"; - ASSERT_EQ(InstallPreload(path, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_EQ(Uninstall(pkgid, PackageType::WGT, true), - ci::AppInstaller::Result::OK); - CheckPackageReadonlyNonExistance(pkgid, {appid}); + ASSERT_EQ(backend.InstallPreload(path), ci::AppInstaller::Result::OK); + ASSERT_EQ(backend.UninstallPreload(pkgid), ci::AppInstaller::Result::OK); + CheckPackageReadonlyNonExistance(pkgid, params); } -TEST_F(PreloadSmokeTest, ManifestDirectInstallMode) { +TEST_F(SmokeTest, ManifestDirectInstallMode) { ASSERT_EQ(getuid(), 0) << "Test cannot be run by normal user"; bf::path src_path = kSmokePackagesDirectory / "ManifestDirectInstallMode"; std::string pkgid = "smokewgt40"; std::string appid = "smokewgt40.ManifestDirectInstallMode"; - bf::path pkg_path = ci::GetRootAppPath(false, kTestUserId); + bf::path pkg_path = ci::GetRootAppPath(false, params.test_user.uid); - CopyDir(src_path / pkgid, pkg_path / pkgid); - ci::PkgQueryInterface pkg_query(pkgid, kTestUserId); - ASSERT_FALSE(pkg_query.IsPackageInstalled(ci::GetRequestMode(kTestUserId))); - ASSERT_EQ(ManifestDirectInstall(pkgid, PackageType::WGT), + ci::CopyDir(src_path / pkgid, pkg_path / pkgid); + ci::PkgQueryInterface pkg_query(pkgid, params.test_user.uid); + ASSERT_FALSE(pkg_query.IsPackageInstalled( + ci::GetRequestMode(params.test_user.uid))); + ASSERT_EQ(backend.ManifestDirectInstall(pkgid), ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); } TEST_F(SmokeTest, ManifestDirectUpdateMode) { @@ -653,13 +734,14 @@ TEST_F(SmokeTest, ManifestDirectUpdateMode) { std::string pkgid = "smokewgt41"; std::string appid = "smokewgt41.ManifestDirectUpdateMode"; - ASSERT_EQ(Install(path, PackageType::WGT), ci::AppInstaller::Result::OK); - int install_time = GetAppInstalledTime(appid.c_str(), kTestUserId); - ASSERT_EQ(ManifestDirectInstall(pkgid, PackageType::WGT), + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::OK); + int install_time = GetAppInstalledTime(appid.c_str(), params.test_user.uid); + ASSERT_EQ(backend.ManifestDirectInstall(pkgid), ci::AppInstaller::Result::OK); - ASSERT_TRUE(GetAppInstalledTime(appid.c_str(), kTestUserId) > install_time) + ASSERT_TRUE(GetAppInstalledTime(appid.c_str(), + params.test_user.uid) > install_time) << "Package is not updated (app installed time didn't change)."; - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); } TEST_F(PreloadSmokeTest, ReadonlyUpdateInstallMode) { @@ -668,12 +750,9 @@ TEST_F(PreloadSmokeTest, ReadonlyUpdateInstallMode) { std::string pkgid = "smokewgt42"; std::string appid = "smokewgt42.ReadonlyUpdateInstallMode"; - ASSERT_EQ(InstallPreload(path, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_EQ(Install(path, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); - ASSERT_TRUE(ValidatePackage(pkgid, {appid}, true)); + ASSERT_EQ(backend.InstallPreload(path), ci::AppInstaller::Result::OK); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); } TEST_F(PreloadSmokeTest, ReadonlyUpdateUninstallMode) { @@ -682,55 +761,53 @@ TEST_F(PreloadSmokeTest, ReadonlyUpdateUninstallMode) { std::string pkgid = "smokewgt43"; std::string appid = "smokewgt43.ReadonlyUpdateUninstallMode"; - ASSERT_EQ(InstallPreload(path, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_EQ(Install(path, PackageType::WGT), + ASSERT_EQ(backend.InstallPreload(path), ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); - ASSERT_TRUE(ValidatePackage(pkgid, {appid}, true)); - ASSERT_EQ(Uninstall(pkgid, PackageType::WGT, false), - ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid}, true)); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); + ASSERT_EQ(backend.Uninstall(pkgid), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); } -TEST_F(PreloadSmokeTest, ManifestDirectInstallMode_Hybrid) { +TEST_F(HybridSmokeTest, ManifestDirectInstallMode) { ASSERT_EQ(getuid(), 0) << "Test cannot be run by normal user"; bf::path src_path = kSmokePackagesDirectory / "ManifestDirectInstallMode_Hybrid"; std::string pkgid = "smokehyb12"; std::string appid = "smokehyb12.ManifestDirectInstallModeHybrid"; - bf::path pkg_path = ci::GetRootAppPath(false, kTestUserId); + bf::path pkg_path = ci::GetRootAppPath(false, params.test_user.uid); - CopyDir(src_path / pkgid, pkg_path / pkgid); - ci::PkgQueryInterface pkg_query(pkgid, kTestUserId); - ASSERT_FALSE(pkg_query.IsPackageInstalled(ci::GetRequestMode(kTestUserId))); - ASSERT_EQ(ManifestDirectInstall(pkgid, PackageType::HYBRID), + ci::CopyDir(src_path / pkgid, pkg_path / pkgid); + ci::PkgQueryInterface pkg_query(pkgid, params.test_user.uid); + ASSERT_FALSE(pkg_query.IsPackageInstalled( + ci::GetRequestMode(params.test_user.uid))); + ASSERT_EQ(backend.ManifestDirectInstall(pkgid), ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); } -TEST_F(SmokeTest, ManifestDirectUpdateMode_Hybrid) { +TEST_F(HybridSmokeTest, ManifestDirectUpdateMode) { bf::path path = kSmokePackagesDirectory / "ManifestDirectUpdateMode_Hybrid.wgt"; std::string pkgid = "smokehyb13"; std::string appid = "smokehyb13.ManifestDirectUpdateModeHybrid"; - ASSERT_EQ(Install(path, PackageType::HYBRID), ci::AppInstaller::Result::OK); - int install_time = GetAppInstalledTime(appid.c_str(), kTestUserId); - ASSERT_EQ(ManifestDirectInstall(pkgid, PackageType::HYBRID), - ci::AppInstaller::Result::OK); - ASSERT_TRUE(GetAppInstalledTime(appid.c_str(), kTestUserId) > install_time) + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::OK); + int install_time = GetAppInstalledTime(appid.c_str(), params.test_user.uid); + ASSERT_EQ(backend.ManifestDirectInstall(pkgid), ci::AppInstaller::Result::OK); + ASSERT_TRUE(GetAppInstalledTime(appid.c_str(), + params.test_user.uid) > install_time) << "Package is not updated (app installed time didn't change)."; - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); } TEST_F(SmokeTest, SharedRes24) { bf::path path = kSmokePackagesDirectory / "SharedRes24.wgt"; std::string pkgid = "smokeSh2xx"; std::string appid = "smokeSh2xx.SharedRes24"; - ASSERT_EQ(Install(path, PackageType::WGT), ci::AppInstaller::Result::OK); - ValidatePackage(pkgid, {appid}); - bf::path root_path = ci::GetRootAppPath(false, kTestUserId); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::OK); + ValidatePackage(pkgid, {appid}, params); + bf::path root_path = ci::GetRootAppPath(false, params.test_user.uid); ASSERT_TRUE(bf::is_regular_file(root_path / pkgid / "res" / "wgt" / "shared" / "res" / "NOT-SHARED-WGT")); // NOLINT ASSERT_FALSE(bf::exists(root_path / pkgid / "shared" / "res" / "NOT-SHARED-WGT")); // NOLINT } @@ -739,9 +816,9 @@ TEST_F(SmokeTest, SharedRes30) { bf::path path = kSmokePackagesDirectory / "SharedRes30.wgt"; std::string pkgid = "smokeSh3xx"; std::string appid = "smokeSh3xx.SharedRes30"; - ASSERT_EQ(Install(path, PackageType::WGT), ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); - bf::path root_path = ci::GetRootAppPath(false, kTestUserId); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); + bf::path root_path = ci::GetRootAppPath(false, params.test_user.uid); ASSERT_TRUE(bf::is_symlink(root_path / pkgid / "res" / "wgt" / "shared" / "res" / "SHARED-WGT")); // NOLINT ASSERT_TRUE(bf::is_regular_file(root_path / pkgid / "shared" / "res" / "SHARED-WGT")); // NOLINT } @@ -751,42 +828,42 @@ TEST_F(SmokeTest, SharedRes30Delta) { bf::path delta_package = kSmokePackagesDirectory / "SharedRes30Delta.delta"; std::string pkgid = "smokeSh3De"; std::string appid = "smokeSh3De.SharedRes30Delta"; - ASSERT_EQ(DeltaInstall(path, delta_package, PackageType::WGT), - ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid})); + ASSERT_EQ(backend.InstallSuccess(path), ci::AppInstaller::Result::OK); + ASSERT_EQ(backend.Install(delta_package), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); // Check delta modifications - bf::path root_path = ci::GetRootAppPath(false, kTestUserId); + bf::path root_path = ci::GetRootAppPath(false, params.test_user.uid); ASSERT_TRUE(bf::is_symlink(root_path / pkgid / "res" / "wgt" / "shared" / "res" / "SHARED-WGT-2")); // NOLINT ASSERT_TRUE(bf::is_regular_file(root_path / pkgid / "shared" / "res" / "SHARED-WGT-2")); // NOLINT ASSERT_FALSE(bf::exists(root_path / pkgid / "res" / "wgt" / "shared" / "res" / "SHARED-WGT-1")); // NOLINT ASSERT_FALSE(bf::exists(root_path / pkgid / "shared" / "res" / "SHARED-WGT-1")); // NOLINT } -TEST_F(SmokeTest, SharedRes30Hybrid) { +TEST_F(HybridSmokeTest, SharedRes30Hybrid) { bf::path path = kSmokePackagesDirectory / "SharedRes30Hybrid.wgt"; std::string pkgid = "smokeSh3Hy"; std::string appid1 = "smokeSh3Hy.SharedRes30Hybrid"; std::string appid2 = "sharedres30hybridserivce"; - ASSERT_EQ(Install(path, PackageType::HYBRID), ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid1, appid2})); - bf::path root_path = ci::GetRootAppPath(false, kTestUserId); + ASSERT_EQ(backend.Install(path), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid1, appid2}, params)); + bf::path root_path = ci::GetRootAppPath(false, params.test_user.uid); ASSERT_TRUE(bf::is_symlink(root_path / pkgid / "res" / "wgt" / "shared" / "res" / "SHARED-WGT")); // NOLINT ASSERT_TRUE(bf::is_regular_file(root_path / pkgid / "shared" / "res" / "SHARED-WGT")); // NOLINT ASSERT_TRUE(bf::is_regular_file(root_path / pkgid / "shared" / "res" / "SHARED-TPK")); // NOLINT } -TEST_F(SmokeTest, SharedRes30HybridDelta) { +TEST_F(HybridSmokeTest, SharedRes30HybridDelta) { bf::path path = kSmokePackagesDirectory / "SharedRes30HybridDelta.wgt"; bf::path delta_package = kSmokePackagesDirectory / "SharedRes30HybridDelta.delta"; std::string pkgid = "smokeSh3HD"; std::string appid1 = "smokeSh3HD.SharedRes30HybridDelta"; std::string appid2 = "sharedres30hybriddeltaserivce"; - ASSERT_EQ(DeltaInstall(path, delta_package, PackageType::HYBRID), - ci::AppInstaller::Result::OK); - ASSERT_TRUE(ValidatePackage(pkgid, {appid1, appid2})); + ASSERT_EQ(backend.InstallSuccess(path), ci::AppInstaller::Result::OK); + ASSERT_EQ(backend.Install(delta_package), ci::AppInstaller::Result::OK); + ASSERT_TRUE(ValidatePackage(pkgid, {appid1, appid2}, params)); // Check delta modifications - bf::path root_path = ci::GetRootAppPath(false, kTestUserId); + bf::path root_path = ci::GetRootAppPath(false, params.test_user.uid); ASSERT_TRUE(bf::is_symlink(root_path / pkgid / "res" / "wgt" / "shared" / "res" / "SHARED-WGT-2")); // NOLINT ASSERT_TRUE(bf::is_regular_file(root_path / pkgid / "shared" / "res" / "SHARED-WGT-2")); // NOLINT ASSERT_TRUE(bf::is_regular_file(root_path / pkgid / "shared" / "res" / "SHARED-TPK-2")); // NOLINT @@ -795,27 +872,27 @@ TEST_F(SmokeTest, SharedRes30HybridDelta) { } TEST_F(SmokeTest, InstallExtendedMode) { - ASSERT_TRUE(CheckAvailableExtendedStorage()); + ASSERT_TRUE(CheckAvailableExtendedPath()); bf::path path = kSmokePackagesDirectory / "InstallExtendedMode.wgt"; std::string pkgid = "smokewgt44"; std::string appid = "smokewgt44.web"; - ASSERT_EQ(InstallWithStorage(path, PackageType::WGT, StorageType::EXTENDED), + ASSERT_EQ(backend.InstallWithStorage(path, StorageType::EXTENDED), ci::AppInstaller::Result::OK); - ValidatePackage(pkgid, {appid}); + ASSERT_TRUE(ValidateExtendedPackage(pkgid, {appid}, params)); } -} // namespace common_installer +} // namespace smoke_test int main(int argc, char** argv) { - ci::RequestMode request_mode = ParseRequestMode(argc, argv); + ci::RequestMode request_mode = st::ParseRequestMode(argc, argv); if (getuid() != 0 || request_mode != ci::RequestMode::GLOBAL) { std::cout << "Skip tests for preload request" << std::endl; ::testing::GTEST_FLAG(filter) = "SmokeTest.*"; } testing::InitGoogleTest(&argc, argv); - env = testing::AddGlobalTestEnvironment( - new common_installer::SmokeEnvironment(request_mode)); - signal(SIGINT, signalHandler); - signal(SIGSEGV, signalHandler); + ::env = testing::AddGlobalTestEnvironment( + new smoke_test::SmokeEnvironment(request_mode)); + signal(SIGINT, ::signalHandler); + signal(SIGSEGV, ::signalHandler); return RUN_ALL_TESTS(); } diff --git a/src/unit_tests/smoke_utils.cc b/src/unit_tests/smoke_utils.cc index 3730ad0..653df94 100644 --- a/src/unit_tests/smoke_utils.cc +++ b/src/unit_tests/smoke_utils.cc @@ -2,909 +2,39 @@ // Use of this source code is governed by an apache-2.0 license that can be // found in the LICENSE file. -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include - -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include +#include #include "wgt/wgt_installer.h" +#include "hybrid/hybrid_installer.h" #include "unit_tests/smoke_utils.h" -namespace bo = boost::program_options; +namespace ci = common_installer; +namespace st = smoke_test; -const uid_t kGlobalUserUid = tzplatform_getuid(TZ_SYS_GLOBALAPP_USER); -const uid_t kGlobalUserGid = tzplatform_getgid(TZ_SYS_GLOBALAPP_USER); -const uid_t kDefaultUserUid = tzplatform_getuid(TZ_SYS_DEFAULT_USER); -uid_t kTestUserId = kGlobalUserUid; -gid_t kTestGroupId = kGlobalUserGid; -const char kNormalUserName[] = "smokeuser"; -const char kSystemShareGroupName[] = "system_share"; -std::string kTestUserIdStr = std::to_string(kTestUserId); -const std::string& kDefaultUserIdStr = std::to_string(kDefaultUserUid); -const char kLegacyExtImageDir[] = "legacy_extimage_dir"; -const char kMigrateTestDBName[] = "app2sd_migrate.db"; +namespace smoke_test { const bf::path kSmokePackagesDirectory = "/usr/share/wgt-backend-ut/test_samples/smoke/"; - -const char* rwDirectories[] = { - "data", - "cache", - "shared/cache", - "shared/data", - "shared/trusted", -}; - -// common entries -const std::vector kDBEntries = { - {".pkgmgr_parser.db"}, - {".pkgmgr_parser.db-journal"}, - {".pkgmgr_cert.db"}, - {".pkgmgr_cert.db-journal"}, - {".app2sd.db"}, - {".app2sd.db-journal"}, -}; -// globaluser entries -const char kGlobalManifestDir[] = "/opt/share/packages"; -const char kSkelDir[] = "/etc/skel/apps_rw"; -const char kPreloadApps[] = "/usr/apps"; -const char kPreloadManifestDir[] = "/usr/share/packages"; -const char kPreloadIcons[] = "/usr/share/icons"; - -testing::Environment *env = nullptr; -void signalHandler(int signum) { - env->TearDown(); - exit(signum); -} - -ci::RequestMode ParseRequestMode(int argc, char** argv) { - bo::options_description desc("Available options"); - desc.add_options() - ("request-mode", bo::value(), "set request mode") - ("global-request,g", "set request mode to global") - ("user-request,u", "set request mode to user"); - - bo::variables_map vm; - bo::store(bo::command_line_parser(argc, argv). - options(desc).allow_unregistered().run(), vm); - bo::notify(vm); - - if (vm.count("global-request")) { - std::cout << "Request mode was set to global." << std::endl; - return ci::RequestMode::GLOBAL; - } - if (vm.count("user-request")) { - std::cout << "Request mode was set to user." << std::endl; - return ci::RequestMode::USER; - } - if (vm.count("request-mode")) { - if (vm["request-mode"].as() == "global") { - std::cout << "Request mode was set to global." << std::endl; - return ci::RequestMode::GLOBAL; - } - if (vm["request-mode"].as() == "user") { - std::cout << "Request mode was set to user." << std::endl; - return ci::RequestMode::USER; - } - std::cout << "Cannot set request mode to " - << vm["request-mode"].as() << std::endl; - } - std::cout << "Request mode was set to global." << std::endl; - return ci::RequestMode::GLOBAL; -} - -bool TouchFile(const bf::path& path) { - FILE* f = fopen(path.c_str(), "w+"); - if (!f) - return false; - fclose(f); - return true; -} - -bool AddUser(const char *user_name) { - GumUser* user = nullptr; - user = gum_user_create_sync(FALSE); - if (user == nullptr) - LOG(WARNING) << "Failed to create gum user! (user name: " - << user_name << ")"; - g_object_set(G_OBJECT(user), "username", user_name, "usertype", - GUM_USERTYPE_NORMAL, NULL); - gboolean rval = FALSE; - rval = gum_user_add_sync(user); - g_object_unref(user); - return rval; -} - -bool DeleteUser(const char *user_name, bool rem_home_dir) { - bool rval = FALSE; - GumUser* guser = gum_user_get_by_name_sync(user_name, FALSE); - if (guser) - rval = gum_user_delete_sync(guser, rem_home_dir); - return rval; -} - -bool AddTestUser(const char *user_name) { - std::cout << "Adding test user: " << user_name << std::endl; - AddUser(user_name); - if (boost::optional uid = ci::GetUidByUserName(user_name)) { - kTestUserId = *uid; - kTestUserIdStr = std::to_string(kTestUserId); - std::cout << "User created properly: uid=" << *uid; - if (boost::optional gid = ci::GetGidByUid(*uid)) { - kTestGroupId = *gid; - std::cout << " gid=" << *gid; - } - std::cout << std::endl; - return true; - } - LOG(ERROR) << "Adding test user failed"; - return false; -} - -bool DeleteTestUser(const char *user_name) { - std::cout << "Deleting test user: " << user_name << std::endl; - uid_t test_uid; - if (boost::optional uid = ci::GetUidByUserName(user_name)) - test_uid = *uid; - DeleteUser(user_name, true); - if (!ci::GetUidByUserName(user_name)) { - std::cout << "User deleted properly: user_name=" << user_name - << " uid=" << test_uid << std::endl; - return true; - } - LOG(ERROR) << "Deleting test user failed"; - return false; -} - -void RemoveAllRecoveryFiles() { - bf::path root_path = ci::GetRootAppPath(false, - kTestUserId); - if (!bf::exists(root_path)) - return; - for (auto& dir_entry : boost::make_iterator_range( - bf::directory_iterator(root_path), bf::directory_iterator())) { - if (bf::is_regular_file(dir_entry)) { - if (dir_entry.path().string().find("/wgt-recovery") - != std::string::npos) { - bs::error_code error; - bf::remove(dir_entry.path(), error); - } - } - } -} - -bf::path FindRecoveryFile() { - bf::path root_path = ci::GetRootAppPath(false, - kTestUserId); - for (auto& dir_entry : boost::make_iterator_range( - bf::directory_iterator(root_path), bf::directory_iterator())) { - if (bf::is_regular_file(dir_entry)) { - if (dir_entry.path().string().find("/wgt-recovery") - != std::string::npos) { - return dir_entry.path(); - } - } - } - return {}; -} - -bf::path GetPackageRoot(const std::string& pkgid, uid_t uid) { - bf::path root_path = ci::GetRootAppPath(false, uid); - return root_path / pkgid; -} - -bool ValidateFileContentInPackage(const std::string& pkgid, - const std::string& relative, - const std::string& expected, - bool is_readonly) { - bf::path file_path = ci::GetRootAppPath(is_readonly, kTestUserId); - file_path = file_path / pkgid / relative; - if (!bf::exists(file_path)) { - LOG(ERROR) << file_path << " doesn't exist"; - return false; - } - FILE* handle = fopen(file_path.c_str(), "r"); - if (!handle) { - LOG(ERROR) << file_path << " cannot be open"; - return false; - } - std::string content; - std::array buffer; - while (fgets(buffer.data(), buffer.size(), handle)) { - content += buffer.data(); - } - fclose(handle); - return content == expected; -} - -void AddDataFiles(const std::string& pkgid, uid_t uid) { - if (uid == kGlobalUserUid) { - ci::UserList list = ci::GetUserList(); - for (auto l : list) { - auto pkg_path = GetPackageRoot(pkgid, std::get<0>(l)); - ASSERT_TRUE(TouchFile(pkg_path / "data" / "file1.txt")); - ASSERT_TRUE(TouchFile(pkg_path / "data" / "file2.txt")); - } - } else { - auto pkg_path = GetPackageRoot(pkgid, uid); - ASSERT_TRUE(TouchFile(pkg_path / "data" / "file1.txt")); - ASSERT_TRUE(TouchFile(pkg_path / "data" / "file2.txt")); - } -} - -bool ValidateDataFiles(const std::string& pkgid, uid_t uid) { - if (uid == kGlobalUserUid) { - ci::UserList list = ci::GetUserList(); - for (auto l : list) { - auto pkg_path = GetPackageRoot(pkgid, std::get<0>(l)); - EXTENDED_ASSERT_TRUE(bf::exists(pkg_path / "data" / "file1.txt")); - EXTENDED_ASSERT_TRUE(bf::exists(pkg_path / "data" / "file2.txt")); - } - } else { - auto pkg_path = GetPackageRoot(pkgid, uid); - EXTENDED_ASSERT_TRUE(bf::exists(pkg_path / "data" / "file1.txt")); - EXTENDED_ASSERT_TRUE(bf::exists(pkg_path / "data" / "file2.txt")); - } - return true; -} - -bool ValidatePackageRWFS(const std::string& pkgid, uid_t uid) { - bf::path root_path = ci::GetRootAppPath(false, uid); - bf::path package_path = root_path / pkgid; - bf::path data_path = package_path / rwDirectories[DATA]; - bf::path cache_path = package_path / rwDirectories[CACHE]; - bf::path shared_data_path = package_path / rwDirectories[SHARED_DATA]; - - EXTENDED_ASSERT_TRUE(bf::exists(data_path)); - EXTENDED_ASSERT_TRUE(bf::exists(cache_path)); - - struct stat stats; - stat(data_path.c_str(), &stats); - // gid of RW dirs should be system_share - boost::optional system_share = - ci::GetGidByGroupName(kSystemShareGroupName); - EXTENDED_ASSERT_EQ(uid, stats.st_uid); - EXTENDED_ASSERT_EQ(*system_share, stats.st_gid); - if (bf::exists(shared_data_path)) { - stat(shared_data_path.c_str(), &stats); - EXTENDED_ASSERT_EQ(uid, stats.st_uid); - EXTENDED_ASSERT_EQ(*system_share, stats.st_gid); - } - - stat(cache_path.c_str(), &stats); - EXTENDED_ASSERT_EQ(uid, stats.st_uid); - EXTENDED_ASSERT_EQ(*system_share, stats.st_gid); - return true; +WgtBackendInterface::AppQueryInterfacePtr +WgtBackendInterface::CreateQueryInterface() const { + return AppQueryInterfacePtr(new wgt::WgtAppQueryInterface()); } -bool ValidatePackageFS(const std::string& pkgid, - const std::vector& appids, - uid_t uid, gid_t gid, bool is_readonly) { - bf::path root_path = ci::GetRootAppPath(is_readonly, uid); - bf::path package_path = root_path / pkgid; - bf::path shared_path = package_path / "shared"; - EXTENDED_ASSERT_TRUE(bf::exists(root_path)); - EXTENDED_ASSERT_TRUE(bf::exists(package_path)); - EXTENDED_ASSERT_TRUE(bf::exists(shared_path)); - - bf::path manifest_path = - bf::path(getUserManifestPath(uid, is_readonly)) / (pkgid + ".xml"); - EXTENDED_ASSERT_TRUE(bf::exists(manifest_path)); - - for (auto& appid : appids) { - bf::path binary_path = package_path / "bin" / appid; - EXTENDED_ASSERT_TRUE(bf::exists(binary_path)); - } - - bf::path widget_root_path = package_path / "res" / "wgt"; - bf::path config_path = widget_root_path / "config.xml"; - EXTENDED_ASSERT_TRUE(bf::exists(widget_root_path)); - EXTENDED_ASSERT_TRUE(bf::exists(config_path)); - - bf::path private_tmp_path = package_path / "tmp"; - EXTENDED_ASSERT_TRUE(bf::exists(private_tmp_path)); - - // backups should not exist - bf::path package_backup = ci::GetBackupPathForPackagePath(package_path); - bf::path manifest_backup = ci::GetBackupPathForManifestFile(manifest_path); - EXTENDED_ASSERT_FALSE(bf::exists(package_backup)); - EXTENDED_ASSERT_FALSE(bf::exists(manifest_backup)); - - for (bf::recursive_directory_iterator iter(package_path); - iter != bf::recursive_directory_iterator(); ++iter) { - if (bf::is_symlink(symlink_status(iter->path()))) - continue; - bool is_rw_dir = false; - for (const auto rw_dir : rwDirectories) { - bf::path rw_dir_path = rw_dir; - is_rw_dir |= ci::MakeRelativePath(iter->path(), package_path) - == rw_dir_path; - } - if (is_rw_dir || iter->path().filename() == ".mmc") { - iter.no_push(); - continue; - } - struct stat stats; - stat(iter->path().c_str(), &stats); - EXTENDED_ASSERT_EQ(uid, stats.st_uid); - EXTENDED_ASSERT_EQ(gid, stats.st_gid); - } - return true; +WgtBackendInterface::AppInstallerPtr +WgtBackendInterface::CreateInstaller(ci::PkgMgrPtr pkgmgr) const { + return AppInstallerPtr(new wgt::WgtInstaller(pkgmgr)); } -void PackageCheckCleanup(const std::string& pkgid, - const std::vector&, bool is_readonly) { - bf::path root_path = ci::GetRootAppPath(is_readonly, kTestUserId); - bf::path package_path = root_path / pkgid; - ASSERT_FALSE(bf::exists(package_path)); - - bf::path manifest_path = bf::path(getUserManifestPath(kTestUserId, - is_readonly)) / (pkgid + ".xml"); - ASSERT_FALSE(bf::exists(manifest_path)); - - // backups should not exist - bf::path package_backup = ci::GetBackupPathForPackagePath(package_path); - bf::path manifest_backup = ci::GetBackupPathForManifestFile(manifest_path); - ASSERT_FALSE(bf::exists(package_backup)); - ASSERT_FALSE(bf::exists(manifest_backup)); +WgtBackendInterface::AppQueryInterfacePtr +HybridBackendInterface::CreateQueryInterface() const { + return AppQueryInterfacePtr(new wgt::WgtAppQueryInterface()); } -bool ValidatePackage(const std::string& pkgid, - const std::vector& appids, bool is_readonly) { - ci::PkgQueryInterface pkg_query(pkgid, kTestUserId); - EXTENDED_ASSERT_TRUE(pkg_query.IsPackageInstalled( - ci::GetRequestMode(kTestUserId))); - EXTENDED_ASSERT_TRUE(ValidatePackageFS( - pkgid, appids, kTestUserId, kTestGroupId, is_readonly)); - if (kTestUserId == kGlobalUserUid) { - ci::UserList list = ci::GetUserList(); - for (auto& l : list) - EXTENDED_ASSERT_TRUE(ValidatePackageRWFS(pkgid, std::get<0>(l))); - } else { - EXTENDED_ASSERT_TRUE(ValidatePackageRWFS(pkgid, kTestUserId)); - } - return true; +WgtBackendInterface::AppInstallerPtr +HybridBackendInterface::CreateInstaller(ci::PkgMgrPtr pkgmgr) const { + return AppInstallerPtr(new hybrid::HybridInstaller(pkgmgr)); } -void ValidateExternalPackageFS(const std::string& pkgid, - const std::vector& appids, - uid_t uid, gid_t gid) { - ASSERT_EQ(app2ext_usr_enable_external_pkg(pkgid.c_str(), uid), 0); - bf::path root_path = ci::GetRootAppPath(false, uid); - ASSERT_TRUE(bf::exists(root_path / pkgid / ".mmc" / "res")); - ValidatePackageFS(pkgid, appids, uid, gid, false); - ASSERT_EQ(app2ext_usr_disable_external_pkg(pkgid.c_str(), uid), 0); -} - -void ValidateExternalPackage(const std::string& pkgid, - const std::vector& appids) { - ci::PkgQueryInterface pkg_query(pkgid, kTestUserId); - ASSERT_TRUE(pkg_query.IsPackageInstalled(ci::GetRequestMode(kTestUserId))); - std::string storage = pkg_query.StorageForPkgId(); - bf::path ext_mount_path = ci::GetExternalCardPath(); - if (bf::is_empty(ext_mount_path)) { - LOG(INFO) << "Sdcard not exists!"; - ASSERT_EQ(storage, "installed_internal"); - } else { - ASSERT_EQ(storage, "installed_external"); - } - ValidateExternalPackageFS(pkgid, appids, kTestUserId, kTestGroupId); - if (kTestUserId == kGlobalUserUid) { - ci::UserList list = ci::GetUserList(); - for (auto& l : list) - ValidatePackageRWFS(pkgid, std::get<0>(l)); - } else { - ValidatePackageRWFS(pkgid, kTestUserId); - } -} - -bool CheckPackageNonExistance(const std::string& pkgid, - const std::vector& appids) { - ci::PkgQueryInterface pkg_query(pkgid, kTestUserId); - EXTENDED_ASSERT_FALSE(pkg_query.IsPackageInstalled( - ci::GetRequestMode(kTestUserId))); - PackageCheckCleanup(pkgid, appids); - if (kTestUserId == kGlobalUserUid) { - ci::UserList list = ci::GetUserList(); - bf::path skel_path(kSkelDir); - EXTENDED_ASSERT_FALSE(bf::exists(skel_path / pkgid)); - for (auto& l : list) { - bf::path root_path = ci::GetRootAppPath(false, std::get<0>(l)); - bf::path package_path = root_path / pkgid; - EXTENDED_ASSERT_FALSE(bf::exists(package_path)); - } - } - return true; -} - -void CheckPackageReadonlyNonExistance(const std::string& pkgid, - const std::vector& appids) { - ci::PkgQueryInterface pkg_query(pkgid, kTestUserId); - ASSERT_FALSE(pkg_query.IsPackageInstalled(ci::GetRequestMode(kTestUserId))); - PackageCheckCleanup(pkgid, appids, true); -} - -std::unique_ptr CreateQueryInterface() { - std::unique_ptr query_interface( - new wgt::WgtAppQueryInterface()); - return query_interface; -} - -std::unique_ptr CreateInstaller(ci::PkgMgrPtr pkgmgr, - PackageType type) { - switch (type) { - case PackageType::WGT: - return std::unique_ptr(new wgt::WgtInstaller(pkgmgr)); - case PackageType::HYBRID: - return std::unique_ptr( - new hybrid::HybridInstaller(pkgmgr)); - default: - LOG(ERROR) << "Unknown installer type"; - return nullptr; - } -} - -void TestRollbackAfterEachStep(int argc, const char*argv[], - std::function validator, - PackageType type) { - TestPkgmgrInstaller pkgmgr_installer; - std::unique_ptr query_interface = - CreateQueryInterface(); - auto pkgmgr = - ci::PkgMgrInterface::Create(argc, const_cast(argv), - &pkgmgr_installer, - query_interface.get()); - if (!pkgmgr) { - LOG(ERROR) << "Failed to initialize pkgmgr interface"; - return; - } - std::unique_ptr backend = CreateInstaller(pkgmgr, type); - int i; - for (i = backend->StepCount()-1; i >= 0; i--) { - backend->AddStepAtIndex(i); - LOG(DEBUG) << "StepFail is inserted at: " << i; - ASSERT_EQ(ci::AppInstaller::Result::ERROR, - backend->Run()); - if (!validator()) - break; - } - ASSERT_EQ(-1, i); -} - -void CrashAfterEachStep(std::vector args, - std::function validator, - PackageType type) { - std::unique_ptr argv(new const char*[args.size()]); - for (size_t i = 0; i < args.size(); ++i) { - argv[i] = args[i].c_str(); - } - TestPkgmgrInstaller pkgmgr_installer; - std::unique_ptr query_interface = - CreateQueryInterface(); - auto pkgmgr = - ci::PkgMgrInterface::Create(args.size(), const_cast(argv.get()), - &pkgmgr_installer, - query_interface.get()); - if (!pkgmgr) { - LOG(ERROR) << "Failed to initialize pkgmgr interface"; - return; - } - std::unique_ptr backend = CreateInstaller(pkgmgr, type); - int stepCount = backend->StepCount(); - - args.push_back("-idx"); - args.push_back(std::to_string(stepCount)); - int i; - for (i = 0; i < stepCount; i++) { - ci::Subprocess backend_crash("/usr/bin/wgt-backend-ut/smoke-test-helper"); - args.back() = std::to_string(i); - backend_crash.Run(args); - ASSERT_NE(backend_crash.Wait(), 0); - if (!validator(i)) - break; - } - ASSERT_EQ(stepCount, i); -} - -ci::AppInstaller::Result RunInstallerWithPkgrmgr(ci::PkgMgrPtr pkgmgr, - PackageType type, - RequestResult mode) { - std::unique_ptr installer = CreateInstaller(pkgmgr, type); - switch (mode) { - case RequestResult::FAIL: - installer->AddStep(); - break; - default: - break; - } - return installer->Run(); -} -ci::AppInstaller::Result CallBackend(int argc, - const char* argv[], - PackageType type, - RequestResult mode) { - TestPkgmgrInstaller pkgmgr_installer; - std::unique_ptr query_interface = - CreateQueryInterface(); - auto pkgmgr = - ci::PkgMgrInterface::Create(argc, const_cast(argv), - &pkgmgr_installer, query_interface.get()); - if (!pkgmgr) { - LOG(ERROR) << "Failed to initialize pkgmgr interface"; - return ci::AppInstaller::Result::UNKNOWN; - } - return RunInstallerWithPkgrmgr(pkgmgr, type, mode); -} - -ci::AppInstaller::Result Install(const bf::path& path, - PackageType type, - RequestResult mode) { - const char* argv[] = {"", "-i", path.c_str(), "-u", kTestUserIdStr.c_str()}; - return CallBackend(SIZEOFARRAY(argv), argv, type, mode); -} - -ci::AppInstaller::Result InstallPreload(const bf::path& path, PackageType type, - RequestResult mode) { - const char* argv[] = {"", "-i", path.c_str(), "--preload"}; - return CallBackend(SIZEOFARRAY(argv), argv, type, mode); -} - -bool CheckAvailableExternalPath() { - bf::path ext_mount_path = ci::GetExternalCardPath(); - LOG(DEBUG) << "ext_mount_path :" << ext_mount_path; - if (ext_mount_path.empty()) { - LOG(ERROR) << "Sdcard not exists!"; - return false; - } - return true; -} - -bool CheckAvailableExtendedStorage() { - bf::path extended_path = bf::path(tzplatform_getenv(TZ_SYS_EXTENDEDSD)); - LOG(DEBUG) << "extended_path :" << extended_path; - // TODO(jeremy.jang): It should be checked by libstorage API. - if (!bf::exists(extended_path)) { - LOG(ERROR) << "Extended storage not exists!"; - return false; - } - return true; -} - -ci::AppInstaller::Result InstallWithStorage(const bf::path& path, - PackageType type, - StorageType storage_type, - RequestResult mode) { - int default_storage = 0; - int storage = 0; - switch (storage_type) { - case StorageType::EXTERNAL: - storage = 1; - break; - case StorageType::EXTENDED: - storage = 2; - break; - default: - LOG(ERROR) << "Unknown storage type"; - break; - } - vconf_get_int(VCONFKEY_SETAPPL_DEFAULT_MEM_INSTALL_APPLICATIONS_INT, - &default_storage); - vconf_set_int(VCONFKEY_SETAPPL_DEFAULT_MEM_INSTALL_APPLICATIONS_INT, storage); - - const char* argv[] = {"", "-i", path.c_str(), "-u", kTestUserIdStr.c_str()}; - ci::AppInstaller::Result result = - CallBackend(SIZEOFARRAY(argv), argv, type, mode); - - vconf_set_int(VCONFKEY_SETAPPL_DEFAULT_MEM_INSTALL_APPLICATIONS_INT, - default_storage); - return result; -} - -ci::AppInstaller::Result MigrateLegacyExternalImage(const std::string& pkgid, - const bf::path& path, - const bf::path& legacy_path, - PackageType type, - RequestResult mode) { - if (InstallWithStorage(path, type, StorageType::EXTERNAL) != - ci::AppInstaller::Result::OK) { - LOG(ERROR) << "Failed to install application. Cannot perform Migrate"; - return ci::AppInstaller::Result::ERROR; - } - - bf::path ext_mount_path = ci::GetExternalCardPath(); - if (bf::is_empty(ext_mount_path)) { - LOG(ERROR) << "Sdcard not exists!"; - return ci::AppInstaller::Result::ERROR; - } - bf::path app2sd_path = ext_mount_path / "app2sd"; - - char* image_name = app2ext_usr_getname_image(pkgid.c_str(), - kGlobalUserUid); - if (!image_name) { - LOG(ERROR) << "Failed to get external image name"; - return ci::AppInstaller::Result::ERROR; - } - bf::path org_image = app2sd_path / image_name; - free(image_name); - - bs::error_code error; - bf::remove(org_image, error); - if (error) { - LOG(ERROR) << "Failed to remove org image"; - return ci::AppInstaller::Result::ERROR; - } - - bf::path db_path = tzplatform_getenv(TZ_SYS_DB); - bf::path app2sd_db = db_path / ".app2sd.db"; - bf::path app2sd_db_journal = db_path / ".app2sd.db-journal"; - bf::remove(app2sd_db, error); - if (error) { - LOG(ERROR) << "Failed to remove app2sd db"; - return ci::AppInstaller::Result::ERROR; - } - bf::remove(app2sd_db_journal, error); - if (error) { - LOG(ERROR) << "Failed to remove app2sd journal db"; - return ci::AppInstaller::Result::ERROR; - } - - bf::path app2sd_migrate_db = legacy_path / kMigrateTestDBName; - if (!ci::CopyFile(app2sd_migrate_db, app2sd_db)) { - LOG(ERROR) << "Failed to copy test db"; - return ci::AppInstaller::Result::ERROR; - } - - bf::path legacy_src = legacy_path / pkgid; - bf::path legacy_dst = app2sd_path / pkgid; - if (!ci::CopyFile(legacy_src, legacy_dst)) { - LOG(ERROR) << "Failed to copy test image"; - return ci::AppInstaller::Result::ERROR; - } - const char* argv[] = {"", "--migrate-extimg", pkgid.c_str(), - "-u", kTestUserIdStr.c_str()}; - return CallBackend(SIZEOFARRAY(argv), argv, type, mode); -} - -ci::AppInstaller::Result MountInstall(const bf::path& path, - PackageType type, RequestResult mode) { - const char* argv[] = {"", "-w", path.c_str(), "-u", kTestUserIdStr.c_str()}; - return CallBackend(SIZEOFARRAY(argv), argv, type, mode); -} - -ci::AppInstaller::Result Uninstall(const std::string& pkgid, - PackageType type, - bool is_preload, - RequestResult mode) { - if (is_preload) { - const char* argv[] = {"", "-d", pkgid.c_str(), "--preload", - "--force-remove"}; - return CallBackend(SIZEOFARRAY(argv), argv, type, mode); - } else { - const char* argv[] = {"", "-d", pkgid.c_str(), "-u", - kTestUserIdStr.c_str()}; - return CallBackend(SIZEOFARRAY(argv), argv, type, mode); - } -} - -ci::AppInstaller::Result RDSUpdate(const bf::path& path, - const std::string& pkgid, - PackageType type, - RequestResult mode) { - if (Install(path, type) != ci::AppInstaller::Result::OK) { - LOG(ERROR) << "Failed to install application. Cannot perform RDS"; - return ci::AppInstaller::Result::UNKNOWN; - } - const char* argv[] = {"", "-r", pkgid.c_str(), "-u", - kTestUserIdStr.c_str()}; - return CallBackend(SIZEOFARRAY(argv), argv, type, mode); -} - -ci::AppInstaller::Result DeltaInstall(const bf::path& path, - const bf::path& delta_package, PackageType type) { - if (Install(path, type) != ci::AppInstaller::Result::OK) { - LOG(ERROR) << "Failed to install application. Cannot perform delta update"; - return ci::AppInstaller::Result::UNKNOWN; - } - return Install(delta_package, type); -} - -ci::AppInstaller::Result EnablePackage(const std::string& pkgid, - PackageType type, - RequestResult mode) { - const char* argv[] = {"", "-A", pkgid.c_str(), "-u", kTestUserIdStr.c_str()}; - return CallBackend(SIZEOFARRAY(argv), argv, type, mode); -} - -ci::AppInstaller::Result DisablePackage(const std::string& pkgid, - PackageType type, - RequestResult mode) { - const char* argv[] = {"", "-D", pkgid.c_str(), "-u", kTestUserIdStr.c_str()}; - return CallBackend(SIZEOFARRAY(argv), argv, type, mode); -} - -ci::AppInstaller::Result Recover(const bf::path& recovery_file, - PackageType type, - RequestResult mode) { - const char* argv[] = {"", "-b", recovery_file.c_str(), "-u", - kTestUserIdStr.c_str()}; - return CallBackend(SIZEOFARRAY(argv), argv, type, mode); -} - -ci::AppInstaller::Result ManifestDirectInstall(const std::string& pkgid, - PackageType type, - RequestResult mode) { - const char* argv[] = {"", "-y", pkgid.c_str(), "-u", kTestUserIdStr.c_str()}; - return CallBackend(SIZEOFARRAY(argv), argv, type, mode); -} - -namespace { - -boost::filesystem::path GetTrashPath(const boost::filesystem::path& path) { - return path.string() + ".trash"; -} - -} - -bool BackupPath(const bf::path& path) { - bf::path trash_path = GetTrashPath(path); - if (bf::exists(trash_path)) { - LOG(ERROR) << trash_path << " exists. Please remove " - << trash_path << " manually!"; - return false; - } - bf::path backup_path = path.string() + ".bck"; - std::cout << "Backup path: " << path << " to " << backup_path << std::endl; - bs::error_code error; - bf::remove_all(backup_path, error); - if (error) - LOG(ERROR) << "Remove failed: " << backup_path - << " (" << error.message() << ")"; - if (bf::exists(path)) { - bf::rename(path, backup_path, error); - if (error) { - LOG(ERROR) << "Failed to setup test environment. Does some previous" - << " test crashed? Path: " - << backup_path << " should not exist."; - return false; - } - assert(!error); - } - return true; -} - -bool RestorePath(const bf::path& path) { - bf::path backup_path = path.string() + ".bck"; - std::cout << "Restore path: " << path << " from " << backup_path << std::endl; - bs::error_code error; - bf::remove_all(path, error); - if (error) { - bf::path trash_path = GetTrashPath(path); - LOG(ERROR) << "Remove failed: " << path << " (" << error.message() << ")"; - std::cout << "Moving " << path << " to " << trash_path << std::endl; - bf::rename(path, trash_path, error); - if (error) - LOG(ERROR) << "Failed to move " << path << " to " << trash_path - << " (" << error.message() << ")"; - else - LOG(ERROR) << trash_path << " should be removed manually!"; - } - if (bf::exists(backup_path)) { - bf::rename(backup_path, path, error); - if (error) { - LOG(ERROR) << "Failed to restore backup path: " << backup_path - << " (" << error.message() << ")"; - return false; - } - } - return true; -} - -std::vector SetupBackupDirectories() { - std::vector entries; - bf::path db_dir = bf::path(tzplatform_getenv(TZ_SYS_DB)); - if (kTestUserId != kGlobalUserUid) - db_dir = db_dir / "user" / std::to_string(kTestUserId); - for (auto e : kDBEntries) { - bf::path path = db_dir / e; - entries.emplace_back(path); - } - - if (getuid() == 0) { - entries.emplace_back(kPreloadApps); - entries.emplace_back(kPreloadManifestDir); - entries.emplace_back(kPreloadIcons); - } - - if (kTestUserId == kGlobalUserUid) { - entries.emplace_back(kSkelDir); - entries.emplace_back(kGlobalManifestDir); - ci::UserList list = ci::GetUserList(); - for (auto l : list) { - bf::path apps = std::get<2>(l) / "apps_rw"; - entries.emplace_back(apps); - } - } else { - tzplatform_set_user(kTestUserId); - bf::path approot = tzplatform_getenv(TZ_USER_APPROOT); - tzplatform_reset_user(); - entries.emplace_back(approot); - } - - bf::path apps_rw = ci::GetRootAppPath(false, kTestUserId); - entries.emplace_back(apps_rw); - - return entries; -} - -void UninstallAllAppsInDirectory(bf::path dir, bool is_preload) { - if (bf::exists(dir)) { - for (auto& dir_entry : boost::make_iterator_range( - bf::directory_iterator(dir), bf::directory_iterator())) { - if (dir_entry.path().string().find("smoke") != std::string::npos && - bf::is_directory(dir_entry)) { - std::string package = dir_entry.path().filename().string(); - std::regex pkg_regex("smoke[a-zA-Z0-9]{5,}"); - if (std::regex_match(package, pkg_regex)) { - if (Uninstall(dir_entry.path().filename().string(), PackageType::WGT, - is_preload, RequestResult::NORMAL) != - ci::AppInstaller::Result::OK) { - LOG(ERROR) << "Cannot uninstall smoke test app: " - << dir_entry.path().filename().string(); - } - } - } - } - } -} - -void UninstallAllSmokeApps(ci::RequestMode request_mode) { - std::cout << "Uninstalling all smoke apps" << std::endl; - bf::path apps_rw = ci::GetRootAppPath(false, kTestUserId); - UninstallAllAppsInDirectory(apps_rw, false); - if (getuid() == 0 && request_mode == ci::RequestMode::GLOBAL) { - bf::path root_path = kPreloadApps; - UninstallAllAppsInDirectory(root_path, true); - } -} - -int GetAppInstalledTime(const char *appid, uid_t uid) { - int ret = 0; - int installed_time = 0; - pkgmgrinfo_appinfo_h handle = NULL; - ret = pkgmgrinfo_appinfo_get_usr_appinfo(appid, uid, &handle); - if (ret != PMINFO_R_OK) - return -1; - ret = pkgmgrinfo_appinfo_get_installed_time(handle, &installed_time); - if (ret != PMINFO_R_OK) { - pkgmgrinfo_appinfo_destroy_appinfo(handle); - return -1; - } - pkgmgrinfo_appinfo_destroy_appinfo(handle); - return installed_time; -} +} // namespace smoke_test diff --git a/src/unit_tests/smoke_utils.h b/src/unit_tests/smoke_utils.h index b87da34..d7f7276 100644 --- a/src/unit_tests/smoke_utils.h +++ b/src/unit_tests/smoke_utils.h @@ -5,287 +5,39 @@ #ifndef UNIT_TESTS_SMOKE_UTILS_H_ #define UNIT_TESTS_SMOKE_UTILS_H_ - -#include - -#include #include -#include -#include -#include -#include -#include -#include - -#include +#include +#include #include -#include -#include -#include "hybrid/hybrid_installer.h" #include "wgt/wgt_app_query_interface.h" -#define SIZEOFARRAY(ARR) \ - sizeof(ARR) / sizeof(ARR[0]) \ - -#define EXTENDED_ASSERT_TRUE(expression) do { \ - bool tmp = expression; \ - EXPECT_TRUE(tmp) << #expression << " is not true"; \ - if (!tmp) \ - return false; \ -} while (0); - -#define EXTENDED_ASSERT_FALSE(expression) do { \ - bool tmp = expression; \ - EXPECT_FALSE(tmp) << #expression << " is not false"; \ - if (tmp) \ - return false; \ -} while (0); - -#define EXTENDED_ASSERT_EQ(expression, value) do { \ - auto ret = expression; \ - EXPECT_EQ(ret, value) << #expression << " is not equal to " << #value; \ - if (ret != value) \ - return false; \ -} while (0); - -namespace bf = boost::filesystem; -namespace bs = boost::system; -namespace ci = common_installer; - -extern const uid_t kGlobalUserUid; -extern const uid_t kGlobalUserGid; -extern const uid_t kDefaultUserUid; -extern uid_t kTestUserId; -extern gid_t kTestGroupId; -extern std::string kTestUserIdStr; -extern const char kNormalUserName[]; -extern const char kSystemShareGroupName[]; -extern const std::string& kDefaultUserIdStr; -extern const char kLegacyExtImageDir[]; -extern const char kMigrateTestDBName[]; +namespace smoke_test { extern const bf::path kSmokePackagesDirectory; -enum RWDirectory { - DATA, - CACHE, - SHARED_CACHE, - SHARED_DATA, - SHARED_TRUSTED -}; - -extern const char* rwDirectories[]; - -// common entries -extern const std::vector kDBEntries; -// globaluser entries -extern const char kGlobalManifestDir[]; -extern const char kSkelDir[]; -extern const char kPreloadApps[]; -extern const char kPreloadManifestDir[]; -extern const char kPreloadIcons[]; - -extern testing::Environment *env; -void signalHandler(int signum); - -enum class RequestResult { - NORMAL, - FAIL -}; - -class ScopedTzipInterface { +class WgtBackendInterface: public BackendInterface { public: - explicit ScopedTzipInterface(const std::string& pkgid) - : pkg_path_(bf::path(ci::GetRootAppPath(false, - kTestUserId)) / pkgid), - interface_(ci::GetMountLocation(pkg_path_)), - mounted_(true) { - interface_.MountZip(ci::GetZipPackageLocation(pkg_path_, pkgid)); - } - - void Release() { - if (mounted_) { - interface_.UnmountZip(); - mounted_ = false; - } - } - - ~ScopedTzipInterface() { - Release(); - } + using BackendInterface::BackendInterface; private: - bf::path pkg_path_; - ci::TzipInterface interface_; - bool mounted_; + AppQueryInterfacePtr CreateQueryInterface() const override; + AppInstallerPtr CreateInstaller( + common_installer::PkgMgrPtr pkgmgr) const override; }; -class TestPkgmgrInstaller : public ci::PkgmgrInstallerInterface { +class HybridBackendInterface: public BackendInterface { public: - bool CreatePkgMgrInstaller(pkgmgr_installer** installer, - ci::InstallationMode* mode) { - *installer = pkgmgr_installer_offline_new(); - if (!*installer) - return false; - *mode = ci::InstallationMode::ONLINE; - return true; - } + using BackendInterface::BackendInterface; - bool ShouldCreateSignal() const { - return false; - } -}; - -enum class PackageType { - WGT, - HYBRID -}; - -enum class StorageType { - INTERNAL, - EXTERNAL, - EXTENDED + private: + AppQueryInterfacePtr CreateQueryInterface() const override; + AppInstallerPtr CreateInstaller( + common_installer::PkgMgrPtr pkgmgr) const override; }; -ci::RequestMode ParseRequestMode(int argc, char** argv); - -bool TouchFile(const bf::path& path); - -bool AddUser(const char *user_name); - -bool DeleteUser(const char *user_name, bool rem_home_dir); - -bool AddTestUser(const char *user_name); - -bool DeleteTestUser(const char *user_name); - -void RemoveAllRecoveryFiles(); - -bf::path FindRecoveryFile(); - -bf::path GetPackageRoot(const std::string& pkgid, uid_t uid); - -bool ValidateFileContentInPackage(const std::string& pkgid, - const std::string& relative, - const std::string& expected, - bool is_readonly = false); - -void AddDataFiles(const std::string& pkgid, uid_t uid); - -bool ValidateDataFiles(const std::string& pkgid, uid_t uid); - -bool ValidatePackageRWFS(const std::string& pkgid, uid_t uid); - -bool ValidatePackageFS(const std::string& pkgid, - const std::vector& appids, - uid_t uid, gid_t gid, bool is_readonly); - -void PackageCheckCleanup(const std::string& pkgid, - const std::vector&, bool is_readonly = false); - -bool ValidatePackage(const std::string& pkgid, - const std::vector& appids, bool is_readonly = false); - -void ValidateExternalPackageFS(const std::string& pkgid, - const std::vector& appids, - uid_t uid, gid_t gid); - -void ValidateExternalPackage(const std::string& pkgid, - const std::vector& appids); - -bool CheckPackageNonExistance(const std::string& pkgid, - const std::vector& appids); - -void CheckPackageReadonlyNonExistance(const std::string& pkgid, - const std::vector& appids); - -std::unique_ptr CreateQueryInterface(); - -std::unique_ptr CreateInstaller(ci::PkgMgrPtr pkgmgr, - PackageType type); - -void TestRollbackAfterEachStep(int argc, const char*argv[], - std::function validator, - PackageType type = PackageType::WGT); - -void CrashAfterEachStep(std::vector args, - std::function validator, - PackageType type = PackageType::WGT); - -ci::AppInstaller::Result RunInstallerWithPkgrmgr(ci::PkgMgrPtr pkgmgr, - PackageType type, - RequestResult mode); -ci::AppInstaller::Result CallBackend(int argc, - const char* argv[], - PackageType type, - RequestResult mode - = RequestResult::NORMAL); - -ci::AppInstaller::Result Install(const bf::path& path, - PackageType type, - RequestResult mode = RequestResult::NORMAL); - -ci::AppInstaller::Result InstallPreload(const bf::path& path, PackageType type, - RequestResult mode = RequestResult::NORMAL); - -bool CheckAvailableExternalPath(); - -bool CheckAvailableExtendedStorage(); - -ci::AppInstaller::Result InstallWithStorage(const bf::path& path, - PackageType type, - StorageType storage = StorageType::INTERNAL, - RequestResult mode = RequestResult::NORMAL); - -ci::AppInstaller::Result MigrateLegacyExternalImage(const std::string& pkgid, - const bf::path& path, - const bf::path& legacy_path, - PackageType type, - RequestResult mode = RequestResult::NORMAL); - -ci::AppInstaller::Result MountInstall(const bf::path& path, - PackageType type, RequestResult mode = RequestResult::NORMAL); - -ci::AppInstaller::Result Uninstall(const std::string& pkgid, - PackageType type, - bool is_preload, - RequestResult mode = RequestResult::NORMAL); - -ci::AppInstaller::Result RDSUpdate(const bf::path& path, - const std::string& pkgid, - PackageType type, - RequestResult mode = RequestResult::NORMAL); - -ci::AppInstaller::Result DeltaInstall(const bf::path& path, - const bf::path& delta_package, PackageType type); - -ci::AppInstaller::Result EnablePackage(const std::string& pkgid, - PackageType type, - RequestResult mode = RequestResult::NORMAL); - -ci::AppInstaller::Result DisablePackage(const std::string& pkgid, - PackageType type, - RequestResult mode = RequestResult::NORMAL); - -ci::AppInstaller::Result Recover(const bf::path& recovery_file, - PackageType type, - RequestResult mode = RequestResult::NORMAL); - -ci::AppInstaller::Result ManifestDirectInstall(const std::string& pkgid, - PackageType type, RequestResult mode = RequestResult::NORMAL); - -bool BackupPath(const bf::path& path); - -bool RestorePath(const bf::path& path); - -std::vector SetupBackupDirectories(); - -void UninstallAllAppsInDirectory(bf::path dir, bool is_preload); - -void UninstallAllSmokeApps(ci::RequestMode request_mode); +} // namespace smoke_test -int GetAppInstalledTime(const char *appid, uid_t uid); #endif // UNIT_TESTS_SMOKE_UTILS_H_ -- 2.7.4 From 9b65ff24d909117950aa540fbd894819e0a39c19 Mon Sep 17 00:00:00 2001 From: kniedzielew Date: Fri, 20 Oct 2017 17:12:42 +0200 Subject: [PATCH 10/16] Fix in RDSMode test Sdk directory where are files used for update is changed. Submit with: https://review.tizen.org/gerrit/#/c/158034/ Change-Id: Ia2f78f1ae6e3de4ba777773bb945d76762652203 Signed-off-by: kniedzielew --- src/unit_tests/smoke_test.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc index a16c667..14fda52 100644 --- a/src/unit_tests/smoke_test.cc +++ b/src/unit_tests/smoke_test.cc @@ -177,16 +177,12 @@ TEST_F(SmokeTest, RDSMode) { bf::path path = kSmokePackagesDirectory / "RDSMode.wgt"; std::string pkgid = "smokewgt11"; std::string appid = "smokewgt11.RDSMode"; - bf::path delta_directory = kSmokePackagesDirectory / "delta_dir/"; - bf::path sdk_expected_directory = - bf::path(ci::GetRootAppPath(false, params.test_user.uid)) / "tmp" / pkgid; - bs::error_code error; - bf::create_directories(sdk_expected_directory.parent_path(), error); - ASSERT_FALSE(error); + bf::path delta_directory = kSmokePackagesDirectory / "delta_dir"; + bf::path sdk_expected_directory = kSdkDirectory / "tmp" / pkgid; ASSERT_TRUE(ci::CopyDir(delta_directory, sdk_expected_directory)); - ASSERT_EQ(backend.RDSUpdate(path, pkgid), ci::AppInstaller::Result::OK); + ASSERT_EQ(backend.RDSUpdate(path, pkgid), + ci::AppInstaller::Result::OK); ASSERT_TRUE(ValidatePackage(pkgid, {appid}, params)); - // Check delta modifications ASSERT_FALSE(bf::exists(GetPackageRoot(pkgid, params.test_user.uid) / "res" / "wgt" / "DELETED")); -- 2.7.4 From 9fb3bf930c306a94b1f1c8eabda41aacdd2d02b0 Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Tue, 7 Nov 2017 11:15:14 +0900 Subject: [PATCH 11/16] Release version 0.8.0 Changes: - Apply new library for smoke utils - Fix in RDSMode test Change-Id: I91b97c9ed7d6ae87efa545f2fd5fddb54da34450 Signed-off-by: Junghyun Yeon --- packaging/wgt-backend.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/wgt-backend.spec b/packaging/wgt-backend.spec index 5725634..d5ab402 100644 --- a/packaging/wgt-backend.spec +++ b/packaging/wgt-backend.spec @@ -1,6 +1,6 @@ Name: wgt-backend Summary: Application installer backend for WGT -Version: 0.7.5 +Version: 0.8.0 Release: 1 Group: Application Framework/Package Management License: Apache-2.0 -- 2.7.4 From 7c4127098a058b724ce202ab6afb367d89e85dd9 Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Tue, 7 Nov 2017 09:45:22 +0900 Subject: [PATCH 12/16] Fix logic to store api version at application structure - Each application could have different api version based on pkg which it belongs to, such as hybrid pkg. - Store api version of each application into application structure to deliver it to security-manager. Related changes: [app-installers] : https://review.tizen.org/gerrit/159061 Change-Id: I80c0faa909d25d23bb152d6a715ebe3e7e832f70 Signed-off-by: Junghyun Yeon --- src/wgt/step/configuration/step_parse.cc | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/wgt/step/configuration/step_parse.cc b/src/wgt/step/configuration/step_parse.cc index 05a3b5d..353cf28 100644 --- a/src/wgt/step/configuration/step_parse.cc +++ b/src/wgt/step/configuration/step_parse.cc @@ -412,6 +412,7 @@ bool StepParse::FillMainApplicationInfo(manifest_x* manifest) { application->autorestart = strdup("false"); application->launch_mode = strdup(app_info->launch_mode().c_str()); + application->api_version = strdup(manifest->api_version); for (auto& icon : GListRange(manifest->icon)) { icon_x* app_icon = reinterpret_cast(calloc(1, sizeof(icon_x))); if (!app_icon) { @@ -460,7 +461,7 @@ bool StepParse::FillServiceApplicationInfo(manifest_x* manifest) { SetApplicationXDefaults(application); application->support_ambient = strdup("false"); application->package = strdup(manifest->package); - + application->api_version = strdup(manifest->api_version); for (auto& pair : service_info.names()) { AppendLabel(application, pair.second, pair.first); } @@ -527,7 +528,7 @@ bool StepParse::FillWidgetApplicationInfo(manifest_x* manifest) { SetApplicationXDefaults(application); application->support_ambient = strdup("false"); application->package = strdup(manifest->package); - + application->api_version = strdup(manifest->api_version); if (!app_widget.label.default_value.empty()) { AppendLabel(application, app_widget.label.default_value, std::string()); } @@ -903,18 +904,6 @@ common_installer::Step::Status StepParse::process() { backend_data->service_list.set(*service_list); } - manifest_x* manifest = - static_cast(calloc(1, sizeof(manifest_x))); - if (!manifest) { - LOG(ERROR) << "Out of memory"; - return common_installer::Step::Status::ERROR; - } - if (!FillManifestX(manifest)) { - LOG(ERROR) << "[Parse] Storing manifest_x failed. " - << parser_->GetErrorMessage(); - return common_installer::Step::Status::PARSE_ERROR; - } - // Copy data from ManifestData to InstallerContext auto info = GetManifestDataForKey( @@ -940,8 +929,20 @@ common_installer::Step::Status StepParse::process() { const std::string& package_version = wgt_info->version(); const std::string& required_api_version = info->required_version(); + manifest_x* manifest = + static_cast(calloc(1, sizeof(manifest_x))); + if (!manifest) { + LOG(ERROR) << "Out of memory"; + return common_installer::Step::Status::ERROR; + } manifest->api_version = strdup(required_api_version.c_str()); + if (!FillManifestX(manifest)) { + LOG(ERROR) << "[Parse] Storing manifest_x failed. " + << parser_->GetErrorMessage(); + return common_installer::Step::Status::PARSE_ERROR; + } + context_->pkgid.set(manifest->package); // write pkgid for recovery file -- 2.7.4 From 925d590e1d06697a4d799996df3d7883dca533b8 Mon Sep 17 00:00:00 2001 From: Sangyoon Jang Date: Thu, 9 Nov 2017 11:23:17 +0900 Subject: [PATCH 13/16] Change name of OpenRecoveryFileForPath to OpenRecoveryFile Requires: - https://review.tizen.org/gerrit/159379 Change-Id: Iabfaf8d4a98271678a8508d318cab3c5013a51f7 Signed-off-by: Sangyoon Jang --- src/wgt/wgt_app_query_interface.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wgt/wgt_app_query_interface.cc b/src/wgt/wgt_app_query_interface.cc index 87252a0..c5abeda 100644 --- a/src/wgt/wgt_app_query_interface.cc +++ b/src/wgt/wgt_app_query_interface.cc @@ -41,7 +41,7 @@ const char kTizenManifestLocation[] = "tizen-manifest.xml"; std::string ReadPkgidFromRecovery(const std::string& recovery_path) { std::unique_ptr recovery_file = - ci::recovery::RecoveryFile::OpenRecoveryFileForPath(recovery_path); + ci::recovery::RecoveryFile::OpenRecoveryFile(recovery_path); recovery_file->Detach(); return recovery_file->pkgid(); } -- 2.7.4 From a119d0a15485ed3899d979873adc4f72906f40a5 Mon Sep 17 00:00:00 2001 From: Sangyoon Jang Date: Mon, 20 Nov 2017 10:45:40 +0900 Subject: [PATCH 14/16] Add update steps of directories at wgt installer Change-Id: I25c7598b31743d7067f5a13efbb897d667d99531 Signed-off-by: Sangyoon Jang --- src/wgt/wgt_installer.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc index 130c597..05d8dad 100755 --- a/src/wgt/wgt_installer.cc +++ b/src/wgt/wgt_installer.cc @@ -48,6 +48,8 @@ #include #include #include +#include +#include #include #include #include @@ -274,6 +276,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(true); AddStep(); AddStep(); + AddStep(); AddStep(); AddStep(); AddStep(); @@ -290,6 +293,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep( ci::Plugin::ActionType::Upgrade); + AddStep(); AddStep(); AddStep(); } @@ -386,6 +390,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(true); AddStep(); AddStep(); + AddStep(); AddStep(); AddStep(); AddStep(); @@ -402,6 +407,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep( ci::Plugin::ActionType::Upgrade); + AddStep(); AddStep(); AddStep(); } @@ -498,6 +504,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); + AddStep(); AddStep(); AddStep(); AddStep(); @@ -513,6 +520,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep( ci::Plugin::ActionType::Upgrade); + AddStep(); AddStep(true); AddStep(); } @@ -577,6 +585,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep( ci::Plugin::ActionType::Upgrade); + AddStep(); AddStep(); AddStep(); } @@ -701,6 +710,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep( ci::Plugin::ActionType::Upgrade); + AddStep(); AddStep(); } -- 2.7.4 From fb96ce21bf83a7930d179d639e7b5b677d7dfcee Mon Sep 17 00:00:00 2001 From: Sangyoon Jang Date: Mon, 20 Nov 2017 11:10:16 +0900 Subject: [PATCH 15/16] Add patch icon steps at ManifestDirectInstall of hybrid installer Change-Id: I57e351b43aaca6e5429d23b1c92c506e844c64b7 Signed-off-by: Sangyoon Jang --- src/hybrid/hybrid_installer.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc index 2df59cc..48612d8 100644 --- a/src/hybrid/hybrid_installer.cc +++ b/src/hybrid/hybrid_installer.cc @@ -455,6 +455,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); + AddStep(); + AddStep(); AddStep(); AddStep(); AddStep(); @@ -493,6 +495,8 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) ci::configuration::StepParseManifest::StoreLocation::BACKUP); AddStep(); AddStep(); + AddStep(); + AddStep(); AddStep(); AddStep(); AddStep(); -- 2.7.4 From 87100e24fbb381d5d253f61079ac868fae889b53 Mon Sep 17 00:00:00 2001 From: jongmyeong ko Date: Tue, 16 May 2017 05:11:27 +0000 Subject: [PATCH 16/16] Revert "Revert "[Refactor] AppInstaller logic export"" This should be submitted with: - https://review.tizen.org/gerrit/#/c/93998/ - https://review.tizen.org/gerrit/#/c/93999/ This reverts commit 35519ad818702263ead855736499c174b3e97dbe. Change-Id: Ied92513c761f8c52c42b854d74d49eef72fc3144 Signed-off-by: jongmyeongko --- src/hybrid/hybrid_installer.cc | 89 ++++++++++++++++++++++------------------- src/hybrid/hybrid_installer.h | 20 ++++++++++ src/wgt/wgt_installer.cc | 90 +----------------------------------------- src/wgt/wgt_installer.h | 39 +++++++++--------- 4 files changed, 89 insertions(+), 149 deletions(-) diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc index 48612d8..6f727f7 100644 --- a/src/hybrid/hybrid_installer.cc +++ b/src/hybrid/hybrid_installer.cc @@ -107,11 +107,12 @@ namespace hybrid { HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) : AppInstaller("wgt", pkgmgr) { + Init(); context_->cross_app_rules.set(true); context_->backend_data.set(new HybridBackendData()); +} - switch (pkgmgr_->GetRequestType()) { - case ci::RequestType::Install: +void HybridInstaller::InstallSteps() { AddStep(pkgmgr_); AddStep(); AddStep( @@ -162,8 +163,9 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) wgt::filesystem::HybridAdditionalSharedDirs); AddStep(); AddStep(); - break; - case ci::RequestType::Update: +} + +void HybridInstaller::UpdateSteps() { AddStep(pkgmgr_); AddStep(); AddStep( @@ -218,8 +220,9 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); - break; - case ci::RequestType::Uninstall: +} + +void HybridInstaller::UninstallSteps() { AddStep(pkgmgr_); AddStep(); AddStep(); @@ -246,12 +249,14 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); - break; - case ci::RequestType::Reinstall: +} + +void HybridInstaller::ReinstallSteps() { // RDS is not supported for hybrid apps AddStep(); - break; - case ci::RequestType::Delta: +} + +void HybridInstaller::DeltaSteps() { AddStep(pkgmgr_); AddStep(); AddStep( @@ -310,8 +315,9 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); - break; - case ci::RequestType::Recovery: +} + +void HybridInstaller::RecoverySteps() { AddStep(pkgmgr_); AddStep(); AddStep( @@ -328,8 +334,9 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); - break; - case ci::RequestType::MountInstall: +} + +void HybridInstaller::MountInstallSteps() { AddStep(pkgmgr_); AddStep(); AddStep( @@ -380,8 +387,9 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) wgt::filesystem::HybridAdditionalSharedDirs); AddStep(true); AddStep(); - break; - case ci::RequestType::MountUpdate: +} + +void HybridInstaller::MountUpdateSteps() { AddStep(pkgmgr_); AddStep(); AddStep( @@ -435,8 +443,9 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(true); AddStep(); - break; - case ci::RequestType::ManifestDirectInstall: +} + +void HybridInstaller::ManifestDirectInstallSteps() { AddStep(pkgmgr_); AddStep( ci::configuration::StepParseManifest::ManifestLocation::INSTALLED, @@ -473,8 +482,9 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) wgt::filesystem::HybridAdditionalSharedDirs); AddStep(); AddStep(); - break; - case ci::RequestType::ManifestDirectUpdate: +} + +void HybridInstaller::ManifestDirectUpdateSteps() { AddStep(pkgmgr_); AddStep( ci::configuration::StepParseManifest::ManifestLocation::PACKAGE, @@ -512,8 +522,9 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep(); AddStep(); AddStep(); - break; - case ci::RequestType::ManifestPartialInstall: { +} + +void HybridInstaller::ManifestPartialInstallSteps() { AddStep(pkgmgr_); AddStep( ci::configuration::StepParseManifest::ManifestLocation::INSTALLED, @@ -536,9 +547,9 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep( wgt::filesystem::HybridAdditionalSharedDirs); AddStep(); - break; - } - case ci::RequestType::ManifestPartialUpdate: { +} + +void HybridInstaller::ManifestPartialUpdateSteps() { AddStep(pkgmgr_); AddStep( ci::configuration::StepParseManifest::ManifestLocation::INSTALLED, @@ -564,9 +575,9 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) ci::Plugin::ActionType::Upgrade); AddStep(); AddStep(); - break; - } - case ci::RequestType::PartialUninstall: { +} + +void HybridInstaller::PartialUninstallSteps() { AddStep(pkgmgr_); AddStep(); AddStep(); @@ -585,9 +596,9 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) AddStep( ci::security::StepPrivacyPrivilege::ActionType::Uninstall); AddStep(); - break; - } - case ci::RequestType::EnablePkg: +} + +void HybridInstaller::EnablePkgSteps() { AddStep(pkgmgr_); AddStep( ci::configuration::StepParseManifest::ManifestLocation::INSTALLED, @@ -597,8 +608,9 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Enable); AddStep( ci::Plugin::ActionType::Uninstall); - break; - case ci::RequestType::DisablePkg: +} + +void HybridInstaller::DisablePkgSteps() { AddStep(pkgmgr_); AddStep( ci::configuration::StepParseManifest::ManifestLocation::INSTALLED, @@ -608,17 +620,12 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr) ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Disable); AddStep( ci::Plugin::ActionType::Uninstall); - break; - case ci::RequestType::MigrateExtImg: { +} + +void HybridInstaller::MigrateExtImgSteps() { AddStep(pkgmgr_); AddStep(); AddStep(); - break; - } - default: - AddStep(); - break; - } } } // namespace hybrid diff --git a/src/hybrid/hybrid_installer.h b/src/hybrid/hybrid_installer.h index 9824d21..8331393 100644 --- a/src/hybrid/hybrid_installer.h +++ b/src/hybrid/hybrid_installer.h @@ -8,6 +8,8 @@ #include "common/app_installer.h" #include "common/pkgmgr_interface.h" +namespace ci = common_installer; + namespace hybrid { /** @@ -24,6 +26,24 @@ class HybridInstaller : public common_installer::AppInstaller { explicit HybridInstaller(common_installer::PkgMgrPtr pkgmgr); SCOPE_LOG_TAG(HybridInstaller) + + private: + void InstallSteps() override; + void UpdateSteps() override; + void UninstallSteps() override; + void ReinstallSteps() override; + void DeltaSteps() override; + void RecoverySteps() override; + void MountInstallSteps() override; + void MountUpdateSteps() override; + void ManifestDirectInstallSteps() override; + void ManifestDirectUpdateSteps() override; + void DisablePkgSteps() override; + void EnablePkgSteps() override; + void ManifestPartialInstallSteps() override; + void ManifestPartialUpdateSteps() override; + void PartialUninstallSteps() override; + void MigrateExtImgSteps() override; }; } // namespace hybrid diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc index 05d8dad..ed2f0ad 100755 --- a/src/wgt/wgt_installer.cc +++ b/src/wgt/wgt_installer.cc @@ -116,90 +116,8 @@ namespace wgt { WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) : AppInstaller("wgt", pkgrmgr) { + Init(); context_->backend_data.set(new WgtBackendData()); - - /* treat the request */ - switch (pkgmgr_->GetRequestType()) { - case ci::RequestType::Install : { - InstallSteps(); - break; - } - case ci::RequestType::Update: { - UpdateSteps(); - break; - } - case ci::RequestType::Uninstall: { - UninstallSteps(); - break; - } - case ci::RequestType::Reinstall: { - ReinstallSteps(); - break; - } - case ci::RequestType::Delta: { - DeltaSteps(); - break; - } - case ci::RequestType::Recovery: { - RecoverySteps(); - break; - } - case ci::RequestType::MountInstall: { - MountInstallSteps(); - break; - } - case ci::RequestType::MountUpdate: { - MountUpdateSteps(); - break; - } - case ci::RequestType::ManifestDirectInstall: { - ManifestDirectInstallSteps(); - break; - } - case ci::RequestType::ManifestDirectUpdate: { - ManifestDirectUpdateSteps(); - break; - } - case ci::RequestType::ReadonlyUpdateInstall: { - ReadonlyUpdateInstallSteps(); - break; - } - case ci::RequestType::ReadonlyUpdateUninstall: { - ReadonlyUpdateUninstallSteps(); - break; - } - case ci::RequestType::ManifestPartialInstall: { - ManifestPartialInstallSteps(); - break; - } - case ci::RequestType::ManifestPartialUpdate: { - ManifestPartialUpdateSteps(); - break; - } - case ci::RequestType::PartialUninstall: { - ManifestPartialUninstallSteps(); - break; - } - case ci::RequestType::Move: { - MoveSteps(); - break; - } - case ci::RequestType::EnablePkg: { - EnablePkgSteps(); - break; - } - case ci::RequestType::DisablePkg: { - DisablePkgSteps(); - break; - } - case ci::RequestType::MigrateExtImg: { - MigrateExtImgSteps(); - break; - } - default: { - DefaultSteps(); - } - } } void WgtInstaller::InstallSteps() { AddStep(pkgmgr_); @@ -714,7 +632,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); } - void WgtInstaller::ManifestPartialUninstallSteps() { + void WgtInstaller::PartialUninstallSteps() { AddStep(pkgmgr_); AddStep(); AddStep(); @@ -776,8 +694,4 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); } - void WgtInstaller::DefaultSteps() { - AddStep(); - } - } // namespace wgt diff --git a/src/wgt/wgt_installer.h b/src/wgt/wgt_installer.h index 0c3a5e9..c25c2e1 100644 --- a/src/wgt/wgt_installer.h +++ b/src/wgt/wgt_installer.h @@ -26,26 +26,25 @@ class WgtInstaller : public common_installer::AppInstaller { explicit WgtInstaller(common_installer::PkgMgrPtr pkgrmgr); private: - void InstallSteps(); - void UpdateSteps(); - void UninstallSteps(); - void ReinstallSteps(); - void DeltaSteps(); - void RecoverySteps(); - void MountInstallSteps(); - void MountUpdateSteps(); - void ManifestDirectInstallSteps(); - void ManifestDirectUpdateSteps(); - void ReadonlyUpdateInstallSteps(); - void ReadonlyUpdateUninstallSteps(); - void ManifestPartialInstallSteps(); - void ManifestPartialUpdateSteps(); - void ManifestPartialUninstallSteps(); - void MoveSteps(); - void EnablePkgSteps(); - void DisablePkgSteps(); - void MigrateExtImgSteps(); - void DefaultSteps(); + void InstallSteps() override; + void UpdateSteps() override; + void UninstallSteps() override; + void ReinstallSteps() override; + void DeltaSteps() override; + void MoveSteps() override; + void RecoverySteps() override; + void MountInstallSteps() override; + void MountUpdateSteps() override; + void ManifestDirectInstallSteps() override; + void ManifestDirectUpdateSteps() override; + void ManifestPartialInstallSteps() override; + void ManifestPartialUpdateSteps() override; + void PartialUninstallSteps() override; + void ReadonlyUpdateInstallSteps() override; + void ReadonlyUpdateUninstallSteps() override; + void DisablePkgSteps() override; + void EnablePkgSteps() override; + void MigrateExtImgSteps() override; }; } // namespace wgt -- 2.7.4