[Checkins] SVN: zope.mimetype/trunk/ Converted functional tests to unit tests and get rid of all extra test dependencies as a result.

Hanno Schlichting hannosch at hannosch.eu
Sat Dec 26 12:28:42 EST 2009


Log message for revision 107112:
  Converted functional tests to unit tests and get rid of all extra test dependencies as a result.
  

Changed:
  U   zope.mimetype/trunk/CHANGES.txt
  U   zope.mimetype/trunk/setup.py
  D   zope.mimetype/trunk/src/zope/mimetype/ftesting.zcml
  U   zope.mimetype/trunk/src/zope/mimetype/retrieving_mime_types.txt
  D   zope.mimetype/trunk/src/zope/mimetype/testing.py
  U   zope.mimetype/trunk/src/zope/mimetype/tests.py
  U   zope.mimetype/trunk/src/zope/mimetype/typegetter.py

-=-
Modified: zope.mimetype/trunk/CHANGES.txt
===================================================================
--- zope.mimetype/trunk/CHANGES.txt	2009-12-26 17:28:16 UTC (rev 107111)
+++ zope.mimetype/trunk/CHANGES.txt	2009-12-26 17:28:42 UTC (rev 107112)
@@ -5,6 +5,9 @@
 1.2.0 (unreleased)
 ------------------
 
+- Converted functional tests to unit tests and get rid of all extra test
+  dependencies as a result.
+
 - Use the ITerms interface from zope.browser.
 
 - Declared missing dependencies, resolved direct dependency on

Modified: zope.mimetype/trunk/setup.py
===================================================================
--- zope.mimetype/trunk/setup.py	2009-12-26 17:28:16 UTC (rev 107111)
+++ zope.mimetype/trunk/setup.py	2009-12-26 17:28:42 UTC (rev 107112)
@@ -76,12 +76,7 @@
       packages=find_packages('src'),
       package_dir = {'': 'src'},
       namespace_packages=['zope'],
