[CalendarServer-changes] [12532] CalendarServer/trunk/txdav/who/test/test_xml.py

[source_changes at macosforge.org]

Revision: 12532
          http://trac.calendarserver.org//changeset/12532
Author:   wsanchez at apple.com
Date:     2014-01-31 17:48:51 -0800 (Fri, 31 Jan 2014)
Log Message:
-----------
Test record types

Modified Paths:
--------------
    CalendarServer/trunk/txdav/who/test/test_xml.py

Modified: CalendarServer/trunk/txdav/who/test/test_xml.py
===================================================================
--- CalendarServer/trunk/txdav/who/test/test_xml.py	2014-02-01 01:38:50 UTC (rev 12531)
+++ CalendarServer/trunk/txdav/who/test/test_xml.py	2014-02-01 01:48:51 UTC (rev 12532)
@@ -40,7 +40,9 @@
     Tests for calendar and contacts schema extensions.
     """
 
-    def makeRecord(self, elementName, value):
+    def makeRecord(
+        self, typeValue=u"user", elementName=u"password", elementValue=u"123"
+    ):
         uid = u"id"
 
         xmlData = dedent(
@@ -48,7 +50,7 @@
             <?xml version="1.0" encoding="utf-8"?>
 
             <directory realm="Test Realm">
-              <record type="user">
+              <record type="{type}">
                 <uid>{uid}</uid>
                 <short-name>{uid}</short-name>
                 <{element}>{value}</{element}>
@@ -56,9 +58,10 @@
             </directory>
             """[1:]
             .format(
+                type=typeValue.encode("utf-8"),
                 uid=uid.encode("utf-8"),
                 element=elementName.encode("utf-8"),
-                value=value.encode("utf-8"),
+                value=elementValue.encode("utf-8"),
             )
         )
 
@@ -82,7 +85,9 @@
             (FieldName.serviceNodeUID, u"service-node"),
             (FieldName.autoAcceptGroup, u"auto-accept-group"),
         ):
-            record = yield self.makeRecord(element, u"xyzzy")
+            record = yield self.makeRecord(
+                elementName=element, elementValue=u"xyzzy"
+            )
             self.assertEquals(record.fields[field], u"xyzzy")
 
 
@@ -93,7 +98,9 @@
             (FieldName.hasCalendars, u"has-calendars"),
             (FieldName.hasContacts, u"has-contacts"),
         ):
-            record = yield self.makeRecord(element, u"<true />")
+            record = yield self.makeRecord(
+                elementName=element, elementValue=u"<true />"
+            )
             self.assertIdentical(record.fields[field], True, field)
 
 
@@ -112,12 +119,18 @@
         ):
             field = FieldName.autoScheduleMode
             record = yield self.makeRecord(
-                u"auto-schedule-mode", u"<{0} />".format(value)
+                elementName=u"auto-schedule-mode",
+                elementValue=u"<{0} />".format(value),
             )
             self.assertIdentical(record.fields[field], mode)
 
 
+    @inlineCallbacks
     def test_recordTypes(self):
-        raise NotImplementedError(RecordType)
-
-    test_recordTypes.todo = "unimplemented"
+        for recordType, value in (
+            (RecordType.location, u"location"),
+            (RecordType.resource, u"resource"),
+            (RecordType.address, u"address"),
+        ):
+            record = yield self.makeRecord(typeValue=value)
+            self.assertIdentical(record.recordType, recordType)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/7cc52a73/attachment.html>