Changeset 611 in products

Timestamp:

Oct 27, 2006 3:16:55 PM (18 years ago)

Author:

crchemist

Message:

New tests added.

Location:

qPloneComments/tags/2.2.0-rc1

Files:

• skins/qplonecomments/approve_comment_template.pt (modified) (2 diffs)
• tests/helperNotify.py (modified) (4 diffs)
• tests/sample (deleted)
• tests/testNotificationMailsSend.py (deleted)
• tests/testQPloneCommentsNotification.py (modified) (5 diffs)

qPloneComments/tags/2.2.0-rc1/skins/qplonecomments/approve_comment_template.pt

@@ -1 @@
-<div i18n:domain="plonecomments"
+<div i18n:domain="plonecomments" 
      tal:omit-tag=""
      tal:define="charset here/portal_properties/site_properties/default_charset|string:utf-8;
@@ -15 +15 @@
 
 --
-<tal:signature i18n:translate="signature">
-    <tal:organization_name condition="organization_name"
-                           replace="string:$organization_name"
+<tal:signature i18n:translate="signature"> 
+    <tal:organization_name condition="organization_name" 
+                           replace="string:$organization_name" 
                            i18n:name="organization_name"/>
-Support Team
+    Support Team
 </tal:signature>
 </div>

qPloneComments/tags/2.2.0-rc1/tests/helperNotify.py

@@ -15 +15 @@
 PREFIX = os.path.abspath(os.path.dirname(__file__))
 
-ALL_PROPS = ['enable_approve_user_notification', 'enable_reply_user_notification',
-             'enable_rejected_user_notification','enable_moderation',
-             'require_email', 'enable_anonymous_commenting',
-             'enable_published_notification', 'enable_approve_notification']
+def verifyMail(text,  mail_type):
+    pass
 
 def sample_file_path(file):
@@ -33 +31 @@
 
 def writeToFile(f_path, text):
-    result_f = open(f_path,'w')
+    result_f = open(f_path,"a")
     result_f.write(text+'\n')
     result_f.close()
@@ -42 +40 @@
     result_f.close()
 
+def testMailSend(self, state='approve'):
+    result = getFileContent(output_file_path('mail.res'))
+    sample = getFileContent(sample_file_path(state+'.mail'))
+    # Check headers
+    sample_headers = sample.split('\n')[:2]
+    for header in sample_headers:
+        self.assert_(header in result, "State:'%s'. Header '%s' not present in sended mail" % (state, header) )
+    # Check footer
+    sample_footer = sample.split('\n')[-2:-1]
+    self.assert_(sample_footer[0] in result, "State:'%s'. Footer '%s' not present in sended mail" % (state, sample_footer[0]) )
+
+def testNotMailSend(self, state='approve'):
+    result = getFileContent(output_file_path('mail.res'))
+    sample = getFileContent(sample_file_path(state+'.mail'))
+    # Check headers
+    sample_headers = sample.split('\n')[:2]
+    del sample_headers[1]
+    for header in sample_headers:
+        self.assert_(not header in result, "State:'%s'. Header '%s' present in sended mail" % (state, header) )
+
+def testNotMail(self):
+    result = getFileContent(output_file_path('mail.res'))
+    self.assert_(not result, "Mail was sended")
+
 def _send_MH( self, mfrom, mto, messageText ):
-    files = [f for f in os.listdir(output_file_path("")) if f.startswith('mail')]
-    files.sort()
-    fn = files and (files[-1]+ '1') or 'mail'
-    writeToFile(output_file_path(fn), messageText)
+    writeToFile(output_file_path('mail.res'), messageText)
 
 def _send_SMH(self, mfrom, mto, messageText, debug=False):
-    files = [f for f in os.listdir(output_file_path("")) if f.startswith('mail')]
-    files.sort()
-    fn = files and (files[-1]+ '1') or 'mail'
-    writeToFile(output_file_path(fn), messageText)
+    writeToFile(output_file_path('mail.res'), messageText)
 
 def send_SMH(self, message, mto=None, mfrom=None, subject=None, encode=None):
