From: Alex Morega <alex@grep.ro>
Date: Sat, 6 Jul 2013 12:31:11 +0000 (+0200)
Subject: remove test suite factories
X-Git-Tag: 1.0~100^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abb96be40053f9c811f27c0f0dd365224b5c1d00;p=thirdparty%2Fbabel.git

remove test suite factories
---

diff --git a/tests/__init__.py b/tests/__init__.py
index 29e38a16..e69de29b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2007-2011 Edgewall Software
-# All rights reserved.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at http://babel.edgewall.org/wiki/License.
-#
-# This software consists of voluntary contributions made by many
-# individuals. For the exact contribution history, see the revision
-# history and logs, available at http://babel.edgewall.org/log/.
-
-import unittest
-
-def suite():
-    from babel.tests import (test_core, test_dates, test_localedata,
-                             test_numbers, test_plural, test_support,
-                             test_util)
-    from babel.messages import tests as test_messages
-    suite = unittest.TestSuite()
-    suite.addTest(test_core.suite())
-    suite.addTest(test_dates.suite())
-    suite.addTest(test_localedata.suite())
-    suite.addTest(test_messages.suite())
-    suite.addTest(test_numbers.suite())
-    suite.addTest(test_plural.suite())
-    suite.addTest(test_support.suite())
-    suite.addTest(test_util.suite())
-    return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='suite')
diff --git a/tests/messages/__init__.py b/tests/messages/__init__.py
index 354a20ed..e69de29b 100644
--- a/tests/messages/__init__.py
+++ b/tests/messages/__init__.py
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2007-2011 Edgewall Software
-# All rights reserved.
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at http://babel.edgewall.org/wiki/License.
-#
-# This software consists of voluntary contributions made by many
-# individuals. For the exact contribution history, see the revision
-# history and logs, available at http://babel.edgewall.org/log/.
-
-import unittest
-
-def suite():
-    from babel.messages.tests import (
-        test_catalog, test_extract, test_frontend, test_mofile,
-        test_plurals, test_pofile, test_checkers)
-    suite = unittest.TestSuite()
-    suite.addTest(test_catalog.suite())
-    suite.addTest(test_extract.suite())
-    suite.addTest(test_frontend.suite())
-    suite.addTest(test_mofile.suite())
-    suite.addTest(test_plurals.suite())
-    suite.addTest(test_pofile.suite())
-    suite.addTest(test_checkers.suite())
-    return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='suite')
diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py
index f2de33e5..b5ba3588 100644
--- a/tests/messages/test_catalog.py
+++ b/tests/messages/test_catalog.py
@@ -455,13 +455,3 @@ def test_catalog_update():
 
     assert not 'head' in cat
     assert cat.obsolete.values()[0].id == 'head'
-
-
-def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(MessageTestCase))
-    suite.addTest(unittest.makeSuite(CatalogTestCase))
-    return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='suite')
diff --git a/tests/messages/test_checkers.py b/tests/messages/test_checkers.py
index a9d31ef0..5c94d848 100644
--- a/tests/messages/test_checkers.py
+++ b/tests/messages/test_checkers.py
@@ -360,12 +360,3 @@ msgstr[4] ""
             catalog = read_po(StringIO(po_file), _locale)
             message = catalog['foobar']
             checkers.num_plurals(catalog, message)
-
-
-def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(CheckersTestCase))
-    return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='suite')
diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index 77552203..7cd7393a 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -530,14 +530,3 @@ msg = _('')
             assert 'warning: Empty msgid.' in sys.stderr.getvalue()
         finally:
             sys.stderr = stderr
-
-
-def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(ExtractPythonTestCase))
-    suite.addTest(unittest.makeSuite(ExtractJavaScriptTestCase))
-    suite.addTest(unittest.makeSuite(ExtractTestCase))
-    return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='suite')
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index d3b4e209..9e8b6fd7 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -1098,15 +1098,3 @@ def test_parse_keywords():
         'dngettext': (2, 3),
         'pgettext': ((1, 'c'), 2),
     }
-
-
-def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(CompileCatalogTestCase))
-    suite.addTest(unittest.makeSuite(ExtractMessagesTestCase))
-    suite.addTest(unittest.makeSuite(InitCatalogTestCase))
-    suite.addTest(unittest.makeSuite(CommandLineInterfaceTestCase))
-    return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='suite')
diff --git a/tests/messages/test_mofile.py b/tests/messages/test_mofile.py
index a0b54cfa..6d15d0d1 100644
--- a/tests/messages/test_mofile.py
+++ b/tests/messages/test_mofile.py
@@ -74,13 +74,3 @@ class WriteMoTestCase(unittest.TestCase):
         catalog2.add(('Fuzz', 'Fuzzes'), ('', '', ''))
         buf = StringIO()
         mofile.write_mo(buf, catalog2)
