avoid testing deprecation errors with Python3.12

cybertools/brain/tests.py

@@ -1,3 +1,4 @@
+# cybertools.brain.tests
 
 import unittest, doctest
 from zope.interface.verify import verifyClass
@@ -18,10 +19,9 @@ class TestBrain(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-                unittest.makeSuite(TestBrain),
+        unittest.TestLoader().loadTestsFromTestCase(TestBrain),
-                doctest.DocFileSuite('README.txt',
+        doctest.DocFileSuite('README.txt', optionflags=flags,),
-                             optionflags=flags,),
+        ))
-           ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')

cybertools/browser/tests.py

@@ -1,3 +1,4 @@
+# cybertools.browser.tests
 
 import unittest, doctest
 from zope.app.testing import ztapi
@@ -7,8 +8,8 @@ from zope.interface.verify import verifyClass
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-                doctest.DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
-            ))
+        ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')

cybertools/catalog/tests.py

@@ -1,7 +1,6 @@
-#! /usr/bin/python
+# cybertools.catalog.tests
 
-"""
+""" Tests for the 'cybertools.catalog' package.
-Tests for the 'cybertools.catalog' package.
 """
 
 import unittest, doctest
@@ -17,7 +16,7 @@ class Test(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-        unittest.makeSuite(Test),
+        unittest.TestLoader().loadTestsFromTestCase(Test),
         doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 

cybertools/commerce/tests.py

@@ -1,7 +1,6 @@
-#! /usr/bin/python
+# cybertools.commerce.tests
 
-"""
+""" Tests for the 'cybertools.commerce' package.
-Tests for the 'cybertools.commerce' package.
 """
 
 import unittest, doctest
@@ -58,7 +57,7 @@ class Test(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-        unittest.makeSuite(Test),
+        unittest.TestLoader().loadTestsFromTestCase(Test),
         doctest.DocFileSuite('README.txt', optionflags=flags,
                      setUp=setUp, tearDown=tearDown),
         ))

cybertools/composer/layout/tests.py

@@ -1,3 +1,4 @@
+# cybertools.composer.layout.tests
 
 import unittest, doctest
 
@@ -12,9 +13,9 @@ class Test(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-                unittest.makeSuite(Test),
+        unittest.TestLoader().loadTestsFromTestCase(Test),
-                doctest.DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
-            ))
+        ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')

cybertools/composer/message/tests.py

@@ -1,3 +1,4 @@
+# cybertools.composer.message.tests
 
 import unittest, doctest
 
@@ -12,9 +13,9 @@ class Test(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-                unittest.makeSuite(Test),
+        unittest.TestLoader().loadTestsFromTestCase(Test),
-                doctest.DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
-            ))
+        ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')

cybertools/composer/report/tests.py

@@ -1,3 +1,4 @@
+# composer.report.tests
 
 import unittest, doctest
 
@@ -12,9 +13,9 @@ class Test(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-                unittest.makeSuite(Test),
+        unittest.TestLoader().loadTestsFromTestCase(Test),
-                doctest.DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
-            ))
+        ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')

cybertools/composer/rule/tests.py

@@ -1,3 +1,4 @@
+# cybertools.composer.rule.tests
 
 import unittest, doctest
 from email import message_from_string
@@ -27,9 +28,9 @@ class Test(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-                unittest.makeSuite(Test),
+        unittest.TestLoader().loadTestsFromTestCase(Test),
-                doctest.DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
-            ))
+        ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')

cybertools/composer/schema/tests.py

@@ -1,3 +1,4 @@
+# cybertools.composer.schema.tests
 
 import unittest, doctest
 
@@ -12,9 +13,9 @@ class Test(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-                unittest.makeSuite(Test),
+        unittest.TestLoader().loadTestsFromTestCase(Test),
-                doctest.DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
-            ))
+        ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')

cybertools/composer/tests.py

@@ -1,3 +1,4 @@
+# cybertools.composer.tests
 
 import unittest, doctest
 
@@ -12,9 +13,9 @@ class Test(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-                unittest.makeSuite(Test),
+        unittest.TestLoader().loadTestsFromTestCase(Test),
-                doctest.DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
-            ))
+        ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')

cybertools/docgen/tests.py

@@ -1,7 +1,6 @@
 # cybertools.util.docgen.tests
 
-"""
+""" unit tests, doc tests
-unit tests, doc tests
 """
 
 import unittest, doctest
@@ -20,9 +19,9 @@ class Test(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-                unittest.makeSuite(Test),
+        unittest.TestLoader().loadTestsFromTestCase(Test),
-                doctest.DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
-            ))
+        ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')

cybertools/integrator/tests/test_filesystem.py

@@ -1,3 +1,4 @@
+# cybertools.integrator.tests.test_filesystem
 
 import os
 import unittest, doctest
@@ -19,9 +20,9 @@ class Test(unittest.TestCase):
 
 def test_suite():
     return unittest.TestSuite((
-                unittest.makeSuite(Test),
+        unittest.TestLoader().loadTestsFromTestCase(Test),
-                doctest.DocFileSuite('../filesystem.txt', optionflags=flags),
+        doctest.DocFileSuite('../filesystem.txt', optionflags=flags),
-            ))
+        ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')

cybertools/knowledge/survey/tests.py

@@ -1,7 +1,6 @@
-#! /usr/bin/python
+# cybertools.knowledge.survey.tests
 
-"""
+""" Tests for the 'cybertools.knowledge.survey' package.
-Tests for the 'cybertools.knowledge.survey' package.
 """
 
 import unittest, doctest
