[CalendarServer-changes] [5383] CalendarServer/trunk/txdav/propertystore/test

source_changes at macosforge.org source_changes at macosforge.org
Mon Mar 22 20:39:24 PDT 2010


Revision: 5383
          http://trac.macosforge.org/projects/calendarserver/changeset/5383
Author:   wsanchez at apple.com
Date:     2010-03-22 20:39:21 -0700 (Mon, 22 Mar 2010)
Log Message:
-----------
Refactor tests to share some code.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/propertystore/test/test_none.py
    CalendarServer/trunk/txdav/propertystore/test/test_xattr.py

Modified: CalendarServer/trunk/txdav/propertystore/test/test_none.py
===================================================================
--- CalendarServer/trunk/txdav/propertystore/test/test_none.py	2010-03-23 03:21:32 UTC (rev 5382)
+++ CalendarServer/trunk/txdav/propertystore/test/test_none.py	2010-03-23 03:39:21 UTC (rev 5383)
@@ -18,27 +18,17 @@
 Property store tests.
 """
 
-from zope.interface.verify import verifyObject, BrokenMethodImplementation
-
-from twisted.trial import unittest
-
-from twext.web2.dav import davxml
-
-from txdav.idav import IPropertyStore, PropertyChangeNotAllowedError
-from txdav.propertystore.base import PropertyName
+from txdav.idav import PropertyChangeNotAllowedError
 from txdav.propertystore.none import PropertyStore
+from txdav.propertystore.test.base import propertyName, propertyValue
 
+from txdav.propertystore.test import base
 
-class PropertyStoreTest(unittest.TestCase):
+
+class PropertyStoreTest(base.PropertyStoreTest):
     def setUp(self):
         self.propertyStore = PropertyStore()
 
-    def test_interface(self):
-        try:
-            verifyObject(IPropertyStore, self.propertyStore)
-        except BrokenMethodImplementation, e:
-            self.fail(e)
-
     def test_flush(self):
         store = self.propertyStore
 
@@ -46,7 +36,7 @@
         store.flush()
 
         name = propertyName("test")
-        value = davxml.ResponseDescription("Hello, World!")
+        value = propertyValue("Hello, World!")
 
         store[name] = value
 
@@ -62,20 +52,6 @@
 
         self.assertEquals(store.get(name, None), None)
 
-
     def test_abort(self):
-        store = self.propertyStore
-
-        name = propertyName("test")
-        value = davxml.ResponseDescription("Hello, World!")
-
-        store[name] = value
-
-        store.abort()
-
-        self.assertEquals(store.get(name, None), None)
-        self.assertEquals(store.modified, {})
-
-
-def propertyName(name):
-    return PropertyName("http://calendarserver.org/ns/test/", name)
+        super(PropertyStoreTest, self).test_abort()
+        self.assertEquals(self.propertyStore.modified, {})

Modified: CalendarServer/trunk/txdav/propertystore/test/test_xattr.py
===================================================================
--- CalendarServer/trunk/txdav/propertystore/test/test_xattr.py	2010-03-23 03:21:32 UTC (rev 5382)
+++ CalendarServer/trunk/txdav/propertystore/test/test_xattr.py	2010-03-23 03:39:21 UTC (rev 5383)
@@ -18,16 +18,13 @@
 Property store tests.
 """
 
-from zope.interface.verify import verifyObject, BrokenMethodImplementation
-
-from twisted.trial import unittest
-
 from twext.python.filepath import FilePath
-from twext.web2.dav import davxml
 
-from txdav.idav import IPropertyStore
 from txdav.propertystore.base import PropertyName
+from txdav.propertystore.test.base import propertyName
 
+from txdav.propertystore.test import base
+
 try:
     from txdav.propertystore.xattr import PropertyStore
     from xattr import xattr
@@ -36,7 +33,7 @@
     importErrorMessage = str(e)
 
 
-class PropertyStoreTest(unittest.TestCase):
+class PropertyStoreTest(base.PropertyStoreTest):
     def setUp(self):
         tempDir = FilePath(self.mktemp())
         tempDir.makedirs()
@@ -44,50 +41,15 @@
         tempFile.touch()
         self.propertyStore = PropertyStore(tempFile)
 
-    def test_interface(self):
-        try:
-            verifyObject(IPropertyStore, self.propertyStore)
-        except BrokenMethodImplementation, e:
-            self.fail(e)
-
     def test_init(self):
         store = self.propertyStore
         self.failUnless(isinstance(store.attrs, xattr))
         self.assertEquals(store.removed, set())
         self.assertEquals(store.modified, {})
 
-    def test_flush(self):
-        store = self.propertyStore
-
-        name = propertyName("test")
-        value = davxml.ResponseDescription("Hello, World!")
-
-        store[name] = value
-
-        store.flush()
-        store.abort()
-
-        self.assertEquals(store.get(name, None), value)
-
-        del store[name]
-
-        store.flush()
-        store.abort()
-
-        self.assertEquals(store.get(name, None), None)
-
-
     def test_abort(self):
+        super(PropertyStoreTest, self).test_abort()
         store = self.propertyStore
-
-        name = propertyName("test")
-        value = davxml.ResponseDescription("Hello, World!")
-
-        store[name] = value
-
-        store.abort()
-
-        self.assertEquals(store.get(name, None), None)
         self.assertEquals(store.removed, set())
         self.assertEquals(store.modified, {})
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100322/9884b3c9/attachment-0001.html>


More information about the calendarserver-changes mailing list