/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_commit.py

  • Committer: Curtis Hovey
  • Date: 2012-02-28 13:52:00 UTC
  • mfrom: (776.2.12 ui-factory)
  • Revision ID: sinzui.is@verizon.net-20120228135200-xzqb6qhtzck01doo
Merged GtkUIFactory additions and tweaks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
1
 
# Copyright (C) 2007, 2008, 2009, 2011, 2012, 2013 John Arbash Meinel <john@arbash-meinel.com>
 
1
# Copyright (C) 2007, 2008 John Arbash Meinel <john@arbash-meinel.com>
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
235
235
        dlg._on_treeview_files_cursor_changed(treeview)
236
236
        self.assertFalse(CommitDialogNoWidgets._update_per_file_info.called)
237
237
 
238
 
    def test_get_line_height(self):
239
 
        tree = self.make_branch_and_tree('tree')
240
 
        dlg = CommitDialogNoWidgets(tree)
241
 
        textview = Gtk.TextView()
242
 
        line_height = dlg.get_line_height(textview)
243
 
        self.assertIsInstance(line_height, int)
244
 
 
245
238
 
246
239
class TestCommitDialog(tests.TestCaseWithTransport):
247
240
 
1185
1178
            'post_uncommit', commitmsgs.save_commit_messages, None)
1186
1179
 
1187
1180
    def _get_file_info_dict(self, rank):
1188
 
        file_info = [dict(path='a', file_id='a-id',
1189
 
                          message='a {msg} %d' % rank),
1190
 
                     dict(path='b', file_id='b-id',
1191
 
                          message='b msg %d' % rank)]
 
1181
        file_info = [dict(path='a', file_id='a-id', message='a msg %d' % rank),
 
1182
                     dict(path='b', file_id='b-id', message='b msg %d' % rank)]
1192
1183
        return file_info
1193
1184
 
1194
1185
    def _get_file_info_revprops(self, rank):
1196
1187
        return {'file-info': bencode.bencode(file_info_prop).decode('UTF-8')}
1197
1188
 
1198
1189
    def _get_commit_message(self):
1199
 
        return self.config.get_user_option(
1200
 
            'gtk_global_commit_message', expand=False)
 
1190
        return self.config.get_user_option('gtk_global_commit_message')
1201
1191
 
1202
1192
    def _get_file_commit_messages(self):
1203
 
        return self.config.get_user_option(
1204
 
            'gtk_file_commit_messages', expand=False)
 
1193
        return self.config.get_user_option('gtk_file_commit_messages')
1205
1194
 
1206
1195
 
1207
1196
class TestUncommitHook(TestSavedCommitMessages):
1223
1212
    def test_uncommit_one_by_one(self):
1224
1213
        uncommit.uncommit(self.tree.branch, tree=self.tree)
1225
1214
        self.assertEquals(u'three', self._get_commit_message())
