Author: jmorliaguet Date: Sun Oct 30 12:14:24 2005 New Revision: 28817 Modified: z3lab/cpsskins/branches/jmo-perspectives/doc/local-portlets.txt z3lab/cpsskins/branches/jmo-perspectives/elements/displays/boxgroup.py z3lab/cpsskins/branches/jmo-perspectives/elements/format.py z3lab/cpsskins/branches/jmo-perspectives/elements/portlet.py z3lab/cpsskins/branches/jmo-perspectives/elements/slot.py z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/htmlcleaner/__init__.py z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/style/__init__.py z3lab/cpsskins/branches/jmo-perspectives/ftests/test_format.py Log:
- test fixes Modified: z3lab/cpsskins/branches/jmo-perspectives/doc/local-portlets.txt ============================================================================== --- z3lab/cpsskins/branches/jmo-perspectives/doc/local-portlets.txt (original) +++ z3lab/cpsskins/branches/jmo-perspectives/doc/local-portlets.txt Sun Oct 30 12:14:24 2005 @@ -2,7 +2,7 @@ -------------- >>> from cpsskins.elements.slot import Slot - >>> from cpsskins.elements.portlet import Portlet + >>> from cpsskins.elements.portlet import TestPortlet as Portlet >>> from cpsskins.perspectives import SitePerspective Local portlets are displayed in *slots* Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/displays/boxgroup.py ============================================================================== --- z3lab/cpsskins/branches/jmo-perspectives/elements/displays/boxgroup.py (original) +++ z3lab/cpsskins/branches/jmo-perspectives/elements/displays/boxgroup.py Sun Oct 30 12:14:24 2005 @@ -52,7 +52,7 @@ >>> from cpsskins.interfaces import IThemeManagement >>> ztapi.provideUtility(IThemeManagement, thememanager, name='themes') - >>> from cpsskins.elements.portlet import Portlet + >>> from cpsskins.elements.portlet import TestPortlet as Portlet >>> portlet1, portlet2 = (Portlet('portlet1'), Portlet('portlet2')) >>> portlet1.identifier = 1 >>> portlet2.identifier = 2 Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/format.py ============================================================================== --- z3lab/cpsskins/branches/jmo-perspectives/elements/format.py (original) +++ z3lab/cpsskins/branches/jmo-perspectives/elements/format.py Sun Oct 30 12:14:24 2005 @@ -65,7 +65,7 @@ >>> from zope.app.traversing.interfaces import IPathAdapter >>> from zope.component import getAdapter - >>> from cpsskins.elements.displays import Display + >>> from cpsskins.elements.display import Display >>> display = Display() >>> formattable = getAdapter(display, IPathAdapter, "formattable") Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/portlet.py ============================================================================== --- z3lab/cpsskins/branches/jmo-perspectives/elements/portlet.py (original) +++ z3lab/cpsskins/branches/jmo-perspectives/elements/portlet.py Sun Oct 30 12:14:24 2005 @@ -17,16 +17,27 @@ """ __docformat__ = "reStructuredText" +from persistent import Persistent from zope.app import zapi from zope.app.copypastemove import ObjectMover from zope.app.copypastemove.interfaces import IObjectMover from zope.app.traversing.api import getParent from zope.interface import implements -from cpsskins.elements.interfaces import ISlot, IDisplayable -from cpsskins.relations.tool import RelationTool +from cpsskins.elements.interfaces import IPortlet, ISlot, IDisplayable from cpsskins.ontology import hasPortlet, hasPortletFromPerspective +from cpsskins.relations.tool import RelationTool + +class TestPortlet(Persistent): + """A portlet for testing. + """ + implements(IPortlet) + + def __init__(self, title=''): + self.title = title + def __repr__(self): + return "Portlet('%s')" % self.title class PortletMover(ObjectMover): """Use `IObjectMover(obj)` to move an object somewhere.""" Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/slot.py ============================================================================== --- z3lab/cpsskins/branches/jmo-perspectives/elements/slot.py (original) +++ z3lab/cpsskins/branches/jmo-perspectives/elements/slot.py Sun Oct 30 12:14:24 2005 @@ -35,6 +35,7 @@ >>> slot Slot('Some slot', '') + >>> from cpsskins.elements.interfaces import ILeaf >>> ILeaf.providedBy(slot) False Modified: z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/htmlcleaner/__init__.py ============================================================================== --- z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/htmlcleaner/__init__.py (original) +++ z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/htmlcleaner/__init__.py Sun Oct 30 12:14:24 2005 @@ -27,7 +27,7 @@ """Cleans and optimizes the html code. >>> o = object() - >>> c = HTMLCleaner(o) + >>> c = HTMLCleaner() >>> c(markup='<div> Some text </div>', info=None) '<div> Some text </div>' Modified: z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/style/__init__.py ============================================================================== --- z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/style/__init__.py (original) +++ z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/style/__init__.py Sun Oct 30 12:14:24 2005 @@ -45,7 +45,6 @@ ... self.identifier = '12345' >>> from zope.app.testing import ztapi - >>> from cpsskins.elements.formats.style import IStyle >>> ztapi.provideAdapter(IStyle, ICSSRenderer, CSSRenderer) >>> s = FakeStyle() @@ -106,6 +105,7 @@ class CSSRenderer(object): """Render a style in CSS + >>> from cpsskins.engines.default.formats.style import Style >>> s = Style() >>> s.identifier = '12345' >>> s['div.body'] = {'color': 'red'} Modified: z3lab/cpsskins/branches/jmo-perspectives/ftests/test_format.py ============================================================================== --- z3lab/cpsskins/branches/jmo-perspectives/ftests/test_format.py (original) +++ z3lab/cpsskins/branches/jmo-perspectives/ftests/test_format.py Sun Oct 30 12:14:24 2005 @@ -21,9 +21,9 @@ from zope.testing.doctestunit import DocTestSuite -from cpsskins.elements.formats.layout import Layout -from cpsskins.elements.formats.style import Style -from cpsskins.elements.formats.widget import Widget +from cpsskins.engines.default.formats.layout import Layout +from cpsskins.engines.default.formats.style import Style +from cpsskins.engines.default.formats.widget import Widget class TestLayout: def makeTestObject(self): -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins