[common][push][DPTTIZEN-2946, improve tc to avoid block issue]

Change-Id: Idd58a97de7d9c8e1a4bbb919d42c4b4b5aaf5170

diff --git a/common/tct-push-tizen-tests/push/PushManager_getRegistrationId.html b/common/tct-push-tizen-tests/push/PushManager_getRegistrationId.html
index 557efdf3804f9cd460adcaaab7b7d59faa7314aa..312f6a4fe76f61de1e60cc9cddfeaf4ad0f3b594 100755 (executable)
--- a/common/tct-push-tizen-tests/push/PushManager_getRegistrationId.html
+++ b/common/tct-push-tizen-tests/push/PushManager_getRegistrationId.html
@@ -40,7 +40,7 @@ setup({timeout: 90000});
 
 var t = async_test(document.title, {timeout: 90000}),
     pushRegisterSuccessCallback, pushRegisterErrorCallback, registrationIdFromMethod,
-    unregisterServiceDone, unregisterServiceError, stateChangeCallback, notificationCallback;
+    unregisterServiceDone, unregisterServiceError, stateChangeCallback, notificationCallback, isFirstStateChange = true;
 
 t.step(function () {
     unregisterServiceDone = t.step_func(function () {
@@ -71,7 +71,10 @@ t.step(function () {
     stateChangeCallback = t.step_func(function (state) {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback, pushRegisterErrorCallback);
+        } else if (state == "REGISTERED" && isFirstStateChange) {
+            pushRegisterSuccessCallback();
         }
+        isFirstStateChange = false;
     });
 
     tizen.push.connect(stateChangeCallback, notificationCallback);

diff --git a/common/tct-push-tizen-tests/push/PushManager_getRegistrationId_notRegistered.html b/common/tct-push-tizen-tests/push/PushManager_getRegistrationId_notRegistered.html
index 762b196ef4b06286c84108c562682154d710da59..9c83aeae22afe9b48585888b4a3fb4c2a86cc879 100755 (executable)
--- a/common/tct-push-tizen-tests/push/PushManager_getRegistrationId_notRegistered.html
+++ b/common/tct-push-tizen-tests/push/PushManager_getRegistrationId_notRegistered.html
@@ -40,7 +40,7 @@ setup({timeout: 90000});
 
 var t = async_test(document.title, {timeout: 90000}), returnedValue,
     unregisterServiceSuccessCallback, unregisterServiceErrorCallback,
-    stateChangeCallback, notificationCallback;
+    stateChangeCallback, notificationCallback, isFirstStateChange = true;
 
 t.step(function () {
     unregisterServiceSuccessCallback = t.step_func(function () {
@@ -68,7 +68,10 @@ t.step(function () {
     stateChangeCallback = t.step_func(function (state) {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback, pushRegisterErrorCallback);
+        } else if (state == "REGISTERED" && isFirstStateChange) {
+            pushRegisterSuccessCallback();
         }
+        isFirstStateChange = false;
     });
 
     tizen.push.connect(stateChangeCallback, notificationCallback);

diff --git a/common/tct-push-tizen-tests/push/PushManager_getUnreadNotifications.html b/common/tct-push-tizen-tests/push/PushManager_getUnreadNotifications.html
index a022ffa9762a1fe83fc7885978c0acfff88c106c..0bdb79dcff6ece1171b0cb9ea38b74817250ee5a 100755 (executable)
--- a/common/tct-push-tizen-tests/push/PushManager_getUnreadNotifications.html
+++ b/common/tct-push-tizen-tests/push/PushManager_getUnreadNotifications.html
@@ -39,25 +39,33 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test(document.title, {timeout: 90000}),
-    notificationCallback, retVal = null, stateChangeCallback;
+    notificationCallback, retVal = null, stateChangeCallback, isFirstStateChange = true;
 
 t.step(function () {
+    add_result_callback(function () {
+        try {
+            tizen.push.unregister();
+            tizen.push.disconnect();
+        } catch (err) {
+        }
+    });
+
     notificationCallback = t.step_func(function (message) {
     });
 
     pushRegisterSuccessCallback = t.step_func(function (registrationId) {
+        retVal = tizen.push.getUnreadNotifications();
+        assert_equals(retVal, undefined, "method returned value");
+        t.done();
     });
 
     stateChangeCallback = t.step_func(function (state) {
         if(state == "UNREGISTERED") {
             returnedValue = tizen.push.register(pushRegisterSuccessCallback);
-        } else if(state == "REGISTERED") {
-            retVal = tizen.push.getUnreadNotifications();
-            assert_equals(retVal, undefined, "method returned value");
-            tizen.push.unregister();
-            tizen.push.disconnect();
-            t.done();
+        } else if (state == "REGISTERED" && isFirstStateChange) {
+            pushRegisterSuccessCallback();
         }
+        isFirstStateChange = false;
     });
 
     tizen.push.connect(stateChangeCallback, notificationCallback);

diff --git a/common/tct-push-tizen-tests/push/PushManager_register.html b/common/tct-push-tizen-tests/push/PushManager_register.html
index ccf1f92b979bb61f23729859944ed86eabaca0a7..2a40310f6a397db5edba75dc623c75abae18561e 100755 (executable)
--- a/common/tct-push-tizen-tests/push/PushManager_register.html
+++ b/common/tct-push-tizen-tests/push/PushManager_register.html
@@ -40,7 +40,7 @@ setup({timeout: 90000});
 var t = async_test(document.title, {timeout: 90000}),
     pushRegisterSuccessCallback, returnedValue = null,
     unregisterServiceDone, unregisterServiceError,
-    notificationCallback, stateChangeCallback;
+    notificationCallback, stateChangeCallback, isFirstStateChange = true;
 
 t.step(function () {
     unregisterServiceDone = t.step_func(function () {
@@ -70,7 +70,10 @@ t.step(function () {
     stateChangeCallback = t.step_func(function (state) {
         if(state == "UNREGISTERED") {
             returnedValue = tizen.push.register(pushRegisterSuccessCallback);
+        } else if (state == "REGISTERED" && isFirstStateChange) {
+            pushRegisterSuccessCallback();
         }
+        isFirstStateChange = false;
     });
 
     tizen.push.connect(stateChangeCallback, notificationCallback);

diff --git a/common/tct-push-tizen-tests/push/PushManager_register_with_errorCallback.html b/common/tct-push-tizen-tests/push/PushManager_register_with_errorCallback.html
index 693927527fef282cc4bb871acc40e46636bf4cbc..4047bef3864e3eedc0679dfca637ccd395c03887 100755 (executable)
--- a/common/tct-push-tizen-tests/push/PushManager_register_with_errorCallback.html
+++ b/common/tct-push-tizen-tests/push/PushManager_register_with_errorCallback.html
@@ -40,7 +40,7 @@ setup({timeout: 90000});
 var t = async_test(document.title, {timeout: 90000}),
     pushRegisterSuccessCallback, pushRegisterErrorCallback, returnedValue = null,
     unregisterServiceDone, unregisterServiceError,
-    notificationCallback, stateChangeCallback;
+    notificationCallback, stateChangeCallback, isFirstStateChange = true;
 
 t.step(function () {
     unregisterServiceDone = t.step_func(function () {
@@ -74,7 +74,10 @@ t.step(function () {
     stateChangeCallback = t.step_func(function (state) {
         if(state == "UNREGISTERED") {
             returnedValue = tizen.push.register(pushRegisterSuccessCallback, pushRegisterErrorCallback);
+        } else if (state == "REGISTERED" && isFirstStateChange) {
+            pushRegisterSuccessCallback();
         }
+        isFirstStateChange = false;
     });
 
     tizen.push.connect(stateChangeCallback, notificationCallback);

diff --git a/common/tct-push-tizen-tests/push/PushManager_unregister.html b/common/tct-push-tizen-tests/push/PushManager_unregister.html
index ae5e77b9dbf7d4f07106e2cc60b4791f97efefa9..e903abd23ae8356b3cee65cb70367130e54f93df 100755 (executable)
--- a/common/tct-push-tizen-tests/push/PushManager_unregister.html
+++ b/common/tct-push-tizen-tests/push/PushManager_unregister.html
@@ -40,7 +40,7 @@ setup({timeout: 90000});
 var t = async_test(document.title, {timeout: 90000}),
     pushRegisterSuccessCallback, pushRegisterErrorCallback,
     unregisterServiceDone, registrationId, afterRegistrationId, returnedValue = null,
-    notificationCallback, stateChangeCallback;
+    notificationCallback, stateChangeCallback, isFirstStateChange = true;
 
 t.step(function () {
     unregisterServiceDone = t.step_func(function () {
@@ -67,7 +67,10 @@ t.step(function () {
     stateChangeCallback = t.step_func(function (state) {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback, pushRegisterErrorCallback);
+        } else if (state == "REGISTERED" && isFirstStateChange) {
+            pushRegisterSuccessCallback();
         }
+        isFirstStateChange = false;
     });
 
     tizen.push.connect(stateChangeCallback, notificationCallback);

diff --git a/common/tct-push-tizen-tests/push/PushManager_unregister_with_errorCallback.html b/common/tct-push-tizen-tests/push/PushManager_unregister_with_errorCallback.html
index 33833fc8be106dd532c653d735d4654fe4777549..a1eab99e0a5e68dae3ec79203f4e5c283ee9d10a 100755 (executable)
--- a/common/tct-push-tizen-tests/push/PushManager_unregister_with_errorCallback.html
+++ b/common/tct-push-tizen-tests/push/PushManager_unregister_with_errorCallback.html
@@ -40,7 +40,7 @@ setup({timeout: 90000});
 var t = async_test(document.title, {timeout: 90000}), pushRegisterSuccessCallback,
     pushRegisterErrorCallback, unregisterServiceDone, unregisterServiceError,
     registrationId, afterRegistrationId, returnedValue = null,
-    stateChangeCallback, notificationCallback;
+    stateChangeCallback, notificationCallback, isFirstStateChange = true;
 
 t.step(function () {
     unregisterServiceDone = t.step_func(function () {
@@ -70,7 +70,10 @@ t.step(function () {
     stateChangeCallback = t.step_func(function (state) {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback, pushRegisterErrorCallback);
+        } else if (state == "REGISTERED" && isFirstStateChange) {
+            pushRegisterSuccessCallback();
         }
+        isFirstStateChange = false;
     });
 
     tizen.push.connect(stateChangeCallback, notificationCallback);

diff --git a/common/tct-push-tizen-tests/push/PushMessage_alertMessage_attribute.html b/common/tct-push-tizen-tests/push/PushMessage_alertMessage_attribute.html
index a9db13cab76237674ec3a76e79b0724014c0292e..b76e056c2a5bba7230a31a8d4ddc0b67cc01f7da 100755 (executable)
--- a/common/tct-push-tizen-tests/push/PushMessage_alertMessage_attribute.html
+++ b/common/tct-push-tizen-tests/push/PushMessage_alertMessage_attribute.html
@@ -58,7 +58,7 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test(document.title, {timeout: 90000}), stateChangeCallback, notificationCallback,
-    pushRegisterSuccessCallback;
+    pushRegisterSuccessCallback, isFirstStateChange = true;
 
 t.step(function () {
     add_result_callback(function () {
@@ -76,7 +76,10 @@ t.step(function () {
     stateChangeCallback = t.step_func(function (state) {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback);
+        } else if (state == "REGISTERED" && isFirstStateChange) {
+            pushRegisterSuccessCallback();
         }
+        isFirstStateChange = false;
     });
 
     notificationCallback = t.step_func(function (message) {

diff --git a/common/tct-push-tizen-tests/push/PushMessage_appData_attribute.html b/common/tct-push-tizen-tests/push/PushMessage_appData_attribute.html
index 4ac82778c754cf5a3263c7a44c758e05ed9b028d..b60c442aedc949d0aa377bcae01a68bace0e88d2 100755 (executable)
--- a/common/tct-push-tizen-tests/push/PushMessage_appData_attribute.html
+++ b/common/tct-push-tizen-tests/push/PushMessage_appData_attribute.html
@@ -58,7 +58,7 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test(document.title, {timeout: 90000}), stateChangeCallback, notificationCallback,
-    pushRegisterSuccessCallback;
+    pushRegisterSuccessCallback, isFirstStateChange = true;
 
 t.step(function () {
     add_result_callback(function () {
@@ -76,7 +76,10 @@ t.step(function () {
     stateChangeCallback = t.step_func(function (state) {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback);
+        } else if (state == "REGISTERED" && isFirstStateChange) {
+            pushRegisterSuccessCallback();
         }
+        isFirstStateChange = false;
     });
 
     notificationCallback = t.step_func(function (message) {

diff --git a/common/tct-push-tizen-tests/push/PushMessage_date_attribute.html b/common/tct-push-tizen-tests/push/PushMessage_date_attribute.html
index a7fa6b51644a125ff6cde79def513aafade73b68..6638d1ab02971450b78d658cdab2b30bc9ef88d1 100755 (executable)
--- a/common/tct-push-tizen-tests/push/PushMessage_date_attribute.html
+++ b/common/tct-push-tizen-tests/push/PushMessage_date_attribute.html
@@ -58,7 +58,7 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test(document.title, {timeout: 90000}), stateChangeCallback, notificationCallback,
-    pushRegisterSuccessCallback;
+    pushRegisterSuccessCallback, isFirstStateChange = true;
 
 t.step(function () {
     add_result_callback(function () {
@@ -76,7 +76,10 @@ t.step(function () {
     stateChangeCallback = t.step_func(function (state) {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback);
+        } else if (state == "REGISTERED" && isFirstStateChange) {
+            pushRegisterSuccessCallback();
         }
+        isFirstStateChange = false;
     });
 
     notificationCallback = t.step_func(function (message) {

diff --git a/common/tct-push-tizen-tests/push/PushMessage_message_attribute.html b/common/tct-push-tizen-tests/push/PushMessage_message_attribute.html
index 12b388128a79a8795eaf178b23a459b171670592..f7436723b6ef798a94d092ada1e07c6fdc0c7668 100755 (executable)
--- a/common/tct-push-tizen-tests/push/PushMessage_message_attribute.html
+++ b/common/tct-push-tizen-tests/push/PushMessage_message_attribute.html
@@ -58,7 +58,7 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test(document.title, {timeout: 90000}), stateChangeCallback, notificationCallback,
-    pushRegisterSuccessCallback;
+    pushRegisterSuccessCallback, isFirstStateChange = true;
 
 t.step(function () {
     add_result_callback(function () {
@@ -76,7 +76,10 @@ t.step(function () {
     stateChangeCallback = t.step_func(function (state) {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback);
+        } else if (state == "REGISTERED" && isFirstStateChange) {
+            pushRegisterSuccessCallback();
         }
+        isFirstStateChange = false;
     });
 
     notificationCallback = t.step_func(function (message) {

diff --git a/common/tct-push-tizen-tests/push/PushMessage_requestId_attribute.html b/common/tct-push-tizen-tests/push/PushMessage_requestId_attribute.html
index 9eb850c1f203ae20dec66819211061812edc00cc..2a7aa3e4e42a07c88853f8193bdc203b3d04215f 100755 (executable)
--- a/common/tct-push-tizen-tests/push/PushMessage_requestId_attribute.html
+++ b/common/tct-push-tizen-tests/push/PushMessage_requestId_attribute.html
@@ -58,7 +58,7 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test(document.title, {timeout: 90000}), stateChangeCallback, notificationCallback,
-    pushRegisterSuccessCallback;
+    pushRegisterSuccessCallback, isFirstStateChange = true;
 
 t.step(function () {
     add_result_callback(function () {
@@ -76,7 +76,10 @@ t.step(function () {
     stateChangeCallback = t.step_func(function (state) {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback);
+        } else if (state == "REGISTERED" && isFirstStateChange) {
+            pushRegisterSuccessCallback();
         }
+        isFirstStateChange = false;
     });
 
     notificationCallback = t.step_func(function (message) {

diff --git a/common/tct-push-tizen-tests/push/PushMessage_sender_attribute.html b/common/tct-push-tizen-tests/push/PushMessage_sender_attribute.html
index ad14d3e0c0ef11b05a8c2dd60628f2b2ff7c3d4e..71c82de7566aee86a19c4de8aae7f1cc2b44bdea 100755 (executable)
--- a/common/tct-push-tizen-tests/push/PushMessage_sender_attribute.html
+++ b/common/tct-push-tizen-tests/push/PushMessage_sender_attribute.html
@@ -58,7 +58,7 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test(document.title, {timeout: 90000}), stateChangeCallback, notificationCallback,
-    pushRegisterSuccessCallback;
+    pushRegisterSuccessCallback, isFirstStateChange = true;
 
 t.step(function () {
     add_result_callback(function () {
@@ -76,7 +76,10 @@ t.step(function () {
     stateChangeCallback = t.step_func(function (state) {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback);
+        } else if (state == "REGISTERED" && isFirstStateChange) {
+            pushRegisterSuccessCallback();
         }
+        isFirstStateChange = false;
     });
 
     notificationCallback = t.step_func(function (message) {

diff --git a/common/tct-push-tizen-tests/push/PushMessage_sessionInfo_attribute.html b/common/tct-push-tizen-tests/push/PushMessage_sessionInfo_attribute.html
index a9e82a4a30863c0c6df3d25f394c2d931f61f4b0..2ac2803d551f123fdff278b913f8300e3fe91150 100755 (executable)
--- a/common/tct-push-tizen-tests/push/PushMessage_sessionInfo_attribute.html
+++ b/common/tct-push-tizen-tests/push/PushMessage_sessionInfo_attribute.html
@@ -58,7 +58,7 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test(document.title, {timeout: 90000}), stateChangeCallback, notificationCallback,
-    pushRegisterSuccessCallback;
+    pushRegisterSuccessCallback, isFirstStateChange = true;
 
 t.step(function () {
     add_result_callback(function () {
@@ -76,7 +76,10 @@ t.step(function () {
     stateChangeCallback = t.step_func(function (state) {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback);
+        } else if (state == "REGISTERED" && isFirstStateChange) {
+            pushRegisterSuccessCallback();
         }
+        isFirstStateChange = false;
     });
 
     notificationCallback = t.step_func(function (message) {

diff --git a/common/tct-push-tizen-tests/push/PushNotificationCallback_onsuccess.html b/common/tct-push-tizen-tests/push/PushNotificationCallback_onsuccess.html
index a466f4d9f6ae72ddb8854c905fb79cc3d7d2904e..bd72e5cefccbc23a6c9b23563bf78d6dcb5f91b7 100755 (executable)
--- a/common/tct-push-tizen-tests/push/PushNotificationCallback_onsuccess.html
+++ b/common/tct-push-tizen-tests/push/PushNotificationCallback_onsuccess.html
@@ -59,7 +59,7 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test(document.title, {timeout: 90000}), stateChangeCallback, notificationCallback,
-    pushRegisterSuccessCallback;
+    pushRegisterSuccessCallback, isFirstStateChange = true;
 
 t.step(function () {
     pushRegisterSuccessCallback = t.step_func(function (registrationId) {
@@ -69,7 +69,10 @@ t.step(function () {
     stateChangeCallback = t.step_func(function (state) {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback);
+        } else if (state == "REGISTERED" && isFirstStateChange) {
+            pushRegisterSuccessCallback();
         }
+        isFirstStateChange = false;
     });
 
     notificationCallback = t.step_func(function (msg) {

diff --git a/common/tct-push-tizen-tests/push/PushRegisterSuccessCallback_onsuccess.html b/common/tct-push-tizen-tests/push/PushRegisterSuccessCallback_onsuccess.html
index e1e64172a1e01fedca6373c800d58ce0570e1476..03cd9436d47a24689a91bee771bcdbe8f0d14ae8 100755 (executable)
--- a/common/tct-push-tizen-tests/push/PushRegisterSuccessCallback_onsuccess.html
+++ b/common/tct-push-tizen-tests/push/PushRegisterSuccessCallback_onsuccess.html
@@ -40,7 +40,7 @@ setup({timeout: 90000});
 
 var t = async_test(document.title, {timeout: 90000}), pushRegisterSuccessCallback,
     pushRegisterErrorCallback, unregisterServiceDone, unregisterServiceError,
-    stateChangeCallback, notificationCallback;
+    stateChangeCallback, notificationCallback, isFirstStateChange = true;
 
 t.step(function () {
     unregisterServiceDone = t.step_func(function () {
@@ -71,7 +71,10 @@ t.step(function () {
     stateChangeCallback = t.step_func(function (state) {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback, pushRegisterErrorCallback);
+        } else if (state == "REGISTERED" && isFirstStateChange) {
+            pushRegisterSuccessCallback();
         }
+        isFirstStateChange = false;
     });
 
     tizen.push.connect(stateChangeCallback, notificationCallback);