From: Andrzej Krolikowski Date: Fri, 11 Oct 2013 13:19:26 +0000 (+0200) Subject: [Calendar] various fixes X-Git-Tag: 2.2.1_release~65 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f269e0bc27a7d3d26c2b98281df778f8ed58e29;p=test%2Ftct%2Fweb%2Fapi.git [Calendar] various fixes Mainly related to indentation. Change-Id: Ie29f3385b533aaeb3dc6880dc972f78371a2c442 --- diff --git a/tct-calendar-tizen-tests/calendar/CalendarChangeCallback_onitemsremoved.html b/tct-calendar-tizen-tests/calendar/CalendarChangeCallback_onitemsremoved.html old mode 100755 new mode 100644 index 855058175..3ee10a6a0 --- a/tct-calendar-tizen-tests/calendar/CalendarChangeCallback_onitemsremoved.html +++ b/tct-calendar-tizen-tests/calendar/CalendarChangeCallback_onitemsremoved.html @@ -35,7 +35,7 @@ Authors: //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/calendar.html //==== TEST_CRITERIA CBOA CBT var t = async_test(document.title, {timeout: 90000}), - watcher, event_init, calendar, ev; + watcher, eventInit, calendar, ev; setup({timeout: 90000}); t.step(function () { @@ -61,7 +61,7 @@ t.step(function () { calendar.addChangeListener(watcher); - event_init = { + eventInit = { description: "HTML5 Introduction", summary: "HTML5 Webinar ", startDate: new tizen.TZDate(2011, 3, 30, 10, 0), @@ -69,7 +69,7 @@ t.step(function () { location: "Huesca" }; - ev = new tizen.CalendarEvent(event_init); + ev = new tizen.CalendarEvent(eventInit); calendar.add(ev); }); diff --git a/tct-calendar-tizen-tests/calendar/CalendarChangeCallback_onitemsupdated.html b/tct-calendar-tizen-tests/calendar/CalendarChangeCallback_onitemsupdated.html old mode 100755 new mode 100644 index b5a1b33df..b0fb5a3ce --- a/tct-calendar-tizen-tests/calendar/CalendarChangeCallback_onitemsupdated.html +++ b/tct-calendar-tizen-tests/calendar/CalendarChangeCallback_onitemsupdated.html @@ -35,15 +35,15 @@ Authors: //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/calendar.html //==== TEST_CRITERIA CBOA CBT var t = async_test(document.title, {timeout: 90000}), - watcher, event_init, calendar, ev, ev_get; + watcher, eventInit, calendar, ev, evGet; setup({timeout: 90000}); t.step(function () { watcher = { onitemsadded: t.step_func(function (items) { - ev_get = calendar.get(ev.id); - ev_get.summary = "updated summary"; - calendar.update(ev_get); + evGet = calendar.get(ev.id); + evGet.summary = "updated summary"; + calendar.update(evGet); }), onitemsupdated: t.step_func(function (items) { @@ -82,7 +82,7 @@ t.step(function () { calendar.addChangeListener(watcher); - event_init = { + eventInit = { description: "HTML5 Introduction", summary: "HTML5 Webinar ", startDate: new tizen.TZDate(2011, 3, 30, 10, 0), @@ -90,7 +90,7 @@ t.step(function () { location: "Huesca" }; - ev = new tizen.CalendarEvent(event_init); + ev = new tizen.CalendarEvent(eventInit); calendar.add(ev); }); diff --git a/tct-calendar-tizen-tests/calendar/CalendarItem_attribute_valid_value_CalendarEvent.html b/tct-calendar-tizen-tests/calendar/CalendarItem_attribute_valid_value_CalendarEvent.html index fdc10e027..7c2e7ab5f 100644 --- a/tct-calendar-tizen-tests/calendar/CalendarItem_attribute_valid_value_CalendarEvent.html +++ b/tct-calendar-tizen-tests/calendar/CalendarItem_attribute_valid_value_CalendarEvent.html @@ -42,7 +42,7 @@ Authors: test(function () { var retrievedEvent, originalEvent, eventCalendar = tizen.calendar.getDefaultCalendar("EVENT"); - originalEvent = new tizen.CalendarEvent({ + originalEvent = new tizen.CalendarEvent({ description: "Tizen description", summary: "Tizen summary", isAllDay: false, diff --git a/tct-calendar-tizen-tests/calendar/CalendarManager_getCalendars_errorCallback_TypeMismatch.html b/tct-calendar-tizen-tests/calendar/CalendarManager_getCalendars_errorCallback_TypeMismatch.html index c2ca65b50..6624811e8 100644 --- a/tct-calendar-tizen-tests/calendar/CalendarManager_getCalendars_errorCallback_TypeMismatch.html +++ b/tct-calendar-tizen-tests/calendar/CalendarManager_getCalendars_errorCallback_TypeMismatch.html @@ -41,16 +41,17 @@ t.step(function () { successCallback = t.step_func(function (calendars) { assert_unreached("TypeMismatchError should be thrown"); }); + conversionTable = getTypeConversionExceptions("functionObject", true); for (i = 0; i < conversionTable.length; i++) { errorCallback = conversionTable[i][0]; exceptionName = conversionTable[i][1]; - assert_throws({name: exceptionName}, - function () { - calendar = tizen.calendar.getCalendars("EVENT", successCallback, errorCallback); - }, exceptionName + " should be thrown - given incorrect items."); + assert_throws({name: exceptionName}, function () { + calendar = tizen.calendar.getCalendars("EVENT", successCallback, errorCallback); + }, exceptionName + " should be thrown - given incorrect errorCallback"); } + t.done(); }); diff --git a/tct-calendar-tizen-tests/calendar/CalendarManager_getCalendars_errorCallback_invalid_cb.html b/tct-calendar-tizen-tests/calendar/CalendarManager_getCalendars_errorCallback_invalid_cb.html index a639e3f25..bbd571c83 100644 --- a/tct-calendar-tizen-tests/calendar/CalendarManager_getCalendars_errorCallback_invalid_cb.html +++ b/tct-calendar-tizen-tests/calendar/CalendarManager_getCalendars_errorCallback_invalid_cb.html @@ -30,27 +30,28 @@ Authors:
diff --git a/tct-calendar-tizen-tests/calendar/Calendar_CalendarItem_set_summary_geolocation_priority.html b/tct-calendar-tizen-tests/calendar/Calendar_CalendarItem_set_summary_geolocation_priority.html index 9329ac1a5..38759f2f4 100644 --- a/tct-calendar-tizen-tests/calendar/Calendar_CalendarItem_set_summary_geolocation_priority.html +++ b/tct-calendar-tizen-tests/calendar/Calendar_CalendarItem_set_summary_geolocation_priority.html @@ -46,21 +46,20 @@ Authors: //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/calendar.html //==== TEST_CRITERIA - var description = "set attri value: summary & geolocation& priority."; - test(function () { - var event_init = {description:"HTML5 Introduction", - summary:"HTML5 Webinar ", - startDate: new tizen.TZDate(2011, 3, 30, 10, 0), - duration: new tizen.TimeDuration(1, "HOURS"), - location:"Huesca"}, - ev = new tizen.CalendarEvent(event_init); +test(function () { + var event_init = {description:"HTML5 Introduction", + summary:"HTML5 Webinar ", + startDate: new tizen.TZDate(2011, 3, 30, 10, 0), + duration: new tizen.TimeDuration(1, "HOURS"), + location:"Huesca"}, + ev = new tizen.CalendarEvent(event_init); - ev.summary = "check if set attribute value successful after create ev"; - ev.geolocation = new tizen.SimpleCoordinates(60.175, 24.934); - ev.priority = "HIGH"; - assert_equals(ev.summary, "check if set attribute value successful after create ev"); - assert_not_equals(ev.geolocation, null); - assert_equals(ev.priority, "HIGH"); + ev.summary = "check if set attribute value successful after create ev"; + ev.geolocation = new tizen.SimpleCoordinates(60.175, 24.934); + ev.priority = "HIGH"; + assert_equals(ev.summary, "check if set attribute value successful after create ev", "Incorrect summary"); + assert_not_equals(ev.geolocation, null, "Incorrect geolocation"); + assert_equals(ev.priority, "HIGH", "Incorrect priority"); }, document.title); diff --git a/tct-calendar-tizen-tests/calendar/Calendar_CalendarManager_getCalendars_successcallback_invalid.html b/tct-calendar-tizen-tests/calendar/Calendar_CalendarManager_getCalendars_successcallback_invalid.html index 4cf02a3f4..020622983 100644 --- a/tct-calendar-tizen-tests/calendar/Calendar_CalendarManager_getCalendars_successcallback_invalid.html +++ b/tct-calendar-tizen-tests/calendar/Calendar_CalendarManager_getCalendars_successcallback_invalid.html @@ -47,9 +47,9 @@ Authors: //==== TEST_CRITERIA MC test(function (){ - assert_throws(TYPE_MISMATCH_EXCEPTION, function (){ - tizen.calendar.getCalendars("EVENT", false); - }, "TypeMismatchError exception."); + assert_throws(TYPE_MISMATCH_EXCEPTION, function (){ + tizen.calendar.getCalendars("EVENT", false); + }, "TypeMismatchError exception."); }, document.title); diff --git a/tct-calendar-tizen-tests/calendar/Calendar_CalendarManager_getDefaultCalendar_CalendarType_error.html b/tct-calendar-tizen-tests/calendar/Calendar_CalendarManager_getDefaultCalendar_CalendarType_error.html index 60b121f50..73fbe171b 100644 --- a/tct-calendar-tizen-tests/calendar/Calendar_CalendarManager_getDefaultCalendar_CalendarType_error.html +++ b/tct-calendar-tizen-tests/calendar/Calendar_CalendarManager_getDefaultCalendar_CalendarType_error.html @@ -32,10 +32,6 @@ Authors: Calendar_CalendarManager_getDefaultCalendar_CalendarType_error - - - - @@ -49,9 +45,9 @@ Authors: //==== TEST_CRITERIA MC test(function (){ - assert_throws(TYPE_MISMATCH_EXCEPTION, function (){ - tizen.calendar.getDefaultCalendar("123"); - }, "TypeMismatchError exception."); + assert_throws(TYPE_MISMATCH_EXCEPTION, function (){ + tizen.calendar.getDefaultCalendar("123"); + }, "TypeMismatchError exception."); }, document.title); diff --git a/tct-calendar-tizen-tests/calendar/Calendar_CalendarManager_getDefaultCalendar_null.html b/tct-calendar-tizen-tests/calendar/Calendar_CalendarManager_getDefaultCalendar_null.html index 8515fbc60..8ce64e59b 100644 --- a/tct-calendar-tizen-tests/calendar/Calendar_CalendarManager_getDefaultCalendar_null.html +++ b/tct-calendar-tizen-tests/calendar/Calendar_CalendarManager_getDefaultCalendar_null.html @@ -32,10 +32,6 @@ Authors: Calendar_CalendarManager_getDefaultCalendar_null - - - - @@ -50,9 +46,9 @@ Authors: //==== TEST_CRITERIA MC test(function (){ - assert_throws(TYPE_MISMATCH_EXCEPTION, function (){ - tizen.calendar.getDefaultCalendar(null); - }, "TypeMismatchError exception."); + assert_throws(TYPE_MISMATCH_EXCEPTION, function (){ + tizen.calendar.getDefaultCalendar(null); + }, "TypeMismatchError exception."); }, document.title); diff --git a/tct-calendar-tizen-tests/calendar/Calendar_find_errorCallback_TypeMismatch.html b/tct-calendar-tizen-tests/calendar/Calendar_find_errorCallback_TypeMismatch.html index 164603cbf..b803087a0 100644 --- a/tct-calendar-tizen-tests/calendar/Calendar_find_errorCallback_TypeMismatch.html +++ b/tct-calendar-tizen-tests/calendar/Calendar_find_errorCallback_TypeMismatch.html @@ -36,21 +36,22 @@ Authors: //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/calendar.html //==== TEST_CRITERIA MC var t = async_test(document.title), successCallback, - calendar, conversionTable, exceptionName = "TypeMismatchError", i, errorCallback; + calendar, conversionTable, exceptionName, i, errorCallback; t.step(function () { calendar = tizen.calendar.getDefaultCalendar("EVENT"); successCallback = t.step_func(function () { }); + conversionTable = getTypeConversionExceptions("functionObject", true); for (i = 0; i < conversionTable.length; i++) { errorCallback = conversionTable[i][0]; exceptionName = conversionTable[i][1]; - assert_throws({name: exceptionName}, - function () { - calendar.find(successCallback, errorCallback); - }, exceptionName + " should be thrown - given incorrect successCallback."); + assert_throws({name: exceptionName}, function () { + calendar.find(successCallback, errorCallback); + }, exceptionName + " should be thrown - given incorrect errorCallback."); } + t.done(); }); diff --git a/tct-calendar-tizen-tests/calendar/Calendar_find_errorCallback_invalid_cb.html b/tct-calendar-tizen-tests/calendar/Calendar_find_errorCallback_invalid_cb.html index 42e75a126..d46ee6c1b 100644 --- a/tct-calendar-tizen-tests/calendar/Calendar_find_errorCallback_invalid_cb.html +++ b/tct-calendar-tizen-tests/calendar/Calendar_find_errorCallback_invalid_cb.html @@ -36,15 +36,15 @@ Authors: //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/calendar.html //==== TEST_CRITERIA MTCB var t = async_test(document.title), eventSearchSuccessCallback, - errorCallback, ev1, event1, calendar, filter, - exceptionName = "TypeMismatchError"; + errorCallback, ev1, event1, calendar, filter; t.step(function (){ eventSearchSuccessCallback = t.step_func(function (events) { - assert_unreached("Invalid callback invoked: "); + assert_unreached("Success callback invoked"); }); + errorCallback = { onerror: t.step_func(function (items) { - assert_unreached("Invalid callback invoked: "); + assert_unreached("Invalid error callback invoked"); }) }; event1 = {description: "HTML5 Introduction", @@ -56,10 +56,10 @@ t.step(function (){ calendar = tizen.calendar.getDefaultCalendar("EVENT"); calendar.add(ev1); filter = {attributeName: "summary", matchFlag: "CONTAINS", matchValue: "Tizen"}; - assert_throws({name: exceptionName}, - function () { - calendar.find(eventSearchSuccessCallback, errorCallback); - }, exceptionName + " should be thrown - given incorrect sortMode."); + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { + calendar.find(eventSearchSuccessCallback, errorCallback); + }, "Given incorrect errorCallback."); + cleanup(calendar); t.done(); }); diff --git a/tct-calendar-tizen-tests/calendar/Calendar_find_filter_TypeMismatch.html b/tct-calendar-tizen-tests/calendar/Calendar_find_filter_TypeMismatch.html index 97ae54c4c..be2b78f8a 100644 --- a/tct-calendar-tizen-tests/calendar/Calendar_find_filter_TypeMismatch.html +++ b/tct-calendar-tizen-tests/calendar/Calendar_find_filter_TypeMismatch.html @@ -35,32 +35,34 @@ Authors: //==== SPEC Tizen Web API:Social:Calendar:Calendar:find M //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/calendar.html //==== TEST_CRITERIA MC -var t = async_test(document.title), successCallback, event_init, - calendar, ev, conversionTable, exceptionName = "TypeMismatchError", i, errorCallback, +var t = async_test(document.title), successCallback, eventInit, + calendar, ev, conversionTable, exceptionName, i, errorCallback, filter; t.step(function () { - event_init = {description:"HTML5 Introduction", + eventInit = {description:"HTML5 Introduction", summary:"HTML5 Webinar ", startDate: new tizen.TZDate(2011, 3, 30, 10, 0), duration: new tizen.TimeDuration(1, "HOURS"), location:"Huesca"}; calendar = tizen.calendar.getDefaultCalendar("EVENT"); - ev = new tizen.CalendarEvent(event_init); + ev = new tizen.CalendarEvent(eventInit); calendar.add(ev); successCallback = t.step_func(function () { }); + errorCallback = t.step_func(function () { }); + conversionTable = getTypeConversionExceptions("object", true); for (i = 0; i < conversionTable.length; i++) { filter = conversionTable[i][0]; exceptionName = conversionTable[i][1]; - assert_throws({name: exceptionName}, - function () { - calendar.find(successCallback, errorCallback, filter); + assert_throws({name: exceptionName}, function () { + calendar.find(successCallback, errorCallback, filter); }, exceptionName + " should be thrown - given incorrect filter. " + format_value(filter)); } + cleanup(calendar); t.done(); }); diff --git a/tct-calendar-tizen-tests/calendar/Calendar_find_sortMode_TypeMismatch.html b/tct-calendar-tizen-tests/calendar/Calendar_find_sortMode_TypeMismatch.html index a60366cc1..ba08bbf38 100644 --- a/tct-calendar-tizen-tests/calendar/Calendar_find_sortMode_TypeMismatch.html +++ b/tct-calendar-tizen-tests/calendar/Calendar_find_sortMode_TypeMismatch.html @@ -35,33 +35,36 @@ Authors: //==== SPEC Tizen Web API:Social:Calendar:Calendar:find M //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/calendar.html //==== TEST_CRITERIA MC -var t = async_test(document.title), successCallback, event_init, +var t = async_test(document.title), successCallback, eventInit, calendar, ev, conversionTable, exceptionName = "TypeMismatchError", i, errorCallback, filter, sortMode; t.step(function () { - event_init = {description:"HTML5 Introduction", + eventInit = {description:"HTML5 Introduction", summary:"HTML5 Webinar ", startDate: new tizen.TZDate(2011, 3, 30, 10, 0), duration: new tizen.TimeDuration(1, "HOURS"), location:"Huesca"}; calendar = tizen.calendar.getDefaultCalendar("EVENT"); - ev = new tizen.CalendarEvent(event_init); + ev = new tizen.CalendarEvent(eventInit); calendar.add(ev); + successCallback = t.step_func(function () { }); + errorCallback = t.step_func(function () { }); + filter = new tizen.AttributeFilter("summary", "CONTAINS", "Webinar"); conversionTable = getTypeConversionExceptions("object", true); for (i = 0; i < conversionTable.length; i++) { sortMode = conversionTable[i][0]; exceptionName = conversionTable[i][1]; - assert_throws({name: exceptionName}, - function () { - calendar.find(successCallback, errorCallback, filter, sortMode); + assert_throws({name: exceptionName}, function () { + calendar.find(successCallback, errorCallback, filter, sortMode); }, exceptionName + " should be thrown - given incorrect sortMode. " + format_value(sortMode)); } + cleanup(calendar); t.done(); }); diff --git a/tct-calendar-tizen-tests/calendar/Calendar_find_sortMode_invalid_obj.html b/tct-calendar-tizen-tests/calendar/Calendar_find_sortMode_invalid_obj.html index 145f93729..2360018d7 100644 --- a/tct-calendar-tizen-tests/calendar/Calendar_find_sortMode_invalid_obj.html +++ b/tct-calendar-tizen-tests/calendar/Calendar_find_sortMode_invalid_obj.html @@ -62,11 +62,10 @@ t.step(function (){ calendar.add(ev1); calendar.add(ev2); filter = new tizen.AttributeFilter("summary", "CONTAINS", "Tizen"); - assert_throws({name: exceptionName}, - function () { - calendar.find(eventSearchSuccessCallback, errorCallback, - filter, sortMode); + assert_throws({name: exceptionName}, function () { + calendar.find(eventSearchSuccessCallback, errorCallback, filter, sortMode); }, exceptionName + " should be thrown - given incorrect sortMode."); + cleanup(calendar); t.done(); }); diff --git a/tct-calendar-tizen-tests/calendar/Calendar_find_successCallback_TypeMismatch.html b/tct-calendar-tizen-tests/calendar/Calendar_find_successCallback_TypeMismatch.html index 03fbfdbfe..cdee5a351 100644 --- a/tct-calendar-tizen-tests/calendar/Calendar_find_successCallback_TypeMismatch.html +++ b/tct-calendar-tizen-tests/calendar/Calendar_find_successCallback_TypeMismatch.html @@ -36,7 +36,7 @@ Authors: //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/calendar.html //==== TEST_CRITERIA MC var t = async_test(document.title), successCallback, - calendar, conversionTable, exceptionName = "TypeMismatchError", i; + calendar, conversionTable, exceptionName, i; t.step(function () { calendar = tizen.calendar.getDefaultCalendar("EVENT"); conversionTable = getTypeConversionExceptions("functionObject", false); @@ -44,11 +44,11 @@ t.step(function () { successCallback = conversionTable[i][0]; exceptionName = conversionTable[i][1]; - assert_throws({name: exceptionName}, - function () { - calendar.find(successCallback); + assert_throws({name: exceptionName}, function () { + calendar.find(successCallback); }, exceptionName + " should be thrown - given incorrect successCallback."); } + t.done(); }); diff --git a/tct-calendar-tizen-tests/calendar/Calendar_find_successCallback_invalid_cb.html b/tct-calendar-tizen-tests/calendar/Calendar_find_successCallback_invalid_cb.html index f623f0893..871eed3b5 100644 --- a/tct-calendar-tizen-tests/calendar/Calendar_find_successCallback_invalid_cb.html +++ b/tct-calendar-tizen-tests/calendar/Calendar_find_successCallback_invalid_cb.html @@ -35,19 +35,19 @@ Authors: //==== SPEC Tizen Web API:Social:Calendar:Calendar:find M //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/calendar.html //==== TEST_CRITERIA MTCB -var t = async_test(document.title), successCallback, - calendar, exceptionName = "TypeMismatchError"; +var t = async_test(document.title), successCallback, calendar; t.step(function () { successCallback = { onsuccess: t.step_func(function (items) { - assert_unreached("Invalid callback invoked: "); + assert_unreached("Invalid success callback invoked"); }) }; + calendar = tizen.calendar.getDefaultCalendar("EVENT"); - assert_throws({name: exceptionName}, - function () { - calendar.find(successCallback); - }, exceptionName + " should be thrown - given incorrect successCallback."); + assert_throws(TYPE_MISMATCH_EXCEPTION, function () { + calendar.find(successCallback); + }, "Given incorrect successCallback"); + t.done(); }); diff --git a/tct-calendar-tizen-tests/calendar/Calendar_remove.html b/tct-calendar-tizen-tests/calendar/Calendar_remove.html index c2ce1b327..18eca00f2 100644 --- a/tct-calendar-tizen-tests/calendar/Calendar_remove.html +++ b/tct-calendar-tizen-tests/calendar/Calendar_remove.html @@ -43,12 +43,13 @@ var t = async_test(document.title, {timeout: 5000}), task, taskCalendar, t.step(function () { - taskSearchSuccessCallback = t.step_func(function (events) { - assert_equals(returnedValue, undefined, "Incorect returned value from remove()"); + assert_equals(returnedValue, undefined, "Incorect returned value from remove()"); assert_equals(events.length, 0, "Task should not be found."); + t.done(); }); + taskSearchErrorCallback = t.step_func(function (error) { assert_unreached("find() error callaback invoked: " + error.name + ": " + error.message); }); diff --git a/tct-calendar-tizen-tests/calendar/Calendar_removeBatch_errorCallback_TypeMismatch.html b/tct-calendar-tizen-tests/calendar/Calendar_removeBatch_errorCallback_TypeMismatch.html index 457408b19..d6a25cea5 100644 --- a/tct-calendar-tizen-tests/calendar/Calendar_removeBatch_errorCallback_TypeMismatch.html +++ b/tct-calendar-tizen-tests/calendar/Calendar_removeBatch_errorCallback_TypeMismatch.html @@ -40,28 +40,27 @@ Authors: //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/calendar.html //==== TEST_CRITERIA MC var t = async_test(document.title), i, - calendar, ev1, ev_1, successCallback, conversionTable, errorCallback, exceptionName; + calendar, eventInit, calendarEvent, successCallback, conversionTable, errorCallback, exceptionName; t.step(function () { successCallback = t.step_func(function () { }); - ev1 = {description:"HTML5 Introduction", + eventInit = {description:"HTML5 Introduction", summary:"HTML5 Webinar ", startDate: new tizen.TZDate(2011, 3, 30, 10, 0), duration: new tizen.TimeDuration(1, "HOURS"), location:"Huesca"}; calendar = tizen.calendar.getDefaultCalendar("EVENT"); - ev_1 = new tizen.CalendarEvent(ev1); - calendar.add(ev_1); + calendarEvent = new tizen.CalendarEvent(eventInit); + calendar.add(calendarEvent); conversionTable = getTypeConversionExceptions("functionObject", true); for (i = 0; i < conversionTable.length; i++) { errorCallback = conversionTable[i][0]; exceptionName = conversionTable[i][1]; - assert_throws({name: exceptionName}, - function () { - calendar.removeBatch([ev_1.id, 123], successCallback, errorCallback); - }, exceptionName + " should be thrown - given incorrect id."); + assert_throws({name: exceptionName}, function () { + calendar.removeBatch([calendarEvent.id, 123], successCallback, errorCallback); + }, exceptionName + " should be thrown - given incorrect ids."); } cleanup(calendar); t.done(); diff --git a/tct-calendar-tizen-tests/calendar/Calendar_removeBatch_errorCallback_invalid_cb.html b/tct-calendar-tizen-tests/calendar/Calendar_removeBatch_errorCallback_invalid_cb.html index 202721de8..6f4b9f162 100644 --- a/tct-calendar-tizen-tests/calendar/Calendar_removeBatch_errorCallback_invalid_cb.html +++ b/tct-calendar-tizen-tests/calendar/Calendar_removeBatch_errorCallback_invalid_cb.html @@ -34,7 +34,7 @@ Authors: