[Checkins] SVN: CMF/branches/tseaver-catalog_events/CMF - down to one failing test:

[Jens Vagelpohl]

Log message for revision 66698:
  - down to one failing test:
  
    - uncommented the currently commented-out call to ob._recurseOpaques
      because events never reached the items inside the opaque items
      container
    - replaced calls to manage_* in the DiscussionItemContainer with
      direct indexing calls since CMFCatalogAware no longer has the
      manage_* mathods
    - change the expected number of items in the catalog for a test in
      the discussions tests because the DummyContent the discussion
      is attached to will always be indexed as well
  
  

Changed:
  U   CMF/branches/tseaver-catalog_events/CMFCore/CMFCatalogAware.py
  U   CMF/branches/tseaver-catalog_events/CMFDefault/DiscussionItem.py
  U   CMF/branches/tseaver-catalog_events/CMFDefault/tests/test_Discussions.py

-=-
Modified: CMF/branches/tseaver-catalog_events/CMFCore/CMFCatalogAware.py
===================================================================
--- CMF/branches/tseaver-catalog_events/CMFCore/CMFCatalogAware.py	2006-04-08 22:34:18 UTC (rev 66697)
+++ CMF/branches/tseaver-catalog_events/CMFCore/CMFCatalogAware.py	2006-04-09 00:39:42 UTC (rev 66698)
@@ -302,24 +302,24 @@
             ob.indexObject()
             if ICallableOpaqueItemEvents.providedBy(ob):
                 ob.manage_afterAdd(ob, event.newParent)
-            #ob._recurseOpaques('manage_afterAdd', ob)
+            ob._recurseOpaques('manage_afterAdd', ob)
 
     elif IObjectClonedEvent.providedBy(event):
         ob.notifyWorkflowCreated()
         ob._clearLocalRolesAfterClone()
         if ICallableOpaqueItemEvents.providedBy(ob):
             ob.manage_afterClone(ob)
-        #ob._recurseOpaques('manage_afterClone')
+        ob._recurseOpaques('manage_afterClone')
 
     elif IObjectMovedEvent.providedBy(event):
         if event.newParent is not None:
             ob.reindexObject()
-            #ob._recurseOpaques('manage_afterAdd', ob)
+            ob._recurseOpaques('manage_afterAdd', ob)
 
     elif IObjectWillBeMovedEvent.providedBy(event):
         if event.oldParent is not None:
             ob.unindexObject()
             if ICallableOpaqueItemEvents.providedBy(ob):
                 ob.manage_beforeDelete(ob, event.oldParent)
-            #ob._recurseOpaques('manage_beforeDelete', ob)
+            ob._recurseOpaques('manage_beforeDelete', ob)
 

Modified: CMF/branches/tseaver-catalog_events/CMFDefault/DiscussionItem.py
===================================================================
--- CMF/branches/tseaver-catalog_events/CMFDefault/DiscussionItem.py	2006-04-08 22:34:18 UTC (rev 66697)
+++ CMF/branches/tseaver-catalog_events/CMFDefault/DiscussionItem.py	2006-04-09 00:39:42 UTC (rev 66698)
@@ -24,6 +24,7 @@
 from OFS.Traversable import Traversable
 from zope.interface import implements
 
+from Products.CMFCore.interfaces import IContentish
 from Products.CMFCore.interfaces import IDiscussable
 from Products.CMFCore.interfaces import IDiscussionResponse
 from Products.CMFCore.interfaces.Discussions \
@@ -72,7 +73,7 @@
     """ Class for content which is a response to other content.
     """
 
-    implements(IDiscussionResponse)
+    implements(IDiscussionResponse, IContentish)
     __implements__ = (z2IDiscussionResponse, Document.__implements__)
 
     meta_type           = 'Discussion Item'
@@ -210,7 +211,7 @@
         """
         if aq_base(container) is not aq_base(self):
             for obj in self.objectValues():
-                obj.__of__(self).manage_afterAdd(item, container)
+                obj.__of__(self).indexObject()
 
     security.declarePrivate('manage_afterClone')
     def manage_afterClone(self, item):
@@ -219,7 +220,7 @@
             Notify the workflow about the contained items.
         """
         for obj in self.objectValues():
-            obj.__of__(self).manage_afterClone(item)
+            obj.__of__(self).notifyWorkflowCreated()
 
     security.declarePrivate( 'manage_beforeDelete' )
     def manage_beforeDelete(self, item, container):
@@ -228,7 +229,7 @@
         """
         if aq_base(container) is not aq_base(self):
             for obj in self.objectValues():
-                obj.__of__( self ).manage_beforeDelete( item, container )
+                obj.__of__( self ).unindexObject()
 
     #
     #   OFS.ObjectManager query interface.

Modified: CMF/branches/tseaver-catalog_events/CMFDefault/tests/test_Discussions.py
===================================================================
--- CMF/branches/tseaver-catalog_events/CMFDefault/tests/test_Discussions.py	2006-04-08 22:34:18 UTC (rev 66697)
+++ CMF/branches/tseaver-catalog_events/CMFDefault/tests/test_Discussions.py	2006-04-09 00:39:42 UTC (rev 66698)
@@ -306,18 +306,18 @@
         self.assertEqual(len(talkback4.getReplies()), 1)
         self.assertEqual(len(talkback5.getReplies()), 1)
         self.assertEqual(len(talkback6.getReplies()), 0)
-        self.assertEqual(len(ctool), 6)
+        self.assertEqual(len(ctool), 7)
 
         talkback3.deleteReply(id4)
         self.assertEqual(len(talkback.getReplies()), 1)
         self.assertEqual(len(talkback1.getReplies()), 1)
         self.assertEqual(len(talkback2.getReplies()), 1)
         self.assertEqual(len(talkback3.getReplies()), 0)
-        self.assertEqual(len(ctool), 3)
+        self.assertEqual(len(ctool), 4)
 
         talkback.deleteReply(id1)
         self.assertEqual(len(talkback.getReplies()), 0)
-        self.assertEqual(len(ctool), 0)
+        self.assertEqual(len(ctool), 1)
 
     def test_newTalkbackIsWrapped(self):
         test = self._makeDummyContent('test')