Changeset 3270 in products for quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/tests

Timestamp:

Sep 5, 2011 6:23:32 PM (13 years ago)

Author:

vmaksymiv

Message:

compatibility with plone.app.discussion added

Location:

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/tests

Files:

• base.py (modified) (1 diff)
• discussion.txt (added)
• testForms.py (modified) (3 diffs)

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/tests/base.py

@@ -41 +41 @@
         zcml.load_config('configure.zcml', quintagroup.plonecaptchas)
         fiveconfigure.debug_mode = False
+        ztc.installPackage('quintagroup.captcha.core')
         ztc.installPackage('quintagroup.plonecaptchas')
-        ztc.installPackage('quintagroup.captcha.core')
 
 

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/tests/testForms.py

@@ -1 +1 @@
 import unittest
+import doctest
 import re
 from urllib import urlencode
@@ -7 +8 @@
 from Products.PloneTestCase.PloneTestCase import default_password
 
-from quintagroup.plonecaptchas.tests.base import FunctionalTestCase
-from quintagroup.plonecaptchas.config import PRODUCT_NAME
+from quintagroup.plonecaptchas.tests.base import FunctionalTestCase, ztc
+from quintagroup.plonecaptchas.config import PRODUCT_NAME, HAS_APP_DISCUSSION
 
 from quintagroup.captcha.core.tests.testWidget import IMAGE_PATT, NOT_VALID
@@ -217 +218 @@
 def test_suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestDiscussionForm))
+    if HAS_APP_DISCUSSION:
+        suite.addTest(unittest.TestSuite([
+            ztc.FunctionalDocFileSuite(
+                'discussion.txt', package='quintagroup.plonecaptchas.tests',
+                test_class=FunctionalTestCase, globs=globals(),
+                optionflags=doctest.REPORT_ONLY_FIRST_FAILURE |
+                    doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS),
+            ]))
+
+    else:
+        suite.addTest(unittest.makeSuite(TestDiscussionForm))
     suite.addTest(unittest.makeSuite(TestRegisterForm))
     suite.addTest(unittest.makeSuite(TestSendtoForm))