[Checkins] SVN: zope.app.apidoc/trunk/ Updated tests to work with latest zope.testing and use zope.browserpage in favor of zope.app.pagetemplate.
Hanno Schlichting
hannosch at hannosch.eu
Tue Dec 22 14:19:54 EST 2009
Log message for revision 106913:
Updated tests to work with latest zope.testing and use zope.browserpage in favor of zope.app.pagetemplate.
Changed:
U zope.app.apidoc/trunk/CHANGES.txt
U zope.app.apidoc/trunk/setup.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/tests.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/classregistry.txt
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/README.txt
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/README.txt
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/menu.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/tests.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/tests.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/component.txt
U zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/README.txt
U zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/browser.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/browser.txt
U zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/tests.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/interface.txt
U zope.app.apidoc/trunk/src/zope/app/apidoc/presentation.txt
U zope.app.apidoc/trunk/src/zope/app/apidoc/tests.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/tests.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/browser.txt
U zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/tests.py
U zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/browser.txt
U zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/tests.py
-=-
Modified: zope.app.apidoc/trunk/CHANGES.txt
===================================================================
--- zope.app.apidoc/trunk/CHANGES.txt 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/CHANGES.txt 2009-12-22 19:19:54 UTC (rev 106913)
@@ -2,18 +2,17 @@
CHANGES
=======
-3.6.9 (unreleased)
+3.7.0 (unreleased)
------------------
-- Nothing changed yet.
+- Updated tests to work with latest zope.testing and use zope.browserpage in
+ favor of zope.app.pagetemplate.
-
3.6.8 (2009-11-18)
------------------
- Updated the tests after moving IPossibleSite and ISite to zope.component.
-
3.6.7 (2009-09-29)
------------------
@@ -36,7 +35,6 @@
- The ``IContained`` interface moved to ``zope.location.interfaces``. Make a
test pass.
-
3.6.3 (2009-05-16)
------------------
@@ -50,7 +48,6 @@
webserver mode). There are still some files which are not correctly
fetched.
-
3.6.2 (2009-03-17)
------------------
@@ -113,13 +110,11 @@
- Avoid deprecation warnings for ``ZopeMessageFactory``.
-
3.4.1 (2007-10-23)
------------------
- Avoid deprecation warnings.
-
3.4.0 (2007-10-10)
------------------
@@ -128,7 +123,6 @@
- Fixed the code to at least gracefully ignore unzipped eggs. Eventually we
want to handle eggs well.
-
3.4.0a1 (2007-04-22)
--------------------
Modified: zope.app.apidoc/trunk/setup.py
===================================================================
--- zope.app.apidoc/trunk/setup.py 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/setup.py 2009-12-22 19:19:54 UTC (rev 106913)
@@ -28,7 +28,7 @@
setup(
name = 'zope.app.apidoc',
- version = '3.6.9dev',
+ version = '3.7.0dev',
author = 'Zope Corporation and Contributors',
author_email = 'zope-dev at zope.org',
description = 'API Documentation and Component Inspection for Zope 3',
@@ -103,6 +103,7 @@
test=['zope.app.testing',
'zope.app.securitypolicy',
'zope.app.zcmlfiles',
+ 'zope.browserpage>=3.10.1',
'zope.securitypolicy'],
static=['mechanize >= 0.1.8',
'zope.securitypolicy',
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/tests.py 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/tests.py 2009-12-22 19:19:54 UTC (rev 106913)
@@ -13,10 +13,10 @@
##############################################################################
"""Tests for the Book Documentation Module
-$Id: tests.py 29143 2005-02-14 22:43:16Z srichter $
+$Id$
"""
import unittest
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing.doctest import DocTestSuite
def test_suite():
return unittest.TestSuite((
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/classregistry.txt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/classregistry.txt 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/classregistry.txt 2009-12-22 19:19:54 UTC (rev 106913)
@@ -65,6 +65,7 @@
This method returns all classes that implement the specified interface:
+ >>> from pprint import pprint
>>> pprint(reg.getClassesThatImplement(IA)) #doctest:+ELLIPSIS
[('A', <class 'A'>),
('B', <class __builtin__.B at ...>),
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/README.txt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/README.txt 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/README.txt 2009-12-22 19:19:54 UTC (rev 106913)
@@ -170,6 +170,7 @@
>>> klass = codemodule.class_.Class(module, 'Blah', Blah)
+ >>> from pprint import pprint
>>> pprint(klass.getAttributes())
[('bar', 'b', None),
('bli', 'i', <InterfaceClass __builtin__.IBlie>),
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/README.txt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/README.txt 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/README.txt 2009-12-22 19:19:54 UTC (rev 106913)
@@ -40,6 +40,7 @@
Return info objects for all classes in this module.
+ >>> from pprint import pprint
>>> pprint(details.getClasses())
[{'doc': 'Represent the code browser documentation root',
'name': 'CodeModule',
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/menu.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/menu.py 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/menu.py 2009-12-22 19:19:54 UTC (rev 106913)
@@ -63,6 +63,7 @@
>>> menu.request = TestRequest(form={'path': 'Foo'})
>>> info = menu.findClasses()
+ >>> from pprint import pprint
>>> pprint(info)
[{'path': 'zope.app.apidoc.codemodule.browser.Foo',
'url': 'http://127.0.0.1/++apidoc++/Code/zope/app/apidoc/codemodule/browser/Foo/'},
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/tests.py 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/tests.py 2009-12-22 19:19:54 UTC (rev 106913)
@@ -21,7 +21,7 @@
from zope.component.interfaces import IFactory
from zope.configuration import xmlconfig
from zope.interface import implements
-from zope.testing import doctest, doctestunit, renormalizing
+from zope.testing import doctest, renormalizing
from zope.traversing.interfaces import IContainmentRoot
import zope.app
@@ -218,12 +218,10 @@
doctest.DocFileSuite(
'README.txt',
setUp=setUp, tearDown=tearDown,checker=checker,
- globs={'pprint': doctestunit.pprint},
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS),
doctest.DocTestSuite(
'zope.app.apidoc.codemodule.browser.menu',
setUp=setUp, tearDown=tearDown,
- globs={'pprint': doctestunit.pprint},
optionflags=doctest.NORMALIZE_WHITESPACE),
unittest.makeSuite(CodeModuleTests),
introspector,
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/tests.py 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/tests.py 2009-12-22 19:19:54 UTC (rev 106913)
@@ -18,7 +18,7 @@
import os
import unittest
from zope.configuration import xmlconfig
-from zope.testing import doctest, doctestunit
+from zope.testing import doctest
import zope.app.appsetup.appsetup
from zope.app.testing import placelesssetup
@@ -59,7 +59,6 @@
return unittest.TestSuite((
doctest.DocFileSuite('README.txt',
setUp=setUp, tearDown=tearDown,
- globs={'pprint': doctestunit.pprint},
optionflags=doctest.NORMALIZE_WHITESPACE),
doctest.DocFileSuite('directives.txt',
setUp=placelesssetup.setUp,
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/component.txt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/component.txt 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/component.txt 2009-12-22 19:19:54 UTC (rev 106913)
@@ -289,6 +289,7 @@
list interfaces in the context of other components, like adapters and
utilities.
+ >>> from pprint import pprint
>>> pprint(component.getInterfaceInfoDictionary(IFoo))
{'module': 'zope.app.apidoc.doctest', 'name': 'IFoo'}
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/README.txt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/README.txt 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/README.txt 2009-12-22 19:19:54 UTC (rev 106913)
@@ -37,6 +37,7 @@
>>> ifaces = module.items()
>>> ifaces.sort()
+ >>> from pprint import pprint
>>> pprint(ifaces)
[(u'IFoo', <InterfaceClass __builtin__.IFoo>),
(u'__builtin__.IFoo', <InterfaceClass __builtin__.IFoo>)]
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/browser.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/browser.py 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/browser.py 2009-12-22 19:19:54 UTC (rev 106913)
@@ -191,7 +191,7 @@
Example::
- >>> from zope.app.apidoc.tests import pprint
+ >>> from pprint import pprint
>>> from tests import getInterfaceDetails
>>> details = getInterfaceDetails()
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/browser.txt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/browser.txt 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/browser.txt 2009-12-22 19:19:54 UTC (rev 106913)
@@ -62,6 +62,7 @@
Now let's see how successful our searches are:
>>> menu.request['search_str'] = 'Elem'
+ >>> from pprint import pprint
>>> pprint(menu.findInterfaces())
[{'name': 'IElement',
'url': './IElement/index.html'}]
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/tests.py 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/tests.py 2009-12-22 19:19:54 UTC (rev 106913)
@@ -19,7 +19,7 @@
from zope.component.interfaces import IFactory
from zope.interface.interfaces import IInterface
-from zope.testing import doctest, doctestunit
+from zope.testing import doctest
from zope.app.apidoc.testing import APIDocLayer
from zope.app.apidoc.apidoc import APIDocumentation
@@ -92,11 +92,9 @@
return unittest.TestSuite((
doctest.DocFileSuite('README.txt',
setUp=setUp, tearDown=tearDown,
- globs={'pprint': doctestunit.pprint},
optionflags=doctest.NORMALIZE_WHITESPACE),
doctest.DocFileSuite('browser.txt',
setUp=setUp, tearDown=tearDown,
- globs={'pprint': doctestunit.pprint},
optionflags=doctest.NORMALIZE_WHITESPACE),
unittest.makeSuite(InterfaceModuleTests),
))
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/interface.txt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/interface.txt 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/interface.txt 2009-12-22 19:19:54 UTC (rev 106913)
@@ -214,6 +214,7 @@
This function returns a page-template-friendly dictionary for a simple
attribute:
+ >>> from pprint import pprint
>>> pprint(interface.getAttributeInfoDictionary(IFoo['baz']))
{'doc': u'<p>This is the baz attribute</p>\n',
'name': 'baz'}
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/presentation.txt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/presentation.txt 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/presentation.txt 2009-12-22 19:19:54 UTC (rev 106913)
@@ -18,7 +18,7 @@
First, let's inspect a case where a simple browser page was configured without
a special view class. In these cases the factory is a `SimpleViewClass`:
- >>> from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
+ >>> from zope.browserpage.simpleviewclass import SimpleViewClass
>>> view = SimpleViewClass('browser/index.pt')
>>> info = presentation.getViewFactoryData(view)
@@ -27,13 +27,14 @@
the template path:
>>> info['template'] = info['template'].replace('\\', '/')[-32:]
+ >>> from pprint import pprint
>>> pprint(info)
- {'path': 'zope.app.pagetemplate.simpleviewclass.simple',
+ {'path': 'zope.browserpage.simpleviewclass.simple',
'referencable': True,
'resource': None,
'template': 'zope/app/apidoc/browser/index.pt',
'template_obj': <BoundPageTemplateFile of None>,
- 'url': 'zope/app/pagetemplate/simpleviewclass/simple'}
+ 'url': 'zope/browserpage/simpleviewclass/simple'}
So in the result above we see what the function returns. It is a dictionary
(converted to a list for test purposes) that contains the Python path of the
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/tests.py 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/tests.py 2009-12-22 19:19:54 UTC (rev 106913)
@@ -21,7 +21,7 @@
import zope.component.testing
from zope.component.interfaces import IFactory
from zope.interface import implements
-from zope.testing import doctest, doctestunit
+from zope.testing import doctest
from zope.traversing.interfaces import IContainmentRoot
from zope.location import LocationProxy
@@ -69,30 +69,24 @@
doctest.DocFileSuite('README.txt',
setUp=setUp,
tearDown=placelesssetup.tearDown,
- globs={'pprint': doctestunit.pprint},
optionflags=doctest.NORMALIZE_WHITESPACE),
doctest.DocFileSuite('classregistry.txt',
- globs={'pprint': doctestunit.pprint},
optionflags=doctest.NORMALIZE_WHITESPACE),
doctest.DocFileSuite('interface.txt',
setUp=setUp,
tearDown=placelesssetup.tearDown,
- globs={'pprint': doctestunit.pprint},
optionflags=doctest.NORMALIZE_WHITESPACE),
doctest.DocFileSuite('component.txt',
setUp=setUp,
tearDown=placelesssetup.tearDown,
- globs={'pprint': doctestunit.pprint},
optionflags=doctest.NORMALIZE_WHITESPACE),
doctest.DocFileSuite('presentation.txt',
setUp=zope.component.testing.setUp,
tearDown=zope.component.testing.tearDown,
- globs={'pprint': doctestunit.pprint},
optionflags=doctest.NORMALIZE_WHITESPACE),
doctest.DocFileSuite('utilities.txt',
setUp=setUp,
tearDown=placelesssetup.tearDown,
- globs={'pprint': doctestunit.pprint},
optionflags=doctest.NORMALIZE_WHITESPACE),
))
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/tests.py 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/tests.py 2009-12-22 19:19:54 UTC (rev 106913)
@@ -16,7 +16,7 @@
$Id$
"""
import unittest
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing.doctest import DocTestSuite
from zope.app.testing.functional import BrowserTestCase
from zope.app.testing import placelesssetup
from zope.app.apidoc.testing import APIDocLayer
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/browser.txt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/browser.txt 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/browser.txt 2009-12-22 19:19:54 UTC (rev 106913)
@@ -157,5 +157,6 @@
Now we can get the component information:
+ >>> from pprint import pprint
>>> pprint(details.getComponent())
{'path': '__builtin__.Foo', 'url': None}
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/tests.py 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/tests.py 2009-12-22 19:19:54 UTC (rev 106913)
@@ -17,7 +17,7 @@
"""
import unittest
import zope.deprecation
-from zope.testing import doctest, doctestunit
+from zope.testing import doctest
from zope.traversing.interfaces import IPhysicallyLocatable
from zope.location.traversing import LocationPhysicallyLocatable
@@ -93,13 +93,11 @@
doctest.DocFileSuite('README.txt',
setUp=setUp,
tearDown=tearDown,
- globs={'pprint': doctestunit.pprint},
optionflags=doctest.NORMALIZE_WHITESPACE|
doctest.ELLIPSIS),
doctest.DocFileSuite('browser.txt',
setUp=setUp,
tearDown=tearDown,
- globs={'pprint': doctestunit.pprint},
optionflags=doctest.NORMALIZE_WHITESPACE),
unittest.makeSuite(UtilityModuleTests),
))
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/browser.txt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/browser.txt 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/browser.txt 2009-12-22 19:19:54 UTC (rev 106913)
@@ -148,6 +148,7 @@
>>> from zope.configuration.xmlconfig import ParserInfo
>>> details.context.info = ParserInfo('foo.zcml', 2, 3)
>>> info = details.getFileInfo()
+ >>> from pprint import pprint
>>> pprint(info)
{'column': 3,
'ecolumn': 3,
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/tests.py
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/tests.py 2009-12-22 19:07:08 UTC (rev 106912)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/tests.py 2009-12-22 19:19:54 UTC (rev 106913)
@@ -18,7 +18,7 @@
import os
import unittest
from zope.configuration import xmlconfig
-from zope.testing import doctest, doctestunit
+from zope.testing import doctest
from zope.traversing.interfaces import IPhysicallyLocatable
from zope.location.traversing import LocationPhysicallyLocatable
@@ -107,11 +107,9 @@
return unittest.TestSuite((
doctest.DocFileSuite('README.txt',
setUp=setUp, tearDown=tearDown,
- globs={'pprint': doctestunit.pprint},
optionflags=doctest.NORMALIZE_WHITESPACE),
doctest.DocFileSuite('browser.txt',
setUp=setUp, tearDown=tearDown,
- globs={'pprint': doctestunit.pprint},
optionflags=doctest.NORMALIZE_WHITESPACE),
unittest.makeSuite(ZCMLModuleTests),
))
More information about the checkins
mailing list