/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5557.1.15 by John Arbash Meinel
Merge bzr.dev 5597 to resolve NEWS, aka bzr-2.3.txt
1
# Copyright (C) 2009, 2010, 2011 Canonical Ltd
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
17
"""Tests for Annotators."""
18
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
19
from .. import (
4454.3.77 by John Arbash Meinel
Add support for compatibility with old '_break_annotation_tie' function.
20
    annotate,
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
21
    errors,
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
22
    revision,
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
23
    tests,
24
    )
25
6670.4.1 by Jelmer Vernooij
Update imports.
26
from ..bzr import (
27
    knit,
28
    )
29
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
30
6625.1.5 by Martin
Drop custom load_tests implementation and use unittest signature
31
def load_tests(loader, standard_tests, pattern):
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
32
    """Parameterize tests for all versions of groupcompress."""
4913.3.1 by John Arbash Meinel
Implement a permute_for_extension helper.
33
    suite, _ = tests.permute_tests_for_extension(standard_tests, loader,
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
34
        'breezy._annotator_py', 'breezy._annotator_pyx')
4913.3.3 by John Arbash Meinel
Typo in test__annotator. Now 'selftest --list' matches as expected
35
    return suite
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
36
37
38
class TestAnnotator(tests.TestCaseWithMemoryTransport):
39
40
    module = None # Set by load_tests
41
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
42
    fa_key = ('f-id', 'a-id')
43
    fb_key = ('f-id', 'b-id')
44
    fc_key = ('f-id', 'c-id')
45
    fd_key = ('f-id', 'd-id')
4454.3.12 by John Arbash Meinel
Finish fleshing out the ability to determine a revision after conflicts.
46
    fe_key = ('f-id', 'e-id')
47
    ff_key = ('f-id', 'f-id')
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
48
4454.3.66 by John Arbash Meinel
Implement no-graph support for the Python version.
49
    def make_no_graph_texts(self):
50
        factory = knit.make_pack_factory(False, False, 2)
51
        self.vf = factory(self.get_transport())
52
        self.ann = self.module.Annotator(self.vf)
53
        self.vf.add_lines(self.fa_key, (), ['simple\n', 'content\n'])
54
        self.vf.add_lines(self.fb_key, (), ['simple\n', 'new content\n'])
55
4454.3.2 by John Arbash Meinel
Start moving bits into helper functions. Add tests for multiple revs.
56
    def make_simple_text(self):
4454.3.27 by John Arbash Meinel
Simplify the test__annotator tests by avoiding having a real repository.
57
        # TODO: all we really need is a VersionedFile instance, we'd like to
58
        #       avoid creating all the intermediate stuff
59
        factory = knit.make_pack_factory(True, True, 2)
60
        self.vf = factory(self.get_transport())
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
61
        # This assumes nothing special happens during __init__, which may be
62
        # valid
63
        self.ann = self.module.Annotator(self.vf)
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
64
        #  A    'simple|content|'
65
        #  |
66
        #  B    'simple|new content|'
4454.3.27 by John Arbash Meinel
Simplify the test__annotator tests by avoiding having a real repository.
67
        self.vf.add_lines(self.fa_key, [], ['simple\n', 'content\n'])
68
        self.vf.add_lines(self.fb_key, [self.fa_key],
69
                          ['simple\n', 'new content\n'])
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
70
71
    def make_merge_text(self):
72
        self.make_simple_text()
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
73
        #  A    'simple|content|'
74
        #  |\
75
        #  B |  'simple|new content|'
76
        #  | |
77
        #  | C  'simple|from c|content|'
78
        #  |/
79
        #  D    'simple|from c|new content|introduced in merge|'
4454.3.27 by John Arbash Meinel
Simplify the test__annotator tests by avoiding having a real repository.
80
        self.vf.add_lines(self.fc_key, [self.fa_key],
81
                          ['simple\n', 'from c\n', 'content\n'])
82
        self.vf.add_lines(self.fd_key, [self.fb_key, self.fc_key],
83
                          ['simple\n', 'from c\n', 'new content\n',
84
                           'introduced in merge\n'])
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
85
86
    def make_common_merge_text(self):
87
        """Both sides of the merge will have introduced a line."""
88
        self.make_simple_text()
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
89
        #  A    'simple|content|'
90
        #  |\
91
        #  B |  'simple|new content|'
92
        #  | |
93
        #  | C  'simple|new content|'
94
        #  |/
