← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/tree_implementations/__init__.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/__init__.py
73
73
        made_control.create_branch()
74
74
        return self.workingtree_format.initialize(made_control)
75
75
 
 
76
    def _convert_tree(self, tree, converter=None):
 
77
        """helper to convert using the converter or a supplied one."""
 
78
        # convert that to the final shape
 
79
        if converter is None:
 
80
            converter = self.workingtree_to_test_tree
 
81
        return converter(tree)
 
82
 
76
83
    def get_tree_no_parents_no_content(self, empty_tree, converter=None):
77
84
        """Make a tree with no parents and no contents from empty_tree.
78
85
        
79
86
        :param empty_tree: A working tree with no content and no parents to
80
87
            modify.
81
88
        """
82
 
        # convert that to the final shape
83
 
        if converter is None:
84
 
            converter = self.workingtree_to_test_tree
85
 
        return converter(empty_tree)
 
89
        return self._convert_tree(empty_tree, converter)
86
90
 
87
91
    def _make_abc_tree(self, tree):
88
92
        """setup an abc content tree."""
90
94
        self.build_tree(files, transport=tree.bzrdir.root_transport)
91
95
        tree.add(files, ['a-id', 'b-id', 'c-id'])
92
96
 
93
 
    def get_tree_no_parents_abc_content(self):
 
97
    def get_tree_no_parents_abc_content(self, tree, converter=None):
94
98
        """return a test tree with a, b/, b/c contents."""
95
 
        tree = self.make_branch_and_tree('.')
96
99
        self._make_abc_tree(tree)
97
 
        return self.workingtree_to_test_tree(tree)
 
100
        return self._convert_tree(tree, converter)
98
101
 
99
 
    def get_tree_no_parents_abc_content_2(self):
 
102
    def get_tree_no_parents_abc_content_2(self, tree, converter=None):
100
103
        """return a test tree with a, b/, b/c contents.
101
104
        
102
105
        This variation changes the content of 'a' to foobar\n.
103
106
        """
104
 
        tree = self.make_branch_and_tree('.')
105
107
        self._make_abc_tree(tree)
106
108
        f = open(tree.basedir + '/a', 'wb')
107
109
        try:
108
110
            f.write('foobar\n')
109
111
        finally:
110
112
            f.close()
111
 
        return self.workingtree_to_test_tree(tree)
 
113
        return self._convert_tree(tree, converter)
112
114
 
113
 
    def get_tree_no_parents_abc_content_3(self):
 
115
    def get_tree_no_parents_abc_content_3(self, tree, converter=None):
114
116
        """return a test tree with a, b/, b/c contents.
115
117
        
116
118
        This variation changes the executable flag of b/c to True.
117
119
        """
118
 
        tree = self.make_branch_and_tree('.')
119
120
        self._make_abc_tree(tree)
120
121
        tt = transform.TreeTransform(tree)
121
122
        trans_id = tt.trans_id_tree_path('b/c')
122
123
        tt.set_executability(True, trans_id)
123
124
        tt.apply()
124
 
        return self.workingtree_to_test_tree(tree)
 
125
        return self._convert_tree(tree, converter)
125
126
 
126
 
    def get_tree_no_parents_abc_content_4(self):
 
127
    def get_tree_no_parents_abc_content_4(self, tree, converter=None):
127
128
        """return a test tree with d, b/, b/c contents.
128
129
        
129
130
        This variation renames a to d.
130
131
        """
131
 
        tree = self.make_branch_and_tree('.')
132
132
        self._make_abc_tree(tree)
133
133
        tree.rename_one('a', 'd')
134
 
        return self.workingtree_to_test_tree(tree)
 
134
        return self._convert_tree(tree, converter)
135
135
 
136
 
    def get_tree_no_parents_abc_content_5(self):
 
136
    def get_tree_no_parents_abc_content_5(self, tree, converter=None):
137
137
        """return a test tree with d, b/, b/c contents.
138
138
        
139
139
        This variation renames a to d and alters its content to 'bar\n'.
140
140
        """
141
 
        tree = self.make_branch_and_tree('.')
142
141
        self._make_abc_tree(tree)
143
142
        tree.rename_one('a', 'd')
144
143
        f = open(tree.basedir + '/d', 'wb')
146
145
            f.write('bar\n')
147
146
        finally:
148
147
            f.close()
149
 
        return self.workingtree_to_test_tree(tree)
 
148
        return self._convert_tree(tree, converter)
150
149
 
151
 
    def get_tree_no_parents_abc_content_6(self):
 
150
    def get_tree_no_parents_abc_content_6(self, tree, converter=None):
152
151
        """return a test tree with a, b/, e contents.
153
152
        
154
153
        This variation renames b/c to e, and makes it executable.
155
154
        """
156
 
        tree = self.make_branch_and_tree('.')
157
155
        self._make_abc_tree(tree)
158
156
        tt = transform.TreeTransform(tree)
159
157
        trans_id = tt.trans_id_tree_path('b/c')
161
159
        tt.adjust_path('e', parent_trans_id, trans_id)
162
160
        tt.set_executability(True, trans_id)
163
161
        tt.apply()
164
 
        return self.workingtree_to_test_tree(tree)
 
162
        return self._convert_tree(tree, converter)
165
163
 
166
164
 
167
165
class TreeTestProviderAdapter(WorkingTreeTestProviderAdapter):