From: jongmyeongko Date: Mon, 28 Nov 2016 16:57:03 +0000 (+0900) Subject: apply new features X-Git-Tag: submit/tizen_3.0/20161130.132739~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F08%2F100908%2F3;p=platform%2Fcore%2Fappfw%2Ftpk-backend.git apply new features - force-clean - partial install/update Requires : https://review.tizen.org/gerrit/#/c/100625/ https://review.tizen.org/gerrit/#/c/100323/ https://review.tizen.org/gerrit/#/c/100891/ Change-Id: Ia5961f7f8704e1cf45181a8848a0cbb0900093c7 Signed-off-by: jongmyeongko --- diff --git a/src/tpk/tpk_installer.cc b/src/tpk/tpk_installer.cc index 3339865..19aad68 100644 --- a/src/tpk/tpk_installer.cc +++ b/src/tpk/tpk_installer.cc @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -145,6 +146,9 @@ void TpkInstaller::Prepare() { case ci::RequestType::ManifestPartialUpdate: ManifestPartialUpdateSteps(); break; + case ci::RequestType::PartialUninstall: + PartialUninstallSteps(); + break; case ci::RequestType::Clear: ClearSteps(); break; @@ -241,6 +245,7 @@ void TpkInstaller::UninstallSteps() { AddStep(pkgmgr_); AddStep(); AddStep(); + AddStep(); AddStep( ci::configuration::StepParseManifest::ManifestLocation::INSTALLED, ci::configuration::StepParseManifest::StoreLocation::NORMAL); @@ -504,7 +509,7 @@ void TpkInstaller::ManifestDirectUpdateSteps() { AddStep(); } -void TpkInstaller::ManifestDirectRWInstallSteps() { +void TpkInstaller::ManifestPartialInstallSteps() { AddStep(pkgmgr_); AddStep( ci::configuration::StepParseManifest::ManifestLocation::INSTALLED, @@ -518,7 +523,7 @@ void TpkInstaller::ManifestDirectRWInstallSteps() { AddStep(); } -void TpkInstaller::ManifestDirectRWUpdateSteps() { +void TpkInstaller::ManifestPartialUpdateSteps() { AddStep(pkgmgr_); AddStep( ci::configuration::StepParseManifest::ManifestLocation::INSTALLED, @@ -531,6 +536,23 @@ void TpkInstaller::ManifestDirectRWUpdateSteps() { AddStep(); } +void TpkInstaller::PartialUninstallSteps() { + AddStep(pkgmgr_); + AddStep(); + AddStep(); + AddStep( + ci::configuration::StepParseManifest::ManifestLocation::INSTALLED, + ci::configuration::StepParseManifest::StoreLocation::NORMAL); + AddStep( + ci::Plugin::ActionType::Uninstall); + AddStep(); + AddStep(); + AddStep(); + AddStep(); + AddStep(); + AddStep(); +} + void TpkInstaller::ClearSteps() { AddStep(pkgmgr_); AddStep( diff --git a/src/tpk/tpk_installer.h b/src/tpk/tpk_installer.h index 89fc60d..0ebeec8 100644 --- a/src/tpk/tpk_installer.h +++ b/src/tpk/tpk_installer.h @@ -42,8 +42,9 @@ class TPK_BACKEND_EXPORT_API TpkInstaller void MountUpdateSteps(); void ManifestDirectInstallSteps(); void ManifestDirectUpdateSteps(); - void ManifestDirectRWInstallSteps(); - void ManifestDirectRWUpdateSteps(); + void ManifestPartialInstallSteps(); + void ManifestPartialUpdateSteps(); + void PartialUninstallSteps(); void ClearSteps(); SCOPE_LOG_TAG(TpkInstaller) diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc index 4713aac..bff6d31 100644 --- a/src/unit_tests/smoke_test.cc +++ b/src/unit_tests/smoke_test.cc @@ -518,9 +518,7 @@ TEST_F(SmokeTest, DisablePkg) { std::string appid = "smokeapp23.DisablePkg"; ASSERT_EQ(Install(path), ci::AppInstaller::Result::OK); ASSERT_EQ(DisablePackage(pkgid), ci::AppInstaller::Result::OK); - ASSERT_FALSE(ci::QueryIsPackageInstalled(pkgid, ci::GetRequestMode( - kTestUserId), - kTestUserId)); + ASSERT_TRUE(ci::QueryIsDisabledPackage(pkgid, kTestUserId)); ValidatePackageFS(pkgid, {appid}); }