1226
 
        self.assertEquals(u'd4:a-id9:a {msg} 34:b-id7:b msg 3e',
 
1215
        self.assertEquals(u'd4:a-id7:a msg 34:b-id7:b msg 3e',
1227
1216
                          self._get_file_commit_messages())
1228
1217
 
1229
1218
        uncommit.uncommit(self.tree.branch, tree=self.tree)
1230
1219
        self.assertEquals(u'two\n******\nthree', self._get_commit_message())
1231
 
        self.assertEquals(u'd4:a-id26:a {msg} 2\n******\na {msg} 3'
 
1220
        self.assertEquals(u'd4:a-id22:a msg 2\n******\na msg 3'
1232
1221
                          '4:b-id22:b msg 2\n******\nb msg 3e',
1233
1222
                          self._get_file_commit_messages())
1234
1223
 
1235
1224
        uncommit.uncommit(self.tree.branch, tree=self.tree)
1236
1225
        self.assertEquals(u'one\n******\ntwo\n******\nthree',
1237
1226
                          self._get_commit_message())
1238
 
        self.assertEquals(
1239
 
            u'd4:a-id43:a {msg} 1\n******\na {msg} 2\n******\na {msg} 3'
1240
 
            '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
1241
 
            self._get_file_commit_messages())
 
1227
        self.assertEquals(u'd4:a-id37:a msg 1\n******\na msg 2\n******\na msg 3'
 
1228
                          '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
 
1229
                          self._get_file_commit_messages())
1242
1230
 
1243
1231
    def test_uncommit_all_at_once(self):
1244
1232
        uncommit.uncommit(self.tree.branch, tree=self.tree, revno=1)
1245
1233
        self.assertEquals(u'one\n******\ntwo\n******\nthree',
1246
1234
                          self._get_commit_message())
1247
 
        self.assertEquals(
1248
 
            u'd4:a-id43:a {msg} 1\n******\na {msg} 2\n******\na {msg} 3'
1249
 
            '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
1250
 
            self._get_file_commit_messages())
 
1235
        self.assertEquals(u'd4:a-id37:a msg 1\n******\na msg 2\n******\na msg 3'
 
1236
                          '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
 
1237
                          self._get_file_commit_messages())
1251
1238
 
1252
1239
 
1253
1240
class TestReusingSavedCommitMessages(TestSavedCommitMessages, QuestionHelpers):
1261
1248
        self.tree.add(['a'], ['a-id'])
1262
1249
        self.tree.add(['b'], ['b-id'])
1263
1250
        rev1 = self.tree.commit('one', revprops=self._get_file_info_revprops(1))
1264
 
        rev2 = self.tree.commit('two{x}',
1265
 
                                revprops=self._get_file_info_revprops(2))
 
1251
        rev2 = self.tree.commit('two', revprops=self._get_file_info_revprops(2))
1266
1252
        uncommit.uncommit(self.tree.branch, tree=self.tree)
1267
1253
        self.build_tree_contents([('tree/a', 'new a content\n'),
1268
1254
                                  ('tree/b', 'new b content'),])
1277
1263
 
1278
1264
    def test_setup_saved_messages(self):
1279
1265
        # Check the initial setup
1280
 
        self.assertEquals(u'two{x}', self._get_commit_message())
1281
 
        self.assertEquals(u'd4:a-id9:a {msg} 24:b-id7:b msg 2e',
 
1266
        self.assertEquals(u'two', self._get_commit_message())
 
1267
        self.assertEquals(u'd4:a-id7:a msg 24:b-id7:b msg 2e',
1282
1268
                          self._get_file_commit_messages())
1283
1269
 
1284
1270
    def test_messages_are_reloaded(self):
1285
1271
        dlg = self._get_commit_dialog(self.tree)
1286
 
        self.assertEquals(u'two{x}', dlg._get_global_commit_message())
 
1272
        self.assertEquals(u'two', dlg._get_global_commit_message())
1287
1273
        self.assertEquals(([u'a', u'b'],
1288
1274
                           [{ 'path': 'a',
1289
 
                             'file_id': 'a-id', 'message': 'a {msg} 2',},
 
1275
                             'file_id': 'a-id', 'message': 'a msg 2',},
1290
1276
                           {'path': 'b',
1291
1277
                            'file_id': 'b-id', 'message': 'b msg 2',}],),
1292
1278
                          dlg._get_specific_files())
1301
1287
        dlg = self._get_commit_dialog(self.tree)
1302
1288
        self._set_question_yes(dlg) # Save messages
1303
1289
        dlg._do_cancel()
1304
 
        self.assertEquals(u'two{x}', self._get_commit_message())
1305
 
        self.assertEquals(u'd4:a-id9:a {msg} 24:b-id7:b msg 2e',
 
1290
        self.assertEquals(u'two', self._get_commit_message())
 
1291
        self.assertEquals(u'd4:a-id7:a msg 24:b-id7:b msg 2e',
1306
1292
                          self._get_file_commit_messages())
1307
1293
 
1308
1294
    def test_messages_are_cleared_on_cancel_if_required(self):