From: Tomasz Kusmierz Date: Wed, 21 Aug 2013 10:13:53 +0000 (+0200) Subject: [Calendar] CalendarAtendee.contactRef - ensure contact exists X-Git-Tag: 2.2.1_release~114^2~81 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef3f312a53b17adaad2f057080c335f5c7907c27;p=test%2Ftct%2Fweb%2Fapi.git [Calendar] CalendarAtendee.contactRef - ensure contact exists Change-Id: I3a14b161e28fdbe12922c292feb51c424ba4271d --- diff --git a/tct-calendar-tizen-tests/calendar/CalendarAttendee_attribute_valid_CalendarTask.html b/tct-calendar-tizen-tests/calendar/CalendarAttendee_attribute_valid_CalendarTask.html index 0e29896a1..cf82fe1dc 100644 --- a/tct-calendar-tizen-tests/calendar/CalendarAttendee_attribute_valid_CalendarTask.html +++ b/tct-calendar-tizen-tests/calendar/CalendarAttendee_attribute_valid_CalendarTask.html @@ -23,10 +23,8 @@ Authors: -calendar/UTC_calendar +CalendarAttendee_attribute_valid_CalendarTask - - @@ -43,7 +41,10 @@ Authors: //==== TEST_CRITERIA test(function () { var originalTask, retrievedTask, originalAttendee, retrievedAttendee, - taskCalendar = tizen.calendar.getDefaultCalendar("TASK"); + taskCalendar = tizen.calendar.getDefaultCalendar("TASK"), contactRef; + + contactRef = new tizen.ContactRef("1", "2"); + contactRef = ensureContactRefIsValid(contactRef); originalAttendee = new tizen.CalendarAttendee("jo@gg.com", { name: "Jo", @@ -54,7 +55,7 @@ test(function () { group: "work", delegatorURI: "a.com", delegateURI: "b.com", - contactRef: new tizen.ContactRef("1", "2") + contactRef: contactRef }); originalTask = new tizen.CalendarTask({ @@ -76,8 +77,10 @@ test(function () { assert_equals(originalAttendee.group, retrievedAttendee.group, "See if the group equals."); assert_equals(originalAttendee.delegatorURI, retrievedAttendee.delegatorURI, "See if the delegatorURI equals."); assert_equals(originalAttendee.delegateURI, retrievedAttendee.delegateURI, "See if the delegateURI equals."); - assert_equals(originalAttendee.contactRef.addressBookId, retrievedAttendee.contactRef.addressBookId, "See if the contactRef.addressBookId equals."); - assert_equals(originalAttendee.contactRef.contactId, retrievedAttendee.contactRef.contactId, "See if the contactRef.contactId equals."); + assert_equals(originalAttendee.contactRef.addressBookId, retrievedAttendee.contactRef.addressBookId, + "See if the contactRef.addressBookId equals."); + assert_equals(originalAttendee.contactRef.contactId, retrievedAttendee.contactRef.contactId, + "See if the contactRef.contactId equals."); }, "CalendarAttendee_attribute_valid_CalendarTask"); diff --git a/tct-calendar-tizen-tests/calendar/CalendarAttendee_attribute_valid_value_CalendarEvent.html b/tct-calendar-tizen-tests/calendar/CalendarAttendee_attribute_valid_value_CalendarEvent.html index f5ffb38f8..b14cfe197 100644 --- a/tct-calendar-tizen-tests/calendar/CalendarAttendee_attribute_valid_value_CalendarEvent.html +++ b/tct-calendar-tizen-tests/calendar/CalendarAttendee_attribute_valid_value_CalendarEvent.html @@ -23,10 +23,8 @@ Authors: -calendar/UTC_calendar +CalendarAttendee_attribute_valid_value_CalendarEvent - - @@ -43,7 +41,10 @@ Authors: //==== TEST_CRITERIA test(function () { var originalEvent, retrievedEvent, originalAttendee, retrievedAttendee, - eventCalendar = tizen.calendar.getDefaultCalendar("EVENT"); + eventCalendar = tizen.calendar.getDefaultCalendar("EVENT"), contactRef; + + contactRef = new tizen.ContactRef("1", "2"); + contactRef = ensureContactRefIsValid(contactRef); originalAttendee = new tizen.CalendarAttendee("jo@gg.com", { name: "Jo", @@ -54,7 +55,7 @@ test(function () { group: "work", delegatorURI: "a.com", delegateURI: "b.com", - contactRef: new tizen.ContactRef("1", "2") + contactRef: contactRef }); originalEvent = new tizen.CalendarEvent({ @@ -76,8 +77,10 @@ test(function () { assert_equals(originalAttendee.group, retrievedAttendee.group, "See if the group equals."); assert_equals(originalAttendee.delegatorURI, retrievedAttendee.delegatorURI, "See if the delegatorURI equals."); assert_equals(originalAttendee.delegateURI, retrievedAttendee.delegateURI, "See if the delegateURI equals."); - assert_equals(originalAttendee.contactRef.addressBookId, retrievedAttendee.contactRef.addressBookId, "See if the contactRef.addressBookId equals."); - assert_equals(originalAttendee.contactRef.contactId, retrievedAttendee.contactRef.contactId, "See if the contactRef.contactId equals."); + assert_equals(originalAttendee.contactRef.addressBookId, retrievedAttendee.contactRef.addressBookId, + "See if the contactRef.addressBookId equals."); + assert_equals(originalAttendee.contactRef.contactId, retrievedAttendee.contactRef.contactId, + "See if the contactRef.contactId equals."); }, "CalendarAttendee_attribute_valid_value_CalendarEvent"); diff --git a/tct-calendar-tizen-tests/calendar/CalendarAttendee_contactRef_attribute.html b/tct-calendar-tizen-tests/calendar/CalendarAttendee_contactRef_attribute.html index ad42f1323..b0443b529 100644 --- a/tct-calendar-tizen-tests/calendar/CalendarAttendee_contactRef_attribute.html +++ b/tct-calendar-tizen-tests/calendar/CalendarAttendee_contactRef_attribute.html @@ -37,9 +37,12 @@ Authors: //==== TEST_CRITERIA AE AT ASG test(function () { - var attendee_init, uri, calendarAttendee; + var attendee_init, uri, calendarAttendee, contactRef; - attendee_init = {name:"attendee1", + contactRef = new tizen.ContactRef("1", "2"); + contactRef = ensureContactRefIsValid(contactRef); + attendee_init = { + name:"attendee1", role: "CHAIR", group: "group1", status: "ACCEPTED", @@ -47,7 +50,8 @@ test(function () { type: "GROUP", delegatorURI: "mailto:delegator@domain.com", delegateURI: "mailto:delegate@domain.com", - contactRef: new tizen.ContactRef("1", "2")}; + contactRef: contactRef + }; uri = "mailto:attendee2@domain.com"; @@ -57,15 +61,17 @@ test(function () { assert_true(calendarAttendee.contactRef instanceof tizen.ContactRef, "calendarAttendee.contactRef should be type of ContactRef."); - assert_equals(calendarAttendee.contactRef.addressBookId, "1", + assert_equals(calendarAttendee.contactRef.addressBookId, contactRef.addressBookId, "calendarAttendee.contactRef.addressBookId should equals to init value."); - assert_equals(calendarAttendee.contactRef.contactId, "2", + assert_equals(calendarAttendee.contactRef.contactId, contactRef.contactId, "calendarAttendee.contactRef.contactId should have equals to value."); - calendarAttendee.contactRef = new tizen.ContactRef("3", "4"); - assert_equals(calendarAttendee.contactRef.addressBookId, "3", + contactRef = new tizen.ContactRef("3", "4"); + contactRef = ensureContactRefIsValid(contactRef); + calendarAttendee.contactRef = contactRef; + assert_equals(calendarAttendee.contactRef.addressBookId, contactRef.addressBookId, "calendarAttendee.contactRef.addressBookId should equals to updated value."); - assert_equals(calendarAttendee.contactRef.contactId, "4", + assert_equals(calendarAttendee.contactRef.contactId, contactRef.contactId, "calendarAttendee.contactRef.contactId should equals to updated value."); }, "CalendarAttendee_contactRef_attribute"); diff --git a/tct-calendar-tizen-tests/calendar/CalendarAttendee_delegateURI_attribute.html b/tct-calendar-tizen-tests/calendar/CalendarAttendee_delegateURI_attribute.html index 342913aec..038d9cd3b 100644 --- a/tct-calendar-tizen-tests/calendar/CalendarAttendee_delegateURI_attribute.html +++ b/tct-calendar-tizen-tests/calendar/CalendarAttendee_delegateURI_attribute.html @@ -37,9 +37,13 @@ Authors: //==== TEST_CRITERIA AE AT ASG test(function () { - var attendee_init, uri, calendarAttendee; + var attendee_init, uri, calendarAttendee, contactRef; - attendee_init = {name:"attendee1", + contactRef = new tizen.ContactRef("1", "2"); + contactRef = ensureContactRefIsValid(contactRef); + + attendee_init = { + name:"attendee1", role: "CHAIR", group: "group1", status: "ACCEPTED", @@ -47,7 +51,8 @@ test(function () { type: "GROUP", delegatorURI: "mailto:delegator@domain.com", delegateURI: "mailto:delegate@domain.com", - contactRef: new tizen.ContactRef("1", "2")}; + contactRef: contactRef + }; uri = "mailto:attendee2@domain.com"; diff --git a/tct-calendar-tizen-tests/calendar/CalendarAttendee_delegatorURI_attribute.html b/tct-calendar-tizen-tests/calendar/CalendarAttendee_delegatorURI_attribute.html index 6c4e851bd..9b0ff3a28 100644 --- a/tct-calendar-tizen-tests/calendar/CalendarAttendee_delegatorURI_attribute.html +++ b/tct-calendar-tizen-tests/calendar/CalendarAttendee_delegatorURI_attribute.html @@ -37,9 +37,13 @@ Authors: //==== TEST_CRITERIA AE AT ASG test(function () { - var attendee_init, uri, calendarAttendee; + var attendee_init, uri, calendarAttendee, contactRef; - attendee_init = {name:"attendee1", + contactRef = new tizen.ContactRef("1", "2"); + contactRef = ensureContactRefIsValid(contactRef); + + attendee_init = { + name:"attendee1", role: "CHAIR", group: "group1", status: "ACCEPTED", @@ -47,7 +51,8 @@ test(function () { type: "GROUP", delegatorURI: "mailto:delegator@domain.com", delegateURI: "mailto:delegate@domain.com", - contactRef: new tizen.ContactRef("1", "2")}; + contactRef: contactRef + }; uri = "mailto:attendee2@domain.com"; diff --git a/tct-calendar-tizen-tests/calendar/CalendarAttendee_group_attribute.html b/tct-calendar-tizen-tests/calendar/CalendarAttendee_group_attribute.html index 0559ae018..0f0201fe1 100644 --- a/tct-calendar-tizen-tests/calendar/CalendarAttendee_group_attribute.html +++ b/tct-calendar-tizen-tests/calendar/CalendarAttendee_group_attribute.html @@ -37,9 +37,13 @@ Authors: //==== TEST_CRITERIA AE AT ASG test(function () { - var attendee_init, uri, calendarAttendee; + var attendee_init, uri, calendarAttendee, contactRef; - attendee_init = {name:"attendee1", + contactRef = new tizen.ContactRef("1", "2"); + contactRef = ensureContactRefIsValid(contactRef); + + attendee_init = { + name:"attendee1", role: "CHAIR", group: "group1", status: "ACCEPTED", @@ -47,7 +51,8 @@ test(function () { type: "GROUP", delegatorURI: "mailto:delegator@domain.com", delegateURI: "mailto:delegate@domain.com", - contactRef: new tizen.ContactRef("1", "2")}; + contactRef: contactRef + }; uri = "mailto:attendee2@domain.com"; diff --git a/tct-calendar-tizen-tests/calendar/CalendarAttendee_name_attribute.html b/tct-calendar-tizen-tests/calendar/CalendarAttendee_name_attribute.html index 24db5c77c..3064e1844 100644 --- a/tct-calendar-tizen-tests/calendar/CalendarAttendee_name_attribute.html +++ b/tct-calendar-tizen-tests/calendar/CalendarAttendee_name_attribute.html @@ -37,9 +37,13 @@ Authors: //==== TEST_CRITERIA AE AT ASG test(function () { - var attendee_init, uri, calendarAttendee; + var attendee_init, uri, calendarAttendee, contactRef; - attendee_init = {name:"attendee1", + contactRef = new tizen.ContactRef("1", "2"); + contactRef = ensureContactRefIsValid(contactRef); + + attendee_init = { + name:"attendee1", role: "CHAIR", group: "group1", status: "ACCEPTED", @@ -47,7 +51,8 @@ test(function () { type: "GROUP", delegatorURI: "mailto:delegator@domain.com", delegateURI: "mailto:delegate@domain.com", - contactRef: new tizen.ContactRef("1", "2")}; + contactRef: contactRef + }; uri = "mailto:attendee2@domain.com"; diff --git a/tct-calendar-tizen-tests/calendar/CalendarAttendee_uri_attribute.html b/tct-calendar-tizen-tests/calendar/CalendarAttendee_uri_attribute.html index 565af69bd..a0db5a82c 100644 --- a/tct-calendar-tizen-tests/calendar/CalendarAttendee_uri_attribute.html +++ b/tct-calendar-tizen-tests/calendar/CalendarAttendee_uri_attribute.html @@ -37,9 +37,13 @@ Authors: //==== TEST_CRITERIA AE AT ASG AN test(function () { - var attendee_init, uri, calendarAttendee; + var attendee_init, uri, calendarAttendee, contactRef; - attendee_init = {name:"attendee1", + contactRef = new tizen.ContactRef("1", "2"); + contactRef = ensureContactRefIsValid(contactRef); + + attendee_init = { + name:"attendee1", role: "CHAIR", group: "group1", status: "ACCEPTED", @@ -47,7 +51,8 @@ test(function () { type: "GROUP", delegatorURI: "mailto:delegator@domain.com", delegateURI: "mailto:delegate@domain.com", - contactRef: new tizen.ContactRef("1", "2")}; + contactRef: contactRef + }; uri = "mailto:attendee2@domain.com"; diff --git a/tct-calendar-tizen-tests/calendar/Calendar_addBatch_with_errorCallback.html b/tct-calendar-tizen-tests/calendar/Calendar_addBatch_with_errorCallback.html index 7218eb3a3..40e11e638 100644 --- a/tct-calendar-tizen-tests/calendar/Calendar_addBatch_with_errorCallback.html +++ b/tct-calendar-tizen-tests/calendar/Calendar_addBatch_with_errorCallback.html @@ -46,7 +46,7 @@ t.step(function () { eventCalendar = tizen.calendar.getDefaultCalendar("EVENT"); events = createTestEvents(); - onAddBatchErrorCB = t.step_func(function (eror) { + onAddBatchErrorCB = t.step_func(function (error) { assert_unreached("onAddBatch() error callaback invoked: " + error.name + ": " + error.message); }); diff --git a/tct-calendar-tizen-tests/calendar/support/calendar_common.js b/tct-calendar-tizen-tests/calendar/support/calendar_common.js index 626f58cc4..fd6867f9a 100644 --- a/tct-calendar-tizen-tests/calendar/support/calendar_common.js +++ b/tct-calendar-tizen-tests/calendar/support/calendar_common.js @@ -241,3 +241,20 @@ function createTestTasks() { location:'Seoul'}); return [task1, task2]; } +ensureContactRefIsValid = function (contactRef) { + var addressBook, testContact, getAddressBook; + + try { + getAddressBook = tizen.contact.getAddressBook(contactRef.addressBookId); + getAddressBook.get(contactRef.contactId); + } catch (error) { + addressBook = tizen.contact.getDefaultAddressBook(); + testContact = new tizen.Contact({ + name: new tizen.ContactName({firstName: "Test", lastName: "Contact"}) + }); + addressBook.add(testContact); + contactRef = new tizen.ContactRef(testContact.addressBookId, testContact.id); + } + + return contactRef; +}