-    files = [f for f in os.listdir(output_file_path("")) if f.startswith('mail')]
-    files.sort()
-    fn = files and (files[-1]+ '1') or 'mail'
-    writeToFile(output_file_path(fn), message)
+    writeToFile(output_file_path('mail.res'), message)
 
 def prepareMailSendTest():
@@ -67 +80 @@
         SecureMailBase.send = send_SMH
         SecureMailBase._send = _send_SMH
-
-def setProperties(prop_sheet, *props):
-    for p in ALL_PROPS:
-        prop_sheet._updateProperty(p, p in props)
-
-def testMailExistance():
-    for f in os.listdir(output_file_path("")):
-        if f.startswith('mail'):
-            return True
-    return False
-
-def getMails():
-    return [file(output_file_path(f),'r').read() for f in os.listdir(output_file_path("")) if f.startswith('mail')]
-
-
-def cleanOutputDir():
-    for f in os.listdir(output_file_path("")):
-        if f.startswith('mail'): os.remove(output_file_path(f))
+    # clear 'mail.res' file
+    clearFile(output_file_path('mail.res'))

qPloneComments/tags/2.2.0-rc1/tests/testQPloneCommentsNotification.py

@@ -1 @@
-#   
+#
 # Test configuration form working
 #
 
 import os, sys, string
-
 if __name__ == '__main__':
     execfile(os.path.join(sys.path[0], 'framework.py'))
@@ -12 +11 @@
 from Products.CMFCore.CMFCorePermissions import ManagePortal, ReplyToItem
 from Products.MailHost.MailHost import MailBase
-
-import re
-
-from Products.qPloneComments.utils import getMsg
 from helperNotify import *
 
 PRODUCT = 'qPloneComments'
 PROPERTY_SHEET = "qPloneComments"
+
 
 PloneTestCase.installProduct(PRODUCT)
@@ -30 +26 @@
         self.prefs._updateProperty('enable_approve_notification', swithA)
         self.prefs._updateProperty('enable_published_notification', swithP)
+
 
     def afterSetUp(self):
@@ -60 +57 @@
         member = self.portal.portal_membership.getAuthenticatedMember()
         member.setMemberProperties({'email':'creator@test.com'})
-
+        
         # Add testing document to portal
         my_doc = self.portal.invokeFactory('Document', id='my_doc')
@@ -74 +71 @@
         prepareMailSendTest()
 
-    def test_bug_parent_reply(self):
-        setProperties(self.prefs, 'enable_reply_user_notification')
+    
+    def testPublishedOFF(self):
         self.my_doc.discussion_reply('A Reply for my_doc' ,'text of reply for my_doc')
