<!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>[5526] CalendarServer/branches/users/wsanchez/transations/txcaldav/calendarstore</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.macosforge.org/projects/calendarserver/changeset/5526">5526</a></dd>
<dt>Author</dt> <dd>glyph@apple.com</dd>
<dt>Date</dt> <dd>2010-04-23 09:54:31 -0700 (Fri, 23 Apr 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>a few more test successes</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserswsancheztransationstxcaldavcalendarstorefilepy">CalendarServer/branches/users/wsanchez/transations/txcaldav/calendarstore/file.py</a></li>
<li><a href="#CalendarServerbranchesuserswsancheztransationstxcaldavcalendarstoretesttest_filepy">CalendarServer/branches/users/wsanchez/transations/txcaldav/calendarstore/test/test_file.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserswsancheztransationstxcaldavcalendarstorefilepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/wsanchez/transations/txcaldav/calendarstore/file.py (5525 => 5526)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/wsanchez/transations/txcaldav/calendarstore/file.py        2010-04-23 16:54:14 UTC (rev 5525)
+++ CalendarServer/branches/users/wsanchez/transations/txcaldav/calendarstore/file.py        2010-04-23 16:54:31 UTC (rev 5526)
</span><span class="lines">@@ -312,11 +312,12 @@
</span><span class="cx">             return None
</span><span class="cx"> 
</span><span class="cx">     def calendarObjectWithUID(self, uid):
</span><del>-        return None
-        # for calendarObjectPath in self.path.children():
-        #     obj = CalendarObject(calendarObjectPath, self)
-        #     if obj.component().resourceUID() == uid:
-        #         return obj
</del><ins>+        # FIXME: This _really_ needs to be inspecting an index, not parsing
+        # every resource.
+        for calendarObjectPath in self.path.children():
+            obj = CalendarObject(calendarObjectPath, self)
+            if obj.component().resourceUID() == uid:
+                return obj
</ins><span class="cx"> 
</span><span class="cx">     def createCalendarObjectWithName(self, name, component):
</span><span class="cx">         if name.startswith(&quot;.&quot;):
</span><span class="lines">@@ -340,7 +341,7 @@
</span><span class="cx">             raise NoSuchCalendarObjectError(name)
</span><span class="cx"> 
</span><span class="cx">     def removeCalendarObjectWithUID(self, uid):
</span><del>-        raise NotImplementedError()
</del><ins>+        self.removeCalendarObjectWithName(self.calendarObjectWithUID(uid).path.basename())
</ins><span class="cx"> 
</span><span class="cx">     def syncToken(self):
</span><span class="cx">         raise NotImplementedError()
</span></span></pre></div>
<a id="CalendarServerbranchesuserswsancheztransationstxcaldavcalendarstoretesttest_filepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/wsanchez/transations/txcaldav/calendarstore/test/test_file.py (5525 => 5526)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/wsanchez/transations/txcaldav/calendarstore/test/test_file.py        2010-04-23 16:54:14 UTC (rev 5525)
+++ CalendarServer/branches/users/wsanchez/transations/txcaldav/calendarstore/test/test_file.py        2010-04-23 16:54:31 UTC (rev 5526)
</span><span class="lines">@@ -595,14 +595,16 @@
</span><span class="cx">             self.calendar1.removeCalendarObjectWithName, name
</span><span class="cx">         )
</span><span class="cx"> 
</span><del>-    @featureUnimplemented
</del><ins>+
</ins><span class="cx">     def test_removeCalendarObjectWithUID_exists(self):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         Remove an existing calendar object.
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         for name in calendar1_objectNames:
</span><del>-            uid = name.rstrip(&quot;.ics&quot;)
-            assert self.calendar1.calendarObjectWithUID(uid) is not None
</del><ins>+            uid = (u'uid' + name.rstrip(&quot;.ics&quot;))
+            
+            self.assertNotIdentical(self.calendar1.calendarObjectWithUID(uid),
+                                    None)
</ins><span class="cx">             self.calendar1.removeCalendarObjectWithUID(uid)
</span><span class="cx">             self.assertEquals(
</span><span class="cx">                 self.calendar1.calendarObjectWithUID(uid),
</span><span class="lines">@@ -613,6 +615,7 @@
</span><span class="cx">                 None
</span><span class="cx">             )
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx">     @featureUnimplemented
</span><span class="cx">     def test_removeCalendarObjectWithUID_absent(self):
</span><span class="cx">         &quot;&quot;&quot;
</span></span></pre>
</div>
</div>

</body>
</html>