Merged from trunk:

  r26878 | jim | 2004-08-03 12:25:34 -0400 (Tue, 03 Aug 2004) | 3 lines

Removed assert statements from test code. Assert statements
don't belong in test code.

2 files changed, 72 insertions, 1 deletions

diff --git a/tests/test_imessagecatalog.py b/tests/test_imessagecatalog.py
new file mode 100644
index 0000000..37ad3c2
--- /dev/null
+++ b/tests/test_imessagecatalog.py
@@ -0,0 +1,69 @@
+##############################################################################
+#
+# Copyright (c) 2001, 2002 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.
+#
+##############################################################################
+"""This is an 'abstract' test for the IMessageCatalog interface.
+
+$Id$
+"""
+import unittest
+from zope.interface.verify import verifyObject
+from zope.i18n.interfaces import IMessageCatalog
+
+
+class TestIMessageCatalog:
+
+
+    # This should be overwritten by every class that inherits this test
+    def _getMessageCatalog(self):
+        pass
+
+    def _getUniqueIndentifier(self):
+        pass
+
+
+    def setUp(self):
+        self._catalog = self._getMessageCatalog()
+
+    def testInterface(self):
+        verifyObject(IMessageCatalog, self._catalog)
+
+    def testGetMessage(self):
+        catalog = self._catalog
+        self.assertEqual(catalog.getMessage('short_greeting'), 'Hello!')
+        self.assertRaises(KeyError, catalog.getMessage, 'foo')
+
+
+    def testQueryMessage(self):
+        catalog = self._catalog
+        self.assertEqual(catalog.queryMessage('short_greeting'), 'Hello!')
+        self.assertEqual(catalog.queryMessage('foo'), None)
+        self.assertEqual(catalog.queryMessage('foo', 'bar'), 'bar')
+
+
+    def testGetLanguage(self):
+        catalog = self._catalog
+        self.assertEqual(catalog.language, 'en')
+
+
+    def testGetDomain(self):
+        catalog = self._catalog
+        self.assertEqual(catalog.domain, 'default')
+
+
+    def testGetIdentifier(self):
+        catalog = self._catalog
+        self.assertEqual(catalog.getIdentifier(), self._getUniqueIndentifier())
+
+
+def test_suite():
+    return unittest.TestSuite() # Deliberatly empty
diff --git a/tests/test_itranslationdomain.py b/tests/test_itranslationdomain.py
index 7190edb..9d2ac25 100644
--- a/tests/test_itranslationdomain.py
+++ b/tests/test_itranslationdomain.py
@@ -46,12 +46,14 @@ class TestITranslationDomain(PlacelessSetup):
     def setUp(self):
         super(TestITranslationDomain, self).setUp()
         self._domain = self._getTranslationDomain()
-        assert verifyObject(ITranslationDomain, self._domain)
 
         # Setup the negotiator utility
         utilities = getService(Utilities)
         utilities.provideUtility(INegotiator, negotiator)        
 
+    def testInterface(self):
+        verifyObject(ITranslationDomain, self._domain)
+
     def testSimpleTranslate(self):
         translate = self._domain.translate
         eq = self.assertEqual