95
        #  D    'simple|new content|'
4454.3.27 by John Arbash Meinel
Simplify the test__annotator tests by avoiding having a real repository.
96
        self.vf.add_lines(self.fc_key, [self.fa_key],
97
                          ['simple\n', 'new content\n'])
98
        self.vf.add_lines(self.fd_key, [self.fb_key, self.fc_key],
99
                          ['simple\n', 'new content\n'])
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
100
4454.3.12 by John Arbash Meinel
Finish fleshing out the ability to determine a revision after conflicts.
101
    def make_many_way_common_merge_text(self):
102
        self.make_simple_text()
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
103
        #  A-.    'simple|content|'
104
        #  |\ \
105
        #  B | |  'simple|new content|'
106
        #  | | |
107
        #  | C |  'simple|new content|'
108
        #  |/  |
109
        #  D   |  'simple|new content|'
110
        #  |   |
111
        #  |   E  'simple|new content|'
112
        #  |  /
113
        #  F-'    'simple|new content|'
4454.3.27 by John Arbash Meinel
Simplify the test__annotator tests by avoiding having a real repository.
114
        self.vf.add_lines(self.fc_key, [self.fa_key],
115
                          ['simple\n', 'new content\n'])
116
        self.vf.add_lines(self.fd_key, [self.fb_key, self.fc_key],
117
                          ['simple\n', 'new content\n'])
118
        self.vf.add_lines(self.fe_key, [self.fa_key],
119
                          ['simple\n', 'new content\n'])
120
        self.vf.add_lines(self.ff_key, [self.fd_key, self.fe_key],
121
                          ['simple\n', 'new content\n'])
4454.3.12 by John Arbash Meinel
Finish fleshing out the ability to determine a revision after conflicts.
122
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
123
    def make_merge_and_restored_text(self):
124
        self.make_simple_text()
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
125
        #  A    'simple|content|'
126
        #  |\
127
        #  B |  'simple|new content|'
128
        #  | |
129
        #  C |  'simple|content|' # reverted to A
130
        #   \|
131
        #    D  'simple|content|'
4454.3.27 by John Arbash Meinel
Simplify the test__annotator tests by avoiding having a real repository.
132
        # c reverts back to 'a' for the new content line
133
        self.vf.add_lines(self.fc_key, [self.fb_key],
134
                          ['simple\n', 'content\n'])
135
        # d merges 'a' and 'c', to find both claim last modified
136
        self.vf.add_lines(self.fd_key, [self.fa_key, self.fc_key],
137
                          ['simple\n', 'content\n'])
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
138
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
139
    def assertAnnotateEqual(self, expected_annotation, key, exp_text=None):
140
        annotation, lines = self.ann.annotate(key)
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
141
        self.assertEqual(expected_annotation, annotation)
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
142
        if exp_text is None:
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
143
            record = next(self.vf.get_record_stream([key], 'unordered', True))
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
144
            exp_text = record.get_bytes_as('fulltext')
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
145
        self.assertEqualDiff(exp_text, ''.join(lines))
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
146
147
    def test_annotate_missing(self):
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
148
        self.make_simple_text()
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
149
        self.assertRaises(errors.RevisionNotPresent,
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
150
                          self.ann.annotate, ('not', 'present'))
4454.3.1 by John Arbash Meinel
Initial api for Annotator.
151
152
    def test_annotate_simple(self):
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
153
        self.make_simple_text()
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
154
        self.assertAnnotateEqual([(self.fa_key,)]*2, self.fa_key)
155
        self.assertAnnotateEqual([(self.fa_key,), (self.fb_key,)], self.fb_key)
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
156
157
    def test_annotate_merge_text(self):
158
        self.make_merge_text()
159
        self.assertAnnotateEqual([(self.fa_key,), (self.fc_key,),
160
                                  (self.fb_key,), (self.fd_key,)],
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
161
                                 self.fd_key)
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
162
163
    def test_annotate_common_merge_text(self):
164
        self.make_common_merge_text()
165
        self.assertAnnotateEqual([(self.fa_key,), (self.fb_key, self.fc_key)],
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
166
                                 self.fd_key)
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
167
4454.3.12 by John Arbash Meinel
Finish fleshing out the ability to determine a revision after conflicts.
168
    def test_annotate_many_way_common_merge_text(self):
169
        self.make_many_way_common_merge_text()
