[CalendarServer-changes] [9907] CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/ datastore

[source_changes at macosforge.org]

Revision: 9907
          http://trac.calendarserver.org//changeset/9907
Author:   gaya at apple.com
Date:     2012-10-08 16:05:51 -0700 (Mon, 08 Oct 2012)
Log Message:
-----------
add test case to test_addressbookObjectKind

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py
    CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/test/test_sql.py

Modified: CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py	2012-10-08 22:52:43 UTC (rev 9906)
+++ CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py	2012-10-08 23:05:51 UTC (rev 9907)
@@ -305,13 +305,13 @@
             self._md5 = component.md5
 
         componentResourceKindToAddressBookObjectKindMap = {
-            None: _ABO_KIND_PERSON,
             "person": _ABO_KIND_PERSON,
             "group": _ABO_KIND_GROUP,
             "resource": _ABO_KIND_RESOURCE,
             "location": _ABO_KIND_LOCATION,
         }
-        self._kind = componentResourceKindToAddressBookObjectKindMap[component.resourceKind()]
+        lcResourceKind = component.resourceKind().lower() if component.resourceKind() else component.resourceKind();
+        self._kind = componentResourceKindToAddressBookObjectKindMap.get(lcResourceKind, _ABO_KIND_PERSON)
 
         if inserting:
             self._resourceID, self._created, self._modified = (

Modified: CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/test/test_sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/test/test_sql.py	2012-10-08 22:52:43 UTC (rev 9906)
+++ CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/test/test_sql.py	2012-10-08 23:05:51 UTC (rev 9907)
@@ -355,6 +355,24 @@
         abObject = self.assertEqual(group.resourceKind(), "group")
         abObject = yield adbk.createObjectResourceWithName("g.vcf", group)
         self.assertEqual(abObject.kind(), _ABO_KIND_GROUP)
+
+        badgroup = VCard.fromString(
+            """BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Apple Inc.//AddressBook 6.1//EN
+UID:uid3
+FN:Bad Group
+N:Bad Group;;;;
+REV:20120503T194243Z
+X-ADDRESSBOOKSERVER-KIND:badgroup
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:uid1
+END:VCARD
+""".replace("\n", "\r\n")
+            )
+        abObject = self.assertEqual(badgroup.resourceKind(), "badgroup")
+        abObject = yield adbk.createObjectResourceWithName("bg.vcf", badgroup)
+        self.assertEqual(abObject.kind(), _ABO_KIND_PERSON)
+
         yield txn.commit()
 
         txn = addressbookStore.newTransaction()
@@ -366,10 +384,16 @@
         self.assertEqual(person.resourceKind(), None)
         self.assertEqual(abObject.kind(), _ABO_KIND_PERSON)
 
-        abObject = yield AddressBookObject.objectWithName(adbk, "g.vcf", "uid1")
+        abObject = yield AddressBookObject.objectWithName(adbk, "g.vcf", "uid2")
         group = yield abObject.component()
         self.assertEqual(group.resourceKind(), "group")
         self.assertEqual(abObject.kind(), _ABO_KIND_GROUP)
+
+        abObject = yield AddressBookObject.objectWithName(adbk, "bg.vcf", "uid3")
+        badgroup = yield abObject.component()
+        self.assertEqual(badgroup.resourceKind(), "badgroup")
+        self.assertEqual(abObject.kind(), _ABO_KIND_PERSON)
+
         yield txn.commit()
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121008/19561b61/attachment.html>