SM : Enhance ScopedInstaller

 * Add requestUid parameter to test without explicitly
   given uid
 * Add guard for uninstalling

Change-Id: I8b5fee86094cd4ad062643a8441f114809be2584

diff --git a/src/security-manager-tests/common/scoped_installer.h b/src/security-manager-tests/common/scoped_installer.h
index 584cffd..26f05d4 100644 (file)
--- a/src/security-manager-tests/common/scoped_installer.h
+++ b/src/security-manager-tests/common/scoped_installer.h
@@ -35,15 +35,16 @@
 
 class ScopedInstaller {
 public:
-    ScopedInstaller(const AppInstallHelper &appInstallHelper)
-        : m_appInstallHelper(appInstallHelper)
+    ScopedInstaller(const AppInstallHelper &appInstallHelper, bool requestUid = true)
+        : m_appInstallHelper(appInstallHelper), m_shouldUninstall(true)
     {
         SecurityManagerTest::InstallRequest instReq;
         instReq.setAppId(m_appInstallHelper.getAppId());
         instReq.setPkgId(m_appInstallHelper.getPkgId());
-        instReq.setUid(m_appInstallHelper.getUID());
         if (m_appInstallHelper.getInstallType() != SM_APP_INSTALL_NONE)
             instReq.setInstallType(m_appInstallHelper.getInstallType());
+        if (requestUid)
+            instReq.setUid(m_appInstallHelper.getUID());
         instReq.setAppTizenVersion(m_appInstallHelper.getVersion());
         if (!m_appInstallHelper.getAuthor().empty())
             instReq.setAuthorId(m_appInstallHelper.getAuthor());
@@ -64,11 +65,14 @@ public:
     }
 
     void uninstallApp() {
+        if (!m_shouldUninstall)
+            return;
         SecurityManagerTest::InstallRequest uninstReq;
         uninstReq.setAppId(m_appInstallHelper.getAppId());
         uninstReq.setUid(m_appInstallHelper.getUID());
 
         SecurityManagerTest::Api::uninstall(uninstReq);
+        m_shouldUninstall = false;
     }
 
     AppInstallHelper& getAIH() {
@@ -77,4 +81,5 @@ public:
 
 protected:
     AppInstallHelper m_appInstallHelper;
+    bool m_shouldUninstall;
 };