Author: jmorliaguet
Date: Sat Nov 26 12:30:48 2005
New Revision: 1933
Modified:
cpsskins/branches/jmo-perspectives/doc/local-portlets.txt
cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt
cpsskins/branches/jmo-perspectives/tests/test_portlets.py
cpsskins/branches/jmo-perspectives/tests/test_storages.py
Log:
- some test fixes
Modified: cpsskins/branches/jmo-perspectives/doc/local-portlets.txt
==============================================================================
--- cpsskins/branches/jmo-perspectives/doc/local-portlets.txt (original)
+++ cpsskins/branches/jmo-perspectives/doc/local-portlets.txt Sat Nov 26
12:30:48 2005
@@ -3,7 +3,7 @@
>>> from cpsskins.elements.slot import Slot
>>> from cpsskins.elements.portlet import TestPortlet as Portlet
- >>> from cpsskins.perspectives import SitePerspective
+ >>> from cpsskins.perspectives import Perspective
Local portlets are displayed in *slots*
@@ -17,7 +17,7 @@
And a perspective:
- >>> perspective = SitePerspective('Some perspective')
+ >>> perspective = Perspective('Some perspective')
>>> perspective.identifier = 3
Let us create a relation to connect the slots, the portlet and the perspective:
@@ -50,7 +50,7 @@
The portlet will not be visible from another perspective:
- >>> other_perspective = SitePerspective('Some other perspective')
+ >>> other_perspective = Perspective('Some other perspective')
>>> other_perspective.identifier = 4
>>> storage.getSeconds(
Modified: cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt
==============================================================================
--- cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt
(original)
+++ cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt Sat Nov
26 12:30:48 2005
@@ -13,7 +13,7 @@
The dummy portlet is an example implementation of a portlet.
- >>> from cpsskins.portlets.dummy import DummyPortlet
+ >>> from cpsskins.portlets.dummy.portlet import Dummy as DummyPortlet
>>> portlet = DummyPortlet(title='Example portlet',
... text='Dummy text.')
@@ -85,12 +85,12 @@
>>> from cpsskins.engines.default.filters.widget import WidgetFilter
>>> from cpsskins.engines.default.formats.interfaces import IWidget
- >>> from cpsskins.browser.rendering.interfaces import IFilter
+ >>> from cpsskins.browser.rendering.interfaces import IFilterView
- >>> ztapi.provideAdapter((IWidget,), IFilter, WidgetFilter)
+ >>> ztapi.provideAdapter((IWidget,), IFilterView, WidgetFilter)
>>> def test_render(widget, rendered, info):
- ... widget_filter = IFilter(widget)
+ ... widget_filter = IFilterView(widget)
... return widget_filter(rendered, info)
>>> test_render(widget, rendered, info)
Modified: cpsskins/branches/jmo-perspectives/tests/test_portlets.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/tests/test_portlets.py (original)
+++ cpsskins/branches/jmo-perspectives/tests/test_portlets.py Sat Nov 26
12:30:48 2005
@@ -21,36 +21,36 @@
from zope.testing.doctestunit import DocTestSuite
-from cpsskins.portlets.actions import ActionsPortlet
-from cpsskins.portlets.breadcrumbs import BreadcrumbsPortlet
-from cpsskins.portlets.custom import CustomPortlet
-from cpsskins.portlets.dummy import DummyPortlet
-from cpsskins.portlets.image import ImagePortlet
-from cpsskins.portlets.macroslot import MacroSlotPortlet
+from cpsskins.portlets.actions.portlet import Actions
+from cpsskins.portlets.breadcrumbs.portlet import Breadcrumbs
+from cpsskins.portlets.custom.portlet import Custom
+from cpsskins.portlets.dummy.portlet import Dummy
+from cpsskins.portlets.image.portlet import Image
+from cpsskins.portlets.macroslot.portlet import MacroSlot
class TestActionsPortlet:
def makeTestObject(self):
- return ActionsPortlet()
+ return Actions()
class TestBreadcrumbsPortlet:
def makeTestObject(self):
- return BreadcrumbsPortlet()
+ return Breadcrumbs()
class TestCustomPortlet:
def makeTestObject(self):
- return CustomPortlet()
+ return Custom()
class TestDummyPortlet:
def makeTestObject(self):
- return DummyPortlet()
+ return Dummy()
class TestImagePortlet:
def makeTestObject(self):
- return ImagePortlet()
+ return Image()
class TestMacroSlotPortlet:
def makeTestObject(self):
- return MacroSlotPortlet()
+ return MacroSlot()
def test_suite():
return unittest.TestSuite((
@@ -61,11 +61,11 @@
unittest.makeSuite(TestMacroSlotPortlet),
DocTestSuite('cpsskins.elements.portlet'),
- DocTestSuite('cpsskins.portlets.actions'),
- DocTestSuite('cpsskins.portlets.breadcrumbs'),
- DocTestSuite('cpsskins.portlets.custom'),
- DocTestSuite('cpsskins.portlets.image'),
- DocTestSuite('cpsskins.portlets.macroslot'),
+ DocTestSuite('cpsskins.portlets.actions.portlet'),
+ DocTestSuite('cpsskins.portlets.breadcrumbs.portlet'),
+ DocTestSuite('cpsskins.portlets.custom.portlet'),
+ DocTestSuite('cpsskins.portlets.image.portlet'),
+ DocTestSuite('cpsskins.portlets.macroslot.portlet'),
))
if __name__ == '__main__':
Modified: cpsskins/branches/jmo-perspectives/tests/test_storages.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/tests/test_storages.py (original)
+++ cpsskins/branches/jmo-perspectives/tests/test_storages.py Sat Nov 26
12:30:48 2005
@@ -21,32 +21,9 @@
from zope.testing.doctestunit import DocTestSuite
-from cpsskins.storage.displays import DisplayStorage
-from cpsskins.storage.formats import FormatStorage
-from cpsskins.storage.portlets import PortletStorage
-
-class TestPortletStorage:
- def makeTestObject(self):
- return PortletStorage()
-
-class TestFormatStorage:
- def makeTestObject(self):
- return FormatStorage()
-
-class TestDisplayStorage:
- def makeTestObject(self):
- return DisplayStorage()
-
- def tearDown(self):
- self.storage.clear()
-
-
def test_suite():
return unittest.TestSuite((
DocTestSuite('cpsskins.storage'),
- unittest.makeSuite(TestPortletStorage),
- unittest.makeSuite(TestDisplayStorage),
- unittest.makeSuite(TestFormatStorage),
))
if __name__ == '__main__':
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
