/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/plugins/stats/test_stats.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/stats/test_stats.py
 
1
from __future__ import absolute_import
 
2
 
 
3
from ...tests import TestCase, TestCaseWithTransport
 
4
from ...revision import Revision
 
5
from .cmds import get_revisions_and_committers, collapse_by_person
 
6
 
 
7
 
 
8
class TestGetRevisionsAndCommitters(TestCaseWithTransport):
 
9
 
 
10
    def test_simple(self):
 
11
        wt = self.make_branch_and_tree('.')
 
12
        wt.commit(message='1', committer='Fero <fero@example.com>', rev_id=b'1')
 
13
        wt.commit(message='2', committer='Fero <fero@example.com>', rev_id=b'2')
 
14
        wt.commit(message='3', committer='Jano <jano@example.com>', rev_id=b'3')
 
15
        wt.commit(message='4', committer='Jano <jano@example.com>',
 
16
                  authors=['Vinco <vinco@example.com>'], rev_id=b'4')
 
17
        wt.commit(message='5', committer='Ferko <fero@example.com>', rev_id=b'5')
 
18
        revs, committers = get_revisions_and_committers(wt.branch.repository,
 
19
                                                        [b'1', b'2', b'3', b'4', b'5'])
 
20
        fero = ('Fero', 'fero@example.com')
 
21
        jano = ('Jano', 'jano@example.com')
 
22
        vinco = ('Vinco', 'vinco@example.com')
 
23
        ferok = ('Ferko', 'fero@example.com')
 
24
        self.assertEqual({fero: fero, jano: jano, vinco:vinco, ferok: fero},
 
25
                         committers)
 
26
 
 
27
    def test_empty_email(self):
 
28
        wt = self.make_branch_and_tree('.')
 
29
        wt.commit(message='1', committer='Fero', rev_id=b'1')
 
30
        wt.commit(message='2', committer='Fero', rev_id=b'2')
 
31
        wt.commit(message='3', committer='Jano', rev_id=b'3')
 
32
        revs, committers = get_revisions_and_committers(wt.branch.repository,
 
33
                                                        [b'1', b'2', b'3'])
 
34
        self.assertEqual({('Fero', ''): ('Fero', ''),
 
35
                          ('Jano', ''): ('Jano', ''),
 
36
                         }, committers)
 
37
 
 
38
    def test_different_case(self):
 
39
        wt = self.make_branch_and_tree('.')
 
40
        wt.commit(message='1', committer='Fero', rev_id=b'1')
 
41
        wt.commit(message='2', committer='Fero', rev_id=b'2')
 
42
        wt.commit(message='3', committer='FERO', rev_id=b'3')
 
43
        revs, committers = get_revisions_and_committers(wt.branch.repository,
 
44
                                                        [b'1', b'2', b'3'])
 
45
        self.assertEqual({('Fero', ''): ('Fero', ''),
 
46
                          ('FERO', ''): ('Fero', ''),
 
47
                         }, committers)
 
48
        self.assertEquals([b'1', b'2', b'3'], sorted([r.revision_id for r in revs]))
 
49
 
 
50
 
 
51
class TestCollapseByPerson(TestCase):
 
52
 
 
53
    def test_no_conflicts(self):
 
54
        revisions = [
 
55
            Revision('1', {}, committer='Foo <foo@example.com>'),
 
56
            Revision('2', {}, committer='Bar <bar@example.com>'),
 
57
            Revision('3', {}, committer='Bar <bar@example.com>'),
 
58
        ]
 
59
        foo = ('Foo', 'foo@example.com')
 
60
        bar = ('Bar', 'bar@example.com')
 
61
        committers = {foo: foo, bar: bar}
 
62
        info = collapse_by_person(revisions, committers)
 
63
        self.assertEquals(2, info[0][0])
 
64
        self.assertEquals({'bar@example.com': 2}, info[0][2])
 
65
        self.assertEquals({'Bar': 2}, info[0][3])
 
66
 
 
67
    def test_different_email(self):
 
68
        revisions = [
 
69
            Revision('1', {}, committer='Foo <foo@example.com>'),
 
70
            Revision('2', {}, committer='Foo <bar@example.com>'),
 
71
            Revision('3', {}, committer='Foo <bar@example.com>'),
 
72
        ]
 
73
        foo = ('Foo', 'foo@example.com')
 
74
        bar = ('Foo', 'bar@example.com')
 
75
        committers = {foo: foo, bar: foo}
 
76
        info = collapse_by_person(revisions, committers)
 
77
        self.assertEquals(3, info[0][0])
 
78
        self.assertEquals({'foo@example.com': 1, 'bar@example.com': 2}, info[0][2])
 
79
        self.assertEquals({'Foo': 3}, info[0][3])
 
80
 
 
81
    def test_different_name(self):
 
82
        revisions = [
 
83
            Revision('1', {}, committer='Foo <foo@example.com>'),
 
84
            Revision('2', {}, committer='Bar <foo@example.com>'),
 
85
            Revision('3', {}, committer='Bar <foo@example.com>'),
 
86
        ]
 
87
        foo = ('Foo', 'foo@example.com')
 
88
        bar = ('Bar', 'foo@example.com')
 
89
        committers = {foo: foo, bar: foo}
 
90
        info = collapse_by_person(revisions, committers)
 
91
        self.assertEquals(3, info[0][0])
 
92
        self.assertEquals({'foo@example.com': 3}, info[0][2])
 
93
        self.assertEquals({'Foo': 1, 'Bar': 2}, info[0][3])
 
94
 
 
95
    def test_different_name_case(self):
 
96
        revisions = [
 
97
            Revision('1', {}, committer='Foo <foo@example.com>'),
 
98
            Revision('2', {}, committer='Foo <foo@example.com>'),
 
99
            Revision('3', {}, committer='FOO <bar@example.com>'),
 
100
        ]
 
101
        foo = ('Foo', 'foo@example.com')
 
102
        FOO = ('FOO', 'bar@example.com')
 
103
        committers = {foo: foo, FOO: foo}
 
104
        info = collapse_by_person(revisions, committers)
 
105
        self.assertEquals(3, info[0][0])
 
106
        self.assertEquals({'foo@example.com': 2, 'bar@example.com': 1}, info[0][2])
 
107
        self.assertEquals({'Foo': 2, 'FOO': 1}, info[0][3])