[Checkins] SVN: zope.app.component/trunk/src/zope/app/component/browser/ remove test sample content object from the non-test-layer ZCML

[Fred L. Drake, Jr.]

Log message for revision 79233:
  remove test sample content object from the non-test-layer ZCML

Changed:
  U   zope.app.component/trunk/src/zope/app/component/browser/configure.zcml
  A   zope.app.component/trunk/src/zope/app/component/browser/ftesting.zcml
  U   zope.app.component/trunk/src/zope/app/component/browser/ftests.py

-=-
Modified: zope.app.component/trunk/src/zope/app/component/browser/configure.zcml
===================================================================
--- zope.app.component/trunk/src/zope/app/component/browser/configure.zcml	2007-08-24 14:32:56 UTC (rev 79232)
+++ zope.app.component/trunk/src/zope/app/component/browser/configure.zcml	2007-08-24 14:33:47 UTC (rev 79233)
@@ -3,12 +3,6 @@
    xmlns:browser="http://namespaces.zope.org/browser"
    >
 
-  <browser:addMenuItem
-      class=".tests.Sample"
-      permission="zope.ManageSite"
-      title="Sample"
-      />
-
 <!-- Registration Managemenet -->
 
   <browser:page

Added: zope.app.component/trunk/src/zope/app/component/browser/ftesting.zcml
===================================================================
--- zope.app.component/trunk/src/zope/app/component/browser/ftesting.zcml	                        (rev 0)
+++ zope.app.component/trunk/src/zope/app/component/browser/ftesting.zcml	2007-08-24 14:33:47 UTC (rev 79233)
@@ -0,0 +1,15 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser"
+    i18n_domain="zope"
+    >
+    
+  <include package="zope.app.component" file="ftesting.zcml"/>
+
+  <browser:addMenuItem
+      class="zope.app.component.browser.tests.Sample"
+      permission="zope.ManageSite"
+      title="Sample"
+      />
+
+</configure>


Property changes on: zope.app.component/trunk/src/zope/app/component/browser/ftesting.zcml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:eol-style
   + native

Modified: zope.app.component/trunk/src/zope/app/component/browser/ftests.py
===================================================================
--- zope.app.component/trunk/src/zope/app/component/browser/ftests.py	2007-08-24 14:32:56 UTC (rev 79232)
+++ zope.app.component/trunk/src/zope/app/component/browser/ftests.py	2007-08-24 14:33:47 UTC (rev 79233)
@@ -17,20 +17,24 @@
 """
 __docformat__ = "reStructuredText"
 
+import os.path
 import unittest
 
 from zope.testing import doctest
 from zope.app.testing import functional
-from zope.app.component.testing import AppComponentLayer
 
+
+AppComponentBrowserLayer = functional.ZCMLLayer(
+    os.path.join(os.path.dirname(__file__), 'ftesting.zcml'),
+    __name__, 'AppComponentBrowserLayer', allow_teardown=True)
+
+
 def test_suite():
     site = functional.FunctionalDocFileSuite(
         "site.txt",
         optionflags=doctest.ELLIPSIS | doctest.NORMALIZE_WHITESPACE)
-    site.layer = AppComponentLayer
-    return unittest.TestSuite((
-        site,
-        ))
+    site.layer = AppComponentBrowserLayer
+    return site
 
 
 if __name__ == '__main__':