-        parent_reply = self.discussion.getDiscussionFor(self.my_doc).getReplies()[0]
-        parent_reply.discussion_reply('reply', 'text')
-
-    def test_bug_mistakable_names(self):
-        setProperties(self.prefs, 'enable_reply_user_notification')
-        self.my_doc.discussion_reply('A Reply for my_doc' ,'text of reply for my_doc')
-        parent_reply = self.discussion.getDiscussionFor(self.my_doc).getReplies()[0]
-
-        args={'mto': 'user_email@gmail.com',
-              'mfrom': 'admin_email@gmail.com',
-              'obj': parent_reply,
-              'organization_name': 'org_name',
-              'name': parent_reply.getOwnerTuple()[1]}
-
-        msg = getMsg(self.portal, 'reply_notify_template', args)
-        patt = re.compile('\\n\\n([^,]*)')
-        m = patt.search(msg)
-        if m:
-            name = m.group(1)
-            self.assertEqual(parent_reply.getOwnerTuple()[1], name)
-        else:
-            raise "No name"
-
-    def test_notificafion_disabled(self):
-        cleanOutputDir()
-        setProperties(self.prefs)
-        self.my_doc.discussion_reply('A Reply for my_doc' ,'text of reply for my_doc')
-        self.assert_(not testMailExistance(), 'Mail was sended when all notification was disabled')
-
-    def test_published_comment_notification(self):
-        cleanOutputDir()
-        setProperties(self.prefs, 'enable_published_notification')
-        self.my_doc.discussion_reply('A Reply for my_doc' ,'text of reply for my_doc')
-        self.assert_(testMailExistance(), 'Mail was not sended when enable_published_notification')
-
-    def test_approve_comment_notification(self):
-        cleanOutputDir()
-        setProperties(self.prefs, 'enable_approve_notification')
-        self.my_doc.discussion_reply('A Reply for my_doc' ,'text of reply for my_doc')
-        self.assert_(testMailExistance(), 'Mail was not sended when enable_approve_notification')
-
-    def test_reply_comment_user_notification(self):
-        cleanOutputDir()
-        setProperties(self.prefs, 'enable_reply_user_notification')
-        self.my_doc.discussion_reply('A Reply for my_doc' ,'text of reply for my_doc')
-        self.assert_(not testMailExistance(), 'Mail was sended for simple reply when enable_reply_user_notification')
-
-        reply = self.discussion.getDiscussionFor(self.my_doc).getReplies()[0]
-        reply.discussion_reply('A Reply for comment' ,'text of reply for comment')
-        reply_for_comment = self.discussion.getDiscussionFor(self.my_doc).getReplies()[0]
-        self.assert_(testMailExistance(), 'Mail was not sended when enable_reply_user_notification')
-
-    def test_rejected_comment_notification(self):
-        cleanOutputDir()
-        setProperties(self.prefs, 'enable_rejected_user_notification', 'enable_moderation')
-        self.my_doc.discussion_reply('A Reply for my_doc' ,'text of reply for my_doc')
-        self.assert_(not testMailExistance(), 'Mail was sended when enable_rejected_user_notification was enabled')
-
-        reply = self.discussion.getDiscussionFor(self.my_doc).getReplies()[0]
-        self.portal.REQUEST.set('ids', [reply.getId()])
-        self.portal.prefs_recent_comments_delete()
-        self.assert_(testMailExistance(), 'Mail was not sended when enable_rejected_user_notification')
-
-    def test_approve_comment_user__notification(self):
-        cleanOutputDir()
-        setProperties(self.prefs, 'enable_approve_user_notification')
-        self.my_doc.discussion_reply('A Reply for my_doc' ,'text of reply for my_doc')
-        self.assert_(testMailExistance(), 'Mail was not sended when enable_approve_user_notification')
-
-    def test_bug_notification_on_single_reply_publish(self):
-        """ Bug: no notification sent on publishing single comment.
-            Must be 3 mails: for replier about replying on his commen;
-                             for replier about publishig his comment;
-                             for document creator about adding new comment.
-        """
-        properties = ['enable_approve_user_notification', 'enable_reply_user_notification',
-                      'enable_published_notification']
-        setProperties(self.prefs, *properties)
-        #setProperties(self.prefs, 'enable_published_notification', )
-        self.my_doc.discussion_reply('A Reply for my_doc' ,'text of reply for my_doc')
-        reply = self.discussion.getDiscussionFor(self.my_doc).getReplies()[0]
-        reply.discussion_reply('A Reply for reply for my_doc' ,'text of reply on reply for my_doc')
-        reply2 = self.discussion.getDiscussionFor(reply).getReplies()[0]
-
-        cleanOutputDir()
-        reply2.discussion_publish_comment()
-        mails = getMails()
-        self.assert_([1 for m in mails if re.search('^Subject:.*(replied).*$', m, re.I|re.M)] \
-                     ,'No notification for reply' % properties)
-        self.assert_([1 for m in mails if re.search('^Subject:.*(added).*$', m, re.I|re.M)] \
-                     , 'No notification for adding comment' % properties)
-        self.assert_([1 for m in mails if re.search('^Subject:.*(published).*$', m, re.I|re.M)] \
-                     , 'No notification for publishing comment' % properties)
-
-    def test_bug_notification_on_single_reply_delete(self):
-        """ Bug: no notification sent on deleting single comment.
-            Mail about rejecing comment should be sent to comentator.
-        """
-        properties = ['enable_rejected_user_notification',]
-        setProperties(self.prefs, *properties)
-        #setProperties(self.prefs, 'enable_published_notification', )
-        self.my_doc.discussion_reply('A Reply for my_doc' ,'text of reply for my_doc')
+        clearFile(output_file_path('mail.res'))
         reply = self.discussion.getDiscussionFor(self.my_doc).getReplies()[0]
 