@@ -18,7 +17,7 @@ class TestSurvey(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-        unittest.makeSuite(TestSurvey),
+        unittest.TestLoader().loadTestsFromTestCase(TestSurvey),
         doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 

cybertools/knowledge/tests.py

@@ -1,7 +1,6 @@
-#! /usr/bin/python
+# cybertools.knowledge.tests
 
-"""
+""" Tests for the 'cybertools.knowledge' package.
-Tests for the 'cybertools.knowledge' package.
 """
 
 import unittest, doctest
@@ -17,7 +16,7 @@ class TestKnowledge(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-        unittest.makeSuite(TestKnowledge),
+        unittest.TestLoader().loadTestsFromTestCase(TestKnowledge),
         doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 

cybertools/link/tests.py

@@ -41,9 +41,9 @@ class TestLink(unittest.TestCase):
 
 def test_suite():
     return unittest.TestSuite((
-                unittest.makeSuite(TestLink),
+        unittest.TestLoader().loadTestsFromTestCase(TestLink),
-                doctest.DocFileSuite('README.txt'),
+        doctest.DocFileSuite('README.txt'),
-            ))
+        ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')

cybertools/media/tests.py

@@ -1,9 +1,6 @@
-#! /usr/bin/python
+# cybertools.media.tests
 
-"""
+""" Tests for the 'cybertools.media' package.
-Tests for the 'cybertools.media' package.
-
-$Id$
 """
 
 import os
@@ -35,9 +32,9 @@ class Test(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-                unittest.makeSuite(Test),
+        unittest.TestLoader().loadTestsFromTestCase(Test),
-                doctest.DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
-            ))
+        ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')

cybertools/organize/tests.py

@@ -1,7 +1,6 @@
-#! /usr/bin/python
+# cybertools.organize.tests
 
-"""
+""" Tests for the 'cybertools.organize' package.
-Tests for the 'cybertools.organize' package.
 """
 
 import unittest, doctest
@@ -34,7 +33,7 @@ def setUp(site):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-        unittest.makeSuite(TestParty),
+        unittest.TestLoader().loadTestsFromTestCase(TestParty),
         doctest.DocFileSuite('README.txt', optionflags=flags),
         doctest.DocFileSuite('formmanager.txt', optionflags=flags),
         doctest.DocFileSuite('servicemanager.txt', optionflags=flags),

cybertools/process/tests.py

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+# cybertools.process.tests
 
 """
 Tests for the 'cybertools.process' package.
@@ -7,7 +7,7 @@ Tests for the 'cybertools.process' package.
 import unittest, doctest
 from cybertools.process.definition import Process
 
-class TestProcess(unittest.TestCase):
+class Test(unittest.TestCase):
     "Basic tests for the process package."
 
     def testBasicStuff(self):
@@ -17,7 +17,7 @@ class TestProcess(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-        unittest.makeSuite(TestProcess),
+        unittest.TestLoader().loadTestsFromTestCase(Test),
         doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 

cybertools/relation/tests.py

@@ -59,9 +59,9 @@ class TestRelation(unittest.TestCase):
 
 def test_suite():
     return unittest.TestSuite((
-                unittest.makeSuite(TestRelation),
+        unittest.TestLoader().loadTestsFromTestCase(TestRelation),
-                doctest.DocFileSuite('README.txt'),
+        doctest.DocFileSuite('README.txt'),
-            ))
+        ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')

cybertools/reporter/tests.py

@@ -7,7 +7,7 @@ from zope.interface.verify import verifyClass
 from cybertools.reporter.interfaces import IResultSet, IRow, ICell
 
 
-class TestReporter(unittest.TestCase):
+class Test(unittest.TestCase):
     "Basic tests for the reporter package."
 
     def testInterfaces(self):
@@ -17,9 +17,9 @@ class TestReporter(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-                unittest.makeSuite(TestReporter),
+        unittest.TestLoader().loadTestsFromTestCase(Test),
-                doctest.DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
-            ))
+        ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')

cybertools/stateful/tests.py

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+# cybertools.stateful.tests
 
 """
 Tests for the 'cybertools.stateful' package.
@@ -17,7 +17,7 @@ class Test(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-        unittest.makeSuite(Test),
+        unittest.TestLoader().loadTestsFromTestCase(Test),
         doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 

cybertools/storage/tests.py

@@ -1,7 +1,6 @@
-#! /usr/bin/python
+# cybertools.storage.tests
 
-"""
+""" Tests for the 'cybertools.storage' package.
-Tests for the 'cybertools.storage' package.
 """
 
 import unittest, doctest
@@ -17,7 +16,7 @@ class Test(unittest.TestCase):
 def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
-        unittest.makeSuite(Test),
+        unittest.TestLoader().loadTestsFromTestCase(Test),
         doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 

cybertools/text/tests.py

@@ -1,7 +1,6 @@
-#! /usr/bin/python
+# cybertools.text.tests
 
-"""
+""" Tests for the 'cybertools.text' package.
-Tests for the 'cybertools.text' package.
 """
 
 import unittest, doctest