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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-26 22:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 7057.
  • Revision ID: jelmer@jelmer.uk-20180726221229-0m28n8ms1kbu8n74
Fix some tree tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
401
401
        self.assertWalkerNext(u'c/e', b'a-id', True, [u'a', u'a'], iterator)
402
402
        self.assertRaises(StopIteration, next, iterator)
403
403
 
404
 
    def assertCmpByDirblock(self, cmp_val, path1, path2):
405
 
        self.assertEqual(cmp_val,
406
 
            _mod_tree.MultiWalker._cmp_path_by_dirblock(path1, path2))
 
404
    def assertLtByDirblock(self, lt_val, path1, path2):
 
405
        self.assertEqual(lt_val,
 
406
            _mod_tree.MultiWalker._lt_path_by_dirblock(path1, path2))
407
407
 
408
 
    def test__cmp_path_by_dirblock(self):
 
408
    def test__lt_path_by_dirblock(self):
409
409
        # We only support Unicode strings at this point
410
410
        self.assertRaises(TypeError,
411
 
            _mod_tree.MultiWalker._cmp_path_by_dirblock, '', 'b')
412
 
        self.assertCmpByDirblock(0, u'', u'')
413
 
        self.assertCmpByDirblock(0, u'a', u'a')
414
 
        self.assertCmpByDirblock(0, u'a/b', u'a/b')
415
 
        self.assertCmpByDirblock(0, u'a/b/c', u'a/b/c')
416
 
        self.assertCmpByDirblock(1, u'a-a', u'a')
417
 
        self.assertCmpByDirblock(-1, u'a-a', u'a/a')
418
 
        self.assertCmpByDirblock(-1, u'a=a', u'a/a')
419
 
        self.assertCmpByDirblock(1, u'a-a/a', u'a/a')
420
 
        self.assertCmpByDirblock(1, u'a=a/a', u'a/a')
421
 
        self.assertCmpByDirblock(1, u'a-a/a', u'a/a/a')
422
 
        self.assertCmpByDirblock(1, u'a=a/a', u'a/a/a')
423
 
        self.assertCmpByDirblock(1, u'a-a/a/a', u'a/a/a')
424
 
        self.assertCmpByDirblock(1, u'a=a/a/a', u'a/a/a')
 
411
            _mod_tree.MultiWalker._lt_path_by_dirblock, b'', b'b')
 
412
        self.assertLtByDirblock(False, u'', u'')
 
413
        self.assertLtByDirblock(False, u'a', u'a')
 
414
        self.assertLtByDirblock(False, u'a/b', u'a/b')
 
415
        self.assertLtByDirblock(False, u'a/b/c', u'a/b/c')
 
416
        self.assertLtByDirblock(False, u'a-a', u'a')
 
417
        self.assertLtByDirblock(True, u'a-a', u'a/a')
 
418
        self.assertLtByDirblock(True, u'a=a', u'a/a')
 
419
        self.assertLtByDirblock(False, u'a-a/a', u'a/a')
 
420
        self.assertLtByDirblock(False, u'a=a/a', u'a/a')
 
421
        self.assertLtByDirblock(False, u'a-a/a', u'a/a/a')
 
422
        self.assertLtByDirblock(False, u'a=a/a', u'a/a/a')
 
423
        self.assertLtByDirblock(False, u'a-a/a/a', u'a/a/a')
 
424
        self.assertLtByDirblock(False, u'a=a/a/a', u'a/a/a')
425
425
 
426
426
    def assertPathToKey(self, expected, path):
427
427
        self.assertEqual(expected, _mod_tree.MultiWalker._path_to_key(path))