From: zhongyuan <zy123.yuan@samsung.com>
Date: Tue, 29 May 2018 07:37:01 +0000 (+0800)
Subject: [common][push][DPTTIZEN-3004, modify 16 tcs to avoid block issue]
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F09%2F180409%2F1;p=test%2Ftct%2Fweb%2Fapi.git

[common][push][DPTTIZEN-3004, modify 16 tcs to avoid block issue]

Change-Id: I8fb54aeae1820b81285db3b602bc4beeaa377685
---

diff --git a/common/tct-push-tizen-tests/push/PushManager_getRegistrationId.html b/common/tct-push-tizen-tests/push/PushManager_getRegistrationId.html
index 312f6a4fe..f719abca9 100755
--- a/common/tct-push-tizen-tests/push/PushManager_getRegistrationId.html
+++ b/common/tct-push-tizen-tests/push/PushManager_getRegistrationId.html
@@ -43,6 +43,14 @@ var t = async_test(document.title, {timeout: 90000}),
     unregisterServiceDone, unregisterServiceError, stateChangeCallback, notificationCallback, isFirstStateChange = true;
 
 t.step(function () {
+    add_result_callback(function () {
+        try {
+            tizen.push.unregister();
+            tizen.push.disconnect();
+        } catch (err) {
+        }
+    });
+
     unregisterServiceDone = t.step_func(function () {
         tizen.push.disconnect();
         t.done();
@@ -72,7 +80,12 @@ t.step(function () {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback, pushRegisterErrorCallback);
         } else if (state == "REGISTERED" && isFirstStateChange) {
-            pushRegisterSuccessCallback();
+            try {
+                registrationIdFromMethod = tizen.push.getRegistrationId();
+                assert_type(registrationIdFromMethod, "string", "getRegistrationId returned incorrect type.");
+            } finally {
+                tizen.push.unregister(unregisterServiceDone, unregisterServiceError);
+            }
         }
         isFirstStateChange = false;
     });
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 9c83aeae2..35585017f 100755
--- a/common/tct-push-tizen-tests/push/PushManager_getRegistrationId_notRegistered.html
+++ b/common/tct-push-tizen-tests/push/PushManager_getRegistrationId_notRegistered.html
@@ -43,6 +43,14 @@ var t = async_test(document.title, {timeout: 90000}), returnedValue,
     stateChangeCallback, notificationCallback, isFirstStateChange = true;
 
 t.step(function () {
+    add_result_callback(function () {
+        try {
+            tizen.push.unregister();
+            tizen.push.disconnect();
+        } catch (err) {
+        }
+    });
+
     unregisterServiceSuccessCallback = t.step_func(function () {
         returnedValue = tizen.push.getRegistrationId();
         assert_equals(returnedValue, null, "Incorrect value from getRegistrationId() method when appplication is not registered.");
@@ -69,7 +77,7 @@ t.step(function () {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback, pushRegisterErrorCallback);
         } else if (state == "REGISTERED" && isFirstStateChange) {
-            pushRegisterSuccessCallback();
+            tizen.push.unregister(unregisterServiceSuccessCallback, unregisterServiceErrorCallback);
         }
         isFirstStateChange = false;
     });
diff --git a/common/tct-push-tizen-tests/push/PushManager_getUnreadNotifications.html b/common/tct-push-tizen-tests/push/PushManager_getUnreadNotifications.html
index 0bdb79dcf..75a1f0cb0 100755
--- a/common/tct-push-tizen-tests/push/PushManager_getUnreadNotifications.html
+++ b/common/tct-push-tizen-tests/push/PushManager_getUnreadNotifications.html
@@ -63,7 +63,9 @@ t.step(function () {
         if(state == "UNREGISTERED") {
             returnedValue = tizen.push.register(pushRegisterSuccessCallback);
         } else if (state == "REGISTERED" && isFirstStateChange) {
-            pushRegisterSuccessCallback();
+            retVal = tizen.push.getUnreadNotifications();
+            assert_equals(retVal, undefined, "method returned value");
+            t.done();
         }
         isFirstStateChange = false;
     });
diff --git a/common/tct-push-tizen-tests/push/PushManager_register.html b/common/tct-push-tizen-tests/push/PushManager_register.html
index 2a40310f6..ed0a92d0f 100755
--- a/common/tct-push-tizen-tests/push/PushManager_register.html
+++ b/common/tct-push-tizen-tests/push/PushManager_register.html
@@ -43,6 +43,14 @@ var t = async_test(document.title, {timeout: 90000}),
     notificationCallback, stateChangeCallback, isFirstStateChange = true;
 
 t.step(function () {
+    add_result_callback(function () {
+        try {
+            tizen.push.unregister();
+            tizen.push.disconnect();
+        } catch (err) {
+        }
+    });
+
     unregisterServiceDone = t.step_func(function () {
         tizen.push.disconnect();
         t.done();
@@ -71,7 +79,7 @@ t.step(function () {
         if(state == "UNREGISTERED") {
             returnedValue = tizen.push.register(pushRegisterSuccessCallback);
         } else if (state == "REGISTERED" && isFirstStateChange) {
-            pushRegisterSuccessCallback();
+            tizen.push.unregister();
         }
         isFirstStateChange = false;
     });
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 4047bef38..7dd7c7706 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
@@ -43,6 +43,14 @@ var t = async_test(document.title, {timeout: 90000}),
     notificationCallback, stateChangeCallback, isFirstStateChange = true;
 
 t.step(function () {
+    add_result_callback(function () {
+        try {
+            tizen.push.unregister();
+            tizen.push.disconnect();
+        } catch (err) {
+        }
+    });
+
     unregisterServiceDone = t.step_func(function () {
         tizen.push.disconnect();
         t.done();
@@ -75,7 +83,7 @@ t.step(function () {
         if(state == "UNREGISTERED") {
             returnedValue = tizen.push.register(pushRegisterSuccessCallback, pushRegisterErrorCallback);
         } else if (state == "REGISTERED" && isFirstStateChange) {
-            pushRegisterSuccessCallback();
+            tizen.push.unregister();
         }
         isFirstStateChange = false;
     });
diff --git a/common/tct-push-tizen-tests/push/PushManager_unregister.html b/common/tct-push-tizen-tests/push/PushManager_unregister.html
index e903abd23..3d1076938 100755
--- a/common/tct-push-tizen-tests/push/PushManager_unregister.html
+++ b/common/tct-push-tizen-tests/push/PushManager_unregister.html
@@ -43,6 +43,14 @@ var t = async_test(document.title, {timeout: 90000}),
     notificationCallback, stateChangeCallback, isFirstStateChange = true;
 
 t.step(function () {
+    add_result_callback(function () {
+        try {
+            tizen.push.unregister();
+            tizen.push.disconnect();
+        } catch (err) {
+        }
+    });
+
     unregisterServiceDone = t.step_func(function () {
         afterRegistrationId = tizen.push.getRegistrationId();
         assert_not_equals(registrationId, afterRegistrationId, "registrationId did not change.");
@@ -68,7 +76,7 @@ t.step(function () {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback, pushRegisterErrorCallback);
         } else if (state == "REGISTERED" && isFirstStateChange) {
-            pushRegisterSuccessCallback();
+            tizen.push.unregister();
         }
         isFirstStateChange = false;
     });
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 a1eab99e0..06468b092 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
@@ -43,6 +43,14 @@ var t = async_test(document.title, {timeout: 90000}), pushRegisterSuccessCallbac
     stateChangeCallback, notificationCallback, isFirstStateChange = true;
 
 t.step(function () {
+    add_result_callback(function () {
+        try {
+            tizen.push.unregister();
+            tizen.push.disconnect();
+        } catch (err) {
+        }
+    });
+
     unregisterServiceDone = t.step_func(function () {
         afterRegistrationId = tizen.push.getRegistrationId();
         assert_not_equals(registrationId, afterRegistrationId, "registrationId did not change.");
@@ -71,7 +79,7 @@ t.step(function () {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback, pushRegisterErrorCallback);
         } else if (state == "REGISTERED" && isFirstStateChange) {
-            pushRegisterSuccessCallback();
+            tizen.push.unregister();
         }
         isFirstStateChange = false;
     });
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 b76e056c2..485f10025 100755
--- a/common/tct-push-tizen-tests/push/PushMessage_alertMessage_attribute.html
+++ b/common/tct-push-tizen-tests/push/PushMessage_alertMessage_attribute.html
@@ -77,7 +77,7 @@ t.step(function () {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback);
         } else if (state == "REGISTERED" && isFirstStateChange) {
-            pushRegisterSuccessCallback();
+            REG_ID = tizen.push.getRegistrationId();
         }
         isFirstStateChange = false;
     });
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 b60c442ae..78086057c 100755
--- a/common/tct-push-tizen-tests/push/PushMessage_appData_attribute.html
+++ b/common/tct-push-tizen-tests/push/PushMessage_appData_attribute.html
@@ -77,7 +77,7 @@ t.step(function () {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback);
         } else if (state == "REGISTERED" && isFirstStateChange) {
-            pushRegisterSuccessCallback();
+            REG_ID = tizen.push.getRegistrationId();
         }
         isFirstStateChange = false;
     });
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 6638d1ab0..fa5e8d037 100755
--- a/common/tct-push-tizen-tests/push/PushMessage_date_attribute.html
+++ b/common/tct-push-tizen-tests/push/PushMessage_date_attribute.html
@@ -77,7 +77,7 @@ t.step(function () {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback);
         } else if (state == "REGISTERED" && isFirstStateChange) {
-            pushRegisterSuccessCallback();
+            REG_ID = tizen.push.getRegistrationId();
         }
         isFirstStateChange = false;
     });
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 f7436723b..9aeaa0467 100755
--- a/common/tct-push-tizen-tests/push/PushMessage_message_attribute.html
+++ b/common/tct-push-tizen-tests/push/PushMessage_message_attribute.html
@@ -77,7 +77,7 @@ t.step(function () {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback);
         } else if (state == "REGISTERED" && isFirstStateChange) {
-            pushRegisterSuccessCallback();
+            REG_ID = tizen.push.getRegistrationId();
         }
         isFirstStateChange = false;
     });
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 2a7aa3e4e..c1ac74a7c 100755
--- a/common/tct-push-tizen-tests/push/PushMessage_requestId_attribute.html
+++ b/common/tct-push-tizen-tests/push/PushMessage_requestId_attribute.html
@@ -77,7 +77,7 @@ t.step(function () {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback);
         } else if (state == "REGISTERED" && isFirstStateChange) {
-            pushRegisterSuccessCallback();
+            REG_ID = tizen.push.getRegistrationId();
         }
         isFirstStateChange = false;
     });
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 71c82de75..179fe4f36 100755
--- a/common/tct-push-tizen-tests/push/PushMessage_sender_attribute.html
+++ b/common/tct-push-tizen-tests/push/PushMessage_sender_attribute.html
@@ -77,7 +77,7 @@ t.step(function () {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback);
         } else if (state == "REGISTERED" && isFirstStateChange) {
-            pushRegisterSuccessCallback();
+            REG_ID = tizen.push.getRegistrationId();
         }
         isFirstStateChange = false;
     });
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 2ac2803d5..0e1748a65 100755
--- a/common/tct-push-tizen-tests/push/PushMessage_sessionInfo_attribute.html
+++ b/common/tct-push-tizen-tests/push/PushMessage_sessionInfo_attribute.html
@@ -77,7 +77,7 @@ t.step(function () {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback);
         } else if (state == "REGISTERED" && isFirstStateChange) {
-            pushRegisterSuccessCallback();
+            REG_ID = tizen.push.getRegistrationId();
         }
         isFirstStateChange = false;
     });
diff --git a/common/tct-push-tizen-tests/push/PushNotificationCallback_onsuccess.html b/common/tct-push-tizen-tests/push/PushNotificationCallback_onsuccess.html
index bd72e5cef..67b71f773 100755
--- a/common/tct-push-tizen-tests/push/PushNotificationCallback_onsuccess.html
+++ b/common/tct-push-tizen-tests/push/PushNotificationCallback_onsuccess.html
@@ -62,6 +62,14 @@ var t = async_test(document.title, {timeout: 90000}), stateChangeCallback, notif
     pushRegisterSuccessCallback, isFirstStateChange = true;
 
 t.step(function () {
+    add_result_callback(function () {
+        try {
+            tizen.push.unregister();
+            tizen.push.disconnect();
+        } catch (err) {
+        }
+    });
+
     pushRegisterSuccessCallback = t.step_func(function (registrationId) {
         REG_ID = registrationId;
     });
@@ -70,7 +78,7 @@ t.step(function () {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback);
         } else if (state == "REGISTERED" && isFirstStateChange) {
-            pushRegisterSuccessCallback();
+            REG_ID = tizen.push.getRegistrationId();;
         }
         isFirstStateChange = false;
     });
diff --git a/common/tct-push-tizen-tests/push/PushRegisterSuccessCallback_onsuccess.html b/common/tct-push-tizen-tests/push/PushRegisterSuccessCallback_onsuccess.html
index 03cd9436d..97836e24d 100755
--- a/common/tct-push-tizen-tests/push/PushRegisterSuccessCallback_onsuccess.html
+++ b/common/tct-push-tizen-tests/push/PushRegisterSuccessCallback_onsuccess.html
@@ -43,6 +43,14 @@ var t = async_test(document.title, {timeout: 90000}), pushRegisterSuccessCallbac
     stateChangeCallback, notificationCallback, isFirstStateChange = true;
 
 t.step(function () {
+    add_result_callback(function () {
+        try {
+            tizen.push.unregister();
+            tizen.push.disconnect();
+        } catch (err) {
+        }
+    });
+
     unregisterServiceDone = t.step_func(function () {
         tizen.push.disconnect();
         t.done();
@@ -72,7 +80,7 @@ t.step(function () {
         if(state == "UNREGISTERED") {
             tizen.push.register(pushRegisterSuccessCallback, pushRegisterErrorCallback);
         } else if (state == "REGISTERED" && isFirstStateChange) {
-            pushRegisterSuccessCallback();
+            tizen.push.unregister();
         }
         isFirstStateChange = false;
     });