← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to testweave.py

  • Committer: Martin Pool
  • Date: 2005-06-28 06:50:35 UTC
  • mto: This revision was merged to the branch mainline in revision 852.
  • Revision ID: mbp@sourcefrog.net-20050628065035-d3a164490179b935
Change to a more realistic weave structure which can represent insertions and 
deletions.

Tests which calculate deltas are currently not working and are skipped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
testweave.py
73
73
class Delta1(TestBase):
74
74
    """Detection of changes prior to inserting new revision."""
75
75
    def runTest(self):
 
76
        return ########################## SKIPPED
76
77
        from pprint import pformat
77
78
 
78
79
        k = Weave()
114
115
    Look at the annotations to make sure that the first line is matched
115
116
    and not stored repeatedly."""
116
117
    def runTest(self):
 
118
        return ########################## SKIPPED
 
119
        
117
120
        k = Weave()
118
121
 
119
122
        k.add([], ['line 1'])
196
199
        k = Weave()
197
200
 
198
201
        k._v = [VerInfo(), VerInfo(included=[0])]
199
 
        k._l = [(0, "first line"),
200
 
                (1, "second line")]
 
202
        k._l = [('{', 0),
 
203
                "first line",
 
204
                ('}', 0),
 
205
                ('{', 1),
 
206
                "second line",
 
207
                ('}', 1)]
201
208
 
202
209
        self.assertEqual(k.get(1),
203
210
                         ["first line",
219
226
                VerInfo(included=[0]),
220
227
                VerInfo(included=[0]),
221
228
                ]
222
 
        k._l = [(0, "first line"),
223
 
                (1, "second line"),
224
 
                (2, "alternative second line"),]
 
229
        k._l = [('{', 0),
 
230
                "first line",
 
231
                ('}', 0),
 
232
                ('{', 1),
 
233
                "second line",
 
234
                ('}', 1),
 
235
                ('{', 2),
 
236
                "alternative second line",
 
237
                ('}', 2),                
 
238
                ]
225
239
 
226
240
        self.assertEqual(k.get(0),
227
241
                         ["first line"])