Changeset 253

Timestamp:

02/05/06 06:30:43

Author:

mylan

Message:

Merged tests for Plone 2.0.5 and 2.1 versions

Files:

• qPloneComments/branches/plone205-21merge/tests/helperNotify.py (modified) (3 diffs)
• qPloneComments/branches/plone205-21merge/tests/testQPloneCommentsModeration.py (modified) (7 diffs)

qPloneComments/branches/plone205-21merge/tests/helperNotify.py

@@ -6 +6 @@
-import os, os.path
-from Products.MailHost.MailHost import MailBase
+ver = "2.0.5"
+try:
+    from Products.SecureMailHost.SecureMailHost import SecureMailBase
+    ver = "2.1"
+except ImportError:
+    pass
-
-PREFIX = os.path.abspath(os.path.dirname(__file__))
@@ -31 +37 @@
-    result_f.close()
-
-def _send( self, mfrom, mto, messageText ):
-    writeToFile(output_file_path('mail.res'), messageText)
-
-def testMailSend(self, state='approve'):
-    result = getFileContent(output_file_path('mail.res'))
@@ -58 +61 @@
-    self.assert_(not result, "Mail was sended")
-
+def _send_MH( self, mfrom, mto, messageText ):
+    writeToFile(output_file_path('mail.res'), messageText)
+
+def _send_SMH(self, mfrom, mto, messageText, debug=False):
+    writeToFile(output_file_path('mail.res'), messageText)
+
+def send_SMH(self, message, mto=None, mfrom=None, subject=None, encode=None):
+    writeToFile(output_file_path('mail.res'), message)
+
-def prepareMailSendTest():
-    # patch MailHost
-
+
+
+
+
+
-    # clear 'mail.res' file
-    clearFile(output_file_path('mail.res'))

qPloneComments/branches/plone205-21merge/tests/testQPloneCommentsModeration.py

@@ -41 +41 @@
-        self._refreshSkinData()
-
+        # Get Plone version
+        self.version = getToolByName(self.portal, 'portal_migration').getFileSystemVersion()
+
-        # Add all users
-        self.membership = getToolByName(self.portal, 'portal_membership', None)
@@ -120 +123 @@
-        # Publish button MUST BE ABSENT in document view form 
-        # Pattern for publish button presence checking
-
+
+
+
+
+
-                             re.S|re.M)
-
-
-
+
+
+
+
-            if not u=='anonym':
-                self.login(u)
@@ -137 +145 @@
-        # Publish button MUST PRESENT in document view form 
-        # Pattern for publish button presence checking
-
-
+
+
+
+
+
+
-        for u in DM_USERS_IDS:
-            self.logout()
@@ -152 +164 @@
-        # Check whether perform real publishing
-        # Pattern for publish button presence checking
-
-
+
+
+
+
+
+
-        for u in DM_USERS_IDS:
-            doc_id = "doc_%s" % u
@@ -177 +193 @@
-
-
-    
-    ## TEST DELETING
-
@@ -193 +208 @@
-            reply.discussion_publish_comment()
-        # Prepare pattern for delete reply button presence checking
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-            if not u=='anonym':
-                self.login(u)
@@ -213 +232 @@
-        # Delete reply button in document view form MUST BE ABSENT for all EXCEPT manager.
-        # Prepare pattern for delete reply button presence checking
-
-
+
+
+
+
+
+
-        for u in DM_USERS_IDS:
-            self.logout()