Sorry, forgot to checkin modified unit tests for parse email bodies

with and without preservation of quoted text.

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@709 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/test/test_mailsplit.py b/test/test_mailsplit.py
index 23d30abc0b5efb284a9ac31816397022e4fbcff3..039abf98c7a1d88ddf1d97ed7b44fa53d14620f6 100644 (file)
--- a/test/test_mailsplit.py
+++ b/test/test_mailsplit.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: test_mailsplit.py,v 1.9 2002-01-10 06:19:20 richard Exp $
+# $Id: test_mailsplit.py,v 1.10 2002-04-23 16:18:18 rochecompaan Exp $
 
 import unittest, cStringIO
 
@@ -44,10 +44,11 @@ issue_tracker@foo.com wrote:
 blah blah blah signature
 userfoo@foo.com
 '''
-        summary, content = parseContent(s)
+        summary, content = parseContent(s, 0, 0)
         self.assertEqual(summary, 'blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah')
         self.assertEqual(content, 'blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah\nblah blah blah blah blah blah blah blah blah blah blah!')
 
+
     def testPostComment(self):
         s = '''
 issue_tracker@foo.com wrote:
@@ -73,48 +74,138 @@ blah blah blah blah blah blah blah blah blah blah blah!
 blah blah blah signature
 userfoo@foo.com
 '''
-        summary, content = parseContent(s)
+        summary, content = parseContent(s, 0, 0)
         self.assertEqual(summary, 'blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah')
         self.assertEqual(content, 'blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah\nblah blah blah blah blah blah blah blah blah blah blah!')
 
+
+    def testKeepCitation(self):
+        s = '''
+blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah
+blah blah blah blah blah blah blah blah blah blah blah!
+
+issue_tracker@foo.com wrote:
+> blah blah blah blahblah blahblah blahblah blah blah blah blah blah blah
+> blah blah blah blah blah blah blah blah blah?  blah blah blah blah blah
+> blah blah blah blah blah blah blah...  blah blah blah blah.  blah blah
+> blah blah blah blah?  blah blah blah blah blah blah!  blah blah!
+>
+> -------
+> nosy: userfoo, userken
+> _________________________________________________
+> Roundup issue tracker
+> issue_tracker@foo.com
+> http://foo.com/cgi-bin/roundup.cgi/issue_tracker/
+
+--
+blah blah blah signature
+userfoo@foo.com
+'''
+        summary, content = parseContent(s, 1, 0)
+        self.assertEqual(summary, 'blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah')
+        self.assertEqual(content, '''\
+blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah
+blah blah blah blah blah blah blah blah blah blah blah!
+
+issue_tracker@foo.com wrote:
+> blah blah blah blahblah blahblah blahblah blah blah blah blah blah blah
+> blah blah blah blah blah blah blah blah blah?  blah blah blah blah blah
+> blah blah blah blah blah blah blah...  blah blah blah blah.  blah blah
+> blah blah blah blah?  blah blah blah blah blah blah!  blah blah!
+>
+> -------
+> nosy: userfoo, userken
+> _________________________________________________
+> Roundup issue tracker
+> issue_tracker@foo.com
+> http://foo.com/cgi-bin/roundup.cgi/issue_tracker/''')
+
+
+    def testKeepBody(self):
+        s = '''
+blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah
+blah blah blah blah blah blah blah blah blah blah blah!
+
+issue_tracker@foo.com wrote:
+> blah blah blah blahblah blahblah blahblah blah blah blah blah blah blah
+> blah blah blah blah blah blah blah blah blah?  blah blah blah blah blah
+> blah blah blah blah blah blah blah...  blah blah blah blah.  blah blah
+> blah blah blah blah?  blah blah blah blah blah blah!  blah blah!
+>
+> -------
+> nosy: userfoo, userken
+> _________________________________________________
+> Roundup issue tracker
+> issue_tracker@foo.com
+> http://foo.com/cgi-bin/roundup.cgi/issue_tracker/
+
+--
+blah blah blah signature
+userfoo@foo.com
+'''
+        summary, content = parseContent(s, 0, 1)
+        self.assertEqual(summary, 'blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah')
+        self.assertEqual(content, '''
+blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah
+blah blah blah blah blah blah blah blah blah blah blah!
+
+issue_tracker@foo.com wrote:
+> blah blah blah blahblah blahblah blahblah blah blah blah blah blah blah
+> blah blah blah blah blah blah blah blah blah?  blah blah blah blah blah
+> blah blah blah blah blah blah blah...  blah blah blah blah.  blah blah
+> blah blah blah blah?  blah blah blah blah blah blah!  blah blah!
+>
+> -------
+> nosy: userfoo, userken
+> _________________________________________________
+> Roundup issue tracker
+> issue_tracker@foo.com
+> http://foo.com/cgi-bin/roundup.cgi/issue_tracker/
+
+--
+blah blah blah signature
+userfoo@foo.com
+''')
+
+
     def testSimple(self):
         s = '''testing'''
-        summary, content = parseContent(s)
+        summary, content = parseContent(s, 0, 0)
         self.assertEqual(summary, 'testing')
         self.assertEqual(content, 'testing')
 
     def testParagraphs(self):
         s = '''testing\n\ntesting\n\ntesting'''
-        summary, content = parseContent(s)
+        summary, content = parseContent(s, 0, 0)
         self.assertEqual(summary, 'testing')
         self.assertEqual(content, 'testing\n\ntesting\n\ntesting')
 
     def testSimpleFollowup(self):
         s = '''>hello\ntesting'''
-        summary, content = parseContent(s)
+        summary, content = parseContent(s, 0, 0)
         self.assertEqual(summary, 'testing')
         self.assertEqual(content, 'testing')
 
     def testSimpleFollowupParas(self):
         s = '''>hello\ntesting\n\ntesting\n\ntesting'''
-        summary, content = parseContent(s)
+        summary, content = parseContent(s, 0, 0)
         self.assertEqual(summary, 'testing')
         self.assertEqual(content, 'testing\n\ntesting\n\ntesting')
 
     def testEmpty(self):
         s = ''
-        summary, content = parseContent(s)
+        summary, content = parseContent(s, 0, 0)
         self.assertEqual(summary, '')
         self.assertEqual(content, '')
 
     def testIndentationSummary(self):
         s = '    Four space indent.\n\n    Four space indent.\nNo indent.'
-        summary, content = parseContent(s)
+        summary, content = parseContent(s, 0, 0)
         self.assertEqual(summary, '    Four space indent.')
 
     def testIndentationContent(self):
         s = '    Four space indent.\n\n    Four space indent.\nNo indent.'
-        summary, content = parseContent(s)
+        summary, content = parseContent(s, 0, 0)
         self.assertEqual(content, s)
 
 def suite():
@@ -123,6 +214,9 @@ def suite():
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.9  2002/01/10 06:19:20  richard
+# followup lines directly after a quoted section were being eaten.
+#
 # Revision 1.8  2001/10/28 23:22:28  richard
 # fixed bug #474749 ] Indentations lost
 #