Get this running again for the most part under Plone 4.0 - the main trick was probably to use the new CMFCatalogAware class. Removed collective.testcaselayer dependency, as that broke totally. There's some test failures left, but indexing works in general. Maybe the custom indexing event handlers aren't all required anymore. The title_or_id test failure looks like there's an infinite loop in the __parent__ pointers never reaching the actual content object. This change breaks Plone 3.x compatibility for the moment.

svn path=/plone.app.discussion/trunk/; revision=30629

plone/app/discussion/tests/layer.py

@@ -1,12 +1,25 @@
+from Testing import ZopeTestCase as ztc
+
 from Products.PloneTestCase import ptc
-import collective.testcaselayer.ptc
+from Products.PloneTestCase import layer
+from Products.Five import zcml
+from Products.Five import fiveconfigure
 
-ptc.setupPloneSite()
+ptc.setupPloneSite(
+    extension_profiles=('plone.app.discussion:default', )
+)
 
-class Layer(collective.testcaselayer.ptc.BasePTCLayer):
-    """Install plone.app.discussion"""
+class DiscussionLayer(layer.PloneSite):
+    """Configure plone.app.discussion"""
 
-    def afterSetUp(self):
-        self.addProfile('plone.app.discussion:default')
+    @classmethod
+    def setUp(cls):
+        fiveconfigure.debug_mode = True
+        import plone.app.discussion
+        zcml.load_config("configure.zcml", plone.app.discussion)
+        fiveconfigure.debug_mode = False
+        ztc.installPackage("plone.app.discussion", quiet=1)
 
-DiscussionLayer = Layer([collective.testcaselayer.ptc.ptc_layer])
+    @classmethod
+    def tearDown(cls):
+        pass