170
        self.assertAnnotateEqual([(self.fa_key,),
171
                                  (self.fb_key, self.fc_key, self.fe_key)],
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
172
                                 self.ff_key)
4454.3.12 by John Arbash Meinel
Finish fleshing out the ability to determine a revision after conflicts.
173
4454.3.4 by John Arbash Meinel
New work on how to resolve conflict lines.
174
    def test_annotate_merge_and_restored(self):
175
        self.make_merge_and_restored_text()
176
        self.assertAnnotateEqual([(self.fa_key,), (self.fa_key, self.fc_key)],
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
177
                                 self.fd_key)
4454.3.10 by John Arbash Meinel
Start working on 'annotate_flat' which conforms to the original spec.
178
179
    def test_annotate_flat_simple(self):
180
        self.make_simple_text()
181
        self.assertEqual([(self.fa_key, 'simple\n'),
182
                          (self.fa_key, 'content\n'),
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
183
                         ], self.ann.annotate_flat(self.fa_key))
4454.3.10 by John Arbash Meinel
Start working on 'annotate_flat' which conforms to the original spec.
184
        self.assertEqual([(self.fa_key, 'simple\n'),
185
                          (self.fb_key, 'new content\n'),
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
186
                         ], self.ann.annotate_flat(self.fb_key))
4454.3.12 by John Arbash Meinel
Finish fleshing out the ability to determine a revision after conflicts.
187
188
    def test_annotate_flat_merge_and_restored_text(self):
189
        self.make_merge_and_restored_text()
190
        # fc is a simple dominator of fa
191
        self.assertEqual([(self.fa_key, 'simple\n'),
192
                          (self.fc_key, 'content\n'),
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
193
                         ], self.ann.annotate_flat(self.fd_key))
4454.3.12 by John Arbash Meinel
Finish fleshing out the ability to determine a revision after conflicts.
194
195
    def test_annotate_common_merge_text(self):
196
        self.make_common_merge_text()
197
        # there is no common point, so we just pick the lexicographical lowest
198
        # and 'b-id' comes before 'c-id'
199
        self.assertEqual([(self.fa_key, 'simple\n'),
200
                          (self.fb_key, 'new content\n'),
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
201
                         ], self.ann.annotate_flat(self.fd_key))
4454.3.12 by John Arbash Meinel
Finish fleshing out the ability to determine a revision after conflicts.
202
203
    def test_annotate_many_way_common_merge_text(self):
204
        self.make_many_way_common_merge_text()
4454.3.14 by John Arbash Meinel
Had a slightly bogus test.
205
        self.assertEqual([(self.fa_key, 'simple\n'),
206
                         (self.fb_key, 'new content\n')],
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
207
                         self.ann.annotate_flat(self.ff_key))
208
4454.3.77 by John Arbash Meinel
Add support for compatibility with old '_break_annotation_tie' function.
209
    def test_annotate_flat_respects_break_ann_tie(self):
210
        tiebreaker = annotate._break_annotation_tie
211
        try:
212
            calls = []
213
            def custom_tiebreaker(annotated_lines):
214
                self.assertEqual(2, len(annotated_lines))
215
                left = annotated_lines[0]
216
                self.assertEqual(2, len(left))
217
                self.assertEqual('new content\n', left[1])
218
                right = annotated_lines[1]
219
                self.assertEqual(2, len(right))
220
                self.assertEqual('new content\n', right[1])
221
                calls.append((left[0], right[0]))
222
                # Our custom tiebreaker takes the *largest* value, rather than
223
                # the *smallest* value
224
                if left[0] < right[0]:
225
                    return right
226
                else:
227
                    return left
228
            annotate._break_annotation_tie = custom_tiebreaker
229
            self.make_many_way_common_merge_text()
230
            self.assertEqual([(self.fa_key, 'simple\n'),
231
                             (self.fe_key, 'new content\n')],
232
                             self.ann.annotate_flat(self.ff_key))
233
            self.assertEqual([(self.fe_key, self.fc_key),
234
                              (self.fe_key, self.fb_key)], calls)
235
        finally:
236
            annotate._break_annotation_tie = tiebreaker
237
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
238
4454.3.19 by John Arbash Meinel
Have _record_annotation start to remove texts when they are no longer needed.
239
    def test_needed_keys_simple(self):
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
240
        self.make_simple_text()
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
241
        keys, ann_keys = self.ann._get_needed_keys(self.fb_key)
