[Contact] Fixed TTS-1926 Contact.groupIds attribute

Change-Id: I462475793514cfe9c3160a748243a4f97f61c152

diff --git a/tct-contact-tizen-tests/contact/Contact_addressBookId_attribute.html b/tct-contact-tizen-tests/contact/Contact_addressBookId_attribute.html
index a51e6c46eb41428a836f3c12eea2046632cab074..a1a1a7dce31d24cdf5435b80de4c2bb012c42b20 100644 (file)
--- a/tct-contact-tizen-tests/contact/Contact_addressBookId_attribute.html
+++ b/tct-contact-tizen-tests/contact/Contact_addressBookId_attribute.html
@@ -63,8 +63,7 @@ test(function () {
         })],
         notes: ["Lorem Ipsum"],
         urls: [new tizen.ContactWebSite("http://www.domain.com", "BLOG")],
-        ringtoneURI: TEST_RING_1,
-        groupIds: [new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1)]
+        ringtoneURI: TEST_RING_1
     });
     assert_own_property(contact, "addressBookId", "Contact doesn't own addressBookId property.");
     assert_equals(contact.addressBookId, null, "contact.addressBookId attribute.");

diff --git a/tct-contact-tizen-tests/contact/Contact_addresses_attribute.html b/tct-contact-tizen-tests/contact/Contact_addresses_attribute.html
index 69cd255f935344b91a6287c22993e27d2b4d311f..ed22cae31502a13a5075ea6fa4ce720a5d366782 100644 (file)
--- a/tct-contact-tizen-tests/contact/Contact_addresses_attribute.html
+++ b/tct-contact-tizen-tests/contact/Contact_addresses_attribute.html
@@ -70,8 +70,7 @@ test(function () {
         })],
         notes: ["Lorem Ipsum"],
         urls: [new tizen.ContactWebSite("http://www.domain.com", "BLOG")],
-        ringtoneURI: TEST_RING_1,
-        groupIds: [new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1)]
+        ringtoneURI: TEST_RING_1
     });
     assert_own_property(contact, "addresses", "Contact doesn't own addresses property.");
     assert_equals(contact.addresses[0].country, contactAddress.country, "addresses.country attribute.");

diff --git a/tct-contact-tizen-tests/contact/Contact_anniversaries_attribute.html b/tct-contact-tizen-tests/contact/Contact_anniversaries_attribute.html
index eaee672a8803239008a447916263cdeafc6ae8bd..24e6c83117dfc4b99eaf5d67dae3a0a730ba0133 100644 (file)
--- a/tct-contact-tizen-tests/contact/Contact_anniversaries_attribute.html
+++ b/tct-contact-tizen-tests/contact/Contact_anniversaries_attribute.html
@@ -65,8 +65,7 @@ test(function () {
         })],
         notes: ["Lorem Ipsum"],
         urls: [new tizen.ContactWebSite("http://www.domain.com", "BLOG")],
-        ringtoneURI: TEST_RING_1,
-        groupIds: [new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1)]
+        ringtoneURI: TEST_RING_1
     });
     assert_own_property(contact, "anniversaries", "Contact doesn't own anniversaries property.");
     assert_equals(contact.anniversaries[0].date.toString(), anniversaries.date.toString(), "anniversaries.date attribute.");

diff --git a/tct-contact-tizen-tests/contact/Contact_birthday_attribute.html b/tct-contact-tizen-tests/contact/Contact_birthday_attribute.html
index b806fc0947ff51c73f85e7e37ad203db31d1fa48..7402c15600e07e171b6f006c889fde09245e369d 100644 (file)
--- a/tct-contact-tizen-tests/contact/Contact_birthday_attribute.html
+++ b/tct-contact-tizen-tests/contact/Contact_birthday_attribute.html
@@ -63,8 +63,7 @@ test(function () {
         })],
         notes: ["Lorem Ipsum"],
         urls: [new tizen.ContactWebSite("http://www.domain.com", "BLOG")],