-        cleanOutputDir()
-        reply.deleteDiscussion()
-        mails = getMails()
-        self.assert_([1 for m in mails if re.search('^Subject:.*(not approved).*$', m, re.I|re.M)] \
-                     ,'No notification for rejecting comment' % properties)
+        # Set Published Notification OFF
+        self.setApprovePublished(swithA=0,swithP=0)
+        reply.discussion_publish_comment()
+        testNotMail(self)
+
+    def testPublishedON(self):
+        self.my_doc.discussion_reply('A Reply for my_doc' ,'text of reply for my_doc')
+        clearFile(output_file_path('mail.res'))
+        reply = self.discussion.getDiscussionFor(self.my_doc).getReplies()[0]
+
+        # Set Published Notification ON
+        self.setApprovePublished(swithA=0,swithP=1)
+        reply.discussion_publish_comment()
+        testMailSend(self, state='published')
 
 
-    #def test_
+    def testApproveOFF(self):
+        # Set Approve Notification OFF
+        self.setApprovePublished(swithA=0,swithP=0)
+        self.my_doc.discussion_reply('Reply 1', 'text of reply')
+        testNotMail(self)
+
+
+    def testApproveON(self):
+        # Set Approve Notification ON
+        self.setApprovePublished(swithA=1,swithP=0)
+        self.my_doc.discussion_reply('Reply 1', 'text of reply')
+        testMailSend(self, state='approve')
+
+
+    def testOFFModerationApprovePublished(self):
+        self.prefs._updateProperty('enable_moderation', 0)
+
+        # Test Enable Approve Notification & Enable Published Notification
+        self.setApprovePublished(swithA=1, swithP=1)
+        self.my_doc.discussion_reply('Reply 1', 'text of reply')
+        testMailSend(self, state='approve')
+        testMailSend(self, state='published')
+
+    
+    def testOFFModerationApprove(self):
+        self.prefs._updateProperty('enable_moderation', 0)
+        
+        # Test Enable Approve Notification & Disable Published Notification
+        self.setApprovePublished(swithA=1,swithP=0)
+        self.my_doc.discussion_reply('Reply 1', 'text of reply')
+        testMailSend(self, state='approve')
+        testNotMailSend(self, state='published')
+
+
+    def testOFFModerationPublished(self): 
+        self.prefs._updateProperty('enable_moderation', 0)
+        
+        # Test Enable Published Notification  & Disable Approve Notification
+        self.setApprovePublished(swithA=0,swithP=1)
+        self.my_doc.discussion_reply('Reply 1', 'text of reply')
+        testNotMailSend(self, state='approve')
+        testMailSend(self, state='published')
+
+
+    def testOFFModeration(self): 
+        self.prefs._updateProperty('enable_moderation', 0)
+        
+        # Test Disable Published Notification & Disable Approve Notification
+        self.setApprovePublished(swithA=0,swithP=0)
+        self.my_doc.discussion_reply('Reply 1', 'text of reply')
+        testNotMailSend(self, state='approve')
+        testNotMailSend(self, state='published')
+        
+
 
 TESTS = [TestNotification]