Fix TTS-2007 by handling unable to re-install widget issues in behavior

Signed-off-by: yuhanx.xu <yuhanx.xu@intel.com>

diff --git a/tests/AppControlExtending/js/main.js b/tests/AppControlExtending/js/main.js
index ace73a3..91c9705 100644 (file)
--- a/tests/AppControlExtending/js/main.js
+++ b/tests/AppControlExtending/js/main.js
@@ -111,6 +111,23 @@ function fileURI() {
     );
 }
 
+function checkInstalledPkg(pkgId) {
+    var packageInfo;
+    if (!pkgId) {
+        return false;
+    }
+    try {
+        packageInfo = tizen.package.getPackageInfo(pkgId);
+    } catch (e) {
+        return false;
+    }
+    if(packageInfo){
+        return true;
+    }
+
+    return false;
+}
+
 function install(url, type) {
     var onInstallationSuccess = {
             onprogress: function(packageId, percentage)
@@ -136,7 +153,13 @@ function install(url, type) {
     }
 
     try {
-        tizen.package.install(url, onInstallationSuccess, onError);
+        if(type == "install1" && checkInstalledPkg("apcontrol1")) {
+            alert("The CustomPackage is already installed");
+        } else if (type == "install2" && checkInstalledPkg("apcontrol2")){
+            alert("The RegularPackage is already installed");
+        } else {
+            tizen.package.install(url, onInstallationSuccess, onError);
+        }
     } catch (e) {
         alert("Exception: " + e.name);
     }
@@ -155,7 +178,7 @@ function uninstall() {
             {
                 console.log("Uninstallation(" + packageId + ") Complete");
                 alert("Please uninstall the next package.");
-                tizen.package.uninstall("apcontrol2", onUninstallationSuccess2);
+                tizen.package.uninstall("apcontrol2", onUninstallationSuccess2, onError);
             }
     }
 
@@ -183,7 +206,7 @@ function uninstall() {
     }
 
     try {
-        tizen.package.uninstall("apcontrol1", onUninstallationSuccess1);
+        tizen.package.uninstall("apcontrol1", onUninstallationSuccess1, onError);
     } catch (e) {
         alert("Exception: " + e.name);
     }

diff --git a/tests/CSP/js/tests.js b/tests/CSP/js/tests.js
index 3b22604..546cea7 100644 (file)
--- a/tests/CSP/js/tests.js
+++ b/tests/CSP/js/tests.js
@@ -39,6 +39,9 @@ $(document).ready(function(){
     app_id = $("#app_id").val();
     package_id = $("#package_id").val();
 
+    $("#install").bind("vclick", function() {
+        install();
+    });
     $("#launch").bind("vclick", function() {
         launch(app_id);
         $('#uninstall').removeClass("ui-disabled");
@@ -88,7 +91,7 @@ function fileURI(wgt_name) {
             {
                 var Url1 = files[i].toURI();
                 installUrl = Url1.replace("file:///", "/");
-                install();
+                //install();
             }
         }
     }
@@ -108,6 +111,23 @@ function fileURI(wgt_name) {
     );
 }
 
+function checkInstalledPkg() {
+    var packageInfo;
+    if (!package_id) {
+        return false;
+    }
+    try {
+        packageInfo = tizen.package.getPackageInfo(package_id);
+    } catch (e) {
+        return false;
+    }
+    if(packageInfo){
+        return true;
+    }
+
+    return false;
+}
+
 function install() {
     var onInstallationSuccess = {
             onprogress: function(packageId, percentage)
@@ -127,7 +147,12 @@ function install() {
     }
 
     try {
-        tizen.package.install(installUrl, onInstallationSuccess, onError);
+        if (checkInstalledPkg()) {
+            $('#launch').removeClass("ui-disabled");
+            alert("The package is already installed");
+        } else  {
+            tizen.package.install(installUrl, onInstallationSuccess, onError);
+        }
     } catch (e) {
         alert("Exception: " + e.name);
     }

diff --git a/tests/CSP/res/csp-asterisk.html b/tests/CSP/res/csp-asterisk.html
index 7e14806..d2c588a 100644 (file)
--- a/tests/CSP/res/csp-asterisk.html
+++ b/tests/CSP/res/csp-asterisk.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="beh1csp001"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/CSP/res/csp-cross-origin.html b/tests/CSP/res/csp-cross-origin.html
index 6850dff..c228bde 100644 (file)
--- a/tests/CSP/res/csp-cross-origin.html
+++ b/tests/CSP/res/csp-cross-origin.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="beh1csp002"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/CSP/res/csp-none.html b/tests/CSP/res/csp-none.html
index 52e7e23..cc5c068 100644 (file)
--- a/tests/CSP/res/csp-none.html
+++ b/tests/CSP/res/csp-none.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="beh1csp003"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/CSP/res/csp-self.html b/tests/CSP/res/csp-self.html
index bce2d9e..75e8702 100644 (file)
--- a/tests/CSP/res/csp-self.html
+++ b/tests/CSP/res/csp-self.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="beh1csp004"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/CSP/res/default-policy-by-directives-csp.html b/tests/CSP/res/default-policy-by-directives-csp.html
index 9b87616..381477d 100644 (file)
--- a/tests/CSP/res/default-policy-by-directives-csp.html
+++ b/tests/CSP/res/default-policy-by-directives-csp.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="beh1csp016"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/CSP/res/default-policy-by-directives-report-only.html b/tests/CSP/res/default-policy-by-directives-report-only.html
index 67b23f0..515d4f0 100644 (file)
--- a/tests/CSP/res/default-policy-by-directives-report-only.html
+++ b/tests/CSP/res/default-policy-by-directives-report-only.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="beh1csp017"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/CSP/res/default-src_asterisk.html b/tests/CSP/res/default-src_asterisk.html
index 3a5a0b9..490c8b5 100644 (file)
--- a/tests/CSP/res/default-src_asterisk.html
+++ b/tests/CSP/res/default-src_asterisk.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="beh1csp015"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/CSP/res/default-src_cross_origin.html b/tests/CSP/res/default-src_cross_origin.html
index ba7c923..b5a04c5 100644 (file)
--- a/tests/CSP/res/default-src_cross_origin.html
+++ b/tests/CSP/res/default-src_cross_origin.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="beh1csp014"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/CSP/res/default-src_none.html b/tests/CSP/res/default-src_none.html
index d845ef4..5c1ae93 100644 (file)
--- a/tests/CSP/res/default-src_none.html
+++ b/tests/CSP/res/default-src_none.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="beh1csp013"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/CSP/res/default-src_self.html b/tests/CSP/res/default-src_self.html
index 5d4572b..e7256e2 100644 (file)
--- a/tests/CSP/res/default-src_self.html
+++ b/tests/CSP/res/default-src_self.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="beh1csp012"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/CSP/res/sandbox-empty-ext.html b/tests/CSP/res/sandbox-empty-ext.html
index e177a5a..28b1f40 100644 (file)
--- a/tests/CSP/res/sandbox-empty-ext.html
+++ b/tests/CSP/res/sandbox-empty-ext.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="beh1csp011"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/CSP/res/sandbox-empty-inline.html b/tests/CSP/res/sandbox-empty-inline.html
index 9cd1fbe..78b18ec 100644 (file)
--- a/tests/CSP/res/sandbox-empty-inline.html
+++ b/tests/CSP/res/sandbox-empty-inline.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="beh1csp010"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/CSP/res/sandbox-empty-int.html b/tests/CSP/res/sandbox-empty-int.html
index 6916285..adc4600 100644 (file)
--- a/tests/CSP/res/sandbox-empty-int.html
+++ b/tests/CSP/res/sandbox-empty-int.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="beh1csp009"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/CSP/res/sandbox-same-origin-allow-scripts.html b/tests/CSP/res/sandbox-same-origin-allow-scripts.html
index d7e5ed0..c72261e 100644 (file)
--- a/tests/CSP/res/sandbox-same-origin-allow-scripts.html
+++ b/tests/CSP/res/sandbox-same-origin-allow-scripts.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="beh1csp008"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/CSP/res/script-src_inline_eval.html b/tests/CSP/res/script-src_inline_eval.html
index ad95a8b..586d878 100644 (file)
--- a/tests/CSP/res/script-src_inline_eval.html
+++ b/tests/CSP/res/script-src_inline_eval.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="beh1csp006"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/CSP/res/script-src_none.html b/tests/CSP/res/script-src_none.html
index 577ba1c..db8c236 100644 (file)
--- a/tests/CSP/res/script-src_none.html
+++ b/tests/CSP/res/script-src_none.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="beh1csp007"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/CSP/res/style-src_self.html b/tests/CSP/res/style-src_self.html
index 66def7d..853ba01 100644 (file)
--- a/tests/CSP/res/style-src_self.html
+++ b/tests/CSP/res/style-src_self.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="beh1csp005"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/Clipboard/js/main.js b/tests/Clipboard/js/main.js
index c057b83..d3c0f78 100644 (file)
--- a/tests/Clipboard/js/main.js
+++ b/tests/Clipboard/js/main.js
@@ -29,7 +29,6 @@ Authors:
 */
 
 var installUrl;
-var flag = false;
 $(document).delegate("#main", "pageinit", function() {
     $("#install").bind("vclick", function() {
         install(installUrl, "install");
@@ -57,12 +56,10 @@ var packageEventCallback = {
         oninstalled: function(packageInfo) {
             hideProcess();
             alert("The application " + packageInfo.name + " is installed");
-            flag = true;
         },
         onuninstalled: function(packageId) {
             hideProcess();
             alert("The Clipboard application is uninstalled");
-            flag = false;
         }
 };
 
@@ -94,6 +91,23 @@ function fileURI() {
     );
 }
 
+function checkInstalledPkg(pkgId) {
+    var packageInfo;
+    if (!pkgId) {
+        return false;
+    }
+    try {
+        packageInfo = tizen.package.getPackageInfo(pkgId);
+    } catch (e) {
+        return false;
+    }
+    if(packageInfo){
+        return true;
+    }
+
+    return false;
+}
+
 function install(url, type) {
     var onInstallationSuccess = {
             onprogress: function(packageId, percentage)
@@ -113,10 +127,11 @@ function install(url, type) {
     }
 
     try {
-        if(flag == true)
+        if(checkInstalledPkg("bclipboard")) {
             alert("The Clipboard application is already installed");
-        else
+        } else {
             tizen.package.install(url, onInstallationSuccess, onError);
+        }
     } catch (e) {
         alert("Exception: " + e.name);
     }
@@ -143,10 +158,7 @@ function uninstall() {
     }
 
     try {
-        if(flag == false)
-            alert("The Clipboard application is already uninstalled or not installed");
-        else
-            tizen.package.uninstall("bclipboard", onUninstallationSuccess, onError);
+        tizen.package.uninstall("bclipboard", onUninstallationSuccess, onError);
     } catch (e) {
         alert("Exception: " + e.name);
     }

diff --git a/tests/ConfigurationExtension/js/tests.js b/tests/ConfigurationExtension/js/tests.js
index 8b0dc18..fd4a470 100644 (file)
--- a/tests/ConfigurationExtension/js/tests.js
+++ b/tests/ConfigurationExtension/js/tests.js
@@ -33,9 +33,6 @@ var installUrl;
 var wgt_name;
 var app_id;
 var package_id;
-var install_wgt = new Array('setting-install-location-internal-only-with-card',
-                            'setting-install-location-prefer-external-no-card',
-                            'setting-install-location-prefer-external-with-card');
 var nolaunch_wgt = new Array('setting-encrypt-enable','setting-encrypt-disable');
 
 $(document).ready(function(){
@@ -43,6 +40,13 @@ $(document).ready(function(){
     app_id = $("#app_id").val();
     package_id = $("#package_id").val();
 
+    $("#install").bind("vclick", function() {
+        install();
+        if(jQuery.inArray(wgt_name, nolaunch_wgt) != -1){
+            $('#uninstall').removeClass("ui-disabled");
+            EnablePassButton();
+        }
+    });
     $("#launch").bind("vclick", function() {
         launch(app_id);
         $('#uninstall').removeClass("ui-disabled");
@@ -56,22 +60,17 @@ $(document).ready(function(){
     } catch (e) {
         alert("Exception: " + e.message);
     }
-    $('#uninstall').addClass("ui-disabled");
-    $('#launch').addClass("ui-disabled");
-    DisablePassButton();
 
-    if(jQuery.inArray(wgt_name, install_wgt) != -1){
-        $("#install").bind("vclick", function() {
-            install();
-        });
-    } else if(jQuery.inArray(wgt_name, nolaunch_wgt) != -1){
+    if(jQuery.inArray(wgt_name, nolaunch_wgt) != -1){
         $('#launch').hide();
         $('#launch_divider').hide();
-        $('#uninstall').removeClass("ui-disabled");
-        EnablePassButton();
     }
+
     packagePre(wgt_name);
+    $('#uninstall').addClass("ui-disabled");
+    $('#launch').addClass("ui-disabled");
     updateFooterButton();
+    DisablePassButton();
 });
 
 var packageEventCallback = {
@@ -102,9 +101,9 @@ function fileURI(wgt_name) {
             {
                 var Url1 = files[i].toURI();
                 installUrl = Url1.replace("file:///", "/");
-                if(jQuery.inArray(wgt_name, install_wgt) == -1){
-                    install();
-                }
+                //if(jQuery.inArray(wgt_name, install_wgt) == -1){
+                //    install();
+                //}
             }
         }
     }
@@ -122,7 +121,24 @@ function fileURI(wgt_name) {
                 alert("Error" + e.message);
             }, "r"
     );
-        }
+}
+
+function checkInstalledPkg() {
+    var packageInfo;
+    if (!package_id) {
+        return false;
+    }
+    try {
+        packageInfo = tizen.package.getPackageInfo(package_id);
+    } catch (e) {
+        return false;
+    }
+    if(packageInfo){
+        return true;
+    }
+
+    return false;
+}
 
 function install() {
     var onInstallationSuccess = {
@@ -144,7 +160,12 @@ function install() {
     }
 
     try {
-        tizen.package.install(installUrl, onInstallationSuccess, onError);
+        if (checkInstalledPkg()) {
+            $('#launch').removeClass("ui-disabled");
+            alert("The package is already installed");
+        } else  {
+            tizen.package.install(installUrl, onInstallationSuccess, onError);
+        }
     } catch (e) {
         $.mobile.hidePageLoadingMsg();
         EnablePassButton();

diff --git a/tests/ConfigurationExtension/res/application-content.html b/tests/ConfigurationExtension/res/application-content.html
index d5f552e..0c7c305 100644 (file)
--- a/tests/ConfigurationExtension/res/application-content.html
+++ b/tests/ConfigurationExtension/res/application-content.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt2apc001"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/ConfigurationExtension/res/setting-an-more.html b/tests/ConfigurationExtension/res/setting-an-more.html
index d8a85c2..01cad4d 100644 (file)
--- a/tests/ConfigurationExtension/res/setting-an-more.html
+++ b/tests/ConfigurationExtension/res/setting-an-more.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt2sam045"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/ConfigurationExtension/res/setting-an-one.html b/tests/ConfigurationExtension/res/setting-an-one.html
index edb8cbc..299df64 100644 (file)
--- a/tests/ConfigurationExtension/res/setting-an-one.html
+++ b/tests/ConfigurationExtension/res/setting-an-one.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt2sao044"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/ConfigurationExtension/res/setting-an-zero.html b/tests/ConfigurationExtension/res/setting-an-zero.html
index d79271d..6ef8b2b 100644 (file)
--- a/tests/ConfigurationExtension/res/setting-an-zero.html
+++ b/tests/ConfigurationExtension/res/setting-an-zero.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt2saz043"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/ConfigurationExtension/res/setting-ar-true.html b/tests/ConfigurationExtension/res/setting-ar-true.html
index 8ccaf81..3ad1c7c 100644 (file)
--- a/tests/ConfigurationExtension/res/setting-ar-true.html
+++ b/tests/ConfigurationExtension/res/setting-ar-true.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt2sod031"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/ConfigurationExtension/res/setting-bs-disable.html b/tests/ConfigurationExtension/res/setting-bs-disable.html
index 32fd0d2..6cae1b7 100644 (file)
--- a/tests/ConfigurationExtension/res/setting-bs-disable.html
+++ b/tests/ConfigurationExtension/res/setting-bs-disable.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt2sbd024"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/ConfigurationExtension/res/setting-cm-disable.html b/tests/ConfigurationExtension/res/setting-cm-disable.html
index 9b7a7f1..ceec033 100644 (file)
--- a/tests/ConfigurationExtension/res/setting-cm-disable.html
+++ b/tests/ConfigurationExtension/res/setting-cm-disable.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt2scd026"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/ConfigurationExtension/res/setting-cm-enable.html b/tests/ConfigurationExtension/res/setting-cm-enable.html
index 36e5aae..b658c21 100644 (file)
--- a/tests/ConfigurationExtension/res/setting-cm-enable.html
+++ b/tests/ConfigurationExtension/res/setting-cm-enable.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt2sce027"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/ConfigurationExtension/res/setting-encrypt-disable.html b/tests/ConfigurationExtension/res/setting-encrypt-disable.html
index 1ac3bbe..0aeba59 100644 (file)
--- a/tests/ConfigurationExtension/res/setting-encrypt-disable.html
+++ b/tests/ConfigurationExtension/res/setting-encrypt-disable.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt2sed028"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider" id="launch_divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/ConfigurationExtension/res/setting-encrypt-enable.html b/tests/ConfigurationExtension/res/setting-encrypt-enable.html
index f185733..605fbf5 100644 (file)
--- a/tests/ConfigurationExtension/res/setting-encrypt-enable.html
+++ b/tests/ConfigurationExtension/res/setting-encrypt-enable.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt2see029"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider" id="launch_divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/ConfigurationExtension/res/setting-hwkey-default.html b/tests/ConfigurationExtension/res/setting-hwkey-default.html
index 7d5387e..e65a6b3 100644 (file)
--- a/tests/ConfigurationExtension/res/setting-hwkey-default.html
+++ b/tests/ConfigurationExtension/res/setting-hwkey-default.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt2shd044"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/ConfigurationExtension/res/setting-hwkey-disable.html b/tests/ConfigurationExtension/res/setting-hwkey-disable.html
index 7bf5083..1a09d7b 100644 (file)
--- a/tests/ConfigurationExtension/res/setting-hwkey-disable.html
+++ b/tests/ConfigurationExtension/res/setting-hwkey-disable.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt2skd041"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/ConfigurationExtension/res/setting-hwkey-enable.html b/tests/ConfigurationExtension/res/setting-hwkey-enable.html
index f5a15f7..2379723 100644 (file)
--- a/tests/ConfigurationExtension/res/setting-hwkey-enable.html
+++ b/tests/ConfigurationExtension/res/setting-hwkey-enable.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt2ske042"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/DragandDrop/js/main.js b/tests/DragandDrop/js/main.js
index 0fe367f..2a1ae8c 100644 (file)
--- a/tests/DragandDrop/js/main.js
+++ b/tests/DragandDrop/js/main.js
@@ -29,7 +29,6 @@ Authors:
 */
 
 var installUrl;
-var flag = false;
 $(document).delegate("#main", "pageinit", function() {
     $("#install").bind("vclick", function() {
         install(installUrl, "install");
@@ -57,12 +56,10 @@ var packageEventCallback = {
         oninstalled: function(packageInfo) {
             hideProcess();
             alert("The application " + packageInfo.name + " is installed");
-            flag = true;
         },
         onuninstalled: function(packageId) {
             hideProcess();
             alert("The application DragandDrop is uninstalled");
-            flag = false;
         }
 };
 
@@ -94,6 +91,23 @@ function fileURI() {
     );
 }
 
+function checkInstalledPkg(pkgId) {
+    var packageInfo;
+    if (!pkgId) {
+        return false;
+    }
+    try {
+        packageInfo = tizen.package.getPackageInfo(pkgId);
+    } catch (e) {
+        return false;
+    }
+    if(packageInfo){
+        return true;
+    }
+
+    return false;
+}
+
 function install(url, type) {
     var onInstallationSuccess = {
             onprogress: function(packageId, percentage)
@@ -113,10 +127,11 @@ function install(url, type) {
     }
 
     try {
-        if(flag == true)
+        if(checkInstalledPkg("bhdragdrop")) {
             alert("The DragandDrop application is already installed");
-        else
+        } else {
             tizen.package.install(url, onInstallationSuccess, onError);
+        }
     } catch (e) {
         alert("Exception: " + e.name);
     }
@@ -143,10 +158,7 @@ function uninstall() {
     }
 
     try {
-        if(flag == false)
-            alert("The DragandDrop application is already uninstalled or not installed");
-        else
-            tizen.package.uninstall("bhdragdrop", onUninstallationSuccess, onError);
+        tizen.package.uninstall("bhdragdrop", onUninstallationSuccess, onError);
     } catch (e) {
         alert("Exception: " + e.name);
     }

diff --git a/tests/DynamicBox/js/main.js b/tests/DynamicBox/js/main.js
index 27a4299..55c0829 100644 (file)
--- a/tests/DynamicBox/js/main.js
+++ b/tests/DynamicBox/js/main.js
@@ -56,6 +56,18 @@ var package_ids = new Array('wrt6awi014',
                             'wrt6awb003',
                             'wrt6awb005');
 
+var id_maps = {'app-widget-mouse-event-false.wgt':        'wrt6awi014',
+               'app-widget-sample.wgt':                   'wrt6app001',
+               'app-widget-unload-event.wgt':             'wrt6aws017',
+               'app-widget-box-appwidgetready-event.wgt': 'wrt6awb006',
+               'app-widget-box-label-fr.wgt':             'wrt6awb010',
+               'app-widget-primary-true-false.wgt':       'wrt6awi004',
+               'app-widget-mouse-event-true.wgt':         'wrt6awi013',
+               'app-widget-load-event.wgt':               'wrt6aws016',
+               'app-widget-visibility-event.wgt':         'wrt6aws018',
+               'app-widget-box-size-decoration.wgt':      'wrt6awb003',
+               'app-widget-box-size-preview.wgt':         'wrt6awb005'};
+
 $(document).delegate("#main", "pageinit", function() {
     DisablePassButton();
 
@@ -141,6 +153,34 @@ function fileURI(wgt_name) {
     );
 }
 
+function checkInstalledPkg(pkgId) {
+    var packageInfo;
+    if (!pkgId) {
+        return false;
+    }
+    try {
+        packageInfo = tizen.package.getPackageInfo(pkgId);
+    } catch (e) {
+        return false;
+    }
+    if(packageInfo){
+        return true;
+    }
+
+    return false;
+}
+
+function checkWgtName(filePath) {
+    var name = "";
+    wgt_names.forEach(function (wgt_name) {
+        if (filePath.indexOf(wgt_name) != -1) {
+            name = wgt_name;
+        }
+    });
+
+    return name;
+}
+
 function install() {
     $("#launch").addClass("ui-disabled");
     var totalBar = Math.floor(install_number / wgt_names.length * 100);
@@ -178,7 +218,21 @@ function install() {
     }
 
     try {
-        tizen.package.install(installUrl, onInstallationSuccess, onError);
+        var wgt_name = checkWgtName(installUrl);
+        if (wgt_name && checkInstalledPkg(id_maps[wgt_name])) {
+            alert("Package " + id_maps[wgt_name] + " is already installed");
+            $("#launch").removeClass("ui-disabled");
+            install_number++;
+            if(install_number < wgt_names.length){
+                packagePre(wgt_names[install_number]);
+            } else {
+                install_number = 0;
+                $.mobile.loading('hide');
+                alert("All widgets is installed!");
+            }
+        } else {
+            tizen.package.install(installUrl, onInstallationSuccess, onError);
+        }
     } catch (e) {
         alert("Exception: " + e.name);
     }
@@ -216,11 +270,12 @@ function uninstall(package_id) {
     }
 
     var onError = function (err) {
+        $.mobile.loading('hide');
         alert("Error occured on installation : " + err.name);
     }
 
     try {
-        tizen.package.uninstall(package_id, onUninstallationSuccess);
+        tizen.package.uninstall(package_id, onUninstallationSuccess, onError);
     } catch (e) {
         alert("Exception: " + e.name);
     }

diff --git a/tests/PackageManagement/index.html b/tests/PackageManagement/index.html
index 1977dd7..45e01ea 100644 (file)
--- a/tests/PackageManagement/index.html
+++ b/tests/PackageManagement/index.html
@@ -49,27 +49,27 @@ Authors:
                 <li data-role="list-divider" role="heading">Test PKManagement installation</li>
                 <li id="Sample-widget1">
                     <a href="javascript:goToApp('res/Sample-widget1.html')" data-transition="slide" style="">
-                        <h2>PKManagement_APP_Installed</h2>
+                        <h2>pkmanagement_app_installed</h2>
                     </a>
                 </li>
                 <li id="Sample-widget2">
                     <a href="javascript:goToApp('res/Sample-widget2.html')" data-transition="slide" style="">
-                        <h2>PKManagement_PowerFailure_Install</h2>
+                        <h2>pkmanagement_powerfailure_install</h2>
                     </a>
                 </li>
                 <li id="Sample-widget3">
                     <a href="javascript:goToApp('res/Sample-widget3.html')" data-transition="slide" style="">
-                        <h2>WebApp_fileBrowser_install</h2>
+                        <h2>webapp_filebrowser_install</h2>
                     </a>
                 </li>
                 <li id="Sample-widget4">
                     <a href="javascript:goToApp('res/Sample-widget4.html')" data-transition="slide" style="">
-                        <h2>WebApp_Get_Information</h2>
+                        <h2>webapp_get_information</h2>
                     </a>
                 </li>
                 <li id="widget-version-1">
                     <a href="javascript:goToApp('res/widget-version-1.html')" data-transition="slide" style="">
-                        <h2>PKManagement_OfflineUpdate_CloseUpdate</h2>
+                        <h2>pkmanagement_offlineupdate_closeupdate</h2>
                     </a>
                 </li>
                 <li id="npruntime-all-on-arm">

diff --git a/tests/PackageManagement/js/tests.js b/tests/PackageManagement/js/tests.js
index 220ba53..9fa0b57 100644 (file)
--- a/tests/PackageManagement/js/tests.js
+++ b/tests/PackageManagement/js/tests.js
@@ -33,7 +33,7 @@ var installUrl;
 var wgt_name;
 var app_id;
 var package_id;
-var install_wgt = new Array('Sample-widget2');
+var update_flag = false;
 var update_wgt = new Array('widget-version-1');
 var nolaunch_wgt = new Array('Sample-widget3','Sample-widget4');
 
@@ -42,6 +42,13 @@ $(document).ready(function(){
     app_id = $("#app_id").val();
     package_id = $("#package_id").val();
 
+    $("#install").bind("vclick", function() {
+        install();
+        if(jQuery.inArray(wgt_name, nolaunch_wgt) != -1){
+            $('#uninstall').removeClass("ui-disabled");
+            EnablePassButton();
+        }
+    });
     $("#uninstall").bind("vclick", function() {
         uninstall(package_id);
     });
@@ -51,21 +58,17 @@ $(document).ready(function(){
         alert("Exception: " + e.message);
     }
 
-    $('#uninstall').addClass("ui-disabled");
-    $('#launch').addClass("ui-disabled");
-    DisablePassButton();
-
     if(jQuery.inArray(wgt_name, update_wgt) != -1){
         $("#launch").bind("vclick", function() {
             packagePre("widget-version-1-1");
+            update_flag = true;
+            install();
             $('#uninstall').removeClass("ui-disabled");
             EnablePassButton();
         });
     } else if(jQuery.inArray(wgt_name, nolaunch_wgt) != -1){
         $('#launch').hide();
         $('#launch_divider').hide();
-        $('#uninstall').removeClass("ui-disabled");
-        EnablePassButton();
     } else {
         $("#launch").bind("vclick", function() {
             launch(app_id);
@@ -73,13 +76,12 @@ $(document).ready(function(){
             EnablePassButton();
         });
     }
-    if(jQuery.inArray(wgt_name, install_wgt) != -1){
-        $("#install").bind("vclick", function() {
-            install();
-        });
-    }
+
     packagePre(wgt_name);
+    $('#uninstall').addClass("ui-disabled");
+    $('#launch').addClass("ui-disabled");
     updateFooterButton();
+    DisablePassButton();
 });
 
 var packageEventCallback = {
@@ -89,6 +91,7 @@ var packageEventCallback = {
         alert("The package " + packageInfo.name + " is installed");
     },
     onupdated: function(packageInfo) {
+        update_flag = false;
         $.mobile.hidePageLoadingMsg();
         $('#launch').removeClass("ui-disabled");
         alert("The package " + packageInfo.name + " is updated");
@@ -110,9 +113,9 @@ function fileURI(wgt_name) {
             {
                 var Url1 = files[i].toURI();
                 installUrl = Url1.replace("file:///", "/");
-                if(jQuery.inArray(wgt_name, install_wgt) == -1){
-                    install();
-                }
+                //if(jQuery.inArray(wgt_name, install_wgt) == -1){
+                //    install();
+                //}
             }
         }
     }
@@ -132,6 +135,23 @@ function fileURI(wgt_name) {
     );
 }
 
+function checkInstalledPkg() {
+    var packageInfo;
+    if (!package_id) {
+        return false;
+    }
+    try {
+        packageInfo = tizen.package.getPackageInfo(package_id);
+    } catch (e) {
+        return false;
+    }
+    if(packageInfo){
+        return true;
+    }
+
+    return false;
+}
+
 function install() {
     var onInstallationSuccess = {
             onprogress: function(packageId, percentage)
@@ -151,7 +171,12 @@ function install() {
     }
 
     try {
-        tizen.package.install(installUrl, onInstallationSuccess, onError);
+        if (checkInstalledPkg() && !update_flag) {
+            $('#launch').removeClass("ui-disabled");
+            alert("The package is already installed");
+        } else  {
+            tizen.package.install(installUrl, onInstallationSuccess, onError);
+        }
     } catch (e) {
         alert("Exception: " + e.name);
     }

diff --git a/tests/PackageManagement/res/Sample-widget1.html b/tests/PackageManagement/res/Sample-widget1.html
index a3d4994..a282262 100644 (file)
--- a/tests/PackageManagement/res/Sample-widget1.html
+++ b/tests/PackageManagement/res/Sample-widget1.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt1smt007"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/PackageManagement/res/Sample-widget3.html b/tests/PackageManagement/res/Sample-widget3.html
index facb34d..a267397 100644 (file)
--- a/tests/PackageManagement/res/Sample-widget3.html
+++ b/tests/PackageManagement/res/Sample-widget3.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt1smt009"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider" id="launch_divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/PackageManagement/res/Sample-widget4.html b/tests/PackageManagement/res/Sample-widget4.html
index 52809f7..8ba2cb7 100644 (file)
--- a/tests/PackageManagement/res/Sample-widget4.html
+++ b/tests/PackageManagement/res/Sample-widget4.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt1smt010"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider" id="launch_divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/PackageManagement/res/npruntime-all-on-arm.html b/tests/PackageManagement/res/npruntime-all-on-arm.html
index abc3d3c..d3f14a6 100644 (file)
--- a/tests/PackageManagement/res/npruntime-all-on-arm.html
+++ b/tests/PackageManagement/res/npruntime-all-on-arm.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="ZkMSjQuYt8"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/PackageManagement/res/npruntime-arm-on-x86.html b/tests/PackageManagement/res/npruntime-arm-on-x86.html
index a075f78..5042fdd 100644 (file)
--- a/tests/PackageManagement/res/npruntime-arm-on-x86.html
+++ b/tests/PackageManagement/res/npruntime-arm-on-x86.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="UZmPMhuMeO"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider" id="launch_divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/PackageManagement/res/widget-version-1.html b/tests/PackageManagement/res/widget-version-1.html
index 5a7ca34..2fcca8e 100644 (file)
--- a/tests/PackageManagement/res/widget-version-1.html
+++ b/tests/PackageManagement/res/widget-version-1.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt1wvt006"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Update</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Update</div>

diff --git a/tests/Stability/js/tests.js b/tests/Stability/js/tests.js
index 7c2aa06..e04e821 100644 (file)
--- a/tests/Stability/js/tests.js
+++ b/tests/Stability/js/tests.js
@@ -40,6 +40,13 @@ $(document).ready(function(){
     app_id = $("#app_id").val();
     package_id = $("#package_id").val();
 
+    $("#install").bind("vclick", function() {
+        install();
+        if(jQuery.inArray(wgt_name, install_wgt) != -1){
+            $('#uninstall').removeClass("ui-disabled");
+            EnablePassButton();
+        }
+    });
     $("#uninstall").bind("vclick", function() {
         uninstall(package_id);
     });
@@ -48,21 +55,18 @@ $(document).ready(function(){
     } catch (e) {
         alert("Exception: " + e.message);
     }
+
     if(jQuery.inArray(wgt_name, install_wgt) != -1){
-        $("#install").bind("vclick", function() {
-            install();
-            $('#uninstall').removeClass("ui-disabled");
-            EnablePassButton();
-        });
         $('#launch').hide();
         $('#launch_divider').hide();
-    }else{
+    } else {
         $("#launch").bind("vclick", function() {
             launch(app_id);
             $('#uninstall').removeClass("ui-disabled");
             EnablePassButton();
         });
     }
+
     packagePre(wgt_name);
     $('#uninstall').addClass("ui-disabled");
     $('#launch').addClass("ui-disabled");
@@ -98,9 +102,9 @@ function fileURI(wgt_name) {
             {
                 var Url1 = files[i].toURI();
                 installUrl = Url1.replace("file:///", "/");
-                if(jQuery.inArray(wgt_name, install_wgt) == -1){
-                    install();
-                }
+                //if(jQuery.inArray(wgt_name, install_wgt) == -1){
+                //    install();
+                //}
             }
         }
     }
@@ -120,6 +124,23 @@ function fileURI(wgt_name) {
     );
 }
 
+function checkInstalledPkg() {
+    var packageInfo;
+    if (!package_id) {
+        return false;
+    }
+    try {
+        packageInfo = tizen.package.getPackageInfo(package_id);
+    } catch (e) {
+        return false;
+    }
+    if(packageInfo){
+        return true;
+    }
+
+    return false;
+}
+
 function install() {
     var onInstallationSuccess = {
             onprogress: function(packageId, percentage)
@@ -139,7 +160,12 @@ function install() {
     }
 
     try {
-        tizen.package.install(installUrl, onInstallationSuccess, onError);
+        if (checkInstalledPkg()) {
+            $('#launch').removeClass("ui-disabled");
+            alert("The package is already installed");
+        } else  {
+            tizen.package.install(installUrl, onInstallationSuccess, onError);
+        }
     } catch (e) {
         alert("Exception: " + e.name);
     }

diff --git a/tests/Stability/res/test-hd-image.html b/tests/Stability/res/test-hd-image.html
index eb6d39b..4d48a57 100644 (file)
--- a/tests/Stability/res/test-hd-image.html
+++ b/tests/Stability/res/test-hd-image.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrttest001"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/WRTSupport/js/tests.js b/tests/WRTSupport/js/tests.js
index 982f53f..db3f6b9 100644 (file)
--- a/tests/WRTSupport/js/tests.js
+++ b/tests/WRTSupport/js/tests.js
@@ -41,6 +41,9 @@ $(document).ready(function(){
         app_id = $("#app_id").val();
         package_id = $("#package_id").val();
 
+        $("#install").bind("vclick", function() {
+            install();
+        });
         $("#launch").bind("vclick", function() {
             launch(app_id);
             $('#uninstall').removeClass("ui-disabled");
@@ -54,6 +57,7 @@ $(document).ready(function(){
         } catch (e) {
             alert("Exception: " + e.message);
         }
+
         packagePre(wgt_name);
         $('#uninstall').addClass("ui-disabled");
         $('#launch').addClass("ui-disabled");
@@ -92,7 +96,7 @@ function fileURI(wgt_name) {
             {
                 var Url1 = files[i].toURI();
                 installUrl = Url1.replace("file:///", "/");
-                install();
+                //install();
             }
         }
     }
@@ -112,6 +116,23 @@ function fileURI(wgt_name) {
     );
 }
 
+function checkInstalledPkg() {
+    var packageInfo;
+    if (!package_id) {
+        return false;
+    }
+    try {
+        packageInfo = tizen.package.getPackageInfo(package_id);
+    } catch (e) {
+        return false;
+    }
+    if(packageInfo){
+        return true;
+    }
+
+    return false;
+}
+
 function install() {
     var onInstallationSuccess = {
             onprogress: function(packageId, percentage)
@@ -131,7 +152,12 @@ function install() {
     }
 
     try {
-        tizen.package.install(installUrl, onInstallationSuccess, onError);
+        if (checkInstalledPkg()) {
+            $('#launch').removeClass("ui-disabled");
+            alert("The package is already installed");
+        } else  {
+            tizen.package.install(installUrl, onInstallationSuccess, onError);
+        }
     } catch (e) {
         alert("Exception: " + e.name);
     }

diff --git a/tests/WRTSupport/res/lifecycle-unload-event.html b/tests/WRTSupport/res/lifecycle-unload-event.html
index c20e680..3e461b9 100644 (file)
--- a/tests/WRTSupport/res/lifecycle-unload-event.html
+++ b/tests/WRTSupport/res/lifecycle-unload-event.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt3lue021"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/WRTSupport/res/other-localization.html b/tests/WRTSupport/res/other-localization.html
index f342046..23d9fdf 100644 (file)
--- a/tests/WRTSupport/res/other-localization.html
+++ b/tests/WRTSupport/res/other-localization.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt3olo022"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/WRTSupport/res/other-uri-schemes-mailto.html b/tests/WRTSupport/res/other-uri-schemes-mailto.html
index b6afaf0..e392783 100644 (file)
--- a/tests/WRTSupport/res/other-uri-schemes-mailto.html
+++ b/tests/WRTSupport/res/other-uri-schemes-mailto.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt3ous125"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/WRTSupport/res/other-uri-schemes.html b/tests/WRTSupport/res/other-uri-schemes.html
index dba7ea0..40c82e2 100644 (file)
--- a/tests/WRTSupport/res/other-uri-schemes.html
+++ b/tests/WRTSupport/res/other-uri-schemes.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt3ous027"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/WRTSupport/res/other-widget-access-policy.html b/tests/WRTSupport/res/other-widget-access-policy.html
index e027b3b..196b079 100644 (file)
--- a/tests/WRTSupport/res/other-widget-access-policy.html
+++ b/tests/WRTSupport/res/other-widget-access-policy.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt3owa028"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/WRTSupport/res/protection-encryption-check.html b/tests/WRTSupport/res/protection-encryption-check.html
index ef7476e..31cca98 100644 (file)
--- a/tests/WRTSupport/res/protection-encryption-check.html
+++ b/tests/WRTSupport/res/protection-encryption-check.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt5pec002"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/WRTSupport/res/security-permission.html b/tests/WRTSupport/res/security-permission.html
index a9d18b5..e83f20c 100644 (file)
--- a/tests/WRTSupport/res/security-permission.html
+++ b/tests/WRTSupport/res/security-permission.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt5pec120"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/WRTSupport/res/security-policy.html b/tests/WRTSupport/res/security-policy.html
index a60deaa..a2d46fb 100644 (file)
--- a/tests/WRTSupport/res/security-policy.html
+++ b/tests/WRTSupport/res/security-policy.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt5pec119"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/WRTSupport/res/url-access-multi-all.html b/tests/WRTSupport/res/url-access-multi-all.html
index 24e74d2..8b34d81 100644 (file)
--- a/tests/WRTSupport/res/url-access-multi-all.html
+++ b/tests/WRTSupport/res/url-access-multi-all.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt3uam047"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/WRTSupport/res/url-access-multi-subdomains.html b/tests/WRTSupport/res/url-access-multi-subdomains.html
index 48c3cf2..879ebb0 100644 (file)
--- a/tests/WRTSupport/res/url-access-multi-subdomains.html
+++ b/tests/WRTSupport/res/url-access-multi-subdomains.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt3uam048"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/WRTSupport/res/url-access-multi.html b/tests/WRTSupport/res/url-access-multi.html
index 3daab86..e0b7abf 100644 (file)
--- a/tests/WRTSupport/res/url-access-multi.html
+++ b/tests/WRTSupport/res/url-access-multi.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt3uam046"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/WRTUI/js/tests.js b/tests/WRTUI/js/tests.js
index 058ab5a..3ea08b2 100644 (file)
--- a/tests/WRTUI/js/tests.js
+++ b/tests/WRTUI/js/tests.js
@@ -39,6 +39,9 @@ $(document).ready(function(){
     app_id = $("#app_id").val();
     package_id = $("#package_id").val();
 
+    $("#install").bind("vclick", function() {
+        install();
+    });
     $("#launch").bind("vclick", function() {
         launch(app_id);
         $('#uninstall').removeClass("ui-disabled");
@@ -88,7 +91,7 @@ function fileURI(wgt_name) {
             {
                 var Url1 = files[i].toURI();
                 installUrl = Url1.replace("file:///", "/");
-                install();
+                //install();
             }
         }
     }
@@ -108,6 +111,23 @@ function fileURI(wgt_name) {
     );
 }
 
+function checkInstalledPkg() {
+    var packageInfo;
+    if (!package_id) {
+        return false;
+    }
+    try {
+        packageInfo = tizen.package.getPackageInfo(package_id);
+    } catch (e) {
+        return false;
+    }
+    if(packageInfo){
+        return true;
+    }
+
+    return false;
+}
+
 function install() {
     var onInstallationSuccess = {
             onprogress: function(packageId, percentage)
@@ -127,7 +147,12 @@ function install() {
     }
 
     try {
-        tizen.package.install(installUrl, onInstallationSuccess, onError);
+        if (checkInstalledPkg()) {
+            $('#launch').removeClass("ui-disabled");
+            alert("The package is already installed");
+        } else  {
+            tizen.package.install(installUrl, onInstallationSuccess, onError);
+        }
     } catch (e) {
         alert("Exception: " + e.name);
     }

diff --git a/tests/WRTUI/res/application-rotation-sensor-enable.html b/tests/WRTUI/res/application-rotation-sensor-enable.html
index 86246e2..ce64575 100644 (file)
--- a/tests/WRTUI/res/application-rotation-sensor-enable.html
+++ b/tests/WRTUI/res/application-rotation-sensor-enable.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt4ars001"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/WRTUI/res/multiple-browsing-context.html b/tests/WRTUI/res/multiple-browsing-context.html
index 9227aa4..e64270e 100644 (file)
--- a/tests/WRTUI/res/multiple-browsing-context.html
+++ b/tests/WRTUI/res/multiple-browsing-context.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt4mbc004"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/WRTUI/res/view-mode-fullscreen-rotation.html b/tests/WRTUI/res/view-mode-fullscreen-rotation.html
index 0a2e550..82db236 100644 (file)
--- a/tests/WRTUI/res/view-mode-fullscreen-rotation.html
+++ b/tests/WRTUI/res/view-mode-fullscreen-rotation.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt4vmf013"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>

diff --git a/tests/WRTUI/res/view-mode-maximized-rotation.html b/tests/WRTUI/res/view-mode-maximized-rotation.html
index 01ac548..42d16ee 100644 (file)
--- a/tests/WRTUI/res/view-mode-maximized-rotation.html
+++ b/tests/WRTUI/res/view-mode-maximized-rotation.html
@@ -47,6 +47,10 @@ Authors:
                 <input type="hidden" id="package_id" value="wrt4vmm015"/>
             </div>
             <ul data-role="listview">
+                <li data-role="list-divider">Package Install</li>
+                <li>
+                    <div data-role="button" id="install" style="height:40px; line-height:20px;">Package Install</div>
+                </li>
                 <li data-role="list-divider">Package Launch</li>
                 <li>
                     <div data-role="button" id="launch" style="height:40px; line-height:20px;">Package Launch</div>