-
-
-def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(ReadMoTestCase))
-    suite.addTest(unittest.makeSuite(WriteMoTestCase))
-    return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='suite')
diff --git a/tests/messages/test_plurals.py b/tests/messages/test_plurals.py
index 3a885cab..9466decf 100644
--- a/tests/messages/test_plurals.py
+++ b/tests/messages/test_plurals.py
@@ -26,10 +26,3 @@ def test_get_plural():
     assert tup.plural_expr == '0'
     assert tup.plural_forms == 'npurals=1; plural=0'
     assert str(tup) == 'npurals=1; plural=0'
-
-def suite():
-    suite = unittest.TestSuite()
-    return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='suite')
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index cef41e58..68e3d223 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -549,14 +549,3 @@ class PofileFunctionsTestCase(unittest.TestCase):
         self.assertEqual(expected_denormalized, pofile.denormalize(msgstr))
         self.assertEqual(expected_denormalized,
                          pofile.denormalize('""\n' + msgstr))
-
-
-def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(ReadPoTestCase))
-    suite.addTest(unittest.makeSuite(WritePoTestCase))
-    suite.addTest(unittest.makeSuite(PofileFunctionsTestCase))
-    return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='suite')
diff --git a/tests/test_core.py b/tests/test_core.py
index 83b80230..f00a13df 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -270,13 +270,3 @@ def test_parse_locale():
     assert core.parse_locale('en_US.UTF-8') == ('en', 'US', None, None)
     assert (core.parse_locale('de_DE.iso885915@euro') ==
             ('de', 'DE', None, None))
-
-
-def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(LocaleTest))
-    suite.addTest(unittest.makeSuite(DefaultLocaleTest))
-    return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='suite')
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 07ef390d..8ef3591c 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -512,18 +512,3 @@ def test_parse_pattern():
     assert (dates.parse_pattern("H:mm' Uhr 'z").format ==
             u'%(H)s:%(mm)s Uhr %(z)s')
     assert dates.parse_pattern("hh' o''clock'").format == u"%(hh)s o'clock"
-
-
-def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(DateTimeFormatTestCase))
-    suite.addTest(unittest.makeSuite(FormatDateTestCase))
-    suite.addTest(unittest.makeSuite(FormatDatetimeTestCase))
-    suite.addTest(unittest.makeSuite(FormatTimeTestCase))
-    suite.addTest(unittest.makeSuite(FormatTimedeltaTestCase))
-    suite.addTest(unittest.makeSuite(TimeZoneAdjustTestCase))
-    return suite
-
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='suite')
diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index 565d6abd..17ecd639 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -72,12 +72,3 @@ def test_merge():
     d = {1: 'foo', 3: 'baz'}
     localedata.merge(d, {1: 'Foo', 2: 'Bar'})
     assert d == {1: 'Foo', 2: 'Bar', 3: 'baz'}
-
-
-def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(MergeResolveTestCase))
-    return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='suite')
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 0a730851..00ceca11 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -273,14 +273,3 @@ def test_parse_grouping():
     assert numbers.parse_grouping('##') == (1000, 1000)
     assert numbers.parse_grouping('#,###') == (3, 3)
     assert numbers.parse_grouping('#,####,###') == (3, 4)
-
-
-def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(FormatDecimalTestCase))
-    suite.addTest(unittest.makeSuite(BankersRoundTestCase))
-    suite.addTest(unittest.makeSuite(NumberParsingTestCase))
-    return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='suite')
diff --git a/tests/test_plural.py b/tests/test_plural.py
index d7bebf8d..644a97df 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -68,12 +68,3 @@ def test_cldr_modulo():
     assert plural.cldr_modulo(-3, 5) == -3
     assert plural.cldr_modulo(-3, -5) == -3
     assert plural.cldr_modulo(3, 5) == 3
-
-
-def suite():
-    suite = unittest.TestSuite()
-    return suite
-
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='suite')
diff --git a/tests/test_support.py b/tests/test_support.py
index a3d01712..e165434d 100644
--- a/tests/test_support.py
+++ b/tests/test_support.py
@@ -299,14 +299,3 @@ def test_lazy_proxy():
         u"Hello, universe!",
         u"Hello, world!",
     ]
-
-
-def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TranslationsTestCase, 'test'))
-    suite.addTest(unittest.makeSuite(NullTranslationsTestCase, 'test'))
-    suite.addTest(unittest.makeSuite(LazyProxyTestCase, 'test'))
-    return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='suite')
diff --git a/tests/test_util.py b/tests/test_util.py
index 0c9d349d..321014c9 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -28,11 +28,3 @@ def test_pathmatch():
     assert not util.pathmatch('**.py', 'templates/index.html')
     assert util.pathmatch('**/templates/*.html', 'templates/index.html')
     assert not util.pathmatch('**/templates/*.html', 'templates/foo/bar.html')
-
-
-def suite():
-    suite = unittest.TestSuite()
-    return suite
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='suite')