From 292c6828db3b38adf647d53e54ec4e14e8e83b4d Mon Sep 17 00:00:00 2001
From: Damian Pietruchowski <d.pietruchow@samsung.com>
Date: Thu, 9 Feb 2017 12:16:34 +0100
Subject: [PATCH] Step Recover Per User Directories for Recovery Mode added

Requires: https://review.tizen.org/gerrit/#/c/112049/

Verification: Run SmokeTest.RecoveryMode_ForInstallation

Change-Id: I6e19567b19d4057c7b51bec3e77239a07f631ed9
Signed-off-by: Damian Pietruchowski <d.pietruchow@samsung.com>
---
 src/unit_tests/smoke_test.cc | 8 ++++++++
 src/wgt/wgt_installer.cc     | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc
index 7328a1c..d0c1fbd 100644
--- a/src/unit_tests/smoke_test.cc
+++ b/src/unit_tests/smoke_test.cc
@@ -371,6 +371,14 @@ void CheckPackageNonExistance(const std::string& pkgid,
       pkgid, ci::GetRequestMode(kTestUserId),
       kTestUserId));
   PackageCheckCleanup(pkgid, appids);
+  if (kTestUserId == kGlobalUserUid) {
+      ci::UserList list = ci::GetUserList();
+      for (auto& l : list) {
+        bf::path root_path = ci::GetRootAppPath(false, std::get<0>(l));
+        bf::path package_path = root_path / pkgid;
+        ASSERT_FALSE(bf::exists(package_path));
+      }
+  }
 }
 
 void CheckPackageReadonlyNonExistance(const std::string& pkgid,
diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 9413c22..dbe78b1 100755
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -38,6 +38,7 @@
 #include <common/step/filesystem/step_recover_manifest.h>
 #include <common/step/filesystem/step_recover_external_storage.h>
 #include <common/step/filesystem/step_recover_storage_directories.h>
+#include <common/step/filesystem/step_recover_per_user_storage_directories.h>
 #include <common/step/filesystem/step_remove_files.h>
 #include <common/step/filesystem/step_remove_icons.h>
 #include <common/step/filesystem/step_remove_globalapp_symlinks.h>
@@ -386,6 +387,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::filesystem::StepRecoverManifest>();
       AddStep<ci::filesystem::StepRecoverExternalStorage>();
       AddStep<ci::filesystem::StepRecoverStorageDirectories>();
+      AddStep<ci::filesystem::StepRecoverPerUserStorageDirectories>();
       AddStep<ci::filesystem::StepRecoverFiles>();
       AddStep<ci::mount::StepMountRecover>();
       AddStep<wgt::security::StepWgtRecoverSignature>();
-- 
2.7.4