/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_delta.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-30 19:32:13 UTC
  • mfrom: (6637 work)
  • mto: This revision was merged to the branch mainline in revision 6639.
  • Revision ID: jelmer@jelmer.uk-20170530193213-qm21s6dc7dln237t
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_delta.py
22
22
    tests,
23
23
    )
24
24
from ..sixish import (
25
 
    BytesIO,
 
25
    StringIO,
26
26
    )
27
27
 
28
28
 
227
227
class TestChangesFrom(tests.TestCaseWithTransport):
228
228
 
229
229
    def show_string(self, delta, *args,  **kwargs):
230
 
        to_file = BytesIO()
 
230
        to_file = StringIO()
231
231
        _mod_delta.report_delta(to_file, delta, *args, **kwargs)
232
232
        return to_file.getvalue()
233
233
 
319
319
        d = wt.changes_from(repo.revision_tree(_mod_revision.NULL_REVISION))
320
320
        return d, long_status, short_status
321
321
 
322
 
    def test_delta_show_short_status_no_filter(self):
 
322
    def test_short_status(self):
323
323
        d, long_status, short_status = self._get_delta()
324
 
        out = BytesIO()
 
324
        out = StringIO()
325
325
        _mod_delta.report_delta(out, d, short_status=True)
326
326
        self.assertEqual(short_status, out.getvalue())
327
327
 
328
 
    def test_delta_show_long_status_no_filter(self):
 
328
    def test_long_status(self):
329
329
        d, long_status, short_status = self._get_delta()
330
 
        out = BytesIO()
 
330
        out = StringIO()
331
331
        _mod_delta.report_delta(out, d, short_status=False)
332
332
        self.assertEqual(long_status, out.getvalue())
333
333
 
334
 
    def test_delta_show_no_filter(self):
 
334
    def test_predicate_always(self):
335
335
        d, long_status, short_status = self._get_delta()
336
 
        out = BytesIO()
337
 
        def not_a_filter(path, file_id):
 
336
        out = StringIO()
 
337
        def always(path, file_id):
338
338
            return True
339
 
        _mod_delta.report_delta(out, d, short_status=True, filter=not_a_filter)
 
339
        _mod_delta.report_delta(out, d, short_status=True, predicate=always)
340
340
        self.assertEqual(short_status, out.getvalue())
341
341
 
342
 
    def test_delta_show_short_status_single_file_filter(self):
 
342
    def test_short_status_path_predicate(self):
343
343
        d, long_status, short_status = self._get_delta()
344
 
        out = BytesIO()
 
344
        out = StringIO()
345
345
        def only_f2(path, file_id):
346
346
            return path == 'f2'
347
 
        _mod_delta.report_delta(out, d, short_status=True, filter=only_f2)
 
347
        _mod_delta.report_delta(out, d, short_status=True, predicate=only_f2)
348
348
        self.assertEqual("A  f2\n", out.getvalue())
349
349
 
350
 
    def test_delta_show_long_status_single_file_filter(self):
 
350
    def test_long_status_path_predicate(self):
351
351
        d, long_status, short_status = self._get_delta()
352
 
        out = BytesIO()
 
352
        out = StringIO()
353
353
        def only_f2(path, file_id):
354
354
            return path == 'f2'
355
 
        _mod_delta.report_delta(out, d, short_status=False, filter=only_f2)
 
355
        _mod_delta.report_delta(out, d, short_status=False, predicate=only_f2)
356
356
        self.assertEqual("added:\n  f2\n", out.getvalue())
357
357
 
358
 
    def test_delta_show_short_status_single_file_id_filter(self):
 
358
    def test_long_status_id_predicate(self):
359
359
        d, long_status, short_status = self._get_delta()
360
 
        out = BytesIO()
 
360
        out = StringIO()
361
361
        def only_f2_id(path, file_id):
362
362
            return file_id == 'f2-id'
363
 
        _mod_delta.report_delta(out, d, short_status=True, filter=only_f2_id)
364
 
        self.assertEqual("A  f2\n", out.getvalue())
 
363
        _mod_delta.report_delta(out, d, predicate=only_f2_id)
 
364
        self.assertEqual("added:\n  f2\n", out.getvalue())
365
365