-        ringtoneURI: TEST_RING_1,
-        groupIds: [new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1)]
+        ringtoneURI: TEST_RING_1
     });
     assert_own_property(contact, "birthday", "Contact doesn't own birthday property.");
     assert_equals(contact.birthday.toString(), new Date(1980, 3, 4).toString(), "birthday attribute.");

diff --git a/tct-contact-tizen-tests/contact/Contact_emails_attribute.html b/tct-contact-tizen-tests/contact/Contact_emails_attribute.html
index c150503fe8c7aa568116670b83048e021c89c10c..6b5b202f2b10543848a3268a155ac6c59b74b8f2 100644 (file)
--- a/tct-contact-tizen-tests/contact/Contact_emails_attribute.html
+++ b/tct-contact-tizen-tests/contact/Contact_emails_attribute.html
@@ -65,8 +65,7 @@ test(function () {
         })],
         notes:["Lorem Ipsum"],
         urls: [new tizen.ContactWebSite("http://www.domain.com", "BLOG")],
-        ringtoneURI: TEST_RING_1,
-        groupIds: [new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1)]
+        ringtoneURI: TEST_RING_1
     });
     assert_own_property(contact, "emails", "Contact doesn't own emails property.");
     assert_equals(contact.emails[0].email, contactEmailAddress.email, "contact.email attribute.");

diff --git a/tct-contact-tizen-tests/contact/Contact_groupIds_attribute.html b/tct-contact-tizen-tests/contact/Contact_groupIds_attribute.html
index 708fa779e9bbcad1397de1d4553d624260e1c5ab..483e2c945ec4b635af8f2c737fb7c8d0ebf9f284 100644 (file)
--- a/tct-contact-tizen-tests/contact/Contact_groupIds_attribute.html
+++ b/tct-contact-tizen-tests/contact/Contact_groupIds_attribute.html
@@ -37,9 +37,15 @@ Authors:
 //==== TEST_CRITERIA AE AT ASG AN
 
 test(function () {
-    var contact, contactGroupId, newContactGroupId;
-    contactGroupId = new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1);
-    newContactGroupId = new tizen.ContactGroup("Family1", TEST_RING_2, TEST_IMAGE_1);
+    var contact, addressBook, contactGroup, contactGroupId, newContactGroup, newContactGroupId;
+    addressBook = tizen.contact.getDefaultAddressBook();
+    contactGroup = new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1);
+    addressBook.addGroup(contactGroup);
+    contactGroupId = contactGroup.id;
+    newContactGroup = new tizen.ContactGroup("Family1", TEST_RING_2, TEST_IMAGE_1);
+    addressBook.addGroup(newContactGroup);
+    newContactGroupId = newContactGroup.id;
+
     contact = new tizen.Contact({
         name: new tizen.ContactName({
             firstName: "John",
@@ -66,18 +72,21 @@ test(function () {
         notes: ["Lorem Ipsum"],
         urls: [new tizen.ContactWebSite("http://www.domain.com", "BLOG")],
         ringtoneURI: TEST_RING_1,
-        groupIds: [new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1)]
+        groupIds: [contactGroupId]
     });
     assert_own_property(contact, "groupIds", "Contact doesn't own groupIds property.");
-    assert_equals(contact.groupIds[0].groupIds, contactGroupId.groupIds, "groupIds.email attribute.");
     assert_type(contact.groupIds, "array", "contact.groupIds type chceck");
     assert_equals(contact.groupIds.length, 1, "contact.groupIds.length chceck");
+    assert_equals(contact.groupIds[0].groupIds, contactGroupId.groupIds, "groupIds.groupIds attribute.");
     contact.groupIds = [newContactGroupId];
-    assert_equals(contact.groupIds[0].email, newContactGroupId.groupIds, "groupIds.email attribute.");
-    assert_type(contact.groupIds, "array", "contact.groupIds type chceck");
-    assert_equals(contact.groupIds.length, 1, "contact.groupIds.length chceck");
+    assert_type(contact.groupIds, "array", "contact.groupIds type chcec after assign attempt");
+    assert_equals(contact.groupIds.length, 1, "contact.groupIds.length chcec after assign attempt");
+    assert_equals(contact.groupIds[0].groupIds, newContactGroupId.groupIds, "groupIds.groupIds attribute after assign attempt");
     contact.groupIds = null;
     assert_not_equals(contact.groupIds, null, "operation no accept null");
+
+    addressBook.removeGroup(contactGroupId);
+    addressBook.removeGroup(newContactGroupId);
 }, "Contact_groupIds_attribute");
 
 </script>

diff --git a/tct-contact-tizen-tests/contact/Contact_id_attribute.html b/tct-contact-tizen-tests/contact/Contact_id_attribute.html
index 61e1889c1d21190b2e887e5aef08aaa937e87f92..4c8bb2ec819c51e3f877753f85995892787b9f58 100644 (file)
--- a/tct-contact-tizen-tests/contact/Contact_id_attribute.html
+++ b/tct-contact-tizen-tests/contact/Contact_id_attribute.html
@@ -63,8 +63,7 @@ test(function () {
         })],
         notes: ["Lorem Ipsum"],
         urls: [new tizen.ContactWebSite("http://www.domain.com", "BLOG")],
