/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 tests/test_builder.py

Clean up the builder, start using it for big speed gains.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_builder.py
21
21
from bzrlib.plugins.git import tests
22
22
 
23
23
 
24
 
class TestCommitBuilder(tests.TestCase):
 
24
class TestGitBranchBuilder(tests.TestCase):
25
25
 
26
26
    def test__create_blob(self):
27
27
        stream = StringIO()
28
 
        builder = tests.GitCommitBuilder(stream)
 
28
        builder = tests.GitBranchBuilder(stream)
29
29
        self.assertEqual(1, builder._create_blob('foo\nbar\n'))
30
30
        self.assertEqualDiff('blob\nmark :1\ndata 8\nfoo\nbar\n\n',
31
31
                             stream.getvalue())
32
32
 
33
33
    def test_set_file(self):
34
34
        stream = StringIO()
35
 
        builder = tests.GitCommitBuilder(stream)
 
35
        builder = tests.GitBranchBuilder(stream)
36
36
        builder.set_file('foobar', 'foo\nbar\n', False)
37
37
        self.assertEqualDiff('blob\nmark :1\ndata 8\nfoo\nbar\n\n',
38
38
                             stream.getvalue())
40
40
 
41
41
    def test_set_file_unicode(self):
42
42
        stream = StringIO()
43
 
        builder = tests.GitCommitBuilder(stream)
 
43
        builder = tests.GitBranchBuilder(stream)
44
44
        builder.set_file(u'f\xb5/bar', 'contents\nbar\n', False)
45
45
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nbar\n\n',
46
46
                             stream.getvalue())
48
48
 
49
49
    def test_set_file_executable(self):
50
50
        stream = StringIO()
51
 
        builder = tests.GitCommitBuilder(stream)
 
51
        builder = tests.GitBranchBuilder(stream)
52
52
        builder.set_file(u'f\xb5/bar', 'contents\nbar\n', True)
53
53
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nbar\n\n',
54
54
                             stream.getvalue())
56
56
 
57
57
    def test_set_link(self):
58
58
        stream = StringIO()
59
 
        builder = tests.GitCommitBuilder(stream)
 
59
        builder = tests.GitBranchBuilder(stream)
60
60
        builder.set_link(u'f\xb5/bar', 'link/contents')
61
61
        self.assertEqualDiff('blob\nmark :1\ndata 13\nlink/contents\n',
62
62
                             stream.getvalue())
64
64
 
65
65
    def test_delete_entry(self):
66
66
        stream = StringIO()
67
 
        builder = tests.GitCommitBuilder(stream)
 
67
        builder = tests.GitBranchBuilder(stream)
68
68
        builder.delete_entry(u'path/to/f\xb5')
69
69
        self.assertEqual(['D path/to/f\xc2\xb5\n'], builder.commit_info)
70
70
 
71
71
    def test_add_and_commit(self):
72
72
        stream = StringIO()
73
 
        builder = tests.GitCommitBuilder(stream)
 
73
        builder = tests.GitBranchBuilder(stream)
74
74
 
75
75
        builder.set_file(u'f\xb5/bar', 'contents\nbar\n', False)
76
 
        self.assertEqual(2, builder.commit('refs/head/master',
77
 
                                           'Joe Foo <joe@foo.com>',
 
76
        self.assertEqual(2, builder.commit('Joe Foo <joe@foo.com>',
78
77
                                           u'committing f\xb5/bar',
79
78
                                           timestamp=1194586400,
80
79
                                           timezone='+0100'))
88
87
                             'M 100644 :1 f\xc2\xb5/bar\n'
89
88
                             '\n',
90
89
                             stream.getvalue())
 
90
 
 
91
    def test_commit_base(self):
 
92
        stream = StringIO()
 
93
        builder = tests.GitBranchBuilder(stream)
 
94
 
 
95
        builder.set_file(u'foo', 'contents\nfoo\n', False)
 
96
        r1 = builder.commit('Joe Foo <joe@foo.com>', u'first',
 
97
                            timestamp=1194586400)
 
98
        r2 = builder.commit('Joe Foo <joe@foo.com>', u'second',
 
99
                            timestamp=1194586405)
 
100
        r3 = builder.commit('Joe Foo <joe@foo.com>', u'third',
 
101
                            timestamp=1194586410,
 
102
                            base=r1)
 
103
 
 
104
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nfoo\n\n'
 
105
                             'commit refs/head/master\n'
 
106
                             'mark :2\n'
 
107
                             'committer Joe Foo <joe@foo.com> 1194586400 +0000\n'
 
108
                             'data 5\n'
 
109
                             'first'
 
110
                             '\n'
 
111
                             'M 100644 :1 foo\n'
 
112
                             '\n'
 
113
                             'commit refs/head/master\n'
 
114
                             'mark :3\n'
 
115
                             'committer Joe Foo <joe@foo.com> 1194586405 +0000\n'
 
116
                             'data 6\n'
 
117
                             'second'
 
118
                             '\n'
 
119
                             '\n'
 
120
                             'commit refs/head/master\n'
 
121
                             'mark :4\n'
 
122
                             'committer Joe Foo <joe@foo.com> 1194586410 +0000\n'
 
123
                             'data 5\n'
 
124
                             'third'
 
125
                             '\n'
 
126
                             'from :2\n'
 
127
                             '\n', stream.getvalue())
 
