Author: jmorliaguet
Date: Sat Dec 10 19:14:46 2005
New Revision: 2008
Added:
cpsskins/branches/jmo-perspectives/tests/setup.py (contents, props changed)
cpsskins/branches/jmo-perspectives/tests/test_display.py
- copied, changed from r2006,
cpsskins/branches/jmo-perspectives/ftests/test_display.py
cpsskins/branches/jmo-perspectives/tests/test_filters.py
- copied, changed from r2007,
cpsskins/branches/jmo-perspectives/ftests/test_filters.py
cpsskins/branches/jmo-perspectives/tests/test_format.py
- copied, changed from r2007,
cpsskins/branches/jmo-perspectives/ftests/test_format.py
cpsskins/branches/jmo-perspectives/tests/test_portlet.py
- copied, changed from r2006,
cpsskins/branches/jmo-perspectives/ftests/test_portlet.py
cpsskins/branches/jmo-perspectives/tests/test_renderers.py
- copied, changed from r2006,
cpsskins/branches/jmo-perspectives/ftests/test_renderers.py
Removed:
cpsskins/branches/jmo-perspectives/ftests/test_display.py
cpsskins/branches/jmo-perspectives/ftests/test_filters.py
cpsskins/branches/jmo-perspectives/ftests/test_format.py
cpsskins/branches/jmo-perspectives/ftests/test_portlet.py
cpsskins/branches/jmo-perspectives/ftests/test_renderers.py
Modified:
cpsskins/branches/jmo-perspectives/engines/default/formats/effect.py
cpsskins/branches/jmo-perspectives/engines/default/formats/layout.py
cpsskins/branches/jmo-perspectives/engines/default/formats/style.py
cpsskins/branches/jmo-perspectives/engines/default/formats/widget.py
Log:
- moved non-functional tests to 'cpsskins.tests'
- added a common test setup
Modified: cpsskins/branches/jmo-perspectives/engines/default/formats/effect.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/engines/default/formats/effect.py
(original)
+++ cpsskins/branches/jmo-perspectives/engines/default/formats/effect.py
Sat Dec 10 19:14:46 2005
@@ -19,7 +19,7 @@
from persistent import Persistent
from zope.component.interfaces import IFactory
-from zope.interface import implements
+from zope.interface import implements, implementedBy
from zope.i18nmessageid import MessageFactory
from zope.schema import Choice, Int, Bool
Modified: cpsskins/branches/jmo-perspectives/engines/default/formats/layout.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/engines/default/formats/layout.py
(original)
+++ cpsskins/branches/jmo-perspectives/engines/default/formats/layout.py
Sat Dec 10 19:14:46 2005
@@ -21,7 +21,7 @@
from zope.app.traversing.interfaces import ITraversable
from zope.component.interfaces import IFactory
-from zope.interface import implements
+from zope.interface import implements, implementedBy
from zope.interface.common.mapping import IMapping
from cpsskins.elements.format import Format
Modified: cpsskins/branches/jmo-perspectives/engines/default/formats/style.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/engines/default/formats/style.py
(original)
+++ cpsskins/branches/jmo-perspectives/engines/default/formats/style.py Sat Dec
10 19:14:46 2005
@@ -24,7 +24,7 @@
from zope.app.publisher.browser import BrowserView
from zope.component import adapts
from zope.component.interfaces import IFactory
-from zope.interface import implements
+from zope.interface import implements, implementedBy
from zope.interface.common.mapping import IMapping
from zope.i18nmessageid import MessageFactory
Modified: cpsskins/branches/jmo-perspectives/engines/default/formats/widget.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/engines/default/formats/widget.py
(original)
+++ cpsskins/branches/jmo-perspectives/engines/default/formats/widget.py
Sat Dec 10 19:14:46 2005
@@ -20,7 +20,7 @@
from persistent import Persistent
from zope.component import getUtilitiesFor
from zope.component.interfaces import IFactory
-from zope.interface import implements
+from zope.interface import implements, implementedBy
from zope.i18nmessageid import MessageFactory
from zope.schema.vocabulary import SimpleVocabulary
from zope.schema import Choice
Added: cpsskins/branches/jmo-perspectives/tests/setup.py
==============================================================================
--- (empty file)
+++ cpsskins/branches/jmo-perspectives/tests/setup.py Sat Dec 10 19:14:46 2005
@@ -0,0 +1,47 @@
+##############################################################################
+#
+# Copyright (c) 2005 Nuxeo 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.
+#
+##############################################################################
+"""Format tests
+
+$Id$
+"""
+__docformat__ = "reStructuredText"
+
+def setUp(test):
+ from zope.app.testing import ztapi, setup
+ from zope.app.traversing.interfaces import IPathAdapter
+
+ from cpsskins.elements import element
+ from cpsskins.elements.display import Displayable
+ from cpsskins.elements.format import Formattable
+ from cpsskins.elements.interfaces import IElement, IDisplay
+ from cpsskins.elements.interfaces import IIdentifiable
+ from cpsskins.perspectives import perspective
+ from cpsskins.perspectives.interfaces import IPerspective
+ from cpsskins.relations.interfaces import IRelationTool, IRelationStorage
+ from cpsskins.relations.interfaces import IRelatable
+ from cpsskins.relations.tool import RelationTool
+ from cpsskins.relations.storage import RelationStorage
+
+ ztapi.provideAdapter(IDisplay, IPathAdapter, Formattable, 'formattable')
+ ztapi.provideAdapter(IElement, IPathAdapter, Displayable, 'displayable')
+ ztapi.provideAdapter(IElement, IRelationTool, RelationTool)
+ ztapi.provideAdapter(IElement, IIdentifiable, element.Identifiable)
+ ztapi.provideAdapter(IElement, IRelatable, element.Relatable)
+ ztapi.provideAdapter(IPerspective, IRelatable, perspective.Relatable)
+
+ ztapi.provideAdapter(None, IRelationStorage, RelationStorage)
+ ztapi.provideUtility(IRelationStorage, RelationStorage())
+
+ setup.setUpSiteManagerLookup()
+
Copied: cpsskins/branches/jmo-perspectives/tests/test_display.py (from r2006,
cpsskins/branches/jmo-perspectives/ftests/test_display.py)
==============================================================================
--- cpsskins/branches/jmo-perspectives/ftests/test_display.py (original)
+++ cpsskins/branches/jmo-perspectives/tests/test_display.py Sat Dec 10
19:14:46 2005
@@ -26,12 +26,7 @@
from cpsskins.engines.default.displays.box import Box
from cpsskins.engines.default.displays.boxgroup import BoxGroup
-def setUp(test):
- from zope.app.testing import ztapi
- from zope.app.traversing.interfaces import IPathAdapter
- from cpsskins.elements.display import Displayable
- from cpsskins.elements.interfaces import IElement
- ztapi.provideAdapter(IElement, IPathAdapter, Displayable, 'displayable')
+from cpsskins.tests.setup import setUp
class TestArea:
def makeTestObject(self):
Copied: cpsskins/branches/jmo-perspectives/tests/test_filters.py (from r2007,
cpsskins/branches/jmo-perspectives/ftests/test_filters.py)
==============================================================================
--- cpsskins/branches/jmo-perspectives/ftests/test_filters.py (original)
+++ cpsskins/branches/jmo-perspectives/tests/test_filters.py Sat Dec 10
19:14:46 2005
@@ -21,15 +21,7 @@
from zope.testing.doctestunit import DocTestSuite
-def setUp(test):
- from zope.app.testing import ztapi
- from cpsskins.elements.element import Identifiable, Relatable
- from cpsskins.elements.interfaces import IElement
- from cpsskins.elements.interfaces import IIdentifiable
- from cpsskins.relations.interfaces import IRelatable
-
- ztapi.provideAdapter(IElement, IIdentifiable, Identifiable)
- ztapi.provideAdapter(IElement, IRelatable, Relatable)
+from cpsskins.tests.setup import setUp
def test_suite():
return unittest.TestSuite((
Copied: cpsskins/branches/jmo-perspectives/tests/test_format.py (from r2007,
cpsskins/branches/jmo-perspectives/ftests/test_format.py)
==============================================================================
--- cpsskins/branches/jmo-perspectives/ftests/test_format.py (original)
+++ cpsskins/branches/jmo-perspectives/tests/test_format.py Sat Dec 10
19:14:46 2005
@@ -24,30 +24,7 @@
from cpsskins.engines.default.formats.layout import Layout
from cpsskins.engines.default.formats.style import Style
from cpsskins.engines.default.formats.widget import Widget
-
-def setUp(test):
- from zope.app.testing import ztapi, setup
- from zope.app.traversing.interfaces import IPathAdapter
-
- from cpsskins.elements.element import Identifiable, Relatable
- from cpsskins.elements.display import Displayable
- from cpsskins.elements.format import Formattable
- from cpsskins.elements.interfaces import IElement, IDisplay
- from cpsskins.elements.interfaces import IIdentifiable
- from cpsskins.relations.interfaces import IRelationTool, IRelationStorage
- from cpsskins.relations.interfaces import IRelatable
- from cpsskins.relations.tool import RelationTool
- from cpsskins.relations.storage import RelationStorage
-
- ztapi.provideAdapter(IElement, IPathAdapter, Displayable, 'displayable')
- ztapi.provideAdapter(IDisplay, IPathAdapter, Formattable, 'formattable')
- ztapi.provideAdapter(IElement, IRelationTool, RelationTool)
- ztapi.provideAdapter(IElement, IIdentifiable, Identifiable)
- ztapi.provideAdapter(IElement, IRelatable, Relatable)
- ztapi.provideAdapter(None, IRelationStorage, RelationStorage)
- ztapi.provideUtility(IRelationStorage, RelationStorage())
-
- setup.setUpSiteManagerLookup()
+from cpsskins.tests.setup import setUp
class TestLayout:
def makeTestObject(self):
Copied: cpsskins/branches/jmo-perspectives/tests/test_portlet.py (from r2006,
cpsskins/branches/jmo-perspectives/ftests/test_portlet.py)
==============================================================================
--- cpsskins/branches/jmo-perspectives/ftests/test_portlet.py (original)
+++ cpsskins/branches/jmo-perspectives/tests/test_portlet.py Sat Dec 10
19:14:46 2005
@@ -19,24 +19,15 @@
import unittest
-from zope.app.testing.functional import FunctionalDocFileSuite
from zope.testing import doctest
-def setUp(test):
- from zope.app.testing import ztapi
- from cpsskins.elements.interfaces import IElement
- from cpsskins.elements import element
- from cpsskins.perspectives import perspective
- from cpsskins.perspectives.interfaces import IPerspective
- from cpsskins.relations.interfaces import IRelatable
- ztapi.provideAdapter(IElement, IRelatable, element.Relatable)
- ztapi.provideAdapter(IPerspective, IRelatable, perspective.Relatable)
+from cpsskins.tests.setup import setUp
def test_suite():
return unittest.TestSuite((
doctest.DocFileSuite('../doc/local-portlets.txt', setUp=setUp),
doctest.DocFileSuite('../doc/portlet-rendering.txt', setUp=setUp),
- FunctionalDocFileSuite('../doc/portlet-ordering.txt', setUp=setUp),
+ doctest.DocFileSuite('../doc/portlet-ordering.txt', setUp=setUp),
))
if __name__ == '__main__':
Copied: cpsskins/branches/jmo-perspectives/tests/test_renderers.py (from r2006,
cpsskins/branches/jmo-perspectives/ftests/test_renderers.py)
==============================================================================
--- cpsskins/branches/jmo-perspectives/ftests/test_renderers.py (original)
+++ cpsskins/branches/jmo-perspectives/tests/test_renderers.py Sat Dec 10
19:14:46 2005
@@ -23,7 +23,9 @@
def test_suite():
return unittest.TestSuite((
- DocTestSuite('cpsskins.browser.rendering.engine'),
+ DocTestSuite('cpsskins.browser.rendering.renderer'),
+ DocTestSuite('cpsskins.browser.rendering.context'),
+ DocTestSuite('cpsskins.browser.rendering.viewer'),
DocFileSuite('../doc/canvas-rendering.txt'),
DocFileSuite('../doc/draft-rendering-pipelines.txt'),
))
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
