Author: jmorliaguet
Date: Wed Mar 29 23:42:54 2006
New Revision: 2742

Modified:
   cpsskins/branches/jmo-perspectives/ftests/test_io.py
   cpsskins/branches/jmo-perspectives/ftests/test_portlet.py
   cpsskins/branches/jmo-perspectives/io/README.txt
   cpsskins/branches/jmo-perspectives/tests/setup.py
Log:

- test cleanup



Modified: cpsskins/branches/jmo-perspectives/ftests/test_io.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ftests/test_io.py        (original)
+++ cpsskins/branches/jmo-perspectives/ftests/test_io.py        Wed Mar 29 
23:42:54 2006
@@ -17,23 +17,12 @@
 """
 __docformat__ = "reStructuredText"
 
-import re
 import unittest
 
 from zope.app.testing import ztapi
 from zope.app.testing.functional import FunctionalDocFileSuite
-from zope.app.component.testing import PlacefulSetup
-from zope.app.testing import ztapi
-from zope.component import getMultiAdapter
-from zope.configuration.xmlconfig import XMLConfig
-from zope.publisher.browser import TestRequest
-from zope.interface import implements
-
-import cpsskins.elements.element
-
-from cpsskins.elements.interfaces import IElement, IIdentifiable
-from cpsskins.elements.element import Identifiable
-from cpsskins.relations.interfaces import IRelatable
+
+from cpsskins.elements.interfaces import IElement
 from cpsskins.io.interfaces import IDataExporter, IDataImporter
 
 def setUp(test):

Modified: cpsskins/branches/jmo-perspectives/ftests/test_portlet.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ftests/test_portlet.py   (original)
+++ cpsskins/branches/jmo-perspectives/ftests/test_portlet.py   Wed Mar 29 
23:42:54 2006
@@ -19,7 +19,6 @@
 
 import unittest
 
-from zope.testing import doctest
 from zope.app.testing.functional import FunctionalDocFileSuite
 
 from cpsskins.tests.setup import setUp

Modified: cpsskins/branches/jmo-perspectives/io/README.txt
==============================================================================
--- cpsskins/branches/jmo-perspectives/io/README.txt    (original)
+++ cpsskins/branches/jmo-perspectives/io/README.txt    Wed Mar 29 23:42:54 2006
@@ -37,6 +37,8 @@
 
 - 'perspective'
 
+- 'relation'
+
 
 The element type of a given resource is obtained by querying the resource's
 IElementType.
@@ -165,12 +167,16 @@
 
     >>> from zope.publisher.browser import TestRequest
     >>> from zope.component import getMultiAdapter
+    >>> request = TestRequest()
 
     >>> from cpsskins.io.interfaces import IDataExporter, IDataImporter
 
+Export of styles
+----------------
+
     >>> resource = Style()
     >>> resource[u'div.body'] = {'color': u'red', 'border': u'none'}
-    >>> exporter = getMultiAdapter((resource, TestRequest()), IDataExporter)
+    >>> exporter = getMultiAdapter((resource, request), IDataExporter)
 
     >>> print exporter()
     <?xml version="1.0"?>
@@ -182,3 +188,40 @@
     </style>
     <BLANKLINE>
 
+
+Export of relations
+-------------------
+
+    >>> from cpsskins.relations import TestRelate, Predicate
+
+    >>> from cpsskins.relations import MonadicRelation
+    >>> resource = MonadicRelation(predicate=Predicate(u'_ A'),
+    ...                            first=TestRelate(u'first'))
+
+    >>> exporter = getMultiAdapter((resource, request), IDataExporter)
+
+
+Export of elements
+------------------
+
+    >>> from cpsskins.elements.cell import Cell
+    >>> resource = Cell(u'Some cell')
+
+    >>> exporter = getMultiAdapter((resource, request), IDataExporter)
+    >>> print exporter()
+    <?xml version="1.0"?>
+    <element uri="canvas-cell-12345" title="Some cell"/>
+    <BLANKLINE>
+
+
+Export of container elements
+----------------------------
+
+    >>> from cpsskins.tests.setup import addThemeManager, addThemeSkeleton
+    >>> root = getRootFolder()
+    >>> theme = addThemeSkeleton(addThemeManager(root))
+
+    >>> exporter = getMultiAdapter((theme, request), IDataExporter)
+
+    to finish
+

Modified: cpsskins/branches/jmo-perspectives/tests/setup.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/tests/setup.py   (original)
+++ cpsskins/branches/jmo-perspectives/tests/setup.py   Wed Mar 29 23:42:54 2006
@@ -21,7 +21,6 @@
 from zope.app.traversing.interfaces import IPathAdapter
 from zope.app.event.interfaces import IObjectCreatedEvent, IObjectModifiedEvent
 from zope.app.container.interfaces import IObjectAddedEvent, 
IObjectRemovedEvent
-from zope.configuration.xmlconfig import XMLConfig
 
 from cpsskins.thememanager import ThemeManagementFolder
 from cpsskins import controllers
@@ -67,10 +66,10 @@
     return tmutil
 
 def addThemeSkeleton(context):
-    theme = elements.theme.Theme()
+    theme = elements.theme.Theme('A theme')
     context.addTheme(theme)
-    theme[u'page'] = elements.themepage.ThemePage()
-    theme[u'page'][u'block'] = elements.pageblock.PageBlock()
-    theme[u'page'][u'block'][u'cell'] = elements.cell.Cell()
+    theme[u'page'] = elements.themepage.ThemePage('A page')
+    theme[u'page'][u'block'] = elements.pageblock.PageBlock('A page block')
+    theme[u'page'][u'block'][u'cell'] = elements.cell.Cell('A cell')
     return theme
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to