128
 
 
129
    def test_commit_merge(self):
 
130
        stream = StringIO()
 
131
        builder = tests.GitBranchBuilder(stream)
 
132
 
 
133
        builder.set_file(u'foo', 'contents\nfoo\n', False)
 
134
        r1 = builder.commit('Joe Foo <joe@foo.com>', u'first',
 
135
                            timestamp=1194586400)
 
136
        r2 = builder.commit('Joe Foo <joe@foo.com>', u'second',
 
137
                            timestamp=1194586405)
 
138
        r3 = builder.commit('Joe Foo <joe@foo.com>', u'third',
 
139
                            timestamp=1194586410,
 
140
                            base=r1)
 
141
        r4 = builder.commit('Joe Foo <joe@foo.com>', u'Merge',
 
142
                            timestamp=1194586415,
 
143
                            merge=[r2])
 
144
 
 
145
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nfoo\n\n'
 
146
                             'commit refs/head/master\n'
 
147
                             'mark :2\n'
 
148
                             'committer Joe Foo <joe@foo.com> 1194586400 +0000\n'
 
149
                             'data 5\n'
 
150
                             'first'
 
151
                             '\n'
 
152
                             'M 100644 :1 foo\n'
 
153
                             '\n'
 
154
                             'commit refs/head/master\n'
 
155
                             'mark :3\n'
 
156
                             'committer Joe Foo <joe@foo.com> 1194586405 +0000\n'
 
157
                             'data 6\n'
 
158
                             'second'
 
159
                             '\n'
 
160
                             '\n'
 
161
                             'commit refs/head/master\n'
 
162
                             'mark :4\n'
 
163
                             'committer Joe Foo <joe@foo.com> 1194586410 +0000\n'
 
164
                             'data 5\n'
 
165
                             'third'
 
166
                             '\n'
 
167
                             'from :2\n'
 
168
                             '\n'
 
169
                             'commit refs/head/master\n'
 
170
                             'mark :5\n'
 
171
                             'committer Joe Foo <joe@foo.com> 1194586415 +0000\n'
 
172
                             'data 5\n'
 
173
                             'Merge'
 
174
                             '\n'
 
175
                             'merge :3\n'
 
176
                             '\n', stream.getvalue())
 
177
 
 
178
    def test_auto_timestamp(self):
 
179
        stream = StringIO()
 
180
        builder = tests.GitBranchBuilder(stream)
 
181
        builder.commit('Joe Foo <joe@foo.com>', u'message')
 
182
        self.assertContainsRe(stream.getvalue(),
 
183
                              r'committer Joe Foo <joe@foo\.com> \d+ \+0000')
 
184
 
 
185
 
 
186
class TestGitBranchBuilderReal(tests.TestCaseInTempDir):
 
187
 
 
188
    def test_create_real_branch(self):
 
189
        tests.run_git('init')
 
190
 
 
191
        builder = tests.GitBranchBuilder()
 
192
        builder.set_file(u'foo', 'contents\nfoo\n', False)
 
193
        r1 = builder.commit('Joe Foo <joe@foo.com>', u'first',
 
194
                            timestamp=1194586400)
 
195
        mapping = builder.finish()
 
196
        self.assertEqual({1:'44411e8e9202177dd19b6599d7a7991059fa3cb4',
 
197
                          2: 'b0b62e674f67306fddcf72fa888c3b56df100d64',
 
198
                         }, mapping)