[CalendarServer-changes] [12530] CalendarServer/trunk/txdav/who

[source_changes at macosforge.org]

Revision: 12530
          http://trac.calendarserver.org//changeset/12530
Author:   wsanchez at apple.com
Date:     2014-01-31 17:27:41 -0800 (Fri, 31 Jan 2014)
Log Message:
-----------
Handle auto-schedule mode.

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

Modified: CalendarServer/trunk/txdav/who/test/test_xml.py
===================================================================
--- CalendarServer/trunk/txdav/who/test/test_xml.py	2014-02-01 01:27:21 UTC (rev 12529)
+++ CalendarServer/trunk/txdav/who/test/test_xml.py	2014-02-01 01:27:41 UTC (rev 12530)
@@ -62,6 +62,10 @@
             )
         )
 
+        # print("-" * 80)
+        # print(xmlData)
+        # print("-" * 80)
+
         service = xmlService(
             self.mktemp(), xmlData=xmlData, serviceClass=DirectoryService
         )
@@ -96,7 +100,7 @@
     @inlineCallbacks
     def test_autoScheduleMode(self):
         for mode, value in (
-            (AutoScheduleMode.none, u"none"),
+            (AutoScheduleMode.none, u"asm-none"),
             (AutoScheduleMode.accept, u"accept"),
             (AutoScheduleMode.decline, u"decline"),
             (AutoScheduleMode.acceptIfFree, u"accept-if-free"),
@@ -107,12 +111,12 @@
             ),
         ):
             field = FieldName.autoScheduleMode
-            record = yield self.makeRecord(field, u"auto-schedule-mode", value)
+            record = yield self.makeRecord(
+                field, u"auto-schedule-mode", u"<{0} />".format(value)
+            )
             self.assertIdentical(record.fields[field], mode)
 
-    test_autoScheduleMode.todo = "constants unhandled"
 
-
     def test_recordTypes(self):
         raise NotImplementedError(RecordType)
 

Modified: CalendarServer/trunk/txdav/who/xml.py
===================================================================
--- CalendarServer/trunk/txdav/who/xml.py	2014-02-01 01:27:21 UTC (rev 12529)
+++ CalendarServer/trunk/txdav/who/xml.py	2014-02-01 01:27:41 UTC (rev 12530)
@@ -44,7 +44,7 @@
     XML calendar and contacts element names.
     """
 
-    # Field names
+    # Provisioning fields
 
     serviceNodeUID = ValueConstant(u"service-node")
     serviceNodeUID.fieldName = FieldName.serviceNodeUID
@@ -58,14 +58,40 @@
     hasContacts = ValueConstant(u"has-contacts")
     hasContacts.fieldName = FieldName.hasContacts
 
+    # Auto-schedule fields
+
     autoScheduleMode = ValueConstant(u"auto-schedule-mode")
     autoScheduleMode.fieldName = FieldName.autoScheduleMode
 
     autoAcceptGroup = ValueConstant(u"auto-accept-group")
     autoAcceptGroup.fieldName = FieldName.autoAcceptGroup
 
+    # Auto-schedule modes
 
+    none = ValueConstant(u"none")
+    none.constantValue = AutoScheduleMode.none
 
+    accept = ValueConstant(u"accept")
+    accept.constantValue = AutoScheduleMode.accept
+
+    decline = ValueConstant(u"decline")
+    decline.constantValue = AutoScheduleMode.decline
+
+    acceptIfFree = ValueConstant(u"accept-if-free")
+    acceptIfFree.constantValue = AutoScheduleMode.acceptIfFree
+
+    declineIfBusy = ValueConstant(u"decline-if-busy")
+    declineIfBusy.constantValue = AutoScheduleMode.declineIfBusy
+
+    acceptIfFreeDeclineIfBusy = ValueConstant(
+        u"accept-if-free-decline-if-busy"
+    )
+    acceptIfFreeDeclineIfBusy.constantValue = (
+        AutoScheduleMode.acceptIfFreeDeclineIfBusy
+    )
+
+
+
 class Attribute(Values):
     """
     XML calendar and contacts attribute names.
@@ -89,33 +115,6 @@
 
 
 
-class AutoScheduleValue(Values):
-    """
-    XML element values for auto-schedule modes.
-    """
-
-    none = ValueConstant(u"none")
-    none.mode = AutoScheduleMode.none
-
-    accept = ValueConstant(u"accept")
-    accept.mode = AutoScheduleMode.accept
-
-    decline = ValueConstant(u"decline")
-    decline.mode = AutoScheduleMode.decline
-
-    acceptIfFree = ValueConstant(u"accept-if-free")
-    acceptIfFree.mode = AutoScheduleMode.acceptIfFree
-
-    declineIfBusy = ValueConstant(u"decline-if-busy")
-    declineIfBusy.mode = AutoScheduleMode.declineIfBusy
-
-    acceptIfFreeDeclineIfBusy = ValueConstant(
-        u"accept-if-free-decline-if-busy"
-    )
-    acceptIfFreeDeclineIfBusy.mode = AutoScheduleMode.acceptIfFreeDeclineIfBusy
-
-
-
 #
 # Directory Service
 #
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/f6786820/attachment.html>