projects / test / tct / web / api.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9ddf05d)
[Calendar] CalendarAtendee.contactRef - ensure contact exists
authorTomasz Kusmierz <t.kusmierz@samsung.com>
Wed, 21 Aug 2013 10:13:53 +0000 (12:13 +0200)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Wed, 21 Aug 2013 13:37:17 +0000 (13:37 +0000)
Change-Id: I3a14b161e28fdbe12922c292feb51c424ba4271d

tct-calendar-tizen-tests/calendar/CalendarAttendee_attribute_valid_CalendarTask.html patch | blob | history
tct-calendar-tizen-tests/calendar/CalendarAttendee_attribute_valid_value_CalendarEvent.html patch | blob | history
tct-calendar-tizen-tests/calendar/CalendarAttendee_contactRef_attribute.html patch | blob | history
tct-calendar-tizen-tests/calendar/CalendarAttendee_delegateURI_attribute.html patch | blob | history
tct-calendar-tizen-tests/calendar/CalendarAttendee_delegatorURI_attribute.html patch | blob | history
tct-calendar-tizen-tests/calendar/CalendarAttendee_group_attribute.html patch | blob | history
tct-calendar-tizen-tests/calendar/CalendarAttendee_name_attribute.html patch | blob | history
tct-calendar-tizen-tests/calendar/CalendarAttendee_uri_attribute.html patch | blob | history
tct-calendar-tizen-tests/calendar/Calendar_addBatch_with_errorCallback.html patch | blob | history
tct-calendar-tizen-tests/calendar/support/calendar_common.js patch | blob | history

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 0e29896a16fb999ebf2c0c33117634959aa1ac3c..cf82fe1dcbca70f3b84ec54ab5fb12151dc37d8d 100644 (file)
--- 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:
 <html lang="en">
 
 <head>
-<title>calendar/UTC_calendar</title>
+<title>CalendarAttendee_attribute_valid_CalendarTask</title>
 <meta charset="utf-8">
-<script>window.onerror = function(e) { console.log(e); }; </script>
-<!-- <link rel="stylesheet" href="../style.css"/> -->
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/calendar_common.js"></script>
 </head>
@@ -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 f5ffb38f8a4db80d0cf3027aeb6808b31ca77461..b14cfe197f9186d3f1b5b9a3e93276c5a3c85ca3 100644 (file)
--- 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:
 <html lang="en">
 
 <head>
-<title>calendar/UTC_calendar</title>
+<title>CalendarAttendee_attribute_valid_value_CalendarEvent</title>
 <meta charset="utf-8">
-<script>window.onerror = function(e) { console.log(e); }; </script>
-<!-- <link rel="stylesheet" href="../style.css"/> -->
 <script type="text/javascript" src="../resources/unitcommon.js"></script>
 <script type="text/javascript" src="support/calendar_common.js"></script>
 </head>
@@ -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 ad42f1323c2d11f1a8e9bd0f2ec37953ff18e43a..b0443b5294550201e13be44c2264a5a7750e8e03 100644 (file)
--- 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 342913aec69daefb5c3e99df40071b1a828e753c..038d9cd3b24c56e2b15476d8007ad5fba5558c1b 100644 (file)
--- 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 6c4e851bd8da2c98ea1842c26c6f5a137bdbab71..9b0ff3a2826a19459cb856524f2938828f8ea89d 100644 (file)
--- 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 0559ae0182861ce4babc1f14d6f13c55c02fd006..0f0201fe1ab48a8829a8ff6014abf99100ddd2ee 100644 (file)
--- 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 24db5c77cfb17a560b26085a233f3819597e8443..3064e1844e56b2d9a20182568e77394f97dc4e83 100644 (file)
--- 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 565af69bd7366728eb2623e36693a094e9e34fb0..a0db5a82c638e3789239edea116a325c623b8fe9 100644 (file)
--- 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 7218eb3a3870fdec01a119d4b5fc2dd95567fadf..40e11e638406383b5f66559a8cf75e96f397b389 100644 (file)
--- 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 626f58cc45e7b604a658f48a78f29cc81b12c06e..fd6867f9a308efeef5c14387faaa5f62671ad6eb 100644 (file)
--- 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;
+}
Domain: Testing;