[Checkins] SVN: megrok.five/trunk/src/megrok/five/ Instead of loading Five's site.zcml (which might vary from instance to instance

[Philipp von Weitershausen]

Log message for revision 73824:
  Instead of loading Five's site.zcml (which might vary from instance to instance
  due ot package-includes and/or other customizations), provide our own ftesting.zcml
  and define a layer based on that. Now the ftest passes.
  

Changed:
  A   megrok.five/trunk/src/megrok/five/ftesting.zcml
  U   megrok.five/trunk/src/megrok/five/testing.py
  U   megrok.five/trunk/src/megrok/five/tests/test_zmiadd_functional.py

-=-
Added: megrok.five/trunk/src/megrok/five/ftesting.zcml
===================================================================
--- megrok.five/trunk/src/megrok/five/ftesting.zcml	2007-03-28 08:24:10 UTC (rev 73823)
+++ megrok.five/trunk/src/megrok/five/ftesting.zcml	2007-03-28 08:35:45 UTC (rev 73824)
@@ -0,0 +1,13 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+	       xmlns:meta="http://namespaces.zope.org/meta">
+
+  <include package="Products.Five" />
+  <include package="grok" file="meta.zcml" />
+  <include package="megrok.five" />
+
+  <meta:redefinePermission from="zope2.Public" to="zope.Public" />
+
+  <securityPolicy
+      component="Products.Five.security.FiveSecurityPolicy" />
+
+</configure>


Property changes on: megrok.five/trunk/src/megrok/five/ftesting.zcml
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: megrok.five/trunk/src/megrok/five/testing.py
===================================================================
--- megrok.five/trunk/src/megrok/five/testing.py	2007-03-28 08:24:10 UTC (rev 73823)
+++ megrok.five/trunk/src/megrok/five/testing.py	2007-03-28 08:35:45 UTC (rev 73824)
@@ -1,11 +1,2 @@
-from Products.Five import zcml
-
-class FunctionalLayer:
-
-    @classmethod
-    def setUp(cls):
-        zcml.load_site()
-
-    @classmethod
-    def tearDown(cls):
-        raise NotImplementedError
+from zope.app.testing.functional import defineLayer
+defineLayer('FunctionalLayer', 'ftesting.zcml')

Modified: megrok.five/trunk/src/megrok/five/tests/test_zmiadd_functional.py
===================================================================
--- megrok.five/trunk/src/megrok/five/tests/test_zmiadd_functional.py	2007-03-28 08:24:10 UTC (rev 73823)
+++ megrok.five/trunk/src/megrok/five/tests/test_zmiadd_functional.py	2007-03-28 08:35:45 UTC (rev 73824)
@@ -13,18 +13,14 @@
   >>> browser.open('http://localhost/manage_main')
 
   >>> add = browser.getControl(name=':action')
+  >>> 'megrok.five.tests.test_zmiadd_functional.MammothManager' in add.displayOptions
+  True
 
-  XXX The following test doesn't work due to a setup bug in the zope 2
-  instance buildout recipe...
-
-  #>>> 'megrok.five.tests.test_zmiadd_functional.TestApp' in add.displayOptions
-  #True
-
 """
 import grok
 import megrok.five
 
-class TestApp(megrok.five.Model, grok.Application):
+class MammothManager(megrok.five.Model, grok.Application):
     pass
 
 
@@ -36,6 +32,3 @@
     suite = FunctionalDocTestSuite()
     suite.layer = FunctionalLayer
     return unittest.TestSuite([suite])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')