Index: /main/waeup.sirp/trunk/src/waeup/sirp/tests/test_imagestorage.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/tests/test_imagestorage.py	(revision 7071)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/tests/test_imagestorage.py	(revision 7072)
@@ -259,17 +259,30 @@
         return
 
-    def test_get_file_by_context(self):
+    def test_get_file_by_context_w_attr(self):
         # if we register a file name chooser, we can also get a file
-        # by context
+        # by context and attribute
         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')
+        file_id1 = IFileStoreNameChooser(context).chooseName()
+        file_id2 = IFileStoreNameChooser(context).chooseName(attr='img')
+        file_id3 = IFileStoreNameChooser(context).chooseName(attr='doc')
+        fs = ExtFileStore()
+        # create three files for a single context, each which
+        # different content
+        fs.createFile(file_id1, StringIO('my sample 1'))
+        fs.createFile(file_id2, StringIO('my sample 2'))
+        fs.createFile(file_id3, StringIO('my sample 3'))
+        # now get back all files indicated by different `attr` markers
+        result1 = fs.getFileByContext(context)
+        result2 = fs.getFileByContext(context, attr='img')
+        result3 = fs.getFileByContext(context, attr='doc')
+        # each file has a different file id
+        self.assertEqual(file_id1, '__mymarker__mysample.txt')
+        self.assertEqual(file_id2, '__mymarker__mysample.jpg')
+        self.assertEqual(file_id3, '__mymarker__mysample.doc')
+        # each file has different content
+        self.assertEqual(result1.read(), 'my sample 1')
+        self.assertEqual(result2.read(), 'my sample 2')
+        self.assertEqual(result3.read(), 'my sample 3')
         return
 
