Changeset 7032

Timestamp:

8 Nov 2011, 14:13:30 (13 years ago)

Author:

uli

Message:

Finish default file store name chooser and related tests.

Location:

main/waeup.sirp/branches/ulif-extimgstore/src/waeup/sirp

Files:

• imagestorage.py (modified) (3 diffs)
• tests/test_imagestorage.py (modified) (1 diff)

main/waeup.sirp/branches/ulif-extimgstore/src/waeup/sirp/imagestorage.py

@@ -210 +210 @@
 
 class FileStoreNameChooser(grok.Adapter):
+    """Default file store name chooser.
+
+    File store name choosers pick a file id, a string, for a certain
+    context object. They are normally registered as adapters for a
+    certain content type and know how to build the file id for this
+    special type of context.
+
+    Provides the :class:`waeup.sirp.interfaces.IFileStoreNameChooser`
+    interface.
+
+    This default file name chosser accepts almost every name as long
+    as it is a string or unicode object.
+    """
     grok.context(Interface)
     grok.implements(IFileStoreNameChooser)
@@ -217 +230 @@
 
         Raises a user error if the name is not valid.
-        """
-        pass
+
+        For the default file store name chooser any name is valid.
+        """
+        if isinstance(name, basestring):
+            return True
+        return False
 
     def chooseName(self, name):
@@ -228 +245 @@
         chooseName is expected to always choose a valid name (that
         would pass the checkName test) and never raise an error.
-        """
+
+        For this default name chooser we return the given name if it
+        is valid or ``unknown_file`` else.
+        """
+        if self.checkName(name):
+            return name
         return u'unknown_file'
 

main/waeup.sirp/branches/ulif-extimgstore/src/waeup/sirp/tests/test_imagestorage.py

@@ -310 +310 @@
         self.assertEqual(contents, 'Hi there!')
 
-class NameChooserTests(unittest.TestCase):
+class FileStoreNameChooserTests(FunctionalTestCase):
+
+    layer = FunctionalLayer
 
     def test_iface(self):
+        # we provide the interfaces we promise to do
         obj = FileStoreNameChooser(None)
         verifyClass(IFileStoreNameChooser, FileStoreNameChooser)
         verifyObject(IFileStoreNameChooser, obj)
+        return
+
+    def test_accessible_as_adapter(self):
+        # we can get a file name chooser via adapter
+        chooser = IFileStoreNameChooser(object())
+        self.assertTrue(
+            isinstance(chooser, FileStoreNameChooser))
+        return
+
+    def test_check_name(self):
+        # default file name choosers accept any string
+        chooser = FileStoreNameChooser(object())
+        self.assertEqual(chooser.checkName('Hi there!'), True)
+        self.assertEqual(chooser.checkName(None), False)
+        return
+
+    def test_choose_name(self):
+        # we get a simple string if we do not pass in a valid string
+        chooser = FileStoreNameChooser(object())
+        self.assertEqual(chooser.chooseName('myname'), 'myname')
+        self.assertEqual(chooser.chooseName(None), u'unknown_file')
         return