[Collective-checkins] CMFEditions/tests test_EditionsTool.py,1.6,1.7

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

Update of /cvsroot/collective/CMFEditions/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv22938/tests

Modified Files:
	test_EditionsTool.py 
Log Message:
updated unit tests to reflect changes in CMFStaging and ZopeVersionControl. Tests work again with current releases and checkouts.

Index: test_EditionsTool.py
===================================================================
RCS file: /cvsroot/collective/CMFEditions/tests/test_EditionsTool.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- test_EditionsTool.py	6 Jan 2004 13:14:44 -0000	1.6
+++ test_EditionsTool.py	6 Jan 2004 15:28:28 -0000	1.7
@@ -18,6 +18,9 @@
 # along with CMFEditions; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #########################################################################
+"""
+$Id$
+"""
 
 import os, sys
 if __name__ == '__main__':
@@ -71,8 +74,8 @@
         # declare the folders above as stages
         portal_staging.manage_editStages(
             (
-                StageDefinition('site', 'site', 'live stage'),
-                StageDefinition('work', 'work', 'working stage'),
+                StageDefinition('site', 'site', 'site stage'),
+                StageDefinition('work', 'work', 'work stage'),
             )
         )
 
@@ -135,20 +138,24 @@
         work = self.portal.work
         work_doc = self.portal.work.doc
         
-        # first ever update
+        # edit work edition
+        work_doc.edit(text_format='plain', text='v1')
         self.failIf(getattr(aq_base(site), 'doc', None))
+        
+        # first ever update
         portal_editions.updateToSite(work_doc)
-        result1_doc = getattr(aq_base(site), 'doc', None)
-        self.failUnless(result1_doc)
-
-        # update existing item
-        portal_editions.updateToSite(work_doc)
-        result2_doc = getattr(aq_base(site), 'doc', None)
-        self.failUnless(result2_doc)
+        site_doc = getattr(aq_base(site), 'doc')
+        self.assertEqual(site_doc.EditableBody(), 'v1')
         
-        # the items of the first and of the second updateToSite
-        # should be different
-        self.failIfEqual(result1_doc, result2_doc)
+        # edit work edition
+        work_doc.edit(text_format='plain', text='v2')
+        site_doc = getattr(aq_base(site), 'doc')
+        self.assertEqual(site_doc.EditableBody(), 'v1')
+        
+        # update changes
+        portal_editions.updateToSite(work_doc)
+        site_doc = getattr(aq_base(site), 'doc')
+        self.assertEqual(site_doc.EditableBody(), 'v2')
         
     def test_lockerUpdatesLockedEditionToSite(self):
         """checks if a locked object can be updated to the site by
@@ -157,14 +164,15 @@
         XXX The question here is if we should allow that!
         """
         portal_editions = self.portal.portal_editions
+        portal_lock = self.portal.portal_lock
         site = self.portal.site
         work = self.portal.work
         work_doc = self.portal.work.doc
         
         # lets lock the object and then ...
-        portal_editions.lock(work_doc)
+        portal_lock.lock(work_doc)
                 
-        # ... update it to teh site.
+        # ... update it to the site.
         portal_editions.updateToSite(work_doc)
         
         result1_doc = getattr(aq_base(site), 'doc', None)
@@ -175,12 +183,13 @@
         another user than the one that locked the edition.
         """
         portal_editions = self.portal.portal_editions
+        portal_lock = self.portal.portal_lock
         site = self.portal.site
         work = self.portal.work
         work_doc = self.portal.work.doc
         
         # lets lock the object and then ...
-        portal_editions.lock(work_doc)
+        portal_lock.lock(work_doc)
         
         # ... login as another user check if the reviewer is able to update the object to the site
         self.login('reviewer')
@@ -220,4 +229,3 @@
         suite = TestSuite()
         suite.addTest(makeSuite(TestEditionsTool))
         return suite
-