Changeset 6743 for main/waeup.sirp/trunk/src/waeup

Timestamp:

13 Sep 2011, 09:32:46 (13 years ago)

Author:

uli

Message:

More usage of logger-aware testing components.
Remove unnecessary imports/testsuite registrations.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/utils/tests

Files:

• test_batching.py (modified) (1 diff)
• test_converters.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/utils/tests/test_batching.py

@@ -25 +25 @@
 import shutil
 import tempfile
-import unittest
 from zope import schema
-from zope.app.testing.functional import FunctionalTestCase
 from zope.component import provideUtility
 from zope.component.factory import Factory
-from zope.component.hooks import setSite, clearSite
+from zope.component.hooks import clearSite
 from zope.component.interfaces import IFactory
 from zope.interface import Interface, implements
 from waeup.sirp.app import University
-from waeup.sirp.testing import FunctionalLayer, doctestsuite_for_module
-from waeup.sirp.utils.helpers import attrs_to_fields
+from waeup.sirp.testing import FunctionalLayer, FunctionalTestCase
 
 optionflags = (

main/waeup.sirp/trunk/src/waeup/sirp/utils/tests/test_converters.py

@@ -24 +24 @@
 """
 import datetime
-import os
 import shutil
 import tempfile
-import unittest
 from zope import schema
-from zope.app.testing.functional import FunctionalTestCase
 from zope.component import provideUtility
 from zope.component.factory import Factory
-from zope.component.hooks import setSite, clearSite
+from zope.component.hooks import clearSite
 from zope.component.interfaces import IFactory
 from zope.formlib import form
 from zope.interface import (
     Interface, implements, invariant, Invalid, implementedBy)
-from zope.interface.verify import verifyClass, verifyObject
 
 from waeup.sirp.app import University
-from waeup.sirp.testing import FunctionalLayer, doctestsuite_for_module
+from waeup.sirp.testing import FunctionalLayer, FunctionalTestCase
+from waeup.sirp.university import Faculty
 from waeup.sirp.utils.converters import IObjectConverter
 from waeup.sirp.utils.helpers import attrs_to_fields
@@ -339 +336 @@
         assert data['num_cars'] == 1
         return
-
-
-def test_suite():
-    suite = unittest.TestSuite()
-    for testcase in [
-        ConverterTests,
-        ]:
-        suite.addTest(unittest.TestLoader().loadTestsFromTestCase(
-                testcase
-                )
-        )
-    return suite
-