[CalendarServer-changes] [11926] CalendarServer/trunk/twext/who
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:21:39 PDT 2014
Revision: 11926
http://trac.calendarserver.org//changeset/11926
Author: wsanchez at apple.com
Date: 2013-11-08 16:58:52 -0800 (Fri, 08 Nov 2013)
Log Message:
-----------
Test description.
Modified Paths:
--------------
CalendarServer/trunk/twext/who/directory.py
CalendarServer/trunk/twext/who/test/test_directory.py
Modified: CalendarServer/trunk/twext/who/directory.py
===================================================================
--- CalendarServer/trunk/twext/who/directory.py 2013-11-09 00:42:10 UTC (rev 11925)
+++ CalendarServer/trunk/twext/who/directory.py 2013-11-09 00:58:52 UTC (rev 11926)
@@ -373,7 +373,13 @@
"""
description = [self.__class__.__name__, u":"]
- for name, value in self.fields.items():
+ # for name in sorted(self.fields, key=lambda name: name.name):
+ for name in self.service.fieldName.iterconstants():
+ if name not in self.fields:
+ continue
+
+ value = self.fields[name]
+
if hasattr(name, "description"):
name = name.description
else:
@@ -389,6 +395,8 @@
description.append(u" = ")
description.append(value)
+ description.append(u"\n")
+
return u"".join(description)
Modified: CalendarServer/trunk/twext/who/test/test_directory.py
===================================================================
--- CalendarServer/trunk/twext/who/test/test_directory.py 2013-11-09 00:42:10 UTC (rev 11925)
+++ CalendarServer/trunk/twext/who/test/test_directory.py 2013-11-09 00:58:52 UTC (rev 11926)
@@ -665,6 +665,25 @@
self.assertRaises(AttributeError, lambda: nobody.emailAddresses)
+ def test_description(self):
+ """
+ C{description} returns the expected string.
+ """
+ wsanchez = self.makeRecord(self.fields_wsanchez)
+
+ self.assertEquals(
+u"""
+DirectoryRecord:
+ UID = UID:wsanchez
+ record type = user
+ short names = (u'wsanchez', u'wilfredo_sanchez')
+ full names = (u'Wilfredo Sanchez', u'Wilfredo Sanchez Vega')
+ email addresses = ('wsanchez at calendarserver.org', 'wsanchez at example.com')
+"""[1:],
+ wsanchez.description()
+ )
+
+
def test_members_group(self):
"""
Group members.
@@ -678,6 +697,7 @@
Non-groups have no members.
"""
wsanchez = self.makeRecord(self.fields_wsanchez)
+
self.assertEquals(
set((yield wsanchez.members())),
set()
@@ -695,11 +715,13 @@
class DirectoryRecordTest(unittest.TestCase, BaseDirectoryRecordTest):
def test_members_group(self):
staff = self.makeRecord(self.fields_staff)
+
self.assertFailure(staff.members(), NotImplementedError)
def test_groups(self):
wsanchez = self.makeRecord(self.fields_wsanchez)
+
self.assertFailure(wsanchez.groups(), NotImplementedError)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/5a25d51c/attachment.html>
More information about the calendarserver-changes
mailing list