From: zy123.yuan <zy123.yuan@samsung.com>
Date: Wed, 31 Jan 2018 09:49:40 +0000 (+0800)
Subject: [common][push][DPTTIZEN-2946, improve tc to avoid block issue]
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F44%2F168844%2F1;p=test%2Ftct%2Fweb%2Fapi.git

[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 557efdf38..312f6a4fe 100755
--- 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 762b196ef..9c83aeae2 100755
--- 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 a022ffa97..0bdb79dcf 100755
--- 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 ccf1f92b9..2a40310f6 100755
--- 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 693927527..4047bef38 100755
--- 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 ae5e77b9d..e903abd23 100755
--- 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 33833fc8b..a1eab99e0 100755
--- 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 a9db13cab..b76e056c2 100755
--- 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 4ac82778c..b60c442ae 100755
--- 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 a7fa6b516..6638d1ab0 100755
--- 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 12b388128..f7436723b 100755
--- 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 9eb850c1f..2a7aa3e4e 100755
--- 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 ad14d3e0c..71c82de75 100755
--- 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 a9e82a4a3..2ac2803d5 100755
--- 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 a466f4d9f..bd72e5cef 100755
--- 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 e1e64172a..03cd9436d 100755
--- 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);