[Checkins] SVN: zope.app.basicskin/trunk/ Avoid extraneous testing dependencies and remove test extra.

[Hanno Schlichting]

Log message for revision 106671:
  Avoid extraneous testing dependencies and remove test extra.
  

Changed:
  U   zope.app.basicskin/trunk/CHANGES.txt
  U   zope.app.basicskin/trunk/buildout.cfg
  U   zope.app.basicskin/trunk/setup.py
  D   zope.app.basicskin/trunk/src/zope/app/basicskin/tests/sampleinterfaces.py
  U   zope.app.basicskin/trunk/src/zope/app/basicskin/tests/test_standardmacros.py

-=-
Modified: zope.app.basicskin/trunk/CHANGES.txt
===================================================================
--- zope.app.basicskin/trunk/CHANGES.txt	2009-12-16 22:45:29 UTC (rev 106670)
+++ zope.app.basicskin/trunk/CHANGES.txt	2009-12-16 22:56:40 UTC (rev 106671)
@@ -5,6 +5,8 @@
 3.5.0 (unreleased)
 ------------------
 
+- Avoid extraneous testing dependencies and remove test extra.
+
 - Avoid zope.app.component testing dependency.
 
 - Removed BBB import for IBasicSkin.

Modified: zope.app.basicskin/trunk/buildout.cfg
===================================================================
--- zope.app.basicskin/trunk/buildout.cfg	2009-12-16 22:45:29 UTC (rev 106670)
+++ zope.app.basicskin/trunk/buildout.cfg	2009-12-16 22:56:40 UTC (rev 106671)
@@ -4,5 +4,4 @@
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = zope.app.basicskin [test]
-
+eggs = zope.app.basicskin

Modified: zope.app.basicskin/trunk/setup.py
===================================================================
--- zope.app.basicskin/trunk/setup.py	2009-12-16 22:45:29 UTC (rev 106670)
+++ zope.app.basicskin/trunk/setup.py	2009-12-16 22:56:40 UTC (rev 106671)
@@ -52,7 +52,6 @@
       packages=find_packages('src'),
       package_dir = {'': 'src'},
       namespace_packages=['zope', 'zope.app'],
-      extras_require = dict(test=['zope.app.testing']),
       install_requires=['setuptools',
                         'zope.component',
                         'zope.interface',

Deleted: zope.app.basicskin/trunk/src/zope/app/basicskin/tests/sampleinterfaces.py
===================================================================
--- zope.app.basicskin/trunk/src/zope/app/basicskin/tests/sampleinterfaces.py	2009-12-16 22:45:29 UTC (rev 106670)
+++ zope.app.basicskin/trunk/src/zope/app/basicskin/tests/sampleinterfaces.py	2009-12-16 22:56:40 UTC (rev 106671)
@@ -1,38 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Fake Traverser with interfaces.
-
-$Id$
-"""
-from zope.interface import Interface, implements
-from zope.traversing.interfaces import ITraverser
-
-class FakeTraverser(object):
-
-    implements(ITraverser)
-
-    def __init__(self, *args, **kw): pass
-
-    def traverse(self, *args, **kw):
-        return None
-
-
-class I1(Interface): pass
-class I2(I1): pass
-
-class O1(object):
-    implements(I1)
-
-class O2(object):
-    implements(I2)

Modified: zope.app.basicskin/trunk/src/zope/app/basicskin/tests/test_standardmacros.py
===================================================================
--- zope.app.basicskin/trunk/src/zope/app/basicskin/tests/test_standardmacros.py	2009-12-16 22:45:29 UTC (rev 106670)
+++ zope.app.basicskin/trunk/src/zope/app/basicskin/tests/test_standardmacros.py	2009-12-16 22:56:40 UTC (rev 106671)
@@ -16,14 +16,17 @@
 $Id$
 """
 import unittest
+
+from zope.component import getGlobalSiteManager
 from zope.component.testing import PlacelessSetup
 from zope.interface import implements, Interface
 from zope.publisher.browser import TestRequest
 from zope.publisher.interfaces.browser import IBrowserView
+from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 
 from zope.app.basicskin.standardmacros import Macros
-from zope.app.testing import ztapi
 
+
 class ViewWithMacros(object):
     implements(IBrowserView)
 
@@ -57,7 +60,7 @@
              'tree':'works_with_page1_tree'}
 
 def createMacrosInstance(pages):
-    
+
     class T(Macros):
         aliases = {'afoo': 'foo', 'abar': 'bar'}
 
@@ -67,13 +70,20 @@
         macro_pages = pages
     return T(C(), TestRequest())
 
+
+def browserView(for_, name, factory):
+    gsm = getGlobalSiteManager()
+    for_ = (for_, ) + (IDefaultBrowserLayer,)
+    gsm.registerAdapter(factory, for_, Interface, name, event=False)
+
+
 class Test(PlacelessSetup, unittest.TestCase):
 
     def setUp(self):
         PlacelessSetup.setUp(self)
-        ztapi.browserView(I, 'page1', page1)
-        ztapi.browserView(I, 'collides_with_page1', collides_with_page1)
-        ztapi.browserView(I, 'works_with_page1',  works_with_page1)
+        browserView(I, 'page1', page1)
+        browserView(I, 'collides_with_page1', collides_with_page1)
+        browserView(I, 'works_with_page1',  works_with_page1)
 
     def testSinglePage(self):
         macros = createMacrosInstance(('page1',))