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

[source_changes at macosforge.org]

Revision: 12531
          http://trac.calendarserver.org//changeset/12531
Author:   wsanchez at apple.com
Date:     2014-01-31 17:38:50 -0800 (Fri, 31 Jan 2014)
Log Message:
-----------
Simplify test a bit

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:27:41 UTC (rev 12530)
+++ CalendarServer/trunk/txdav/who/test/test_xml.py	2014-02-01 01:38:50 UTC (rev 12531)
@@ -40,8 +40,8 @@
     Tests for calendar and contacts schema extensions.
     """
 
-    def makeRecord(self, fieldName, elementName, value):
-        uid = u"THE ONLY RECORD"
+    def makeRecord(self, elementName, value):
+        uid = u"id"
 
         xmlData = dedent(
             b"""
@@ -50,7 +50,7 @@
             <directory realm="Test Realm">
               <record type="user">
                 <uid>{uid}</uid>
-                <short-name>wsanchez</short-name>
+                <short-name>{uid}</short-name>
                 <{element}>{value}</{element}>
               </record>
             </directory>
@@ -82,7 +82,7 @@
             (FieldName.serviceNodeUID, u"service-node"),
             (FieldName.autoAcceptGroup, u"auto-accept-group"),
         ):
-            record = yield self.makeRecord(field, element, u"xyzzy")
+            record = yield self.makeRecord(element, u"xyzzy")
             self.assertEquals(record.fields[field], u"xyzzy")
 
 
@@ -93,14 +93,14 @@
             (FieldName.hasCalendars, u"has-calendars"),
             (FieldName.hasContacts, u"has-contacts"),
         ):
-            record = yield self.makeRecord(field, element, u"<true />")
+            record = yield self.makeRecord(element, u"<true />")
             self.assertIdentical(record.fields[field], True, field)
 
 
     @inlineCallbacks
     def test_autoScheduleMode(self):
         for mode, value in (
-            (AutoScheduleMode.none, u"asm-none"),
+            (AutoScheduleMode.none, u"none"),
             (AutoScheduleMode.accept, u"accept"),
             (AutoScheduleMode.decline, u"decline"),
             (AutoScheduleMode.acceptIfFree, u"accept-if-free"),
@@ -112,7 +112,7 @@
         ):
             field = FieldName.autoScheduleMode
             record = yield self.makeRecord(
-                field, u"auto-schedule-mode", u"<{0} />".format(value)
+                u"auto-schedule-mode", u"<{0} />".format(value)
             )
             self.assertIdentical(record.fields[field], mode)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/f92ab78d/attachment.html>