[Collective-checkins] CMFEditions/tests test_EditionsTool.py,1.21,1.22

[Gr?goire W. <gr...@pr...>]

Update of /cvsroot/collective/CMFEditions/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6138/tests

Modified Files:
	test_EditionsTool.py 
Log Message:
For Phil (and others): it's now possible to work with one stage only in cases only versioning is used

Index: test_EditionsTool.py
===================================================================
RCS file: /cvsroot/collective/CMFEditions/tests/test_EditionsTool.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- test_EditionsTool.py	20 Jan 2004 07:56:43 -0000	1.21
+++ test_EditionsTool.py	27 Jan 2004 17:41:10 -0000	1.22
@@ -189,12 +189,12 @@
     def test00_interface(self):
         portal_editions = self.portal.portal_editions
         
+        # test interface conformance
         verifyObject(IVersioning, portal_editions)
         verifyObject(IStaging, portal_editions)
         
     def test01_storeAndRollbackToPreviousVersion(self):
         portal_editions = self.portal.portal_editions
-        live = self.portal.live
         work = self.portal.work
         work_doc = work.doc
         
@@ -208,11 +208,9 @@
         portal_editions.rollback(work_doc)
         self.assertEqual(work_doc.EditableBody(), "v2")
         
-    def test02_rollbackToSpecificVersion(self):
+    def _rollbackToSpecificVersion(self, work_stage):
         portal_editions = self.portal.portal_editions
-        live = self.portal.live
-        work = self.portal.work
-        work_doc = work.doc
+        work_doc = work_stage.doc
         
         # store the work edition two times
         work_doc.edit(text_format='plain', text="v1")
@@ -229,9 +227,29 @@
         portal_editions.rollback(work_doc, version_ids[-2])
         self.assertEqual(work_doc.EditableBody(), "v2")
         
+    def test02_rollbackToSpecificVersion(self):
+        # call the test
+        self._rollbackToSpecificVersion(self.portal.work)
+
+    def test03_storeAndRollbackToPreviousVersionWithPortalRootAsWorkStage(self):
+        # same test as 'test02_rollbackToSpecificVersion'
+        # but with the portal root as the work stage and no live 
+        # stage specified.
+        
+        # declare the portal root as work stage and let the liev stage undefined
+        portal_editions = self.portal.portal_editions
+        portal_editions.declareAsStages(
+            {'name':'work', 'path':'', 'title':'the portal root is the work stage'},
+        )
+        
+        # add a document
+        self.portal.invokeFactory('Document', 'doc')
+        
+        # call the test
+        self._rollbackToSpecificVersion(self.portal)
+        
     def test10_getWorkEditionFromWorkEdition(self):
         portal_editions = self.portal.portal_editions
-        live = self.portal.live
         work = self.portal.work
         work_doc = work.doc
         
@@ -327,7 +345,6 @@
         # by another user than the one that locked the edition.
         portal_editions = self.portal.portal_editions
         portal_lock = self.portal.portal_lock
-        live = self.portal.live
         work = self.portal.work
         work_doc = work.doc
         
@@ -352,7 +369,7 @@
         # publish
         work_doc.edit(text_format='plain', text='v1')
         portal_editions.publish(work_doc, message="set text to 'v1'")
-        live_doc = self.portal.live.doc
+        live_doc = live.doc
         
         # edit work edition
         work_doc.edit(text_format='plain', text='v2')