[CalendarServer-changes] [5019] CalendarServer/trunk/txcaldav/calendarstore

[source_changes at macosforge.org]

Revision: 5019
          http://trac.macosforge.org/projects/calendarserver/changeset/5019
Author:   wsanchez at apple.com
Date:     2010-02-02 16:28:12 -0800 (Tue, 02 Feb 2010)
Log Message:
-----------
Filling out file store

Modified Paths:
--------------
    CalendarServer/trunk/txcaldav/calendarstore/file.py
    CalendarServer/trunk/txcaldav/calendarstore/test/test_file.py

Modified: CalendarServer/trunk/txcaldav/calendarstore/file.py
===================================================================
--- CalendarServer/trunk/txcaldav/calendarstore/file.py	2010-02-02 21:37:57 UTC (rev 5018)
+++ CalendarServer/trunk/txcaldav/calendarstore/file.py	2010-02-03 00:28:12 UTC (rev 5019)
@@ -67,8 +67,8 @@
             # be CalendarStoreNotFoundError.
             raise NotFoundError("No such calendar store")
 
-    def __str__(self):
-        return "<%s: %s>" % (self.__class__, self.path)
+    def __repr__(self):
+        return "<%s: %s>" % (self.__class__.__name__, self.path.path)
 
     def calendarHomeWithUID(self, uid):
         return CalendarHome(self.path.child(uid), self)
@@ -83,8 +83,8 @@
         self.path = path
         self.calendarStore = calendarStore
 
-    def __str__(self):
-        return "<%s: %s>" % (self.__class__, self.path)
+    def __repr__(self):
+        return "<%s: %s>" % (self.__class__.__name__, self.path)
 
     def uid(self):
         return self.path.basename()
@@ -97,7 +97,11 @@
         )
 
     def calendarWithName(self, name):
-        return Calendar(self.path.child(name), self)
+        childPath = self.path.child(name)
+        if childPath.isdir():
+            return Calendar(childPath, self)
+        else:
+            return None
 
     def createCalendarWithName(self, name):
         raise NotImplementedError()
@@ -120,8 +124,8 @@
         self.path = path
         self.calendarHome = calendarHome
 
-    def __str__(self):
-        return "<%s: %s>" % (self.__class__, self.path)
+    def __repr__(self):
+        return "<%s: %s>" % (self.__class__.__name__, self.path.path)
 
     def name(self):
         return self.path.basename()
@@ -137,7 +141,11 @@
         )
 
     def calendarObjectWithName(self, name):
-        return CalendarObject(self.path.child(name), self)
+        childPath = self.path.child(name)
+        if childPath.isfile():
+            return CalendarObject(childPath, self)
+        else:
+            return None
 
     def calendarObjectWithUID(self, uid):
         raise NotImplementedError()
@@ -173,8 +181,8 @@
         self.path = path
         self.calendar = calendar
 
-    def __str__(self):
-        return "<%s: %s>" % (self.__class__, self.path)
+    def __repr__(self):
+        return "<%s: %s>" % (self.__class__.__name__, self.path.path)
 
     def name(self):
         return self.path.basename()

Modified: CalendarServer/trunk/txcaldav/calendarstore/test/test_file.py
===================================================================
--- CalendarServer/trunk/txcaldav/calendarstore/test/test_file.py	2010-02-02 21:37:57 UTC (rev 5018)
+++ CalendarServer/trunk/txcaldav/calendarstore/test/test_file.py	2010-02-03 00:28:12 UTC (rev 5019)
@@ -61,9 +61,27 @@
         )
 
 
+def setUpCalendarStore(test):
+    test.root = FilePath(test.mktemp())
+    test.root.createDirectory()
+
+    calendarPath = test.root.child("store")
+    storePath.copyTo(calendarPath)
+
+    test.calendarStore = CalendarStore(calendarPath)
+
+def setUpHome1(test):
+    setUpCalendarStore(test)
+    test.home1 = test.calendarStore.calendarHomeWithUID("home1")
+
+def setUpCalendar1(test):
+    setUpHome1(test)
+    test.calendar1 = test.home1.calendarWithName("calendar_1")
+
+
 class CalendarStoreTest(unittest.TestCase):
     def setUp(self):
-        self.calendarStore = CalendarStore(storePath)
+        setUpCalendarStore(self)
 
     # FIXME: If we define an interface
     #def test_interface(self):
@@ -83,8 +101,7 @@
 
 class CalendarHomeTest(unittest.TestCase, PropertiesTestMixin):
     def setUp(self):
-        self.calendarStore = CalendarStore(storePath)
-        self.home1 = self.calendarStore.calendarHomeWithUID("home1")
+        setUpHome1(self)
 
     def test_interface(self):
         try:
@@ -121,6 +138,7 @@
             calendar = self.home1.calendarWithName(name)
             self.failUnless(isinstance(calendar, Calendar), calendar)
             self.assertEquals(calendar.name(), name)
+        self.assertEquals(self.home1.calendarWithName("xyzzy"), None)
 
     def test_createCalendarWithName(self):
         raise NotImplementedError()
@@ -133,9 +151,7 @@
 
 class CalendarTest(unittest.TestCase, PropertiesTestMixin):
     def setUp(self):
-        self.calendarStore = CalendarStore(storePath)
-        self.home1 = self.calendarStore.calendarHomeWithUID("home1")
-        self.calendar1 = self.home1.calendarWithName("calendar_1")
+        setUpCalendar1(self)
 
     def test_interface(self):
         try:
@@ -186,6 +202,8 @@
             )
             self.assertEquals(calendarObject.name(), name)
 
+        self.assertEquals(self.calendar1.calendarObjectWithName("xyzzy"), None)
+
     def test_calendarObjectWithUID(self):
         raise NotImplementedError()
     test_calendarObjectWithUID.todo = "Unimplemented"
@@ -217,9 +235,7 @@
 
 class CalendarObjectTest(unittest.TestCase, PropertiesTestMixin):
     def setUp(self):
-        self.calendarStore = CalendarStore(storePath)
-        self.home1 = self.calendarStore.calendarHomeWithUID("home1")
-        self.calendar1 = self.home1.calendarWithName("calendar_1")
+        setUpCalendar1(self)
         self.object1 = self.calendar1.calendarObjectWithName("1.ics")
 
     def test_interface(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100202/636b9688/attachment-0001.html>