[CalendarServer-changes] [2358] CalendarServer/branches/propfind-cache/twistedcaldav

[source_changes at macosforge.org]

Revision: 2358
          http://trac.macosforge.org/projects/calendarserver/changeset/2358
Author:   dreid at apple.com
Date:     2008-04-28 10:35:23 -0700 (Mon, 28 Apr 2008)

Log Message:
-----------
Add an object for watching if cache tokens have changed.

Modified Paths:
--------------
    CalendarServer/branches/propfind-cache/twistedcaldav/cache.py
    CalendarServer/branches/propfind-cache/twistedcaldav/test/test_cache.py

Modified: CalendarServer/branches/propfind-cache/twistedcaldav/cache.py
===================================================================
--- CalendarServer/branches/propfind-cache/twistedcaldav/cache.py	2008-04-26 02:44:34 UTC (rev 2357)
+++ CalendarServer/branches/propfind-cache/twistedcaldav/cache.py	2008-04-28 17:35:23 UTC (rev 2358)
@@ -26,17 +26,10 @@
     name = "cacheTokens"
 
 
-class CacheChangeNotifier(object):
-    def __init__(self, propertyStore):
-        self._propertyStore = propertyStore
-        self._propToken = None
-        self._dataToken = None
+class CacheChangeLoaderMixin(object):
+    _propToken = None
+    _dataToken = None
 
-    def _newDataToken(self):
-        return uuid.uuid4()
-
-    _newPropertyToken = _newDataToken
-
     def _loadTokens(self):
         try:
             tokens = self._propertyStore.get(CacheTokensProperty.qname())
@@ -46,6 +39,19 @@
         except HTTPError, e:
             pass
 
+
+
+class CacheChangeNotifier(CacheChangeLoaderMixin):
+    def __init__(self, propertyStore):
+        self._propertyStore = propertyStore
+
+
+    def _newDataToken(self):
+        return uuid.uuid4()
+
+    _newPropertyToken = _newDataToken
+
+
     def _writeTokens(self):
         if self._propToken is None:
             self._propToken = self._newPropertyToken()
@@ -57,12 +63,42 @@
                                                              self._dataToken))
         self._propertyStore.set(property)
 
+
     def propertiesChanged(self):
         self._loadTokens()
         self._propToken = self._newPropertyToken()
         self._writeTokens()
 
+
     def dataChanged(self):
         self._loadTokens()
         self._dataToken = self._newDataToken()
         self._writeTokens()
+
+
+
+class CacheChangeObserver(CacheChangeLoaderMixin):
+    def __init__(self, propertyStore):
+        self._propertyStore = propertyStore
+        self._oldPropToken = None
+        self._oldDataToken = None
+
+
+    def propertiesHaveChanged(self):
+        self._loadTokens()
+
+        if self._propToken != self._oldPropToken:
+            self._oldPropToken = self._propToken
+            return True
+
+        return False
+
+
+    def dataHasChanged(self):
+        self._loadTokens()
+
+        if self._dataToken != self._oldDataToken:
+            self._oldDataToken = self._dataToken
+            return True
+
+        return False

Modified: CalendarServer/branches/propfind-cache/twistedcaldav/test/test_cache.py
===================================================================
--- CalendarServer/branches/propfind-cache/twistedcaldav/test/test_cache.py	2008-04-26 02:44:34 UTC (rev 2357)
+++ CalendarServer/branches/propfind-cache/twistedcaldav/test/test_cache.py	2008-04-28 17:35:23 UTC (rev 2358)
@@ -18,7 +18,9 @@
 
 from twisted.trial.unittest import TestCase
 
-from twistedcaldav.cache import CacheChangeNotifier, CacheTokensProperty
+from twistedcaldav.cache import CacheChangeNotifier
+from twistedcaldav.cache import CacheTokensProperty
+from twistedcaldav.cache import CacheChangeObserver
 
 from twistedcaldav.test.util import InMemoryPropertyStore
 
@@ -45,6 +47,7 @@
                                                 self.ccn,
                                                 CacheChangeNotifier)
 
+
     def test_unsetPropertiesAreProvisioned(self):
         self.ccn.propertiesChanged()
         tokens = self.props._properties[CacheTokensProperty.qname()
@@ -53,6 +56,7 @@
             tokens,
             'propToken0:dataToken0')
 
+
     def test_changedPropertiesChangesPropToken(self):
         self.ccn.propertiesChanged()
         self.ccn.propertiesChanged()
@@ -71,3 +75,75 @@
         self.assertEquals(
             tokens,
             'propToken0:dataToken1')
+
+
+
+class CacheChangeObserverTests(TestCase):
+    def setUp(self):
+        self.props = InMemoryPropertyStore()
+        self.props._properties[CacheTokensProperty.qname()
+                               ] = CacheTokensProperty.fromString(
+            'propToken0:dataToken0')
+        self.observer = CacheChangeObserver(self.props)
+
+
+    def test_propertiesHaveChangedNewObserver(self):
+        self.assertEquals(self.observer.propertiesHaveChanged(), True)
+
+
+    def test_propertiesHaveChanged(self):
+        self.assertEquals(self.observer.propertiesHaveChanged(), True)
+
+        self.props._properties[CacheTokensProperty.qname()
+                               ] = CacheTokensProperty.fromString(
+            'propToken1:dataToken0')
+
+        self.assertEquals(self.observer.propertiesHaveChanged(), True)
+
+
+    def test_propertiesHaveNotChanged(self):
+        self.assertEquals(self.observer.propertiesHaveChanged(), True)
+        self.assertEquals(self.observer.propertiesHaveChanged(), False)
+
+
+    def test_propertiesDoNotChangeData(self):
+        self.assertEquals(self.observer.propertiesHaveChanged(), True)
+        self.assertEquals(self.observer.dataHasChanged(), True)
+
+        self.props._properties[CacheTokensProperty.qname()
+                               ] = CacheTokensProperty.fromString(
+            'propToken1:dataToken0')
+
+        self.assertEquals(self.observer.propertiesHaveChanged(), True)
+        self.assertEquals(self.observer.dataHasChanged(), False)
+
+
+    def test_dataHasChanged(self):
+        self.assertEquals(self.observer.dataHasChanged(), True)
+
+        self.props._properties[CacheTokensProperty.qname()
+                               ] = CacheTokensProperty.fromString(
+            'propToken0:dataToken1')
+
+        self.assertEquals(self.observer.dataHasChanged(), True)
+
+
+    def test_dataHasChangedNewObserver(self):
+        self.assertEquals(self.observer.dataHasChanged(), True)
+
+
+    def test_dataHasNotChanged(self):
+        self.assertEquals(self.observer.dataHasChanged(), True)
+        self.assertEquals(self.observer.dataHasChanged(), False)
+
+
+    def test_dataDoesNotChangeProperties(self):
+        self.assertEquals(self.observer.dataHasChanged(), True)
+        self.assertEquals(self.observer.propertiesHaveChanged(), True)
+
+        self.props._properties[CacheTokensProperty.qname()
+                               ] = CacheTokensProperty.fromString(
+            'propToken0:dataToken1')
+
+        self.assertEquals(self.observer.dataHasChanged(), True)
+        self.assertEquals(self.observer.propertiesHaveChanged(), False)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080428/d514549e/attachment.html