[common][tct-alarm-tizen-tests][TNEXT-4102 TNEXT-3193 TNEXT-3186 TNEXT-3183 DPTIZEN...

Change-Id: I40e12d400f37c5dca12498aef9f5c21be8c3f37e
Signed-off-by: xy.qian <xy.qian@samsung.com>

diff --git a/common/tct-alarm-tizen-tests/alarm/AlarmManager_addAlarmNotification.html b/common/tct-alarm-tizen-tests/alarm/AlarmManager_addAlarmNotification.html
index 2f2001aee39e9e6864767b28c1f2b050b13fd34c..380b284b27104010ff926d8dc116ab2d2a7e4689 100644 (file)
--- a/common/tct-alarm-tizen-tests/alarm/AlarmManager_addAlarmNotification.html
+++ b/common/tct-alarm-tizen-tests/alarm/AlarmManager_addAlarmNotification.html
@@ -53,10 +53,16 @@ test(function () {
     alarm = new tizen.AlarmAbsolute(date);
     notificationDict = {
         content: "This is a simple notification.",
-        iconPath: "images/webapi-tizen-notification-test_image1.jpg",
-        soundPath: "music/webapi-tizen-notification-test_noise1.mp3"
+        images:
+        {
+            iconPath : "images/webapi-tizen-notification-test_image1.jpg"
+        },
+        actions:
+        {
+            soundPath : "music/webapi-tizen-notification-test_noise1.mp3"
+        }
     };
-    notification = new tizen.StatusNotification("SIMPLE", "Simple notification", notificationDict);
+    notification = new tizen.UserNotification("SIMPLE", "Simple notification", notificationDict);
     retVal = tizen.alarm.addAlarmNotification(alarm, notification);
     noti = tizen.alarm.getAlarmNotification(alarm.id);
     assert_type(retVal, "undefined", "method returned value");

diff --git a/common/tct-alarm-tizen-tests/alarm/AlarmManager_addAlarmNotification_alarm_TypeMismatch.html b/common/tct-alarm-tizen-tests/alarm/AlarmManager_addAlarmNotification_alarm_TypeMismatch.html
index 26282268b7578c7d04c1f3452e392eb4649cd93b..f3d0fdfad0da8c46ea2062c8e2f0de7a022ad11a 100644 (file)
--- a/common/tct-alarm-tizen-tests/alarm/AlarmManager_addAlarmNotification_alarm_TypeMismatch.html
+++ b/common/tct-alarm-tizen-tests/alarm/AlarmManager_addAlarmNotification_alarm_TypeMismatch.html
@@ -40,11 +40,17 @@ test(function () {
     var notificationDict, notification, i, conversionTable = getTypeConversionExceptions("object");
     notificationDict = {
         content: "This is a simple notification.",
-        iconPath: "images/webapi-tizen-notification-test_image1.jpg",
-        soundPath: "music/webapi-tizen-notification-test_noise1.mp3"
+        images:
+        {
+            iconPath : "images/webapi-tizen-notification-test_image1.jpg"
+        },
+        actions:
+        {
+            soundPath : "music/webapi-tizen-notification-test_noise1.mp3"
+        }
     };
 
-    notification = new tizen.StatusNotification("SIMPLE", "Simple notification", notificationDict);
+    notification = new tizen.UserNotification("SIMPLE", "Simple notification", notificationDict);
     for (i = 0; i < conversionTable.length; i++) {
         assert_throws({name: conversionTable[i][1]}, function () {
             tizen.alarm.addAlarmNotification(conversionTable[i][0], notification);

diff --git a/common/tct-alarm-tizen-tests/alarm/AlarmManager_getAlarmNotification.html b/common/tct-alarm-tizen-tests/alarm/AlarmManager_getAlarmNotification.html
index 5e863813ed47842ca341e327d82792d35aa0fb51..38e5c317a6fcda1197b96e749d361d19bc223409 100644 (file)
--- a/common/tct-alarm-tizen-tests/alarm/AlarmManager_getAlarmNotification.html
+++ b/common/tct-alarm-tizen-tests/alarm/AlarmManager_getAlarmNotification.html
@@ -53,13 +53,19 @@ test(function () {
     alarm = new tizen.AlarmAbsolute(date);
     notificationDict = {
         content: "This is a simple notification.",
-        iconPath: "images/webapi-tizen-notification-test_image1.jpg",
-        soundPath: "music/webapi-tizen-notification-test_noise1.mp3"
+        images:
+        {
+            iconPath : "images/webapi-tizen-notification-test_image1.jpg"
+        },
+        actions:
+        {
+            soundPath : "music/webapi-tizen-notification-test_noise1.mp3"
+        }
     };
-    notification = new tizen.StatusNotification("SIMPLE", "Simple notification", notificationDict);
+    notification = new tizen.UserNotification("SIMPLE", "Simple notification", notificationDict);
     tizen.alarm.addAlarmNotification(alarm, notification);
     retVal = tizen.alarm.getAlarmNotification(alarm.id);
-    assert_true(retVal instanceof tizen.StatusNotification, "object was not get properly");
+    assert_true(retVal instanceof tizen.UserNotification, "object was not get properly");
 }, document.title);
 
 </script>

diff --git a/common/tct-alarm-tizen-tests/alarm/AlarmManager_getAlarmNotification_NotFoundError.html b/common/tct-alarm-tizen-tests/alarm/AlarmManager_getAlarmNotification_NotFoundError.html
index 6f6077f6f9d126fda2ab939558a85530e6c1644a..372449dfc0e1e911ba5ef2caa233f7861df82184 100644 (file)
--- a/common/tct-alarm-tizen-tests/alarm/AlarmManager_getAlarmNotification_NotFoundError.html
+++ b/common/tct-alarm-tizen-tests/alarm/AlarmManager_getAlarmNotification_NotFoundError.html
@@ -45,10 +45,16 @@ test(function () {
     alarm = new tizen.AlarmAbsolute(date);
     notificationDict = {
         content: "This is a simple notification.",
-        iconPath: "images/webapi-tizen-notification-test_image1.jpg",
-        soundPath: "music/webapi-tizen-notification-test_noise1.mp3"
+        images:
+        {
+            iconPath : "images/webapi-tizen-notification-test_image1.jpg"
+        },
+        actions:
+        {
+            soundPath : "music/webapi-tizen-notification-test_noise1.mp3"
+        }
     };
-    notification = new tizen.StatusNotification("SIMPLE", "Simple notification", notificationDict);
+    notification = new tizen.UserNotification("SIMPLE", "Simple notification", notificationDict);
     tizen.alarm.addAlarmNotification(alarm, notification);
     tizen.alarm.remove(alarm.id);
     assert_throws(NOT_FOUND_EXCEPTION, function () {