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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_rename_map.py
36
36
    def test_add_edge_hashes(self):
37
37
        rn = RenameMap(None)
38
38
        rn.add_edge_hashes(self.a_lines, 'a')
39
 
        self.assertEqual(set(['a']), rn.edge_hashes[myhash(('a\n', 'b\n'))])
40
 
        self.assertEqual(set(['a']), rn.edge_hashes[myhash(('b\n', 'c\n'))])
 
39
        self.assertEqual({'a'}, rn.edge_hashes[myhash(('a\n', 'b\n'))])
 
40
        self.assertEqual({'a'}, rn.edge_hashes[myhash(('b\n', 'c\n'))])
41
41
        self.assertIs(None, rn.edge_hashes.get(myhash(('c\n', 'd\n'))))
42
42
 
43
43
    def test_add_file_edge_hashes(self):
46
46
        tree.add('a', 'a')
47
47
        rn = RenameMap(tree)
48
48
        rn.add_file_edge_hashes(tree, ['a'])
49
 
        self.assertEqual(set(['a']), rn.edge_hashes[myhash(('a\n', 'b\n'))])
50
 
        self.assertEqual(set(['a']), rn.edge_hashes[myhash(('b\n', 'c\n'))])
 
49
        self.assertEqual({'a'}, rn.edge_hashes[myhash(('a\n', 'b\n'))])
 
50
        self.assertEqual({'a'}, rn.edge_hashes[myhash(('b\n', 'c\n'))])
51
51
        self.assertIs(None, rn.edge_hashes.get(myhash(('c\n', 'd\n'))))
52
52
 
53
53
    def test_hitcounts(self):
87
87
            'path3/path4/path5': 'c',
88
88
        })
89
89
        self.assertEqual(
90
 
            {'path2': set(['b']), 'path3/path4': set(['c']), 'path3': set()},
 
90
            {'path2': {'b'}, 'path3/path4': {'c'}, 'path3': set()},
91
91
            required_parents)
92
92
 
93
93
    def test_find_directory_renames(self):
98
98
            'path3/path4/path5': 'c',
99
99
        }
100
100
        required_parents = {
101
 
            'path2': set(['b']),
102
 
            'path3/path4': set(['c']),
 
101
            'path2': {'b'},
 
102
            'path3/path4': {'c'},
103
103
            'path3': set([])}
104
104
        missing_parents = {
105
 
            'path2-id': set(['b']),
106
 
            'path4-id': set(['c']),
107
 
            'path3-id': set(['path4-id'])}
 
105
            'path2-id': {'b'},
 
106
            'path4-id': {'c'},
 
107
            'path3-id': {'path4-id'}}
108
108
        matches = rn.match_parents(required_parents, missing_parents)
109
109
        self.assertEqual({'path3/path4': 'path4-id', 'path2': 'path2-id'},
110
110
                         matches)