Index: /main/waeup.sirp/branches/ulif-extimgstore/src/waeup/sirp/tests/test_imagestorage.py
===================================================================
--- /main/waeup.sirp/branches/ulif-extimgstore/src/waeup/sirp/tests/test_imagestorage.py	(revision 7051)
+++ /main/waeup.sirp/branches/ulif-extimgstore/src/waeup/sirp/tests/test_imagestorage.py	(revision 7052)
@@ -6,5 +6,6 @@
 from hurry.file import HurryFile
 from hurry.file.interfaces import IFileRetrieval
-from zope.component import getUtility, provideUtility, queryUtility
+from zope.component import (
+    getUtility, provideUtility, queryUtility, provideAdapter)
 from zope.component.hooks import setSite
 from zope.interface.verify import verifyClass, verifyObject
@@ -149,4 +150,14 @@
         path = self.pathFromFileID(store, root, file_id)
         return f, path, HurryFile(filename, file_id)
+
+class CustomContext(object):
+    pass
+
+class CustomContextFileChooser(object):
+    def __init__(self, context):
+        self.context = context
+
+    def chooseName(self, name=None):
+        return '__mymarker__mysample.txt'
 
 class FunctionalExtFileStoreTests(FunctionalTestCase):
@@ -169,4 +180,8 @@
         provideUtility(
             CustomizedFileHandler(), IFileStoreHandler, name=u'mymarker')
+        # register a file chooser adapter for CustomContext
+        provideAdapter(
+            CustomContextFileChooser,
+            (CustomContext,), IFileStoreNameChooser)
         return
 
@@ -238,4 +253,19 @@
         return
 
+    def test_get_file_by_context(self):
+        # if we register a file name chooser, we can also get a file
+        # by context
+        fs = ExtFileStore()
+        context = CustomContext()
+        file_id = IFileStoreNameChooser(context).chooseName()
+        fs = ExtFileStore()
+        fs.createFile(file_id, StringIO('my sample'))
+        result = fs.getFileByContext(context)
+        self.assertEqual(
+            file_id, '__mymarker__mysample.txt')
+        self.assertEqual(
+            result.read(), 'my sample')
+        return
+
     def test_get_default_handler(self):
         # we can get a default handler
