← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/tree_implementations/test_test_trees.py

  • Committer: Robert Collins
  • Date: 2006-07-25 06:50:12 UTC
  • mto: (1852.9.1 Tree.compare().)
  • mto: This revision was merged to the branch mainline in revision 1892.
  • Revision ID: robertc@robertcollins.net-20060725065012-564e2d0e113dcabf
Update tree_implementation test tree factories to be intertree ready.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_test_trees.py
34
34
            [(path, node.file_id) for path, node in tree.iter_entries_by_dir()])
35
35
 
36
36
    def test_abc_tree_no_parents(self):
37
 
        tree = self.get_tree_no_parents_abc_content()
 
37
        tree = self.make_branch_and_tree('.')
 
38
        tree = self.get_tree_no_parents_abc_content(tree)
38
39
        self.assertEqual([], tree.get_parent_ids())
39
40
        self.assertEqual([], tree.conflicts())
40
41
        self.assertEqual([], list(tree.unknowns()))
49
50
        self.assertFalse(tree.is_executable('c-id'))
50
51
 
51
52
    def test_abc_tree_content_2_no_parents(self):
52
 
        tree = self.get_tree_no_parents_abc_content_2()
 
53
        tree = self.make_branch_and_tree('.')
 
54
        tree = self.get_tree_no_parents_abc_content_2(tree)
53
55
        self.assertEqual([], tree.get_parent_ids())
54
56
        self.assertEqual([], tree.conflicts())
55
57
        self.assertEqual([], list(tree.unknowns()))
64
66
        self.assertFalse(tree.is_executable('c-id'))
65
67
        
66
68
    def test_abc_tree_content_3_no_parents(self):
67
 
        tree = self.get_tree_no_parents_abc_content_3()
 
69
        tree = self.make_branch_and_tree('.')
 
70
        tree = self.get_tree_no_parents_abc_content_3(tree)
68
71
        self.assertEqual([], tree.get_parent_ids())
69
72
        self.assertEqual([], tree.conflicts())
70
73
        self.assertEqual([], list(tree.unknowns()))
79
82
        self.assertTrue(tree.is_executable('c-id'))
80
83
        
81
84
    def test_abc_tree_content_4_no_parents(self):
82
 
        tree = self.get_tree_no_parents_abc_content_4()
 
85
        tree = self.make_branch_and_tree('.')
 
86
        tree = self.get_tree_no_parents_abc_content_4(tree)
83
87
        self.assertEqual([], tree.get_parent_ids())
84
88
        self.assertEqual([], tree.conflicts())
85
89
        self.assertEqual([], list(tree.unknowns()))
94
98
        self.assertFalse(tree.is_executable('c-id'))
95
99
        
96
100
    def test_abc_tree_content_5_no_parents(self):
97
 
        tree = self.get_tree_no_parents_abc_content_5()
 
101
        tree = self.make_branch_and_tree('.')
 
102
        tree = self.get_tree_no_parents_abc_content_5(tree)
98
103
        self.assertEqual([], tree.get_parent_ids())
99
104
        self.assertEqual([], tree.conflicts())
100
105
        self.assertEqual([], list(tree.unknowns()))
109
114
        self.assertFalse(tree.is_executable('c-id'))
110
115
        
111
116
    def test_abc_tree_content_6_no_parents(self):
112
 
        tree = self.get_tree_no_parents_abc_content_6()
 
117
        tree = self.make_branch_and_tree('.')
 
118
        tree = self.get_tree_no_parents_abc_content_6(tree)
113
119
        self.assertEqual([], tree.get_parent_ids())
114
120
        self.assertEqual([], tree.conflicts())
115
121
        self.assertEqual([], list(tree.unknowns()))