[Zope3-checkins] CVS: Zope3/src/zope/i18n/tests - test_gettextmessagecatalog.py:1.4 test_globaltranslationservice.py:1.6 test_imessagecatalog.py:1.2 test_itranslationservice.py:1.2 test_simpletranslationservice.py:1.4

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/i18n/tests
In directory cvs.zope.org:/tmp/cvs-serv32029/src/zope/i18n/tests

Modified Files:
	test_gettextmessagecatalog.py test_globaltranslationservice.py 
	test_imessagecatalog.py test_itranslationservice.py 
	test_simpletranslationservice.py 
Log Message:
Whee, 'make test' was not working for me. It took all these changes to fix
it.


=== Zope3/src/zope/i18n/tests/test_gettextmessagecatalog.py 1.3 => 1.4 ===
--- Zope3/src/zope/i18n/tests/test_gettextmessagecatalog.py:1.3	Tue Mar 25 18:25:15 2003
+++ Zope3/src/zope/i18n/tests/test_gettextmessagecatalog.py	Tue Mar 25 19:19:58 2003
@@ -36,8 +36,9 @@
 
 
 def test_suite():
-    loader=unittest.TestLoader()
-    return loader.loadTestsFromTestCase(GettextMessageCatalogTest)
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(GettextMessageCatalog))
+    return suite
 
 if __name__=='__main__':
     unittest.TextTestRunner().run(test_suite())


=== Zope3/src/zope/i18n/tests/test_globaltranslationservice.py 1.5 => 1.6 ===
--- Zope3/src/zope/i18n/tests/test_globaltranslationservice.py:1.5	Tue Mar 25 18:25:15 2003
+++ Zope3/src/zope/i18n/tests/test_globaltranslationservice.py	Tue Mar 25 19:19:58 2003
@@ -27,7 +27,10 @@
     return os.path.dirname(tests.__file__)
 
 
-class TestGlobalTranslationService(TestITranslationService):
+class TestGlobalTranslationService(unittest.TestCase, TestITranslationService):
+
+    def setUp(self):
+        TestITranslationService.setUp(self)
 
     def _getTranslationService(self):
         service = GlobalTranslationService('default')
@@ -95,8 +98,9 @@
 
 
 def test_suite():
-    loader = unittest.TestLoader()
-    return loader.loadTestsFromTestCase(TestGlobalTranslationService)
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(TestGlobalTranslationService))
+    return suite
 
 
 if __name__ == '__main__':


=== Zope3/src/zope/i18n/tests/test_imessagecatalog.py 1.1 => 1.2 ===
--- Zope3/src/zope/i18n/tests/test_imessagecatalog.py:1.1	Tue Mar 25 18:25:15 2003
+++ Zope3/src/zope/i18n/tests/test_imessagecatalog.py	Tue Mar 25 19:19:58 2003
@@ -20,7 +20,7 @@
 from zope.i18n.interfaces import IMessageCatalog
 
 
-class TestIMessageCatalog(unittest.TestCase):
+class TestIMessageCatalog:
 
 
     # This should be overwritten by every class that inherits this test


=== Zope3/src/zope/i18n/tests/test_itranslationservice.py 1.1 => 1.2 ===
--- Zope3/src/zope/i18n/tests/test_itranslationservice.py:1.1	Tue Mar 25 18:25:15 2003
+++ Zope3/src/zope/i18n/tests/test_itranslationservice.py	Tue Mar 25 19:19:58 2003
@@ -40,7 +40,7 @@
 
 
 
-class TestITranslationService(PlacelessSetup, unittest.TestCase):
+class TestITranslationService(PlacelessSetup):
 
     # This should be overwritten by every clas that inherits this test
     def _getTranslationService(self):


=== Zope3/src/zope/i18n/tests/test_simpletranslationservice.py 1.3 => 1.4 ===
--- Zope3/src/zope/i18n/tests/test_simpletranslationservice.py:1.3	Tue Mar 25 18:25:15 2003
+++ Zope3/src/zope/i18n/tests/test_simpletranslationservice.py	Tue Mar 25 19:19:58 2003
@@ -20,7 +20,10 @@
 from zope.i18n.tests.test_itranslationservice import TestITranslationService
 
 
-class TestSimpleTranslationService(TestITranslationService):
+class TestSimpleTranslationService(unittest.TestCase, TestITranslationService):
+
+    def setUp(self):
+        TestITranslationService.setUp(self)
 
     def _getTranslationService(self):
         service = SimpleTranslationService(
@@ -33,8 +36,10 @@
 
 
 def test_suite():
-    loader = unittest.TestLoader()
-    return loader.loadTestsFromTestCase(TestSimpleTranslationService)
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(TestSimpleTranslationService))
+    return suite
+
 
 if __name__ == '__main__':
     unittest.TextTestRunner().run(test_suite())