-      extras_require = dict(
-          test=['zope.app.securitypolicy',
-                'zope.app.testing',
-                'zope.app.zcmlfiles',
-                'zope.securitypolicy',
-                ]),
+      extras_require = dict(test=[]),
       install_requires=['setuptools',
                         'zope.app.form',
                         'zope.browser',

Deleted: zope.mimetype/trunk/src/zope/mimetype/ftesting.zcml
===================================================================
--- zope.mimetype/trunk/src/zope/mimetype/ftesting.zcml	2009-12-26 17:28:16 UTC (rev 107111)
+++ zope.mimetype/trunk/src/zope/mimetype/ftesting.zcml	2009-12-26 17:28:42 UTC (rev 107112)
@@ -1,44 +0,0 @@
-<configure
-    xmlns="http://namespaces.zope.org/zope"
-    xmlns:browser="http://namespaces.zope.org/browser"
-    xmlns:zcml="http://namespaces.zope.org/zcml"
-    i18n_domain="zc.catalog"
-    >
-
-  <include
-      zcml:condition="installed zope.app.zcmlfiles"
-      package="zope.app.zcmlfiles"
-      />
-  <include
-      zcml:condition="not-installed zope.app.zcmlfiles"
-      package="zope.app"
-      />
-  <include package="zope.mimetype" file="meta.zcml"/>
-  <include package="zope.mimetype"/>
-
-  <!-- Security -->
-
-  <include package="zope.app.securitypolicy" file="meta.zcml" />
-  <include package="zope.app.securitypolicy" />
-
-  <securityPolicy
-      component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
-      />
-
-  <role
-      id="zope.Anonymous"
-      title="Everybody"
-      description="All users have this role implicitly"
-      />
-  <role id="zope.Manager" title="Site Manager" />
-
-  <grantAll role="zope.Manager" />
-
-
-  <unauthenticatedPrincipal id="zope.anybody" title="Unauthenticated User" />
-
-  <principal id="zope.mgr" title="Manager" login="mgr" password="mgrpw" />
-
-  <grant role="zope.Manager" principal="zope.mgr" />
-
-</configure>

Modified: zope.mimetype/trunk/src/zope/mimetype/retrieving_mime_types.txt
===================================================================
--- zope.mimetype/trunk/src/zope/mimetype/retrieving_mime_types.txt	2009-12-26 17:28:16 UTC (rev 107111)
+++ zope.mimetype/trunk/src/zope/mimetype/retrieving_mime_types.txt	2009-12-26 17:28:42 UTC (rev 107112)
@@ -14,7 +14,10 @@
 A utility is used to retrieve MIME types.
 
     >>> from zope import component
+    >>> from zope.mimetype import typegetter
     >>> from zope.mimetype.interfaces import IMimeTypeGetter
+    >>> component.provideUtility(typegetter.smartMimeTypeGuesser,
+    ...                          provides=IMimeTypeGetter)
     >>> mime_getter = component.getUtility(IMimeTypeGetter)
 
 To map a particular file name, file contents, and content type to a MIME type.
@@ -35,6 +38,8 @@
 A utility is also used to retrieve character sets (charsets).
 
     >>> from zope.mimetype.interfaces import ICharsetGetter
+    >>> component.provideUtility(typegetter.charsetGetter,
+    ...                          provides=ICharsetGetter)
     >>> charset_getter = component.getUtility(ICharsetGetter)
 
 To map a particular file name, file contents, and content type to a charset.

Deleted: zope.mimetype/trunk/src/zope/mimetype/testing.py
===================================================================
--- zope.mimetype/trunk/src/zope/mimetype/testing.py	2009-12-26 17:28:16 UTC (rev 107111)
+++ zope.mimetype/trunk/src/zope/mimetype/testing.py	2009-12-26 17:28:42 UTC (rev 107112)
@@ -1,24 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2007 Zope Corporation 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.
-#
-##############################################################################
-"""zope.mimetype common test related classes/functions/objects.
-
-$Id$
-"""
-__docformat__ = "reStructuredText"
-import os
-from zope.app.testing.functional import ZCMLLayer
-
-MimetypeLayer = ZCMLLayer(
-    os.path.join(os.path.split(__file__)[0], 'ftesting.zcml'),
-    __name__, 'MimetypeLayer', allow_teardown=True)

Modified: zope.mimetype/trunk/src/zope/mimetype/tests.py
===================================================================
--- zope.mimetype/trunk/src/zope/mimetype/tests.py	2009-12-26 17:28:16 UTC (rev 107111)
+++ zope.mimetype/trunk/src/zope/mimetype/tests.py	2009-12-26 17:28:42 UTC (rev 107112)
@@ -16,13 +16,12 @@
 """
 import unittest
 import doctest
-from zope.app.testing import functional
-from zope.app.testing import placelesssetup
 
+from zope.component import testing
 import zope.interface
 import zope.mimetype.interfaces
-from zope.mimetype import testing
 
+
 class ISampleContentTypeOne(zope.interface.Interface):
     """This is a sample content type interface."""
 ISampleContentTypeOne.setTaggedValue("title", u"Type One")
@@ -45,28 +44,25 @@
 
 
 def test_suite():
-    retrievingMimeTypes = functional.FunctionalDocFileSuite(
-        'retrieving_mime_types.txt',
-        optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
-        )
-    retrievingMimeTypes.layer = testing.MimetypeLayer
     return unittest.TestSuite((
-        retrievingMimeTypes,
+        doctest.DocFileSuite('retrieving_mime_types.txt',
+                             setUp=testing.setUp,
+                             tearDown=testing.tearDown),
         doctest.DocFileSuite('event.txt',
-                             setUp=placelesssetup.setUp,
-                             tearDown=placelesssetup.tearDown),
+                             setUp=testing.setUp,
+                             tearDown=testing.tearDown),
         doctest.DocFileSuite('source.txt',
-                             setUp=placelesssetup.setUp,
-                             tearDown=placelesssetup.tearDown),
+                             setUp=testing.setUp,
+                             tearDown=testing.tearDown),
         doctest.DocFileSuite('constraints.txt'),
         doctest.DocFileSuite('contentinfo.txt',
-                             setUp=placelesssetup.setUp,
-                             tearDown=placelesssetup.tearDown),
+                             setUp=testing.setUp,
+                             tearDown=testing.tearDown),
         doctest.DocFileSuite('typegetter.txt'),
         doctest.DocFileSuite('utils.txt'),
         doctest.DocFileSuite('widget.txt',
-                             setUp=placelesssetup.setUp,
-                             tearDown=placelesssetup.tearDown),
+                             setUp=testing.setUp,
+                             tearDown=testing.tearDown),
         doctest.DocFileSuite(
             'codec.txt',
             optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,

Modified: zope.mimetype/trunk/src/zope/mimetype/typegetter.py
===================================================================
--- zope.mimetype/trunk/src/zope/mimetype/typegetter.py	2009-12-26 17:28:16 UTC (rev 107111)
+++ zope.mimetype/trunk/src/zope/mimetype/typegetter.py	2009-12-26 17:28:42 UTC (rev 107112)
@@ -11,7 +11,7 @@
 #
 ##############################################################################
 
-# There's a zope.app.content_types module that exports a similar API,
+# There's a zope.contenttype module that exports a similar API,
 # but that's pretty hueristic.  Some of this should perhaps be folded
 # back into that, or this package could provide a replacement.
 #



More information about the checkins mailing list