<!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>[13060] CalendarServer/branches/users/sagen/move2who-4</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/13060">13060</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-03-31 13:17:32 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>More tests for locations and addresses</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4calendarservertoolstesttest_gatewaypy">CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_gateway.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavcaldavdatastoresqlpy">CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4calendarservertoolstesttest_gatewaypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_gateway.py (13059 => 13060)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_gateway.py 2014-03-31 20:16:25 UTC (rev 13059)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_gateway.py 2014-03-31 20:17:32 UTC (rev 13060)
</span><span class="lines">@@ -321,7 +321,6 @@
</span><span class="cx"> # self.assertEquals(record.extras["comment"], "Updated Test Comment")
</span><span class="cx"> self.assertEquals(record.floor, "Second")
</span><span class="cx"> # self.assertEquals(record.extras["capacity"], "41")
</span><del>- self.assertEquals(record.streetAddress, "2 Infinite Loop\nCupertino, 95014\nCA")
</del><span class="cx"> self.assertEquals(record.autoScheduleMode, AutoScheduleMode.acceptIfFree)
</span><span class="cx"> self.assertEquals(record.autoAcceptGroup, "F5A6142C-4189-4E9E-90B0-9CD0268B314B")
</span><span class="cx">
</span><span class="lines">@@ -333,6 +332,24 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_setAddressOnLocation(self):
+ yield self.runCommand(command_createLocation)
+ yield self.runCommand(command_createAddress)
+ yield self.runCommand(command_setAddressOnLocation)
+ results = yield self.runCommand(command_getLocationAttributes)
+ self.assertEquals(results["result"]["AssociatedAddress"], "C701069D-9CA1-4925-A1A9-5CD94767B74B")
+ self._flush()
+ record = yield self.directory.recordWithUID("836B1B66-2E9A-4F46-8B1C-3DD6772C20B2")
+ self.assertEquals(record.associatedAddress, "C701069D-9CA1-4925-A1A9-5CD94767B74B")
+ yield self.runCommand(command_removeAddressFromLocation)
+ results = yield self.runCommand(command_getLocationAttributes)
+ self.assertEquals(results["result"]["AssociatedAddress"], "")
+ self._flush()
+ record = yield self.directory.recordWithUID("836B1B66-2E9A-4F46-8B1C-3DD6772C20B2")
+ self.assertEquals(record.associatedAddress, u"")
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_destroyLocation(self):
</span><span class="cx">
</span><span class="cx"> record = yield self.directory.recordWithUID("location01")
</span><span class="lines">@@ -755,8 +772,6 @@
</span><span class="cx"> <key>Capacity</key>
</span><span class="cx"> <string>41</string>
</span><span class="cx"> -->
</span><del>- <key>StreetAddress</key>
- <string>2 Infinite Loop\nCupertino, 95014\nCA</string>
</del><span class="cx"> <key>ReadProxies</key>
</span><span class="cx"> <array>
</span><span class="cx"> <string>user03</string>
</span><span class="lines">@@ -771,6 +786,35 @@
</span><span class="cx"> </plist>
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+command_setAddressOnLocation = """<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>command</key>
+ <string>setLocationAttributes</string>
+ <key>GeneratedUID</key>
+ <string>836B1B66-2E9A-4F46-8B1C-3DD6772C20B2</string>
+ <key>AssociatedAddress</key>
+ <string>C701069D-9CA1-4925-A1A9-5CD94767B74B</string>
+</dict>
+</plist>
+"""
+
+command_removeAddressFromLocation = """<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>command</key>
+ <string>setLocationAttributes</string>
+ <key>GeneratedUID</key>
+ <string>836B1B66-2E9A-4F46-8B1C-3DD6772C20B2</string>
+ <key>AssociatedAddress</key>
+ <string></string>
+</dict>
+</plist>
+"""
+
+
</ins><span class="cx"> command_getLocationAttributes = """<?xml version="1.0" encoding="UTF-8"?>
</span><span class="cx"> <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><span class="cx"> <plist version="1.0">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/sql.py (13059 => 13060)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/sql.py 2014-03-31 20:16:25 UTC (rev 13059)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/sql.py 2014-03-31 20:17:32 UTC (rev 13060)
</span><span class="lines">@@ -2277,23 +2277,23 @@
</span><span class="cx"> for attendee in sub.getAllAttendeeProperties():
</span><span class="cx"> if attendee.parameterValue("CUTYPE") == "ROOM":
</span><span class="cx"> value = attendee.value()
</span><ins>+ # FIXME: this should use recordWithCalendarUserAddress(), right?
</ins><span class="cx"> if value.startswith("urn:uuid:"):
</span><span class="cx"> guid = value[9:]
</span><span class="cx"> loc = yield self.directoryService().recordWithGUID(guid)
</span><span class="cx"> if loc is not None:
</span><del>- guid = loc.extras.get("associatedAddress",
- None)
- if guid is not None:
- addr = yield self.directoryService().recordWithGUID(guid)
</del><ins>+ uid = getattr(loc, "associatedAddress", "")
+ if uid:
+ addr = yield self.directoryService().recordWithUID(uid)
</ins><span class="cx"> if addr is not None:
</span><del>- street = addr.extras.get("streetAddress", "")
- geo = addr.extras.get("geo", "")
</del><ins>+ street = getattr(addr, "streetAddress", "")
+ geo = getattr(addr, "geographicLocation", "")
</ins><span class="cx"> if street and geo:
</span><span class="cx"> title = attendee.parameterValue("CN")
</span><span class="cx"> params = {
</span><del>- "X-ADDRESS" : street,
- "X-APPLE-RADIUS" : "71",
- "X-TITLE" : title,
</del><ins>+ "X-ADDRESS": street,
+ "X-APPLE-RADIUS": "71",
+ "X-TITLE": title,
</ins><span class="cx"> }
</span><span class="cx"> structured = Property("X-APPLE-STRUCTURED-LOCATION",
</span><span class="cx"> "geo:%s" % (geo,), params=params,
</span></span></pre>
</div>
</div>
</body>
</html>