Handle disable and enable Pass Button in behavior

Change-Id: I5f571ad9b519e55449a22953565043817398197e
Signed-off-by: Feng Gang <gangx.feng@intel.com>

diff --git a/tests/AppControlExtending/index.html b/tests/AppControlExtending/index.html
index e0116a6..ac64d5e 100644 (file)
--- a/tests/AppControlExtending/index.html
+++ b/tests/AppControlExtending/index.html
@@ -71,10 +71,12 @@ Authors:
         <div data-role="footer" data-position="fixed" data-tap-toggle="false">
         </div>
         <div data-role="popup" id="popup_info" data-theme="a">
-            <p>Check if application control which defined by users could be supportted</p><br>
-            <p>1. Choose "launch the custom feature" in the select box</p>
-            <p>2. Install and launch the selected appliction </p>
-            <p>3. Check if a green "PASS" displayed in every installed application.</p>
+            <p>Check if AppControls which defined by users are supported.</p><br>
+            <p>1. Choose "launch the custom feature" in the select box.</p>
+            <p>2. Install and launch the selected appliction. </p>
+            <p>3. Choose "launch the regular feature" in the select box.</p>
+            <p>4. Install and launch the selected appliction. </p>
+            <p>5. This case is PASS if a green "PASS" displayed in every installed application.</p>
         </div>
     </div>
 </body>

diff --git a/tests/AppControlExtending/js/main.js b/tests/AppControlExtending/js/main.js
index 52a130b..5d61638 100644 (file)
--- a/tests/AppControlExtending/js/main.js
+++ b/tests/AppControlExtending/js/main.js
@@ -33,7 +33,16 @@ function hideDiv(){
         $(this).hide();
     });
 }
-$(document).ready(function(){
+
+var installUrl1;
+var installUrl2;
+
+var flag1 = false;
+var flag2 = false;
+var passFlag1 = false;
+var passFlag2 = false;
+
+$(document).delegate("#main", "pageinit", function() {
     hideDiv();
     $("#select_1").val("app-control1");
     $("#div_app-control1").show();
@@ -42,15 +51,8 @@ $(document).ready(function(){
         hideDiv();
         $("div[id=div_"+currentValue+"]").show();
     });
-});
+    DisablePassButton();
 
-var installUrl1;
-var installUrl2;
-
-var flag1 = false;
-var flag2 = false;
-
-$(document).delegate("#main", "pageinit", function() {
     $("#btn_app-control1_install").bind("vclick", function() {
         install(installUrl1);
         return false;
@@ -254,11 +256,19 @@ function launch(option) {
             var APP_CONTROL_OPERATION="http://tizen.org/appcontrol/operation/appControl1_c";
             control = new tizen.ApplicationControl(APP_CONTROL_OPERATION, null, null, null, null);
             tizen.application.launchAppControl(control, null, onSuccess, onError, null);
+            passFlag1 = true;
+            if (passFlag1 == true && passFlag2 == true){
+                EnablePassButton();
+            }
         }else if (option == "app-control2"){
             var control;
             var APP_CONTROL_OPERATION="http://tizen.org/appcontrol/operation/appControl2_c";
             control = new tizen.ApplicationControl(APP_CONTROL_OPERATION, null, null, null, null);
             tizen.application.launchAppControl(control, "apcontrol2.AppcontrolRegularWgt", onSuccess, onError, null);
+            passFlag2 = true;
+            if (passFlag1 == true && passFlag2 == true){
+                EnablePassButton();
+            }
         }
     } catch (exc) {
         alert("launch exc:" + exc.message);