Index: main/waeup.ikoba/trunk/src/waeup/ikoba/documents/tests/test_browser.py
===================================================================
--- main/waeup.ikoba/trunk/src/waeup/ikoba/documents/tests/test_browser.py	(revision 12246)
+++ main/waeup.ikoba/trunk/src/waeup/ikoba/documents/tests/test_browser.py	(revision 12256)
@@ -111,10 +111,11 @@
         self.browser.getControl(name="doctype").value = ['PDFDocument']
         self.browser.getControl(name="form.title").value = 'My PDF Document'
+        self.browser.getControl(name="form.document_id").value = 'DOC1'
         self.browser.getControl("Add document").click()
         self.assertTrue('PDF Document added.' in self.browser.contents)
-        document = self.app['documents']['d101']
+        document = self.app['documents']['DOC1']
 
         # Document can be edited
-        self.browser.getLink("d101").click()
+        self.browser.getLink("DOC1").click()
         self.browser.getLink("Manage").click()
         self.browser.getControl(name="form.title").value = 'My first doc'
@@ -122,5 +123,5 @@
         self.assertTrue('Form has been saved.' in self.browser.contents)
         self.browser.getLink("View").click()
-        self.assertEqual(self.browser.url, self.container_path + '/d101/index')
+        self.assertEqual(self.browser.url, self.container_path + '/DOC1/index')
 
         # File can be uploaded
@@ -149,5 +150,5 @@
             name='upload_pdfscanmanageupload').click()
         self.assertTrue(
-            'href="http://localhost/app/documents/d101/sample.pdf">PDF File</a>'
+            'href="http://localhost/app/documents/DOC1/sample.pdf">PDF File</a>'
             in self.browser.contents)
         # Browsing the link shows a real pdf only if the document
@@ -158,5 +159,5 @@
             in self.browser.contents)
         IWorkflowState(document).setState(PUBLISHED)
-        self.browser.open(self.container_path + '/d101/sample.pdf')
+        self.browser.open(self.container_path + '/DOC1/sample.pdf')
         self.assertEqual(
             self.browser.headers['content-type'], 'application/pdf')
@@ -164,5 +165,5 @@
         # Transitions can be performed
         self.assertEqual(document.state, 'published')
-        self.browser.open(self.container_path + '/d101')
+        self.browser.open(self.container_path + '/DOC1')
         self.browser.getLink("Transition").click()
         self.browser.getControl(name="transition").value = ['retract']
@@ -213,11 +214,12 @@
         self.browser.getControl("Add document").click()
         self.browser.getControl(name="doctype").value = ['HTMLDocument']
+        self.browser.getControl(name="form.document_id").value = 'DOC2'
         self.browser.getControl(name="form.title").value = 'My HTML Document'
         self.browser.getControl("Add document").click()
         self.assertTrue('HTML Document added.' in self.browser.contents)
-        document = self.app['documents']['d101']
+        document = self.app['documents']['DOC2']
 
         # Document can be edited
-        self.browser.getLink("d101").click()
+        self.browser.getLink("DOC2").click()
         self.browser.getLink("Manage").click()
         self.browser.getControl(name="form.title").value = 'My second doc'
@@ -230,5 +232,5 @@
         self.assertTrue('Form has been saved.' in self.browser.contents)
         self.browser.getLink("View").click()
-        self.assertEqual(self.browser.url, self.container_path + '/d101/index')
+        self.assertEqual(self.browser.url, self.container_path + '/DOC2/index')
         self.assertTrue(
             '<h1>Hello World</h1>' in self.browser.contents)
@@ -241,5 +243,5 @@
             '<h1>Hallo Welt</h1>' in self.browser.contents)
         # The content can't be rendered yet
-        self.browser.open(self.container_path + '/d101/display')
+        self.browser.open(self.container_path + '/DOC2/display')
         self.assertTrue(
             'The document requested has not yet been published'
@@ -249,5 +251,5 @@
 
         # Transitions can be performed
-        self.browser.open(self.container_path + '/d101')
+        self.browser.open(self.container_path + '/DOC2')
         self.browser.getLink("Transition").click()
         self.browser.getControl(name="transition").value = ['publish']
@@ -256,5 +258,5 @@
 
         # The content can be rendered
-        self.browser.open(self.container_path + '/d101/display')
+        self.browser.open(self.container_path + '/DOC2/display')
         self.assertTrue(
             '<h1>Hallo Welt</h1>' in self.browser.contents)
Index: main/waeup.ikoba/trunk/src/waeup/ikoba/documents/tests/test_document.py
===================================================================
--- main/waeup.ikoba/trunk/src/waeup/ikoba/documents/tests/test_document.py	(revision 12246)
+++ main/waeup.ikoba/trunk/src/waeup/ikoba/documents/tests/test_document.py	(revision 12256)
@@ -72,9 +72,9 @@
         container = DocumentsContainer()
         document = createObject(u'waeup.HTMLDocument')
-        document_id = document.document_id
+        document.document_id = u'DOC'
         container.addDocument(document)
-        self.assertEqual(container[document_id], document)
+        self.assertEqual(container[document.document_id], document)
         self.assertRaises(TypeError, container.addDocument, object())
-        self.assertEqual(document_id, 'd123')
+        self.assertEqual(document.document_id, 'DOC')
         return
 
@@ -151,8 +151,9 @@
         # we can get an image filename for documents not in a container
         doc = PDFDocument()
+        doc.document_id = u'DOC'
         chooser = IFileStoreNameChooser(doc)
         result = chooser.chooseName('sample.jpg')
         # the file would be stored in a ``_default`` directory.
         self.assertEqual(
-            result, '__file-document__documents/sample_d123.jpg')
+            result, '__file-document__documents/sample_DOC.jpg')
         return
