83
78
class StoreText(TestBase):
84
79
"""Store and retrieve a simple text."""
81
def test_storing_text(self):
87
idx = k.add('text0', [], TEXT_0)
88
self.assertEqual(k.get(idx), TEXT_0)
83
idx = k.add_lines('text0', [], TEXT_0)
84
self.assertEqual(k.get_lines(idx), TEXT_0)
89
85
self.assertEqual(idx, 0)
93
88
class AnnotateOne(TestBase):
96
k.add('text0', [], TEXT_0)
97
self.assertEqual(k.annotate(0),
91
k.add_lines('text0', [], TEXT_0)
92
self.assertEqual(k.annotate('text0'),
93
[('text0', TEXT_0[0])])
101
96
class StoreTwo(TestBase):
102
97
def runTest(self):
105
idx = k.add('text0', [], TEXT_0)
100
idx = k.add_lines('text0', [], TEXT_0)
106
101
self.assertEqual(idx, 0)
108
idx = k.add('text1', [], TEXT_1)
103
idx = k.add_lines('text1', [], TEXT_1)
109
104
self.assertEqual(idx, 1)
111
self.assertEqual(k.get(0), TEXT_0)
112
self.assertEqual(k.get(1), TEXT_1)
114
k.dump(self.TEST_LOG)
106
self.assertEqual(k.get_lines(0), TEXT_0)
107
self.assertEqual(k.get_lines(1), TEXT_1)
110
class GetSha1(TestBase):
111
def test_get_sha1(self):
113
k.add_lines('text0', [], 'text0')
114
self.assertEqual('34dc0e430c642a26c3dd1c2beb7a8b4f4445eb79',
116
self.assertRaises(errors.RevisionNotPresent,
118
self.assertRaises(errors.RevisionNotPresent,
118
122
class InvalidAdd(TestBase):
119
123
"""Try to use invalid version number during add."""
120
124
def runTest(self):
123
self.assertRaises(IndexError,
127
self.assertRaises(errors.RevisionNotPresent,
134
class RepeatedAdd(TestBase):
135
"""Add the same version twice; harmless."""
138
idx = k.add_lines('text0', [], TEXT_0)
139
idx2 = k.add_lines('text0', [], TEXT_0)
140
self.assertEqual(idx, idx2)
143
class InvalidRepeatedAdd(TestBase):
146
k.add_lines('basis', [], TEXT_0)
147
idx = k.add_lines('text0', [], TEXT_0)
148
self.assertRaises(errors.RevisionAlreadyPresent,
152
['not the same text'])
153
self.assertRaises(errors.RevisionAlreadyPresent,
156
['basis'], # not the right parents
130
160
class InsertLines(TestBase):
131
161
"""Store a revision that adds one line to the original.
662
ver = k.add('text%d' % i,
672
ver = k.add_lines('text%d' % i,
663
673
list(parents), t)
674
parents.add('text%d' % i)
667
677
self.log("k._weave=" + pformat(k._weave))
669
679
for i, t in enumerate(texts):
670
self.assertEqual(k.get(i), t)
680
self.assertEqual(k.get_lines(i), t)
672
682
self.check_read_write(k)
676
class MergeCases(TestBase):
677
def doMerge(self, base, a, b, mp):
685
class JoinWeavesTests(TestBase):
687
super(JoinWeavesTests, self).setUp()
688
self.weave1 = Weave()
689
self.lines1 = ['hello\n']
690
self.lines3 = ['hello\n', 'cruel\n', 'world\n']
691
self.weave1.add_lines('v1', [], self.lines1)
692
self.weave1.add_lines('v2', ['v1'], ['hello\n', 'world\n'])
693
self.weave1.add_lines('v3', ['v2'], self.lines3)
695
def test_join_empty(self):
696
"""Join two empty weaves."""
697
eq = self.assertEqual
703
def test_join_empty_to_nonempty(self):
704
"""Join empty weave onto nonempty."""
705
self.weave1.join(Weave())
706
self.assertEqual(len(self.weave1), 3)
708
def test_join_unrelated(self):
709
"""Join two weaves with no history in common."""
711
wb.add_lines('b1', [], ['line from b\n'])
714
eq = self.assertEqual
716
eq(sorted(w1.versions()),
717
['b1', 'v1', 'v2', 'v3'])
719
def test_join_related(self):
720
wa = self.weave1.copy()
721
wb = self.weave1.copy()
722
wa.add_lines('a1', ['v3'], ['hello\n', 'sweet\n', 'world\n'])
723
wb.add_lines('b1', ['v3'], ['hello\n', 'pale blue\n', 'world\n'])
724
eq = self.assertEquals
729
eq(wa.get_lines('b1'),
730
['hello\n', 'pale blue\n', 'world\n'])
732
def test_join_parent_disagreement(self):
733
#join reconciles differening parents into a union.
736
wa.add_lines('v1', [], ['hello\n'])
737
wb.add_lines('v0', [], [])
738
wb.add_lines('v1', ['v0'], ['hello\n'])
740
self.assertEqual(['v0'], wa.get_parents('v1'))
742
def test_join_text_disagreement(self):
743
"""Cannot join weaves with different texts for a version."""
746
wa.add_lines('v1', [], ['hello\n'])
747
wb.add_lines('v1', [], ['not\n', 'hello\n'])
748
self.assertRaises(WeaveError,
751
def test_join_unordered(self):
752
"""Join weaves where indexes differ.
754
The source weave contains a different version at index 0."""
755
wa = self.weave1.copy()
757
wb.add_lines('x1', [], ['line from x1\n'])
758
wb.add_lines('v1', [], ['hello\n'])
759
wb.add_lines('v2', ['v1'], ['hello\n', 'world\n'])
761
eq = self.assertEquals
762
eq(sorted(wa.versions()), ['v1', 'v2', 'v3', 'x1',])
763
eq(wa.get_text('x1'), 'line from x1\n')
765
def test_written_detection(self):
766
# Test detection of weave file corruption.
768
# Make sure that we can detect if a weave file has
769
# been corrupted. This doesn't test all forms of corruption,
770
# but it at least helps verify the data you get, is what you want.
678
771
from cStringIO import StringIO
679
from textwrap import dedent
685
w.add('text0', [], map(addcrlf, base))
686
w.add('text1', [0], map(addcrlf, a))
687
w.add('text2', [0], map(addcrlf, b))
774
w.add_lines('v1', [], ['hello\n'])
775
w.add_lines('v2', ['v1'], ['hello\n', 'there\n'])
689
self.log('weave is:')
690
777
tmpf = StringIO()
691
778
write_weave(w, tmpf)
692
self.log(tmpf.getvalue())
694
self.log('merge plan:')
695
p = list(w.plan_merge(1, 2))
696
for state, line in p:
698
self.log('%12s | %s' % (state, line[:-1]))
702
mt.writelines(w.weave_merge(p))
704
self.log(mt.getvalue())
706
mp = map(addcrlf, mp)
707
self.assertEqual(mt.readlines(), mp)
710
def testOneInsert(self):
716
def testSeparateInserts(self):
717
self.doMerge(['aaa', 'bbb', 'ccc'],
718
['aaa', 'xxx', 'bbb', 'ccc'],
719
['aaa', 'bbb', 'yyy', 'ccc'],
720
['aaa', 'xxx', 'bbb', 'yyy', 'ccc'])
722
def testSameInsert(self):
723
self.doMerge(['aaa', 'bbb', 'ccc'],
724
['aaa', 'xxx', 'bbb', 'ccc'],
725
['aaa', 'xxx', 'bbb', 'yyy', 'ccc'],
726
['aaa', 'xxx', 'bbb', 'yyy', 'ccc'])
728
def testOverlappedInsert(self):
729
self.doMerge(['aaa', 'bbb'],
730
['aaa', 'xxx', 'yyy', 'bbb'],
731
['aaa', 'xxx', 'bbb'],
732
['aaa', '<<<<', 'xxx', 'yyy', '====', 'xxx', '>>>>', 'bbb'])
734
# really it ought to reduce this to
735
# ['aaa', 'xxx', 'yyy', 'bbb']
738
def testClashReplace(self):
739
self.doMerge(['aaa'],
742
['<<<<', 'xxx', '====', 'yyy', 'zzz', '>>>>'])
744
def testNonClashInsert(self):
745
self.doMerge(['aaa'],
748
['<<<<', 'xxx', 'aaa', '====', 'yyy', 'zzz', '>>>>'])
750
self.doMerge(['aaa'],
756
def testDeleteAndModify(self):
757
"""Clashing delete and modification.
759
If one side modifies a region and the other deletes it then
760
there should be a conflict with one side blank.
763
#######################################
764
# skippd, not working yet
767
self.doMerge(['aaa', 'bbb', 'ccc'],
768
['aaa', 'ddd', 'ccc'],
770
['<<<<', 'aaa', '====', '>>>>', 'ccc'])
776
from unittest import TestSuite, TestLoader
781
suite.addTest(tl.loadTestsFromModule(testweave))
783
return int(not testsweet.run_suite(suite)) # for shell 0=true
786
if __name__ == '__main__':
788
sys.exit(testweave())
780
# Because we are corrupting, we need to make sure we have the exact text
781
self.assertEquals('# bzr weave file v5\n'
782
'i\n1 f572d396fae9206628714fb2ce00f72e94f2258f\nn v1\n\n'
783
'i 0\n1 90f265c6e75f1c8f9ab76dcf85528352c5f215ef\nn v2\n\n'
784
'w\n{ 0\n. hello\n}\n{ 1\n. there\n}\nW\n',
787
# Change a single letter
788
tmpf = StringIO('# bzr weave file v5\n'
789
'i\n1 f572d396fae9206628714fb2ce00f72e94f2258f\nn v1\n\n'
790
'i 0\n1 90f265c6e75f1c8f9ab76dcf85528352c5f215ef\nn v2\n\n'
791
'w\n{ 0\n. hello\n}\n{ 1\n. There\n}\nW\n')
795
self.assertEqual('hello\n', w.get_text('v1'))
796
self.assertRaises(errors.WeaveInvalidChecksum, w.get_text, 'v2')
797
self.assertRaises(errors.WeaveInvalidChecksum, w.get_lines, 'v2')
798
self.assertRaises(errors.WeaveInvalidChecksum, w.check)
800
# Change the sha checksum
801
tmpf = StringIO('# bzr weave file v5\n'
802
'i\n1 f572d396fae9206628714fb2ce00f72e94f2258f\nn v1\n\n'
803
'i 0\n1 f0f265c6e75f1c8f9ab76dcf85528352c5f215ef\nn v2\n\n'
804
'w\n{ 0\n. hello\n}\n{ 1\n. there\n}\nW\n')
808
self.assertEqual('hello\n', w.get_text('v1'))
809
self.assertRaises(errors.WeaveInvalidChecksum, w.get_text, 'v2')
810
self.assertRaises(errors.WeaveInvalidChecksum, w.get_lines, 'v2')
811
self.assertRaises(errors.WeaveInvalidChecksum, w.check)
814
class InstrumentedWeave(Weave):
815
"""Keep track of how many times functions are called."""
817
def __init__(self, weave_name=None):
818
self._extract_count = 0
819
Weave.__init__(self, weave_name=weave_name)
821
def _extract(self, versions):
822
self._extract_count += 1
823
return Weave._extract(self, versions)
826
class JoinOptimization(TestCase):
827
"""Test that Weave.join() doesn't extract all texts, only what must be done."""
830
w1 = InstrumentedWeave()
831
w2 = InstrumentedWeave()
834
txt1 = ['a\n', 'b\n']
835
txt2 = ['a\n', 'c\n']
836
txt3 = ['a\n', 'b\n', 'c\n']
838
w1.add_lines('txt0', [], txt0) # extract 1a
839
w2.add_lines('txt0', [], txt0) # extract 1b
840
w1.add_lines('txt1', ['txt0'], txt1)# extract 2a
841
w2.add_lines('txt2', ['txt0'], txt2)# extract 2b
842
w1.join(w2) # extract 3a to add txt2
843
w2.join(w1) # extract 3b to add txt1
845
w1.add_lines('txt3', ['txt1', 'txt2'], txt3) # extract 4a
846
w2.add_lines('txt3', ['txt2', 'txt1'], txt3) # extract 4b
847
# These secretly have inverted parents
849
# This should not have to do any extractions
850
w1.join(w2) # NO extract, texts already present with same parents
851
w2.join(w1) # NO extract, texts already present with same parents
853
self.assertEqual(4, w1._extract_count)
854
self.assertEqual(4, w2._extract_count)
856
def test_double_parent(self):
857
# It should not be considered illegal to add
858
# a revision with the same parent twice
859
w1 = InstrumentedWeave()
860
w2 = InstrumentedWeave()
863
txt1 = ['a\n', 'b\n']
864
txt2 = ['a\n', 'c\n']
865
txt3 = ['a\n', 'b\n', 'c\n']
867
w1.add_lines('txt0', [], txt0)
868
w2.add_lines('txt0', [], txt0)
869
w1.add_lines('txt1', ['txt0'], txt1)
870
w2.add_lines('txt1', ['txt0', 'txt0'], txt1)
871
# Same text, effectively the same, because the
872
# parent is only repeated
873
w1.join(w2) # extract 3a to add txt2
874
w2.join(w1) # extract 3b to add txt1
877
class TestNeedsReweave(TestCase):
878
"""Internal corner cases for when reweave is needed."""
880
def test_compatible_parents(self):
882
my_parents = set([1, 2, 3])
884
self.assertTrue(w1._compatible_parents(my_parents, set([3])))
886
self.assertTrue(w1._compatible_parents(my_parents, set(my_parents)))
887
# same empty corner case
888
self.assertTrue(w1._compatible_parents(set(), set()))
889
# other cannot contain stuff my_parents does not
890
self.assertFalse(w1._compatible_parents(set(), set([1])))
891
self.assertFalse(w1._compatible_parents(my_parents, set([1, 2, 3, 4])))
892
self.assertFalse(w1._compatible_parents(my_parents, set([4])))
added
removed
bzrlib/tests/test_weave.py
