/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_parser.py

  • Committer: James Westby
  • Date: 2008-03-09 18:09:13 UTC
  • mto: (0.64.56 fastimport_trunk)
  • mto: This revision was merged to the branch mainline in revision 6631.
  • Revision ID: jw+debian@jameswestby.net-20080309180913-3kk2mg0fwpv1waqu
Make the parser handle multiple words in the committer name.

Also improve the coverage of the parser tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_parser.py
71
71
blob
72
72
mark :1
73
73
data 4
74
 
aaaa
75
 
blob
 
74
aaaablob
76
75
data 5
77
76
bbbbb
78
77
# Commit formats
79
 
commit 
80
 
mark :1
81
 
committer bugs <bugs@bunny.org> now
 
78
commit refs/heads/master
 
79
mark :2
 
80
committer bugs bunny <bugs@bunny.org> now
82
81
data 14
83
82
initial import
84
83
M 644 inline README
85
84
data 18
86
85
Welcome from bugs
87
 
commit 
 
86
commit refs/heads/master
88
87
committer <bugs@bunny.org> now
89
88
data 13
90
89
second commit
91
 
from :1
 
90
from :2
92
91
M 644 inline README
93
 
data 24
 
92
data 23
94
93
Welcome from bugs, etc.
95
94
# Miscellaneous
96
95
checkpoint
109
108
            if cmd.name == 'commit':
110
109
                for fc in cmd.file_iter():
111
110
                    result.append(fc)
 
111
        self.assertEqual(len(result), 9)
112
112
        cmd1 = result[0]
113
113
        self.assertEqual('progress', cmd1.name)
 
114
        self.assertEqual('completed', cmd1.message)
 
115
        cmd2 = result[1]
 
116
        self.assertEqual('blob', cmd2.name)
 
117
        self.assertEqual('1', cmd2.mark)
 
118
        self.assertEqual(':1', cmd2.id)
 
119
        self.assertEqual('aaaa', cmd2.data)
 
120
        self.assertEqual(4, cmd2.lineno)
 
121
        cmd3 = result[2]
 
122
        self.assertEqual('blob', cmd3.name)
 
123
        self.assertEqual('@7', cmd3.id)
 
124
        self.assertEqual(None, cmd3.mark)
 
125
        self.assertEqual('bbbbb', cmd3.data)
 
126
        self.assertEqual(7, cmd3.lineno)
 
127
        cmd4 = result[3]
 
128
        self.assertEqual('commit', cmd4.name)
 
129
        self.assertEqual('2', cmd4.mark)
 
130
        self.assertEqual(':2', cmd4.id)
 
131
        self.assertEqual('initial import', cmd4.message)
 
132
        self.assertEqual('bugs bunny', cmd4.committer[0])
 
133
        self.assertEqual('bugs@bunny.org', cmd4.committer[1])
 
134
        # FIXME: check timestamp and timezone as well
 
135
        self.assertEqual(None, cmd4.author)
 
136
        self.assertEqual(11, cmd4.lineno)
 
137
        self.assertEqual('refs/heads/master', cmd4.ref)
 
138
        self.assertEqual([], cmd4.parents)
 
139
        file_cmd1 = result[4]
 
140
        self.assertEqual('filemodify', file_cmd1.name)
 
141
        self.assertEqual('README', file_cmd1.path)
 
142
        self.assertEqual('file', file_cmd1.kind)
 
143
        self.assertEqual(False, file_cmd1.is_executable)
 
144
        self.assertEqual('Welcome from bugs\n', file_cmd1.data)
 
145
        cmd5 = result[5]
 
146
        self.assertEqual('commit', cmd5.name)
 
147
        self.assertEqual(None, cmd5.mark)
 
148
        self.assertEqual('@19', cmd5.id)
 
149
        self.assertEqual('second commit', cmd5.message)
 
150
        self.assertEqual('', cmd5.committer[0])
 
151
        self.assertEqual('bugs@bunny.org', cmd5.committer[1])
 
152
        # FIXME: check timestamp and timezone as well
 
153
        self.assertEqual(None, cmd5.author)
 
154
        self.assertEqual(19, cmd5.lineno)
 
155
        self.assertEqual('refs/heads/master', cmd5.ref)
 
156
        self.assertEqual([':2'], cmd5.parents)
 
157
        file_cmd2 = result[6]
 
158
        self.assertEqual('filemodify', file_cmd2.name)
 
159
        self.assertEqual('README', file_cmd2.path)
 
160
        self.assertEqual('file', file_cmd2.kind)
 
161
        self.assertEqual(False, file_cmd2.is_executable)
 
162
        self.assertEqual('Welcome from bugs, etc.', file_cmd2.data)
 
163
        cmd6 = result[7]
 
164
        self.assertEqual(cmd6.name, 'checkpoint')
 
165
        cmd7 = result[8]
 
166
        self.assertEqual('progress', cmd7.name)
 
167
        self.assertEqual('completed', cmd7.message)
114
168
 
115
169
 
116
170
class TestStringParsing(tests.TestCase):