-        ringtoneURI: TEST_RING_1,
-        groupIds: [new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1)]
+        ringtoneURI: TEST_RING_1
     });
     assert_own_property(contact, "id", "Contact doesn't own id property.");
     assert_equals(contact.id, null, "contact.id attribute.");

diff --git a/tct-contact-tizen-tests/contact/Contact_isFavorite_attribute.html b/tct-contact-tizen-tests/contact/Contact_isFavorite_attribute.html
index 1b2258db85911ea38c08f65d6f1b981e450da958..ef731a0830314e1e5f89b30d0ae8562415d46365 100644 (file)
--- a/tct-contact-tizen-tests/contact/Contact_isFavorite_attribute.html
+++ b/tct-contact-tizen-tests/contact/Contact_isFavorite_attribute.html
@@ -63,8 +63,7 @@ test(function () {
         })],
         notes: ["Lorem Ipsum"],
         urls: [new tizen.ContactWebSite("http://www.domain.com", "BLOG")],
-        ringtoneURI: TEST_RING_1,
-        groupIds: [new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1)]
+        ringtoneURI: TEST_RING_1
     });
     assert_own_property(contact, "isFavorite", "Contact doesn't own isFavorite property.");
     assert_equals(contact.isFavorite, false, "contact.isFavorite attribute.");

diff --git a/tct-contact-tizen-tests/contact/Contact_lastUpdated_attribute.html b/tct-contact-tizen-tests/contact/Contact_lastUpdated_attribute.html
index 89b8d0146a9e3f8c9d00c41c409400e80cc4251b..7ae4eedd0c7754cd614e8cdb124ff205d3ddf75a 100644 (file)
--- a/tct-contact-tizen-tests/contact/Contact_lastUpdated_attribute.html
+++ b/tct-contact-tizen-tests/contact/Contact_lastUpdated_attribute.html
@@ -63,8 +63,7 @@ test(function () {
         })],
         notes: ["Lorem Ipsum"],
         urls: [new tizen.ContactWebSite("http://www.domain.com", "BLOG")],
-        ringtoneURI: TEST_RING_1,
-        groupIds: [new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1)]
+        ringtoneURI: TEST_RING_1
     });
     assert_own_property(contact, "lastUpdated", "Contact doesn't own lastUpdated property.");
     assert_equals(contact.lastUpdated, null, "contact.lastUpdated attribute.");

