[CMF-checkins] CVS: CMF/CMFUid/tests - test_uidannotation.py:1.5.2.1

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFUid/tests
In directory cvs.zope.org:/tmp/cvs-serv17418/CMFUid/tests

Modified Files:
      Tag: CMF-1_5-branch
	test_uidannotation.py 
Log Message:
- added nested folder test and made it pass
- fixed broken excepts
- some whitespace cleanup


=== CMF/CMFUid/tests/test_uidannotation.py 1.5 => 1.5.2.1 ===
--- CMF/CMFUid/tests/test_uidannotation.py:1.5	Thu Aug 12 11:07:43 2004
+++ CMF/CMFUid/tests/test_uidannotation.py	Fri Aug 27 04:16:22 2004
@@ -15,20 +15,19 @@
 $Id$
 """
 
-from unittest import TestCase, TestSuite, makeSuite, main
+from unittest import TestSuite, makeSuite, main
 import Testing
 import Zope
 Zope.startup()
 
 from Interface.Verify import verifyObject
 
+from Products.CMFCore.PortalFolder import PortalFolder
 from Products.CMFCore.tests.base.dummy import DummyContent
-
 from Products.CMFCore.tests.base.testcase import SecurityTest
 
 from Products.CMFUid.interfaces import IUniqueIdAnnotation
 from Products.CMFUid.interfaces import IUniqueIdAnnotationManagement
-from Products.CMFUid.UniqueIdAnnotationTool import UniqueIdAnnotationTool
 
 
 UID_ATTRNAME = 'cmf_uid'
@@ -36,26 +35,29 @@
 class UniqueIdAnnotationTests(SecurityTest):
 
     def setUp(self):
+        from Products.CMFUid.UniqueIdAnnotationTool \
+                import UniqueIdAnnotationTool
+
         SecurityTest.setUp(self)
         self.root._setObject('portal_uidannotation', UniqueIdAnnotationTool())
         self.root._setObject('dummy', DummyContent(id='dummy'))
-    
+
     def test_interface(self):
         dummy = self.root.dummy
         anno_tool = self.root.portal_uidannotation
         annotation = anno_tool(dummy, UID_ATTRNAME)
-        
+
         verifyObject(IUniqueIdAnnotationManagement, anno_tool)
         verifyObject(IUniqueIdAnnotation, annotation)
-        
+
     def test_setAndGetUid(self):
         dummy = self.root.dummy
         annotation = self.root.portal_uidannotation(dummy, UID_ATTRNAME)
-        
+
         self.assertEqual(annotation(), None)
         annotation.setUid(13)
         self.assertEqual(annotation(), 13)
-        
+
     # copy/rename/add events: Just to remember
     #
     # add/import obj:
@@ -68,55 +70,69 @@
     # copy and paste (clone) obj:
     #   obj.manage_afterAdd(obj_at_target, obj_at_target, target_folder)
     #   obj.manage_afterClone(obj_at_target, obj_at_target)
-        
+
     def test_simulateItemAddRemovingUid(self):
         dummy = self.root.dummy
         annotation = self.root.portal_uidannotation(dummy, UID_ATTRNAME)
-        
-        annotation.manage_afterAdd(dummy, None)
+
+        annotation.__of__(dummy).manage_afterAdd(dummy, None)
         self.assertRaises(AttributeError, getattr, dummy, UID_ATTRNAME)
-        
+
     def test_simulateItemAddDoesNotTouchUid(self):
         dummy = self.root.dummy
         annotation = self.root.portal_uidannotation(dummy, UID_ATTRNAME)
-        
+
         self.root.portal_uidannotation.remove_on_add = False
-        annotation.manage_afterAdd(dummy, None)
+        annotation.__of__(dummy).manage_afterAdd(dummy, None)
         self.assertEqual(getattr(dummy, UID_ATTRNAME), annotation)
-        
+
     def test_simulateItemRename(self):
         dummy = self.root.dummy
         annotation = self.root.portal_uidannotation(dummy, UID_ATTRNAME)
-        
-        annotation.manage_beforeDelete(dummy, None)
-        annotation.manage_afterAdd(dummy, None)
+
+        annotation.__of__(dummy).manage_beforeDelete(dummy, None)
+        annotation.__of__(dummy).manage_afterAdd(dummy, None)
         self.assertEqual(getattr(dummy, UID_ATTRNAME), annotation)
-        
+
     def test_simulateItemCloneRemovingUid1(self):
         dummy = self.root.dummy
         annotation = self.root.portal_uidannotation(dummy, UID_ATTRNAME)
-        
-        annotation.manage_afterAdd(dummy, None)
-        annotation.manage_afterClone(dummy)
+
+        annotation.__of__(dummy).manage_afterAdd(dummy, None)
+        annotation.__of__(dummy).manage_afterClone(dummy)
         self.assertRaises(AttributeError, getattr, dummy, UID_ATTRNAME)
-        
+
     def test_simulateItemCloneRemovingUid2(self):
         dummy = self.root.dummy
         annotation = self.root.portal_uidannotation(dummy, UID_ATTRNAME)
-        
+
         self.root.portal_uidannotation.remove_on_add = False
-        annotation.manage_afterAdd(dummy, None)
-        annotation.manage_afterClone(dummy)
+        annotation.__of__(dummy).manage_afterAdd(dummy, None)
+        annotation.__of__(dummy).manage_afterClone(dummy)
         self.assertRaises(AttributeError, getattr, dummy, UID_ATTRNAME)
-        
+
     def test_simulateItemCloneDoesNotTouchUid(self):
         dummy = self.root.dummy
         annotation = self.root.portal_uidannotation(dummy, UID_ATTRNAME)
-        
+
         self.root.portal_uidannotation.remove_on_clone = False
-        annotation.manage_afterAdd(dummy, None)
-        annotation.manage_afterClone(dummy)
+        annotation.__of__(dummy).manage_afterAdd(dummy, None)
+        annotation.__of__(dummy).manage_afterClone(dummy)
         self.assertEqual(getattr(dummy, UID_ATTRNAME), annotation)
+
+    def test_simulateNestedFolderCloneRemovingUid1(self):
+        self.root._setObject( 'foo', PortalFolder(id='foo') )
+        foo = self.root.foo
+        foo._setObject( 'sub1', PortalFolder(id='sub1') )
+        foo.sub1._setObject( 'sub2', PortalFolder(id='sub2') )
+        foo.sub1.sub2._setObject( 'baz', DummyContent(id='baz', catalog=1) )
+        baz = foo.sub1.sub2.baz
+        annotation = self.root.portal_uidannotation(baz, UID_ATTRNAME)
+        self.assertEqual( getattr(baz, UID_ATTRNAME), annotation )
+
+        foo.manage_afterAdd(foo, None)
+        foo.manage_afterClone(foo)
+        self.assertRaises(AttributeError, getattr, baz, UID_ATTRNAME)
 
 
 def test_suite():