← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_mail_client.py

  • Committer: Andrew Bennetts
  • Date: 2010-01-15 05:30:30 UTC
  • mto: (4973.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4975.
  • Revision ID: andrew.bennetts@canonical.com-20100115053030-1d6qd89pnj8hmb55
Pass kinds (not pairs) to MergeHookParams.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_mail_client.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import urllib
18
18
 
28
28
 
29
29
    def test_commandline(self):
30
30
        mutt = mail_client.Mutt(None)
31
 
        commandline = mutt._get_compose_commandline(None, None, 'file%')
32
 
        self.assertEqual(['-a', 'file%'], commandline)
 
31
        commandline = mutt._get_compose_commandline(
 
32
            None, None, 'file%', body="hello")
 
33
        # The temporary filename is randomly generated, so it is not matched.
 
34
        self.assertEqual(['-a', 'file%', '-i'], commandline[:-1])
33
35
        commandline = mutt._get_compose_commandline('jrandom@example.org',
34
36
                                                     'Hi there!', None)
35
 
        self.assertEqual(['-s', 'Hi there!', 'jrandom@example.org'],
 
37
        self.assertEqual(['-s', 'Hi there!', '--', 'jrandom@example.org'],
36
38
                         commandline)
37
39
 
38
40
    def test_commandline_is_8bit(self):
40
42
        cmdline = mutt._get_compose_commandline(u'jrandom@example.org',
41
43
            u'Hi there!', u'file%')
42
44
        self.assertEqual(
43
 
            ['-s', 'Hi there!', '-a', 'file%', 'jrandom@example.org'],
 
45
            ['-s', 'Hi there!', '-a', 'file%', '--', 'jrandom@example.org'],
44
46
            cmdline)
45
47
        for item in cmdline:
46
48
            self.assertFalse(isinstance(item, unicode),
56
58
        self.assertEqual(['-compose', "attachment='%s'" %
57
59
                          urlutils.local_path_to_url('file%')], commandline)
58
60
        commandline = tbird._get_compose_commandline('jrandom@example.org',
59
 
                                                     'Hi there!', None)
60
 
        self.assertEqual(['-compose', "subject='Hi there!',"
61
 
                                      "to='jrandom@example.org'"], commandline)
 
61
                                                     'Hi there!', None,
 
62
                                                     "bo'dy")
 
63
        self.assertEqual(['-compose', "body=bo%27dy,"
 
64
                                      "subject='Hi there!',"
 
65
                                      "to='jrandom@example.org'"],
 
66
                                      commandline)
62
67
 
63
68
    def test_commandline_is_8bit(self):
64
69
        # test for bug #139318
92
97
        # We won't be able to know the temporary file name at this stage
93
98
        # so we can't raise an assertion with assertEqual
94
99
        cmdline = eclient._get_compose_commandline(None, None, 'file%')
 
100
        if eclient.elisp_tmp_file is not None:
 
101
            self.addCleanup(osutils.delete_any, eclient.elisp_tmp_file)
95
102
        commandline = ' '.join(cmdline)
96
103
        self.assertContainsRe(commandline, '--eval')
97
104
        self.assertContainsRe(commandline, '(compose-mail nil nil)')
102
109
        eclient = mail_client.EmacsMail(None)
103
110
        commandline = eclient._get_compose_commandline(u'jrandom@example.org',
104
111
            u'Hi there!', u'file%')
 
112
        if eclient.elisp_tmp_file is not None:
 
113
            self.addCleanup(osutils.delete_any, eclient.elisp_tmp_file)
105
114
        for item in commandline:
106
115
            self.assertFalse(isinstance(item, unicode),
107
116
                'Command-line item %r is unicode!' % item)
119
128
        self.assertEqual(['jrandom@example.org', '--attach', 'file%'],
120
129
                         commandline)
121
130
        commandline = xdg_email._get_compose_commandline(
122
 
            'jrandom@example.org', 'Hi there!', None)
123
 
        self.assertEqual(['jrandom@example.org', '--subject', 'Hi there!'],
124
 
                         commandline)
 
131
            'jrandom@example.org', 'Hi there!', None, "bo'dy")
 
132
        self.assertEqual(['jrandom@example.org', '--subject', 'Hi there!',
 
133
                          '--body', "bo'dy"], commandline)
125
134
 
126
135
    def test_commandline_is_8bit(self):
127
136
        xdg_email = mail_client.XDGEmail(None)
143
152
        commandline = evo._get_compose_commandline(None, None, 'file%')
144
153
        self.assertEqual(['mailto:?attach=file%25'], commandline)
145
154
        commandline = evo._get_compose_commandline('jrandom@example.org',
146
 
                                                   'Hi there!', None)
147
 
        self.assertEqual(['mailto:jrandom@example.org?subject=Hi%20there%21'],
148
 
                         commandline)
 
155
                                                   'Hi there!', None, 'bo&dy')
 
156
        self.assertEqual(['mailto:jrandom@example.org?body=bo%26dy&'
 
157
                          'subject=Hi%20there%21'], commandline)
149
158
 
150
159
    def test_commandline_is_8bit(self):
151
160
        evo = mail_client.Evolution(None)
188
197
    def test_commandline(self):
189
198
        claws = mail_client.Claws(None)
190
199
        commandline = claws._get_compose_commandline(
191
 
            None, None, 'file%')
 
200
            'jrandom@example.org', None, 'file%')
192
201
        self.assertEqual(
193
 
            ['--compose', 'mailto:?', '--attach', 'file%'], commandline)
 
202
            ['--compose', 'mailto:jrandom@example.org?', '--attach', 'file%'],
 
203
            commandline)
194
204
        commandline = claws._get_compose_commandline(
195
205
            'jrandom@example.org', 'Hi there!', None)
196
206
        self.assertEqual(
214
224
            self.assertFalse(isinstance(item, unicode),
215
225
                'Command-line item %r is unicode!' % item)
216
226
 
 
227
    def test_with_from(self):
 
228
        claws = mail_client.Claws(None)
 
229
        cmdline = claws._get_compose_commandline(
 
230
            u'jrandom@example.org', None, None, None, u'qrandom@example.com')
 
231
        self.assertEqual(
 
232
            ['--compose',
 
233
             'mailto:jrandom@example.org?from=qrandom%40example.com'],
 
234
            cmdline)
 
235
 
 
236
    def test_to_required(self):
 
237
        claws = mail_client.Claws(None)
 
238
        self.assertRaises(errors.NoMailAddressSpecified,
 
239
                          claws._get_compose_commandline,
 
240
                          None, None, 'file%')
 
241
 
 
242
    def test_with_body(self):
 
243
        claws = mail_client.Claws(None)
 
244
        cmdline = claws._get_compose_commandline(
 
245
            u'jrandom@example.org', None, None, 'This is some body text')
 
246
        self.assertEqual(
 
247
            ['--compose',
 
248
             'mailto:jrandom@example.org?body=This%20is%20some%20body%20text'],
 
249
            cmdline)
 
250
 
217
251
 
218
252
class TestEditor(tests.TestCase):
219
253
 
257
291
                                     basename=basename)
258
292
        dummy_client = client.client
259
293
        self.assertEqual(dummy_client.args, (to, subject, directive))
260
 
        self.assertEqual(dummy_client.kwargs, {"basename":basename})
 
294
        self.assertEqual(dummy_client.kwargs,
 
295
                         {"basename": basename, 'body': None})