Skip to content

Commit f140ec8

Browse files
author
Roche Compaan
committed
Sorry, forgot to checkin modified unit tests...
...for parse email bodies with and without preservation of quoted text.
1 parent 4b6fde4 commit f140ec8

File tree

1 file changed

+104
-10
lines changed

1 file changed

+104
-10
lines changed

‎test/test_mailsplit.py‎

Lines changed: 104 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
# $Id: test_mailsplit.py,v 1.9 2002-01-10 06:19:20 richard Exp $
18+
# $Id: test_mailsplit.py,v 1.10 2002-04-23 16:18:18 rochecompaan Exp $
1919

2020
import unittest, cStringIO
2121

@@ -44,10 +44,11 @@ def testPreComment(self):
4444
blah blah blah signature
4545
[email protected]
4646
'''
47-
summary, content = parseContent(s)
47+
summary, content = parseContent(s, 0, 0)
4848
self.assertEqual(summary, 'blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah')
4949
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!')
5050

51+
5152
def testPostComment(self):
5253
s = '''
5354
[email protected] wrote:
@@ -73,48 +74,138 @@ def testPostComment(self):
7374
blah blah blah signature
7475
[email protected]
7576
'''
76-
summary, content = parseContent(s)
77+
summary, content = parseContent(s, 0, 0)
7778
self.assertEqual(summary, 'blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah')
7879
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!')
7980

81+
82+
def testKeepCitation(self):
83+
s = '''
84+
blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah
85+
blah blah blah blah blah blah blah blah blah blah blah!
86+
87+
[email protected] wrote:
88+
> blah blah blah blahblah blahblah blahblah blah blah blah blah blah blah
89+
> blah blah blah blah blah blah blah blah blah? blah blah blah blah blah
90+
> blah blah blah blah blah blah blah... blah blah blah blah. blah blah
91+
> blah blah blah blah? blah blah blah blah blah blah! blah blah!
92+
>
93+
> -------
94+
> nosy: userfoo, userken
95+
> _________________________________________________
96+
> Roundup issue tracker
97+
> [email protected]
98+
> http://foo.com/cgi-bin/roundup.cgi/issue_tracker/
99+
100+
--
101+
blah blah blah signature
102+
[email protected]
103+
'''
104+
summary, content = parseContent(s, 1, 0)
105+
self.assertEqual(summary, 'blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah')
106+
self.assertEqual(content, '''\
107+
blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah
108+
blah blah blah blah blah blah blah blah blah blah blah!
109+
110+
[email protected] wrote:
111+
> blah blah blah blahblah blahblah blahblah blah blah blah blah blah blah
112+
> blah blah blah blah blah blah blah blah blah? blah blah blah blah blah
113+
> blah blah blah blah blah blah blah... blah blah blah blah. blah blah
114+
> blah blah blah blah? blah blah blah blah blah blah! blah blah!
115+
>
116+
> -------
117+
> nosy: userfoo, userken
118+
> _________________________________________________
119+
> Roundup issue tracker
120+
> [email protected]
121+
> http://foo.com/cgi-bin/roundup.cgi/issue_tracker/''')
122+
123+
124+
def testKeepBody(self):
125+
s = '''
126+
blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah
127+
blah blah blah blah blah blah blah blah blah blah blah!
128+
129+
[email protected] wrote:
130+
> blah blah blah blahblah blahblah blahblah blah blah blah blah blah blah
131+
> blah blah blah blah blah blah blah blah blah? blah blah blah blah blah
132+
> blah blah blah blah blah blah blah... blah blah blah blah. blah blah
133+
> blah blah blah blah? blah blah blah blah blah blah! blah blah!
134+
>
135+
> -------
136+
> nosy: userfoo, userken
137+
> _________________________________________________
138+
> Roundup issue tracker
139+
> [email protected]
140+
> http://foo.com/cgi-bin/roundup.cgi/issue_tracker/
141+
142+
--
143+
blah blah blah signature
144+
[email protected]
145+
'''
146+
summary, content = parseContent(s, 0, 1)
147+
self.assertEqual(summary, 'blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah')
148+
self.assertEqual(content, '''
149+
blah blah blah blah... blah blah? blah blah blah blah blah. blah blah blah
150+
blah blah blah blah blah blah blah blah blah blah blah!
151+
152+
[email protected] wrote:
153+
> blah blah blah blahblah blahblah blahblah blah blah blah blah blah blah
154+
> blah blah blah blah blah blah blah blah blah? blah blah blah blah blah
155+
> blah blah blah blah blah blah blah... blah blah blah blah. blah blah
156+
> blah blah blah blah? blah blah blah blah blah blah! blah blah!
157+
>
158+
> -------
159+
> nosy: userfoo, userken
160+
> _________________________________________________
161+
> Roundup issue tracker
162+
> [email protected]
163+
> http://foo.com/cgi-bin/roundup.cgi/issue_tracker/
164+
165+
--
166+
blah blah blah signature
167+
[email protected]
168+
''')
169+
170+
80171
def testSimple(self):
81172
s = '''testing'''
82-
summary, content = parseContent(s)
173+
summary, content = parseContent(s, 0, 0)
83174
self.assertEqual(summary, 'testing')
84175
self.assertEqual(content, 'testing')
85176

86177
def testParagraphs(self):
87178
s = '''testing\n\ntesting\n\ntesting'''
88-
summary, content = parseContent(s)
179+
summary, content = parseContent(s, 0, 0)
89180
self.assertEqual(summary, 'testing')
90181
self.assertEqual(content, 'testing\n\ntesting\n\ntesting')
91182

92183
def testSimpleFollowup(self):
93184
s = '''>hello\ntesting'''
94-
summary, content = parseContent(s)
185+
summary, content = parseContent(s, 0, 0)
95186
self.assertEqual(summary, 'testing')
96187
self.assertEqual(content, 'testing')
97188

98189
def testSimpleFollowupParas(self):
99190
s = '''>hello\ntesting\n\ntesting\n\ntesting'''
100-
summary, content = parseContent(s)
191+
summary, content = parseContent(s, 0, 0)
101192
self.assertEqual(summary, 'testing')
102193
self.assertEqual(content, 'testing\n\ntesting\n\ntesting')
103194

104195
def testEmpty(self):
105196
s = ''
106-
summary, content = parseContent(s)
197+
summary, content = parseContent(s, 0, 0)
107198
self.assertEqual(summary, '')
108199
self.assertEqual(content, '')
109200

110201
def testIndentationSummary(self):
111202
s = ' Four space indent.\n\n Four space indent.\nNo indent.'
112-
summary, content = parseContent(s)
203+
summary, content = parseContent(s, 0, 0)
113204
self.assertEqual(summary, ' Four space indent.')
114205

115206
def testIndentationContent(self):
116207
s = ' Four space indent.\n\n Four space indent.\nNo indent.'
117-
summary, content = parseContent(s)
208+
summary, content = parseContent(s, 0, 0)
118209
self.assertEqual(content, s)
119210

120211
def suite():
@@ -123,6 +214,9 @@ def suite():
123214

124215
#
125216
# $Log: not supported by cvs2svn $
217+
# Revision 1.9 2002/01/10 06:19:20 richard
218+
# followup lines directly after a quoted section were being eaten.
219+
#
126220
# Revision 1.8 2001/10/28 23:22:28 richard
127221
# fixed bug #474749 ] Indentations lost
128222
#

0 commit comments

Comments
 (0)