4454.3.18 by John Arbash Meinel
Start tracking the number of children that need a given text.
242
        self.assertEqual([self.fa_key, self.fb_key], sorted(keys))
243
        self.assertEqual({self.fa_key: 1, self.fb_key: 1},
244
                         self.ann._num_needed_children)
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
245
        self.assertEqual(set(), ann_keys)
4454.3.19 by John Arbash Meinel
Have _record_annotation start to remove texts when they are no longer needed.
246
247
    def test_needed_keys_many(self):
248
        self.make_many_way_common_merge_text()
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
249
        keys, ann_keys = self.ann._get_needed_keys(self.ff_key)
4454.3.19 by John Arbash Meinel
Have _record_annotation start to remove texts when they are no longer needed.
250
        self.assertEqual([self.fa_key, self.fb_key, self.fc_key,
251
                          self.fd_key, self.fe_key, self.ff_key,
252
                         ], sorted(keys))
253
        self.assertEqual({self.fa_key: 3,
254
                          self.fb_key: 1,
255
                          self.fc_key: 1,
256
                          self.fd_key: 1,
257
                          self.fe_key: 1,
258
                          self.ff_key: 1,
259
                         }, self.ann._num_needed_children)
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
260
        self.assertEqual(set(), ann_keys)
261
262
    def test_needed_keys_with_special_text(self):
263
        self.make_many_way_common_merge_text()
264
        spec_key = ('f-id', revision.CURRENT_REVISION)
265
        spec_text = 'simple\nnew content\nlocally modified\n'
266
        self.ann.add_special_text(spec_key, [self.fd_key, self.fe_key],
267
                                  spec_text)
268
        keys, ann_keys = self.ann._get_needed_keys(spec_key)
269
        self.assertEqual([self.fa_key, self.fb_key, self.fc_key,
270
                          self.fd_key, self.fe_key,
271
                         ], sorted(keys))
272
        self.assertEqual([spec_key], sorted(ann_keys))
4454.3.19 by John Arbash Meinel
Have _record_annotation start to remove texts when they are no longer needed.
273
4454.3.62 by John Arbash Meinel
Add a test that shows when parent texts, etc, are present, we don't request again.
274
    def test_needed_keys_with_parent_texts(self):
275
        self.make_many_way_common_merge_text()
276
        # If 'D' and 'E' are already annotated, we don't need to extract all
277
        # the texts
278
        #  D   |  'simple|new content|'
279
        #  |   |
280
        #  |   E  'simple|new content|'
281
        #  |  /
282
        #  F-'    'simple|new content|'
283
        self.ann._parent_map[self.fd_key] = (self.fb_key, self.fc_key)
284
        self.ann._text_cache[self.fd_key] = ['simple\n', 'new content\n']
285
        self.ann._annotations_cache[self.fd_key] = [
286
            (self.fa_key,),
287
            (self.fb_key, self.fc_key),
288
            ]
289
        self.ann._parent_map[self.fe_key] = (self.fa_key,)
290
        self.ann._text_cache[self.fe_key] = ['simple\n', 'new content\n']
291
        self.ann._annotations_cache[self.fe_key] = [
292
            (self.fa_key,),
293
            (self.fe_key,),
294
            ]
295
        keys, ann_keys = self.ann._get_needed_keys(self.ff_key)
296
        self.assertEqual([self.ff_key], sorted(keys))
297
        self.assertEqual({self.fd_key: 1,
298
                          self.fe_key: 1,
299
                          self.ff_key: 1,
300
                         }, self.ann._num_needed_children)
301
        self.assertEqual([], sorted(ann_keys))
302
4454.3.19 by John Arbash Meinel
Have _record_annotation start to remove texts when they are no longer needed.
303
    def test_record_annotation_removes_texts(self):
304
        self.make_many_way_common_merge_text()
305
        # Populate the caches
306
        for x in self.ann._get_needed_texts(self.ff_key):
307
            continue
308
        self.assertEqual({self.fa_key: 3,
309
                          self.fb_key: 1,
310
                          self.fc_key: 1,
311
                          self.fd_key: 1,
312
                          self.fe_key: 1,
313
                          self.ff_key: 1,
314
                         }, self.ann._num_needed_children)
315
        self.assertEqual([self.fa_key, self.fb_key, self.fc_key,
316
                          self.fd_key, self.fe_key, self.ff_key,
317
                         ], sorted(self.ann._text_cache.keys()))