diff --git a/tct-contact-tizen-tests/contact/Contact_name_attribute.html b/tct-contact-tizen-tests/contact/Contact_name_attribute.html
index 47c6a71e9923b82a7fa69ae27f55208c634d2556..12b983824cd1624e54e87a030662f68aa8af4f15 100644 (file)
--- a/tct-contact-tizen-tests/contact/Contact_name_attribute.html
+++ b/tct-contact-tizen-tests/contact/Contact_name_attribute.html
@@ -69,8 +69,7 @@ test(function () {
         })],
         notes: ["Lorem Ipsum"],
         urls: [new tizen.ContactWebSite("http://www.domain.com", "BLOG")],
-        ringtoneURI: TEST_RING_1,
-        groupIds: [new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1)]
+        ringtoneURI: TEST_RING_1
     });
     assert_own_property(contact, "name", "Contact doesn't own addresses property.");
     assert_true(contact.name instanceof tizen.ContactName, "InstanceOf.");

diff --git a/tct-contact-tizen-tests/contact/Contact_notes_attribute.html b/tct-contact-tizen-tests/contact/Contact_notes_attribute.html
index c96ea59b4d959d00b2c9ee525bed1f16d88ae771..5b5a60e753841d8bfbc41e93d1c277f024bff785 100644 (file)
--- a/tct-contact-tizen-tests/contact/Contact_notes_attribute.html
+++ b/tct-contact-tizen-tests/contact/Contact_notes_attribute.html
@@ -63,8 +63,7 @@ test(function () {
         })],
         notes:["Lorem Ipsum"],
         urls: [new tizen.ContactWebSite("http://www.domain.com", "BLOG")],
-        ringtoneURI: TEST_RING_1,
-        groupIds: [new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1)]
+        ringtoneURI: TEST_RING_1
     });
     assert_own_property(contact, "notes", "Contact doesn't own notes property.");
     assert_equals(contact.notes[0], "Lorem Ipsum", "contact.notes attribute.");

diff --git a/tct-contact-tizen-tests/contact/Contact_organizations_attribute.html b/tct-contact-tizen-tests/contact/Contact_organizations_attribute.html
index d6f7a9f4a181b832e57156405c36eb6e88f51831..b03c801627e4f72e0f4b283c2e659bb71b5ae53a 100644 (file)
--- a/tct-contact-tizen-tests/contact/Contact_organizations_attribute.html
+++ b/tct-contact-tizen-tests/contact/Contact_organizations_attribute.html
@@ -65,8 +65,7 @@ test(function () {
         organizations: [contactOrganization],
         notes: ["Lorem Ipsum"],
         urls: [new tizen.ContactWebSite("http://www.domain.com", "BLOG")],
-        ringtoneURI: TEST_RING_1,
-        groupIds: [new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1)]
+        ringtoneURI: TEST_RING_1
     });
     assert_own_property(contact, "addresses", "Contact doesn't own addresses property.");
     assert_equals(contact.organizations[0].name, contactOrganization.name, "name.country attribute.");

diff --git a/tct-contact-tizen-tests/contact/Contact_personId_attribute.html b/tct-contact-tizen-tests/contact/Contact_personId_attribute.html
index e2f2497595e7a7ea715d61eab80c0b319362beb4..14da14a0450392c4ebc84b1f1b22d3002b6f4cc9 100644 (file)
--- a/tct-contact-tizen-tests/contact/Contact_personId_attribute.html
+++ b/tct-contact-tizen-tests/contact/Contact_personId_attribute.html
@@ -63,8 +63,7 @@ test(function () {
         })],
         notes: ["Lorem Ipsum"],
         urls: [new tizen.ContactWebSite("http://www.domain.com", "BLOG")],
-        ringtoneURI: TEST_RING_1,
-        groupIds: [new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1)]
+        ringtoneURI: TEST_RING_1
     });
     assert_own_property(contact, "personId", "Contact doesn't own personId property.");
     assert_equals(contact.personId, null, "contact.personId attribute.");

