[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 312f6a4fe76f61de1e60cc9cddfeaf4ad0f3b594..f719abca96e53f122a293d5610cb55d6432fa61c 100755 (executable)
--- 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 9c83aeae22afe9b48585888b4a3fb4c2a86cc879..35585017f3139466f9fea8cc072a87b881237242 100755 (executable)
--- 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 0bdb79dcff6ece1171b0cb9ea38b74817250ee5a..75a1f0cb0c5c7d5478532021d0f47ff2f187646e 100755 (executable)
--- 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 2a40310f6a397db5edba75dc623c75abae18561e..ed0a92d0f28e4d39f975a40be2651435189371e6 100755 (executable)
--- 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 4047bef3864e3eedc0679dfca637ccd395c03887..7dd7c7706a08ef9d1b910867c186d9905333445f 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
@@ -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 e903abd23ae8356b3cee65cb70367130e54f93df..3d1076938aa0f31e4ad6b48c4e1c3d332b783a53 100755 (executable)
--- 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 a1eab99e0a5e68dae3ec79203f4e5c283ee9d10a..06468b0921014b00aeb9026dbcf38fb9cd67d807 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
@@ -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 b76e056c2a5bba7230a31a8d4ddc0b67cc01f7da..485f100250ad1c07fce3502f5f655306cbe537b6 100755 (executable)
--- 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 b60c442aedc949d0aa377bcae01a68bace0e88d2..78086057cf8b1e84df8174d08f64277cee931f88 100755 (executable)
--- 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 6638d1ab02971450b78d658cdab2b30bc9ef88d1..fa5e8d037f7efc303b3e419572152a9dcf16bda0 100755 (executable)
--- 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 f7436723b6ef798a94d092ada1e07c6fdc0c7668..9aeaa0467e00b2a2238b09f431b54c6d923736e7 100755 (executable)
--- 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 2a7aa3e4e42a07c88853f8193bdc203b3d04215f..c1ac74a7c3800340a772b3e95b923a38d8292d55 100755 (executable)
--- 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 71c82de7566aee86a19c4de8aae7f1cc2b44bdea..179fe4f36e151449a046a5e60d11f3a21267c46e 100755 (executable)
--- 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 2ac2803d551f123fdff278b913f8300e3fe91150..0e1748a65b524efabba0d1af724ae0e083156c35 100755 (executable)
--- 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 bd72e5cefccbc23a6c9b23563bf78d6dcb5f91b7..67b71f77395155af249fa1892f5ffa8903d8e651 100755 (executable)
--- 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 03cd9436d47a24689a91bee771bcdbe8f0d14ae8..97836e24d090ca2949c483bc48102aacef956af4 100755 (executable)
--- 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;
     });