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

  • Committer: Aaron Bentley
  • Date: 2007-12-02 18:23:12 UTC
  • mto: This revision was merged to the branch mainline in revision 3073.
  • Revision ID: aaron.bentley@utoronto.ca-20071202182312-1red2zttrs87iamc
Clean up names and add documentation

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_plan_merge.py
22
22
        tests.TestCaseWithMemoryTransport.setUp(self)
23
23
        self.vf = knit.KnitVersionedFile('root', self.get_transport(),
24
24
                                         create=True)
25
 
        self.plan_merge_vf = plan_merge._PlanMergeVersionedfile('root',
 
25
        self.plan_merge_vf = plan_merge._PlanMergeVersionedFile('root',
26
26
                                                                [self.vf])
27
27
 
28
28
    def add_version(self, version_id, parents, text):
97
97
                         list(plan))
98
98
 
99
99
 
100
 
class TestPlanMergeVersionedfile(tests.TestCaseWithMemoryTransport):
 
100
class TestPlanMergeVersionedFile(tests.TestCaseWithMemoryTransport):
101
101
 
102
102
    def setUp(self):
103
103
        tests.TestCaseWithMemoryTransport.setUp(self)
105
105
                                          create=True)
106
106
        self.vf2 = knit.KnitVersionedFile('root', self.get_transport(),
107
107
                                          create=True)
108
 
        self.plan_merge_vf = plan_merge._PlanMergeVersionedfile('root',
 
108
        self.plan_merge_vf = plan_merge._PlanMergeVersionedFile('root',
109
109
            [self.vf1, self.vf2])
110
110
 
111
111
    def test_add_lines(self):