Adapter interface for external PkgMgr module

Submit together:
- https://review.tizen.org/gerrit/#/c/138998/
- https://review.tizen.org/gerrit/#/c/139346/

Change-Id: Ia27cf4fa824258cb1df1a8a48b8601ddacc66f89
Signed-off-by: Damian Pietruchowski <d.pietruchow@samsung.com>

diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc
index d907386..b55392a 100644 (file)
--- a/src/unit_tests/smoke_test.cc
+++ b/src/unit_tests/smoke_test.cc
@@ -120,9 +120,8 @@ TEST_F(SmokeTest, EnablePkg) {
   ASSERT_EQ(EnablePackage(pkgid, PackageType::WGT),
             ci::AppInstaller::Result::OK);
 
-  ASSERT_TRUE(ci::QueryIsPackageInstalled(pkgid,
-      ci::GetRequestMode(kTestUserId),
-      kTestUserId));
+  ci::PkgQueryInterface pkg_query(pkgid, kTestUserId);
+  ASSERT_TRUE(pkg_query.IsPackageInstalled(ci::GetRequestMode(kTestUserId)));
 }
 
 TEST_F(SmokeTest, DisablePkg) {
@@ -559,7 +558,8 @@ TEST_F(SmokeTest, UserDefinedPlugins) {
   ASSERT_EQ(Install(path, PackageType::WGT), ci::AppInstaller::Result::OK);
   ASSERT_TRUE(ValidatePackage(pkgid, {appid}));
   std::vector<std::string> res;
-  ASSERT_TRUE(ci::QueryPrivilegesForPkgId(pkgid, kTestUserId, &res));
+  ci::PkgQueryInterface pkg_query(pkgid, kTestUserId);
+  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)
           != res.end());
