<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[11944] CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/11944">11944</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2013-11-13 19:37:20 -0800 (Wed, 13 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>add twistedcaldav.directory.test.test_directory.DirectoryRecordTests.test_attendee and fix DirectoryRecord.attendee()</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagengroupcachertwistedcaldavdirectorydirectorypy">CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/directory.py</a></li>
<li><a href="#CalendarServerbranchesuserssagengroupcachertwistedcaldavdirectorytesttest_directorypy">CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/test/test_directory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagengroupcachertwistedcaldavdirectorydirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/directory.py (11943 => 11944)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/directory.py        2013-11-13 22:32:32 UTC (rev 11943)
+++ CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/directory.py        2013-11-14 03:37:20 UTC (rev 11944)
</span><span class="lines">@@ -1531,17 +1531,17 @@
</span><span class="cx"> if "PARTSTAT" not in params:
</span><span class="cx"> params["PARTSTAT"] = "NEEDS-ACTION"
</span><span class="cx"> if "CN"not in params:
</span><del>- if self.fullName():
- params["CN"] = self.fullName()
</del><ins>+ if self.fullName:
+ params["CN"] = self.fullName
</ins><span class="cx"> if "EMAIL" not in params:
</span><del>- if self.emailAddresses():
- params["EMAIL"] = self.emailAddresses()[0]
</del><ins>+ if self.emailAddresses:
+ params["EMAIL"] = list(self.emailAddresses)[0]
</ins><span class="cx"> if "CUTYPE" not in params:
</span><span class="cx"> cuType = self.getCUType()
</span><span class="cx"> if cuType is not "INDIVIDUAL":
</span><span class="cx"> params["CUTYPE"] = cuType
</span><span class="cx">
</span><del>- return Property("ATTENDEE", "urn:uuid:" + self.uid(), params=params)
</del><ins>+ return Property("ATTENDEE", "urn:uuid:" + self.uid, params=params)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagengroupcachertwistedcaldavdirectorytesttest_directorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/test/test_directory.py (11943 => 11944)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/test/test_directory.py        2013-11-13 22:32:32 UTC (rev 11943)
+++ CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/test/test_directory.py        2013-11-14 03:37:20 UTC (rev 11944)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> from twext.who.groups import schedulePolledGroupCachingUpdate
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx"> from twisted.python.filepath import FilePath
</span><span class="lines">@@ -29,9 +30,7 @@
</span><span class="cx"> from twistedcaldav.test.util import TestCase
</span><span class="cx"> from twistedcaldav.test.util import xmlFile, augmentsFile, proxiesFile, dirTest
</span><span class="cx"> from txdav.common.datastore.test.util import buildStore
</span><del>-
</del><span class="cx"> import cPickle as pickle
</span><del>-import uuid
</del><span class="cx">
</span><span class="cx"> def StubCheckSACL(cls, username, service):
</span><span class="cx"> services = {
</span><span class="lines">@@ -1094,24 +1093,48 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class DirectoryRecordTests(TestCase):
</span><del>- """
- Test L{DirectoryRecord} apis.
- """
</del><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def setUp(self):
</span><del>- self.service = DirectoryService()
- self.service.setRealm("test")
- self.service.baseGUID = "0E8E6EC2-8E52-4FF3-8F62-6F398B08A498"
</del><ins>+ super(DirectoryRecordTests, self).setUp()
</ins><span class="cx">
</span><ins>+ self.directoryFixture.addDirectoryService(XMLDirectoryService(
+ {
+ 'xmlFile' : xmlFile,
+ 'augmentService' :
+ augment.AugmentXMLDB(xmlFiles=(augmentsFile.path,)),
+ }
+ ))
+ calendaruserproxy.ProxyDBService = calendaruserproxy.ProxySqliteDB("proxies.sqlite")
</ins><span class="cx">
</span><ins>+ # Set up a principals hierarchy for each service we're testing with
+ self.principalRootResources = {}
+ name = self.directoryService.__class__.__name__
+ url = "/" + name + "/"
+
+ provisioningResource = DirectoryPrincipalProvisioningResource(url, self.directoryService)
+
+ self.site.resource.putChild(name, provisioningResource)
+
+ self.principalRootResources[self.directoryService.__class__.__name__] = provisioningResource
+
+ yield XMLCalendarUserProxyLoader(proxiesFile.path).updateProxyDB()
+
+
+ def tearDown(self):
+ """ Empty the proxy db between tests """
+ return calendaruserproxy.ProxyDBService.clean() #@UndefinedVariable
+
+
</ins><span class="cx"> def test_cacheToken(self):
</span><span class="cx"> """
</span><span class="cx"> Test that DirectoryRecord.cacheToken is different for different records, and its value changes
</span><span class="cx"> as attributes on the record change.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- record1 = DirectoryRecord(self.service, "users", str(uuid.uuid4()), shortNames=("testing1",))
- record2 = DirectoryRecord(self.service, "users", str(uuid.uuid4()), shortNames=("testing2",))
</del><ins>+ records = list((yield self.directoryService.listRecords("users")))
+ record1 = records[0]
+ record2 = records[1]
</ins><span class="cx"> self.assertNotEquals(record1.cacheToken(), record2.cacheToken())
</span><span class="cx">
</span><span class="cx"> cache1 = record1.cacheToken()
</span><span class="lines">@@ -1121,3 +1144,61 @@
</span><span class="cx"> cache1 = record1.cacheToken()
</span><span class="cx"> record1.enabledForCalendaring = True
</span><span class="cx"> self.assertNotEquals(cache1, record1.cacheToken())
</span><ins>+
+
+ @inlineCallbacks
+ def test_attendee(self):
+ """
+ check that attendee property is correct
+ """
+ for recordType in self.directoryService.recordTypes():
+ records = yield self.directoryService.listRecords(recordType)
+ for record in records:
+ record.attendee()
+
+ record = yield self.directoryService.recordWithShortName("users", "user01")
+ attendee = record.attendee(params={"PARTSTAT": "ACCEPTED"})
+ self.assertEquals(attendee.name(), "ATTENDEE")
+ self.assertEquals(attendee.value(), "urn:uuid:user01")
+ self.assertEquals(attendee.parameterNames(), set(['PARTSTAT', 'EMAIL', 'CN']))
+ self.assertEquals(attendee.parameterValue("CN"), "c4ca4238a0b923820dcc509a6f75849bc4c User 01")
+ self.assertEquals(attendee.parameterValue("EMAIL"), "c4ca4238a0@example.com")
+ self.assertEquals(attendee.parameterValue("PARTSTAT"), "ACCEPTED")
+
+ record = yield self.directoryService.recordWithShortName("users", "user02")
+ attendee = record.attendee(params={"MEMBER": "urn:uuid:group02"})
+ self.assertEquals(attendee.name(), "ATTENDEE")
+ self.assertEquals(attendee.value(), "urn:uuid:user02")
+ self.assertEquals(attendee.parameterNames(), set(['MEMBER', 'PARTSTAT', 'EMAIL', 'CN']))
+ self.assertEquals(attendee.parameterValue("CN"), "c81e728d9d4c2f636f067f89cc14862cc81 User 02")
+ self.assertEquals(attendee.parameterValue("EMAIL"), "c81e728d9d@example.com")
+ self.assertEquals(attendee.parameterValue("PARTSTAT"), "NEEDS-ACTION")
+ self.assertEquals(attendee.parameterValue("MEMBER"), "urn:uuid:group02")
+
+ record = yield self.directoryService.recordWithShortName("groups", "managers")
+ attendee = record.attendee()
+ self.assertEquals(attendee.name(), "ATTENDEE")
+ self.assertEquals(attendee.value(), "urn:uuid:9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1")
+ self.assertEquals(attendee.parameterNames(), set(['CUTYPE', 'PARTSTAT', 'CN']))
+ self.assertEquals(attendee.parameterValue("CN"), "Managers")
+ self.assertEquals(attendee.parameterValue("PARTSTAT"), "NEEDS-ACTION")
+ self.assertEquals(attendee.parameterValue("CUTYPE"), "GROUP")
+
+ record = yield self.directoryService.recordWithShortName("locations", "mercury")
+ attendee = record.attendee()
+ self.assertEquals(attendee.name(), "ATTENDEE")
+ self.assertEquals(attendee.value(), "urn:uuid:mercury")
+ self.assertEquals(attendee.parameterNames(), set(['CUTYPE', 'PARTSTAT', 'EMAIL', 'CN']))
+ self.assertEquals(attendee.parameterValue("CN"), "Mercury Seven")
+ self.assertEquals(attendee.parameterValue("EMAIL"), "mercury@example.com")
+ self.assertEquals(attendee.parameterValue("PARTSTAT"), "NEEDS-ACTION")
+ self.assertEquals(attendee.parameterValue("CUTYPE"), "ROOM")
+
+ record = yield self.directoryService.recordWithShortName("resources", "ftlcpu")
+ attendee = record.attendee()
+ self.assertEquals(attendee.name(), "ATTENDEE")
+ self.assertEquals(attendee.value(), "urn:uuid:ftlcpu")
+ self.assertEquals(attendee.parameterNames(), set(['CUTYPE', 'PARTSTAT', 'EMAIL', 'CN']))
+ self.assertEquals(attendee.parameterValue("CN"), "Faster-Than-Light Microprocessor")
+ self.assertEquals(attendee.parameterValue("PARTSTAT"), "NEEDS-ACTION")
+ self.assertEquals(attendee.parameterValue("CUTYPE"), "RESOURCE")
</ins></span></pre>
</div>
</div>
</body>
</html>