/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

Flat is better than nested, remove the gitlib hierarchy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_builder.py
46
46
                             stream.getvalue())
47
47
        self.assertEqual(['M 100644 :1 f\xc2\xb5/bar\n'], builder.commit_info)
48
48
 
49
 
    def test_set_file_newline(self):
50
 
        stream = StringIO()
51
 
        builder = tests.GitBranchBuilder(stream)
52
 
        builder.set_file(u'foo\nbar', 'contents\nbar\n', False)
53
 
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nbar\n\n',
54
 
                             stream.getvalue())
55
 
        self.assertEqual(['M 100644 :1 "foo\\nbar"\n'], builder.commit_info)
56
 
 
57
49
    def test_set_file_executable(self):
58
50
        stream = StringIO()
59
51
        builder = tests.GitBranchBuilder(stream)
70
62
                             stream.getvalue())
71
63
        self.assertEqual(['M 120000 :1 f\xc2\xb5/bar\n'], builder.commit_info)
72
64
 
73
 
    def test_set_link_newline(self):
74
 
        stream = StringIO()
75
 
        builder = tests.GitBranchBuilder(stream)
76
 
        builder.set_link(u'foo\nbar', 'link/contents')
77
 
        self.assertEqualDiff('blob\nmark :1\ndata 13\nlink/contents\n',
78
 
                             stream.getvalue())
79
 
        self.assertEqual(['M 120000 :1 "foo\\nbar"\n'], builder.commit_info)
80
 
 
81
65
    def test_delete_entry(self):
82
66
        stream = StringIO()
83
67
        builder = tests.GitBranchBuilder(stream)
84
68
        builder.delete_entry(u'path/to/f\xb5')
85
69
        self.assertEqual(['D path/to/f\xc2\xb5\n'], builder.commit_info)
86
70
 
87
 
    def test_delete_entry_newline(self):
88
 
        stream = StringIO()
89
 
        builder = tests.GitBranchBuilder(stream)
90
 
        builder.delete_entry(u'path/to/foo\nbar')
91
 
        self.assertEqual(['D "path/to/foo\\nbar"\n'], builder.commit_info)
92
 
 
93
 
    def test_encode_path(self):
94
 
        encode = tests.GitBranchBuilder._encode_path
95
 
        # Unicode is encoded to utf-8
96
 
        self.assertEqual(encode(u'f\xb5'), 'f\xc2\xb5')
97
 
        # The name must be quoted if it starts by a double quote or contains a
98
 
        # newline.
99
 
        self.assertEqual(encode(u'"foo'), '"\\"foo"')
100
 
        self.assertEqual(encode(u'fo\no'), '"fo\\no"')
101
 
        # When the name is quoted, all backslash and quote chars must be
102
 
        # escaped.
103
 
        self.assertEqual(encode(u'fo\\o\nbar'), '"fo\\\\o\\nbar"')
104
 
        self.assertEqual(encode(u'fo"o"\nbar'), '"fo\\"o\\"\\nbar"')
105
 
        # Other control chars, such as \r, need not be escaped.
106
 
        self.assertEqual(encode(u'foo\r\nbar'), '"foo\r\\nbar"')
107
 
 
108
71
    def test_add_and_commit(self):
109
72
        stream = StringIO()
110
73
        builder = tests.GitBranchBuilder(stream)
115
78
                                           timestamp=1194586400,
116
79
                                           timezone='+0100'))
117
80
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nbar\n\n'
118
 
                             'commit refs/heads/master\n'
 
81
                             'commit refs/head/master\n'
119
82
                             'mark :2\n'
120
83
                             'committer Joe Foo <joe@foo.com> 1194586400 +0100\n'
121
84
                             'data 18\n'
139
102
                            base=r1)
140
103
 
141
104
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nfoo\n\n'
142
 
                             'commit refs/heads/master\n'
 
105
                             'commit refs/head/master\n'
143
106
                             'mark :2\n'
144
107
                             'committer Joe Foo <joe@foo.com> 1194586400 +0000\n'
145
108
                             'data 5\n'
147
110
                             '\n'
148
111
                             'M 100644 :1 foo\n'
149
112
                             '\n'
150
 
                             'commit refs/heads/master\n'
 
113
                             'commit refs/head/master\n'
151
114
                             'mark :3\n'
152
115
                             'committer Joe Foo <joe@foo.com> 1194586405 +0000\n'
153
116
                             'data 6\n'
154
117
                             'second'
155
118
                             '\n'
156
119
                             '\n'
157
 
                             'commit refs/heads/master\n'
 
120
                             'commit refs/head/master\n'
158
121
                             'mark :4\n'
159
122
                             'committer Joe Foo <joe@foo.com> 1194586410 +0000\n'
160
123
                             'data 5\n'
180
143
                            merge=[r2])
181
144
 
182
145
        self.assertEqualDiff('blob\nmark :1\ndata 13\ncontents\nfoo\n\n'
183
 
                             'commit refs/heads/master\n'
 
146
                             'commit refs/head/master\n'
184
147
                             'mark :2\n'
185
148
                             'committer Joe Foo <joe@foo.com> 1194586400 +0000\n'
186
149
                             'data 5\n'
188
151
                             '\n'
189
152
                             'M 100644 :1 foo\n'
190
153
                             '\n'
191
 
                             'commit refs/heads/master\n'
 
154
                             'commit refs/head/master\n'
192
155
                             'mark :3\n'
193
156
                             'committer Joe Foo <joe@foo.com> 1194586405 +0000\n'
194
157
                             'data 6\n'
195
158
                             'second'
196
159
                             '\n'
197
160
                             '\n'
198
 
                             'commit refs/heads/master\n'
 
161
                             'commit refs/head/master\n'
199
162
                             'mark :4\n'
200
163
                             'committer Joe Foo <joe@foo.com> 1194586410 +0000\n'
201
164
                             'data 5\n'
203
166
                             '\n'
204
167
                             'from :2\n'
205
168
                             '\n'
206
 
                             'commit refs/heads/master\n'
 
169
                             'commit refs/head/master\n'
207
170
                             'mark :5\n'
208
171
                             'committer Joe Foo <joe@foo.com> 1194586415 +0000\n'
209
172
                             'data 5\n'
219
182
        self.assertContainsRe(stream.getvalue(),
220
183
                              r'committer Joe Foo <joe@foo\.com> \d+ \+0000')
221
184
 
222
 
    def test_reset(self):
223
 
        stream = StringIO()
224
 
        builder = tests.GitBranchBuilder(stream)
225
 
        builder.reset()
226
 
        self.assertEqualDiff('reset refs/heads/master\n\n', stream.getvalue())
227
 
 
228
 
    def test_reset_named_ref(self):
229
 
        stream = StringIO()
230
 
        builder = tests.GitBranchBuilder(stream)
231
 
        builder.reset('refs/heads/branch')
232
 
        self.assertEqualDiff('reset refs/heads/branch\n\n', stream.getvalue())
233
 
 
234
 
    def test_reset_revision(self):
235
 
        stream = StringIO()
236
 
        builder = tests.GitBranchBuilder(stream)
237
 
        builder.reset(mark=123)
238
 
        self.assertEqualDiff(
239
 
            'reset refs/heads/master\n'
240
 
            'from :123\n'
241
 
            '\n', stream.getvalue())
242
 
 
243
185
 
244
186
class TestGitBranchBuilderReal(tests.TestCaseInTempDir):
245
187