4454.3.22 by John Arbash Meinel
Need to record the other annotations before we can record this,
318
        self.ann._record_annotation(self.fa_key, [], [])
4454.3.19 by John Arbash Meinel
Have _record_annotation start to remove texts when they are no longer needed.
319
        self.ann._record_annotation(self.fb_key, [self.fa_key], [])
320
        self.assertEqual({self.fa_key: 2,
321
                          self.fb_key: 1,
322
                          self.fc_key: 1,
323
                          self.fd_key: 1,
324
                          self.fe_key: 1,
325
                          self.ff_key: 1,
326
                         }, self.ann._num_needed_children)
327
        self.assertTrue(self.fa_key in self.ann._text_cache)
4454.3.21 by John Arbash Meinel
Assert that entries in the annotation cache also get cleaned up.
328
        self.assertTrue(self.fa_key in self.ann._annotations_cache)
4454.3.22 by John Arbash Meinel
Need to record the other annotations before we can record this,
329
        self.ann._record_annotation(self.fc_key, [self.fa_key], [])
4454.3.19 by John Arbash Meinel
Have _record_annotation start to remove texts when they are no longer needed.
330
        self.ann._record_annotation(self.fd_key, [self.fb_key, self.fc_key], [])
4454.3.22 by John Arbash Meinel
Need to record the other annotations before we can record this,
331
        self.assertEqual({self.fa_key: 1,
4454.3.19 by John Arbash Meinel
Have _record_annotation start to remove texts when they are no longer needed.
332
                          self.fb_key: 0,
333
                          self.fc_key: 0,
334
                          self.fd_key: 1,
335
                          self.fe_key: 1,
336
                          self.ff_key: 1,
337
                         }, self.ann._num_needed_children)
338
        self.assertTrue(self.fa_key in self.ann._text_cache)
4454.3.21 by John Arbash Meinel
Assert that entries in the annotation cache also get cleaned up.
339
        self.assertTrue(self.fa_key in self.ann._annotations_cache)
4454.3.19 by John Arbash Meinel
Have _record_annotation start to remove texts when they are no longer needed.
340
        self.assertFalse(self.fb_key in self.ann._text_cache)
4454.3.22 by John Arbash Meinel
Need to record the other annotations before we can record this,
341
        self.assertFalse(self.fb_key in self.ann._annotations_cache)
4454.3.19 by John Arbash Meinel
Have _record_annotation start to remove texts when they are no longer needed.
342
        self.assertFalse(self.fc_key in self.ann._text_cache)
4454.3.22 by John Arbash Meinel
Need to record the other annotations before we can record this,
343
        self.assertFalse(self.fc_key in self.ann._annotations_cache)
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
344
345
    def test_annotate_special_text(self):
346
        # Things like WT and PreviewTree want to annotate an arbitrary text
347
        # ('current:') so we need a way to add that to the group of files to be
348
        # annotated.
349
        self.make_many_way_common_merge_text()
350
        #  A-.    'simple|content|'
351
        #  |\ \
352
        #  B | |  'simple|new content|'
353
        #  | | |
354
        #  | C |  'simple|new content|'
355
        #  |/  |
356
        #  D   |  'simple|new content|'
357
        #  |   |
358
        #  |   E  'simple|new content|'
359
        #  |  /
360
        #  SPEC   'simple|new content|locally modified|'
361
        spec_key = ('f-id', revision.CURRENT_REVISION)
362
        spec_text = 'simple\nnew content\nlocally modified\n'
363
        self.ann.add_special_text(spec_key, [self.fd_key, self.fe_key],
364
                                  spec_text)
365
        self.assertAnnotateEqual([(self.fa_key,),
366
                                  (self.fb_key, self.fc_key, self.fe_key),
4454.3.66 by John Arbash Meinel
Implement no-graph support for the Python version.
367
                                  (spec_key,),
4454.3.61 by John Arbash Meinel
Start implementing an Annotator.add_special_text functionality.
368
                                 ], spec_key,
369
                                 exp_text=spec_text)
4454.3.66 by John Arbash Meinel
Implement no-graph support for the Python version.
370
371
    def test_no_graph(self):
372
        self.make_no_graph_texts()
373
        self.assertAnnotateEqual([(self.fa_key,),
374
                                  (self.fa_key,),
375
                                 ], self.fa_key)
376
        self.assertAnnotateEqual([(self.fb_key,),
377
                                  (self.fb_key,),
378
                                 ], self.fb_key)