@@ -641,8 +641,8 @@ TEST_F(PreloadSmokeTest, ManifestDirectInstallMode) {
   bf::path pkg_path = ci::GetRootAppPath(false, kTestUserId);
 
   CopyDir(src_path / pkgid, pkg_path / pkgid);
-  ASSERT_FALSE(QueryIsPackageInstalled(pkgid, ci::GetRequestMode(kTestUserId),
-                                       kTestUserId));
+  ci::PkgQueryInterface pkg_query(pkgid, kTestUserId);
+  ASSERT_FALSE(pkg_query.IsPackageInstalled(ci::GetRequestMode(kTestUserId)));
   ASSERT_EQ(ManifestDirectInstall(pkgid, PackageType::WGT),
             ci::AppInstaller::Result::OK);
   ASSERT_TRUE(ValidatePackage(pkgid, {appid}));
@@ -702,8 +702,8 @@ TEST_F(PreloadSmokeTest, ManifestDirectInstallMode_Hybrid) {
   bf::path pkg_path = ci::GetRootAppPath(false, kTestUserId);
 
   CopyDir(src_path / pkgid, pkg_path / pkgid);
-  ASSERT_FALSE(QueryIsPackageInstalled(pkgid, ci::GetRequestMode(kTestUserId),
-                                       kTestUserId));
+  ci::PkgQueryInterface pkg_query(pkgid, kTestUserId);
+  ASSERT_FALSE(pkg_query.IsPackageInstalled(ci::GetRequestMode(kTestUserId)));
   ASSERT_EQ(ManifestDirectInstall(pkgid, PackageType::HYBRID),
             ci::AppInstaller::Result::OK);
   ASSERT_TRUE(ValidatePackage(pkgid, {appid}));

diff --git a/src/unit_tests/smoke_utils.cc b/src/unit_tests/smoke_utils.cc
index fabb37c..41c777d 100644 (file)
--- a/src/unit_tests/smoke_utils.cc
+++ b/src/unit_tests/smoke_utils.cc
@@ -377,8 +377,9 @@ void PackageCheckCleanup(const std::string& pkgid,
 
 bool ValidatePackage(const std::string& pkgid,
     const std::vector<std::string>& appids, bool is_readonly) {
-  EXTENDED_ASSERT_TRUE(ci::QueryIsPackageInstalled(
-      pkgid, ci::GetRequestMode(kTestUserId), kTestUserId));
+  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) {
@@ -403,10 +404,9 @@ void ValidateExternalPackageFS(const std::string& pkgid,
 
 void ValidateExternalPackage(const std::string& pkgid,
                              const std::vector<std::string>& appids) {
-  ASSERT_TRUE(ci::QueryIsPackageInstalled(
-      pkgid, ci::GetRequestMode(kTestUserId),
-      kTestUserId));
-  std::string storage = ci::QueryStorageForPkgId(pkgid, kTestUserId);
+  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!";
@@ -426,9 +426,9 @@ void ValidateExternalPackage(const std::string& pkgid,
 
 bool CheckPackageNonExistance(const std::string& pkgid,
                               const std::vector<std::string>& appids) {
-  EXTENDED_ASSERT_FALSE(ci::QueryIsPackageInstalled(
-      pkgid, ci::GetRequestMode(kTestUserId),
-      kTestUserId));
+  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();
@@ -445,8 +445,8 @@ bool CheckPackageNonExistance(const std::string& pkgid,
 
 void CheckPackageReadonlyNonExistance(const std::string& pkgid,
                                       const std::vector<std::string>& appids) {
-  ASSERT_FALSE(ci::QueryIsPackageInstalled(
-      pkgid, ci::GetRequestMode(kTestUserId), kTestUserId));
+  ci::PkgQueryInterface pkg_query(pkgid, kTestUserId);
+  ASSERT_FALSE(pkg_query.IsPackageInstalled(ci::GetRequestMode(kTestUserId)));
   PackageCheckCleanup(pkgid, appids, true);
 }
 

diff --git a/src/wgt/step/configuration/step_parse.cc b/src/wgt/step/configuration/step_parse.cc
index 9045043..c339a8f 100644 (file)
--- a/src/wgt/step/configuration/step_parse.cc
+++ b/src/wgt/step/configuration/step_parse.cc
@@ -314,19 +314,17 @@ bool StepParse::FillWidgetInfo(manifest_x* manifest) {
   if (!context_->pkgid.get().empty()) {
     // set update true if package is updated preload package
     ci::RequestType req_type = context_->request_type.get();
-    if (ci::QueryIsUpdatedPackage(context_->pkgid.get(), context_->uid.get()))
+    ci::PkgQueryInterface pkg_query(manifest->package, context_->uid.get());
+    if (pkg_query.IsUpdatedPackage())
       manifest->update = strdup("true");
-    else if (ci::QueryIsPreloadPackage(context_->pkgid.get(),
-        context_->uid.get()) &&
+    else if (pkg_query.IsPreloadPackage() &&
             (req_type == ci::RequestType::Update ||
-             req_type == ci::RequestType::Delta ||
-             req_type == ci::RequestType::MountUpdate ||
-             req_type == ci::RequestType::ReadonlyUpdateInstall))
+            req_type == ci::RequestType::Delta ||
+            req_type == ci::RequestType::MountUpdate ||
+            req_type == ci::RequestType::ReadonlyUpdateInstall))
       manifest->update = strdup("true");
     else
       manifest->update = strdup("false");
-  } else {
-    manifest->update = strdup("false");
   }
 
   return true;

diff --git a/src/wgt/wgt_app_query_interface.cc b/src/wgt/wgt_app_query_interface.cc
index 908cd6b..5f931e0 100644 (file)
--- a/src/wgt/wgt_app_query_interface.cc
+++ b/src/wgt/wgt_app_query_interface.cc
@@ -91,8 +91,8 @@ bool WgtAppQueryInterface::IsHybridApplication(const std::string& arg,
     info = ReadPkgidFromRecovery(arg);
   else
     info = arg;
-
-  if (ci::QueryIsPackageInstalled(info, ci::GetRequestMode(uid), uid)) {
+  ci::PkgQueryInterface pkg_query(info, uid);
+  if (pkg_query.IsPackageInstalled(ci::GetRequestMode(uid))) {
     bf::path package_directory(ci::GetRootAppPath(false, uid));
     if (bf::exists(package_directory / info / kTizenManifestLocation) &&
         bf::exists(package_directory / info / kHybridConfigLocation))