diff --git a/tct-contact-tizen-tests/contact/Contact_phoneNumbers_attribute.html b/tct-contact-tizen-tests/contact/Contact_phoneNumbers_attribute.html
index adc8c6e7ab45d59bdc0206eeb59e8ce2a659b25e..be332b095a007290f6003e13c8517ef231a4ea4a 100644 (file)
--- a/tct-contact-tizen-tests/contact/Contact_phoneNumbers_attribute.html
+++ b/tct-contact-tizen-tests/contact/Contact_phoneNumbers_attribute.html
@@ -65,8 +65,7 @@ test(function () {
         })],
         notes: ["Lorem Ipsum"],
         urls: [new tizen.ContactWebSite("http://www.domain.com", "BLOG")],
-        ringtoneURI: TEST_RING_1,
-        groupIds: [new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1)]
+        ringtoneURI: TEST_RING_1
     });
     assert_own_property(contact, "phoneNumbers", "Contact doesn't own phoneNumbers property.");
     assert_equals(contact.phoneNumbers[0].number, contactPhoneNumber.number, "phoneNumbers.number attribute.");

diff --git a/tct-contact-tizen-tests/contact/Contact_photoURI_attribute.html b/tct-contact-tizen-tests/contact/Contact_photoURI_attribute.html
index d8b52d9ee70f063b9ffed6de8e078c9d75a2682f..2f56ec727a30f8cf66e52111a2763d0984ce111f 100644 (file)
--- a/tct-contact-tizen-tests/contact/Contact_photoURI_attribute.html
+++ b/tct-contact-tizen-tests/contact/Contact_photoURI_attribute.html
@@ -63,8 +63,7 @@ test(function () {
         })],
         notes: ["Lorem Ipsum"],
         urls: [new tizen.ContactWebSite("http://www.domain.com", "BLOG")],
-        ringtoneURI: TEST_RING_1,
-        groupIds: [new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1)]
+        ringtoneURI: TEST_RING_1
     });
     assert_own_property(contact, "photoURI", "Contact doesn't own photoURI property.");
     assert_equals(contact.photoURI, TEST_IMAGE_1, "contact.photoURI attribute.");

diff --git a/tct-contact-tizen-tests/contact/Contact_ringtoneURI_attribute.html b/tct-contact-tizen-tests/contact/Contact_ringtoneURI_attribute.html
index 132fcd37a0b72ede35b967440dc237b878deb168..a97d714171b68ac778feab8d8fcc98f3db8c2f47 100644 (file)
--- a/tct-contact-tizen-tests/contact/Contact_ringtoneURI_attribute.html
+++ b/tct-contact-tizen-tests/contact/Contact_ringtoneURI_attribute.html
@@ -63,8 +63,7 @@ test(function () {
         })],
         notes: ["Lorem Ipsum"],
         urls: [new tizen.ContactWebSite("http://www.domain.com", "BLOG")],
-        ringtoneURI: TEST_RING_1,
-        groupIds: [new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1)]
+        ringtoneURI: TEST_RING_1
     });
     assert_own_property(contact, "ringtoneURI", "Contact doesn't own ringtoneURI property.");
     assert_equals(contact.ringtoneURI, TEST_RING_1, "contact.ringtoneURI attribute.");

diff --git a/tct-contact-tizen-tests/contact/Contact_urls_attribute.html b/tct-contact-tizen-tests/contact/Contact_urls_attribute.html
index 04ec003ac79928f208b486632c97780bbdae29e6..c522a27a19ff63211ea6e74888c0859f5aede158 100644 (file)
--- a/tct-contact-tizen-tests/contact/Contact_urls_attribute.html
+++ b/tct-contact-tizen-tests/contact/Contact_urls_attribute.html
@@ -65,8 +65,7 @@ test(function () {
         })],
         notes:["Lorem Ipsum"],
         urls: [contactEmailAddress],
-        ringtoneURI: TEST_RING_1,
-        groupIds: [new tizen.ContactGroup("Family", TEST_RING_1, TEST_IMAGE_1)]
+        ringtoneURI: TEST_RING_1
     });
     assert_own_property(contact, "urls", "Contact doesn't own urls property.");
     assert_equals(contact.urls[0].url, contactEmailAddress.url, "contact.urls.url attribute.");