~bzr-pqm/bzr/bzr.dev : contents of bzrlib/tests/test

~bzr-pqm/bzr/bzr.dev : (revision 2625)

2052.3.2 by John Arbash Meinel Change Copyright .. by Canonical to Copyright ... Canonical	1	# Copyright (C) 2005 Canonical Ltd
1887.1.1 by Adeodato Simó Do not separate paragraphs in the copyright statement with blank lines,	2	#
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	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.
1887.1.1 by Adeodato Simó Do not separate paragraphs in the copyright statement with blank lines,	7	#
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	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.
1887.1.1 by Adeodato Simó Do not separate paragraphs in the copyright statement with blank lines,	12	#
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	16
	17
1083 by Martin Pool - add space to store revision-id in weave files	18	# TODO: tests regarding version names
1185.13.4 by Robert Collins make reweave visible as a weave method, and quickly integrate into fetch	19	# TODO: rbc 20050108 test that join does not leave an inconsistent weave
	20	# if it fails.
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	21
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	22	"""test suite for weave algorithm"""
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	23
1323 by Martin Pool - caller can pass SHA-1 to Weave.add for efficiency	24	from pprint import pformat
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	25
2024.1.1 by John Arbash Meinel When a weave file is empty, we should get WeaveFormatError, not StopIteration	26	from bzrlib import (
	27	errors,
	28	)
	29	from bzrlib.osutils import sha_string
	30	from bzrlib.tests import TestCase, TestCaseInTempDir
1393.1.68 by Martin Pool - add reweave that joins with ghosts	31	from bzrlib.weave import Weave, WeaveFormatError, WeaveError, reweave
872 by Martin Pool - update testweave	32	from bzrlib.weavefile import write_weave, read_weave
0.1.66 by Martin Pool Cope without set/frozenset classes	33
0.1.66 by Martin Pool Cope without set/frozenset classes	34
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	35	# texts for use in testing
0.1.3 by Martin Pool Change storage of texts for testing	36	TEXT_0 = ["Hello world"]
	37	TEXT_1 = ["Hello world",
	38	"A second line"]
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	39
	40
1233 by Martin Pool - fix up weave tests for new test framework	41	class TestBase(TestCase):
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	42	def check_read_write(self, k):
	43	"""Check the weave k can be written & re-read."""
	44	from tempfile import TemporaryFile
	45	tf = TemporaryFile()
	46
	47	write_weave(k, tf)
	48	tf.seek(0)
	49	k2 = read_weave(tf)
	50
	51	if k != k2:
	52	tf.seek(0)
	53	self.log('serialized weave:')
	54	self.log(tf.read())
1083 by Martin Pool - add space to store revision-id in weave files	55
	56	self.log('')
	57	self.log('parents: %s' % (k._parents == k2._parents))
	58	self.log(' %r' % k._parents)
	59	self.log(' %r' % k2._parents)
	60	self.log('')
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	61	self.fail('read/write check failed')
1185.16.125 by Martin Pool Test for 'name in weave'	62
	63
	64	class WeaveContains(TestBase):
	65	"""Weave __contains__ operator"""
	66	def runTest(self):
	67	k = Weave()
	68	self.assertFalse('foo' in k)
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	69	k.add_lines('foo', [], TEXT_1)
1185.16.125 by Martin Pool Test for 'name in weave'	70	self.assertTrue('foo' in k)
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	71
	72
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	73	class Easy(TestBase):
	74	def runTest(self):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	75	k = Weave()
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	76
	77
	78	class StoreText(TestBase):
	79	"""Store and retrieve a simple text."""
1594.2.24 by Robert Collins Make use of the transaction finalisation warning support to implement in-knit caching.	80
	81	def test_storing_text(self):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	82	k = Weave()
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	83	idx = k.add_lines('text0', [], TEXT_0)
	84	self.assertEqual(k.get_lines(idx), TEXT_0)
0.1.4 by Martin Pool Start indexing knits by both integer and version string.	85	self.assertEqual(idx, 0)
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	86
	87
0.1.7 by Martin Pool Add trivial annotate text	88	class AnnotateOne(TestBase):
0.1.7 by Martin Pool Add trivial annotate text	89	def runTest(self):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	90	k = Weave()
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	91	k.add_lines('text0', [], TEXT_0)
	92	self.assertEqual(k.annotate('text0'),
	93	[('text0', TEXT_0[0])])
0.1.7 by Martin Pool Add trivial annotate text	94
0.1.7 by Martin Pool Add trivial annotate text	95
0.1.5 by Martin Pool Add test for storing two text versions.	96	class StoreTwo(TestBase):
	97	def runTest(self):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	98	k = Weave()
0.1.5 by Martin Pool Add test for storing two text versions.	99
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	100	idx = k.add_lines('text0', [], TEXT_0)
0.1.5 by Martin Pool Add test for storing two text versions.	101	self.assertEqual(idx, 0)
	102
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	103	idx = k.add_lines('text1', [], TEXT_1)
0.1.5 by Martin Pool Add test for storing two text versions.	104	self.assertEqual(idx, 1)
	105
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	106	self.assertEqual(k.get_lines(0), TEXT_0)
	107	self.assertEqual(k.get_lines(1), TEXT_1)
1323 by Martin Pool - caller can pass SHA-1 to Weave.add for efficiency	108
	109
1185.50.28 by John Arbash Meinel Lots of updates for 'bzr check'	110	class GetSha1(TestBase):
	111	def test_get_sha1(self):
	112	k = Weave()
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	113	k.add_lines('text0', [], 'text0')
1185.50.28 by John Arbash Meinel Lots of updates for 'bzr check'	114	self.assertEqual('34dc0e430c642a26c3dd1c2beb7a8b4f4445eb79',
	115	k.get_sha1('text0'))
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	116	self.assertRaises(errors.RevisionNotPresent,
1185.50.28 by John Arbash Meinel Lots of updates for 'bzr check'	117	k.get_sha1, 0)
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	118	self.assertRaises(errors.RevisionNotPresent,
1185.50.28 by John Arbash Meinel Lots of updates for 'bzr check'	119	k.get_sha1, 'text1')
	120
1323 by Martin Pool - caller can pass SHA-1 to Weave.add for efficiency	121
0.1.27 by Martin Pool Check that version numbers passed in are reasonable	122	class InvalidAdd(TestBase):
	123	"""Try to use invalid version number during add."""
	124	def runTest(self):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	125	k = Weave()
0.1.27 by Martin Pool Check that version numbers passed in are reasonable	126
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	127	self.assertRaises(errors.RevisionNotPresent,
	128	k.add_lines,
1083 by Martin Pool - add space to store revision-id in weave files	129	'text0',
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	130	['69'],
0.1.27 by Martin Pool Check that version numbers passed in are reasonable	131	['new text!'])
	132
	133
1237 by Martin Pool - allow the same version to be repeatedly added to a weave	134	class RepeatedAdd(TestBase):
	135	"""Add the same version twice; harmless."""
	136	def runTest(self):
	137	k = Weave()
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	138	idx = k.add_lines('text0', [], TEXT_0)
	139	idx2 = k.add_lines('text0', [], TEXT_0)
1237 by Martin Pool - allow the same version to be repeatedly added to a weave	140	self.assertEqual(idx, idx2)
	141
	142
	143	class InvalidRepeatedAdd(TestBase):
	144	def runTest(self):
	145	k = Weave()
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	146	k.add_lines('basis', [], TEXT_0)
	147	idx = k.add_lines('text0', [], TEXT_0)
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	148	self.assertRaises(errors.RevisionAlreadyPresent,
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	149	k.add_lines,
1237 by Martin Pool - allow the same version to be repeatedly added to a weave	150	'text0',
	151	[],
	152	['not the same text'])
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	153	self.assertRaises(errors.RevisionAlreadyPresent,
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	154	k.add_lines,
1237 by Martin Pool - allow the same version to be repeatedly added to a weave	155	'text0',
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	156	['basis'], # not the right parents
1237 by Martin Pool - allow the same version to be repeatedly added to a weave	157	TEXT_0)
	158
	159
0.1.26 by Martin Pool Refactor parameters to add command	160	class InsertLines(TestBase):
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	161	"""Store a revision that adds one line to the original.
	162
	163	Look at the annotations to make sure that the first line is matched
	164	and not stored repeatedly."""
	165	def runTest(self):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	166	k = Weave()
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	167
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	168	k.add_lines('text0', [], ['line 1'])
	169	k.add_lines('text1', ['text0'], ['line 1', 'line 2'])
	170
	171	self.assertEqual(k.annotate('text0'),
	172	[('text0', 'line 1')])
	173
	174	self.assertEqual(k.get_lines(1),
0.1.25 by Martin Pool Handle insertion of new weave layers that insert text on top of the basis	175	['line 1',
	176	'line 2'])
	177
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	178	self.assertEqual(k.annotate('text1'),
	179	[('text0', 'line 1'),
	180	('text1', 'line 2')])
	181
	182	k.add_lines('text2', ['text0'], ['line 1', 'diverged line'])
	183
	184	self.assertEqual(k.annotate('text2'),
	185	[('text0', 'line 1'),
	186	('text2', 'diverged line')])
0.1.28 by Martin Pool More tests for insertion of lines in new versions.	187
0.1.54 by Martin Pool Fix weave line calculation when making deltas	188	text3 = ['line 1', 'middle line', 'line 2']
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	189	k.add_lines('text3',
	190	['text0', 'text1'],
0.1.54 by Martin Pool Fix weave line calculation when making deltas	191	text3)
	192
937 by Martin Pool - weave raises IndexError when an invalid revision is given	193	# self.log("changes to text3: " + pformat(list(k._delta(set([0, 1]), text3))))
0.1.54 by Martin Pool Fix weave line calculation when making deltas	194
944 by Martin Pool - refactor member names in Weave code	195	self.log("k._weave=" + pformat(k._weave))
0.1.28 by Martin Pool More tests for insertion of lines in new versions.	196
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	197	self.assertEqual(k.annotate('text3'),
	198	[('text0', 'line 1'),
	199	('text3', 'middle line'),
	200	('text1', 'line 2')])
0.1.28 by Martin Pool More tests for insertion of lines in new versions.	201
0.1.31 by Martin Pool Fix insertion of multiple regions, calculating the right line offset as we go.	202	# now multiple insertions at different places
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	203	k.add_lines('text4',
	204	['text0', 'text1', 'text3'],
0.1.31 by Martin Pool Fix insertion of multiple regions, calculating the right line offset as we go.	205	['line 1', 'aaa', 'middle line', 'bbb', 'line 2', 'ccc'])
	206
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	207	self.assertEqual(k.annotate('text4'),
	208	[('text0', 'line 1'),
	209	('text4', 'aaa'),
	210	('text3', 'middle line'),
	211	('text4', 'bbb'),
	212	('text1', 'line 2'),
	213	('text4', 'ccc')])
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	214
0.1.40 by Martin Pool Add test for extracting from weave with nested insertions	215
0.1.56 by Martin Pool Handle deletion of lines by marking the region with a deletion	216	class DeleteLines(TestBase):
	217	"""Deletion of lines from existing text.
	218
	219	Try various texts all based on a common ancestor."""
	220	def runTest(self):
	221	k = Weave()
	222
	223	base_text = ['one', 'two', 'three', 'four']
	224
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	225	k.add_lines('text0', [], base_text)
0.1.56 by Martin Pool Handle deletion of lines by marking the region with a deletion	226
	227	texts = [['one', 'two', 'three'],
	228	['two', 'three', 'four'],
	229	['one', 'four'],
	230	['one', 'two', 'three', 'four'],
	231	]
	232
1083 by Martin Pool - add space to store revision-id in weave files	233	i = 1
0.1.56 by Martin Pool Handle deletion of lines by marking the region with a deletion	234	for t in texts:
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	235	ver = k.add_lines('text%d' % i,
	236	['text0'], t)
1083 by Martin Pool - add space to store revision-id in weave files	237	i += 1
0.1.56 by Martin Pool Handle deletion of lines by marking the region with a deletion	238
	239	self.log('final weave:')
944 by Martin Pool - refactor member names in Weave code	240	self.log('k._weave=' + pformat(k._weave))
0.1.56 by Martin Pool Handle deletion of lines by marking the region with a deletion	241
	242	for i in range(len(texts)):
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	243	self.assertEqual(k.get_lines(i+1),
0.1.56 by Martin Pool Handle deletion of lines by marking the region with a deletion	244	texts[i])
	245
	246
0.1.49 by Martin Pool Add another constraint: revisions should not delete text that they	247	class SuicideDelete(TestBase):
0.1.55 by Martin Pool doc	248	"""Invalid weave which tries to add and delete simultaneously."""
0.1.49 by Martin Pool Add another constraint: revisions should not delete text that they	249	def runTest(self):
	250	k = Weave()
	251
944 by Martin Pool - refactor member names in Weave code	252	k._parents = [(),
0.1.49 by Martin Pool Add another constraint: revisions should not delete text that they	253	]
944 by Martin Pool - refactor member names in Weave code	254	k._weave = [('{', 0),
0.1.49 by Martin Pool Add another constraint: revisions should not delete text that they	255	'first line',
	256	('[', 0),
	257	'deleted in 0',
	258	(']', 0),
	259	('}', 0),
	260	]
891 by Martin Pool - fix up refactoring of weave	261	################################### SKIPPED
	262	# Weave.get doesn't trap this anymore
	263	return
0.1.49 by Martin Pool Add another constraint: revisions should not delete text that they	264
	265	self.assertRaises(WeaveFormatError,
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	266	k.get_lines,
0.1.49 by Martin Pool Add another constraint: revisions should not delete text that they	267	0)
	268
	269
0.1.48 by Martin Pool Basic parsing of delete instructions.	270	class CannedDelete(TestBase):
	271	"""Unpack canned weave with deleted lines."""
	272	def runTest(self):
	273	k = Weave()
	274
944 by Martin Pool - refactor member names in Weave code	275	k._parents = [(),
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	276	frozenset([0]),
0.1.48 by Martin Pool Basic parsing of delete instructions.	277	]
944 by Martin Pool - refactor member names in Weave code	278	k._weave = [('{', 0),
0.1.48 by Martin Pool Basic parsing of delete instructions.	279	'first line',
	280	('[', 1),
	281	'line to be deleted',
	282	(']', 1),
	283	'last line',
	284	('}', 0),
	285	]
1185.50.23 by John Arbash Meinel Adding sha1 check when weave extracts a text.	286	k._sha1s = [sha_string('first lineline to be deletedlast line')
	287	, sha_string('first linelast line')]
0.1.48 by Martin Pool Basic parsing of delete instructions.	288
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	289	self.assertEqual(k.get_lines(0),
0.1.48 by Martin Pool Basic parsing of delete instructions.	290	['first line',
	291	'line to be deleted',
	292	'last line',
	293	])
	294
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	295	self.assertEqual(k.get_lines(1),
0.1.50 by Martin Pool Basic implementation of deletion markers	296	['first line',
	297	'last line',
	298	])
	299
0.1.48 by Martin Pool Basic parsing of delete instructions.	300
0.1.51 by Martin Pool Add test for replacement lines	301	class CannedReplacement(TestBase):
	302	"""Unpack canned weave with deleted lines."""
	303	def runTest(self):
	304	k = Weave()
	305
944 by Martin Pool - refactor member names in Weave code	306	k._parents = [frozenset(),
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	307	frozenset([0]),
0.1.51 by Martin Pool Add test for replacement lines	308	]
944 by Martin Pool - refactor member names in Weave code	309	k._weave = [('{', 0),
0.1.51 by Martin Pool Add test for replacement lines	310	'first line',
	311	('[', 1),
	312	'line to be deleted',
	313	(']', 1),
	314	('{', 1),
	315	'replacement line',
	316	('}', 1),
	317	'last line',
	318	('}', 0),
	319	]
1185.50.23 by John Arbash Meinel Adding sha1 check when weave extracts a text.	320	k._sha1s = [sha_string('first lineline to be deletedlast line')
	321	, sha_string('first linereplacement linelast line')]
0.1.51 by Martin Pool Add test for replacement lines	322
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	323	self.assertEqual(k.get_lines(0),
0.1.51 by Martin Pool Add test for replacement lines	324	['first line',
	325	'line to be deleted',
	326	'last line',
	327	])
	328
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	329	self.assertEqual(k.get_lines(1),
0.1.51 by Martin Pool Add test for replacement lines	330	['first line',
	331	'replacement line',
	332	'last line',
	333	])
	334
	335
0.1.46 by Martin Pool More constraints on structure of weave, and checks that they work	336	class BadWeave(TestBase):
	337	"""Test that we trap an insert which should not occur."""
	338	def runTest(self):
	339	k = Weave()
	340
944 by Martin Pool - refactor member names in Weave code	341	k._parents = [frozenset(),
0.1.46 by Martin Pool More constraints on structure of weave, and checks that they work	342	]
944 by Martin Pool - refactor member names in Weave code	343	k._weave = ['bad line',
0.1.46 by Martin Pool More constraints on structure of weave, and checks that they work	344	('{', 0),
	345	'foo {',
	346	('{', 1),
	347	' added in version 1',
	348	('{', 2),
	349	' added in v2',
	350	('}', 2),
	351	' also from v1',
	352	('}', 1),
	353	'}',
	354	('}', 0)]
	355
891 by Martin Pool - fix up refactoring of weave	356	################################### SKIPPED
	357	# Weave.get doesn't trap this anymore
	358	return
	359
	360
0.1.47 by Martin Pool New WeaveError and WeaveFormatError rather than assertions.	361	self.assertRaises(WeaveFormatError,
0.1.46 by Martin Pool More constraints on structure of weave, and checks that they work	362	k.get,
	363	0)
	364
	365
	366	class BadInsert(TestBase):
	367	"""Test that we trap an insert which should not occur."""
	368	def runTest(self):
	369	k = Weave()
	370
944 by Martin Pool - refactor member names in Weave code	371	k._parents = [frozenset(),
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	372	frozenset([0]),
	373	frozenset([0]),
	374	frozenset([0,1,2]),
0.1.46 by Martin Pool More constraints on structure of weave, and checks that they work	375	]
944 by Martin Pool - refactor member names in Weave code	376	k._weave = [('{', 0),
0.1.46 by Martin Pool More constraints on structure of weave, and checks that they work	377	'foo {',
	378	('{', 1),
	379	' added in version 1',
	380	('{', 1),
	381	' more in 1',
	382	('}', 1),
	383	('}', 1),
	384	('}', 0)]
	385
891 by Martin Pool - fix up refactoring of weave	386
	387	# this is not currently enforced by get
	388	return ##########################################
	389
0.1.47 by Martin Pool New WeaveError and WeaveFormatError rather than assertions.	390	self.assertRaises(WeaveFormatError,
0.1.46 by Martin Pool More constraints on structure of weave, and checks that they work	391	k.get,
	392	0)
	393
0.1.47 by Martin Pool New WeaveError and WeaveFormatError rather than assertions.	394	self.assertRaises(WeaveFormatError,
0.1.46 by Martin Pool More constraints on structure of weave, and checks that they work	395	k.get,
	396	1)
	397
0.1.40 by Martin Pool Add test for extracting from weave with nested insertions	398
	399	class InsertNested(TestBase):
	400	"""Insertion with nested instructions."""
	401	def runTest(self):
	402	k = Weave()
	403
944 by Martin Pool - refactor member names in Weave code	404	k._parents = [frozenset(),
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	405	frozenset([0]),
	406	frozenset([0]),
	407	frozenset([0,1,2]),
0.1.40 by Martin Pool Add test for extracting from weave with nested insertions	408	]
944 by Martin Pool - refactor member names in Weave code	409	k._weave = [('{', 0),
0.1.40 by Martin Pool Add test for extracting from weave with nested insertions	410	'foo {',
	411	('{', 1),
	412	' added in version 1',
0.1.42 by Martin Pool More tests for nested insert instructions	413	('{', 2),
	414	' added in v2',
	415	('}', 2),
	416	' also from v1',
0.1.40 by Martin Pool Add test for extracting from weave with nested insertions	417	('}', 1),
	418	'}',
	419	('}', 0)]
	420
1185.50.23 by John Arbash Meinel Adding sha1 check when weave extracts a text.	421	k._sha1s = [sha_string('foo {}')
	422	, sha_string('foo { added in version 1 also from v1}')
	423	, sha_string('foo { added in v2}')
	424	, sha_string('foo { added in version 1 added in v2 also from v1}')
	425	]
	426
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	427	self.assertEqual(k.get_lines(0),
0.1.40 by Martin Pool Add test for extracting from weave with nested insertions	428	['foo {',
	429	'}'])
	430
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	431	self.assertEqual(k.get_lines(1),
0.1.40 by Martin Pool Add test for extracting from weave with nested insertions	432	['foo {',
	433	' added in version 1',
0.1.42 by Martin Pool More tests for nested insert instructions	434	' also from v1',
0.1.40 by Martin Pool Add test for extracting from weave with nested insertions	435	'}'])
	436
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	437	self.assertEqual(k.get_lines(2),
0.1.44 by Martin Pool More tests for nested insert instructions	438	['foo {',
	439	' added in v2',
	440	'}'])
	441
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	442	self.assertEqual(k.get_lines(3),
0.1.44 by Martin Pool More tests for nested insert instructions	443	['foo {',
	444	' added in version 1',
	445	' added in v2',
	446	' also from v1',
	447	'}'])
	448
0.1.45 by Martin Pool doc	449
0.1.56 by Martin Pool Handle deletion of lines by marking the region with a deletion	450	class DeleteLines2(TestBase):
0.1.30 by Martin Pool Start adding tests for line deletion	451	"""Test recording revisions that delete lines.
	452
	453	This relies on the weave having a way to represent lines knocked
	454	out by a later revision."""
	455	def runTest(self):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	456	k = Weave()
0.1.30 by Martin Pool Start adding tests for line deletion	457
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	458	k.add_lines('text0', [], ["line the first",
0.1.30 by Martin Pool Start adding tests for line deletion	459	"line 2",
	460	"line 3",
	461	"fine"])
	462
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	463	self.assertEqual(len(k.get_lines(0)), 4)
0.1.30 by Martin Pool Start adding tests for line deletion	464
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	465	k.add_lines('text1', ['text0'], ["line the first",
0.1.30 by Martin Pool Start adding tests for line deletion	466	"fine"])
0.1.30 by Martin Pool Start adding tests for line deletion	467
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	468	self.assertEqual(k.get_lines(1),
0.1.30 by Martin Pool Start adding tests for line deletion	469	["line the first",
	470	"fine"])
	471
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	472	self.assertEqual(k.annotate('text1'),
	473	[('text0', "line the first"),
	474	('text0', "fine")])
0.1.56 by Martin Pool Handle deletion of lines by marking the region with a deletion	475
0.1.30 by Martin Pool Start adding tests for line deletion	476
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	477	class IncludeVersions(TestBase):
	478	"""Check texts that are stored across multiple revisions.
	479
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	480	Here we manually create a weave with particular encoding and make
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	481	sure it unpacks properly.
	482
	483	Text 0 includes nothing; text 1 includes text 0 and adds some
	484	lines.
	485	"""
	486
	487	def runTest(self):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	488	k = Weave()
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	489
944 by Martin Pool - refactor member names in Weave code	490	k._parents = [frozenset(), frozenset([0])]
944 by Martin Pool - refactor member names in Weave code	491	k._weave = [('{', 0),
0.1.39 by Martin Pool Change to a more realistic weave structure which can represent insertions and	492	"first line",
	493	('}', 0),
	494	('{', 1),
	495	"second line",
	496	('}', 1)]
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	497
1185.50.23 by John Arbash Meinel Adding sha1 check when weave extracts a text.	498	k._sha1s = [sha_string('first line')
	499	, sha_string('first linesecond line')]
	500
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	501	self.assertEqual(k.get_lines(1),
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	502	["first line",
	503	"second line"])
	504
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	505	self.assertEqual(k.get_lines(0),
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	506	["first line"])
	507
0.1.5 by Martin Pool Add test for storing two text versions.	508
0.1.14 by Martin Pool Another test for version inclusion	509	class DivergedIncludes(TestBase):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	510	"""Weave with two diverged texts based on version 0.
0.1.14 by Martin Pool Another test for version inclusion	511	"""
0.1.14 by Martin Pool Another test for version inclusion	512	def runTest(self):
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	513	# FIXME make the weave, dont poke at it.
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	514	k = Weave()
0.1.14 by Martin Pool Another test for version inclusion	515
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	516	k._names = ['0', '1', '2']
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	517	k._name_map = {'0':0, '1':1, '2':2}
944 by Martin Pool - refactor member names in Weave code	518	k._parents = [frozenset(),
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	519	frozenset([0]),
	520	frozenset([0]),
0.1.17 by Martin Pool Use objects rather than tuples for tracking VerInfo for	521	]
944 by Martin Pool - refactor member names in Weave code	522	k._weave = [('{', 0),
0.1.39 by Martin Pool Change to a more realistic weave structure which can represent insertions and	523	"first line",
	524	('}', 0),
	525	('{', 1),
	526	"second line",
	527	('}', 1),
	528	('{', 2),
	529	"alternative second line",
	530	('}', 2),
	531	]
0.1.14 by Martin Pool Another test for version inclusion	532
1185.50.23 by John Arbash Meinel Adding sha1 check when weave extracts a text.	533	k._sha1s = [sha_string('first line')
	534	, sha_string('first linesecond line')
	535	, sha_string('first linealternative second line')]
	536
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	537	self.assertEqual(k.get_lines(0),
0.1.14 by Martin Pool Another test for version inclusion	538	["first line"])
0.1.14 by Martin Pool Another test for version inclusion	539
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	540	self.assertEqual(k.get_lines(1),
0.1.14 by Martin Pool Another test for version inclusion	541	["first line",
	542	"second line"])
	543
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	544	self.assertEqual(k.get_lines('2'),
0.1.14 by Martin Pool Another test for version inclusion	545	["first line",
	546	"alternative second line"])
	547
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	548	self.assertEqual(list(k.get_ancestry(['2'])),
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	549	['0', '2'])
0.1.77 by Martin Pool New Weave.get_included() does transitive expansion	550
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	551
	552	class ReplaceLine(TestBase):
	553	def runTest(self):
	554	k = Weave()
	555
	556	text0 = ['cheddar', 'stilton', 'gruyere']
	557	text1 = ['cheddar', 'blue vein', 'neufchatel', 'chevre']
	558
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	559	k.add_lines('text0', [], text0)
	560	k.add_lines('text1', ['text0'], text1)
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	561
944 by Martin Pool - refactor member names in Weave code	562	self.log('k._weave=' + pformat(k._weave))
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	563
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	564	self.assertEqual(k.get_lines(0), text0)
	565	self.assertEqual(k.get_lines(1), text1)
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	566
0.1.64 by Martin Pool Add test for merging versions	567
0.1.64 by Martin Pool Add test for merging versions	568	class Merge(TestBase):
0.1.95 by Martin Pool - preliminary merge conflict detection	569	"""Storage of versions that merge diverged parents"""
0.1.64 by Martin Pool Add test for merging versions	570	def runTest(self):
	571	k = Weave()
	572
	573	texts = [['header'],
	574	['header', '', 'line from 1'],
	575	['header', '', 'line from 2', 'more from 2'],
	576	['header', '', 'line from 1', 'fixup line', 'line from 2'],
	577	]
	578
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	579	k.add_lines('text0', [], texts[0])
	580	k.add_lines('text1', ['text0'], texts[1])
	581	k.add_lines('text2', ['text0'], texts[2])
	582	k.add_lines('merge', ['text0', 'text1', 'text2'], texts[3])
0.1.64 by Martin Pool Add test for merging versions	583
0.1.64 by Martin Pool Add test for merging versions	584	for i, t in enumerate(texts):
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	585	self.assertEqual(k.get_lines(i), t)
0.1.64 by Martin Pool Add test for merging versions	586
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	587	self.assertEqual(k.annotate('merge'),
	588	[('text0', 'header'),
	589	('text1', ''),
	590	('text1', 'line from 1'),
	591	('merge', 'fixup line'),
	592	('text2', 'line from 2'),
0.1.64 by Martin Pool Add test for merging versions	593	])
0.1.64 by Martin Pool Add test for merging versions	594
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	595	self.assertEqual(list(k.get_ancestry(['merge'])),
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	596	['text0', 'text1', 'text2', 'merge'])
0.1.77 by Martin Pool New Weave.get_included() does transitive expansion	597
944 by Martin Pool - refactor member names in Weave code	598	self.log('k._weave=' + pformat(k._weave))
0.1.64 by Martin Pool Add test for merging versions	599
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	600	self.check_read_write(k)
0.1.65 by Martin Pool Add Weave.merge_iter to get automerged lines	601
	602
0.1.95 by Martin Pool - preliminary merge conflict detection	603	class Conflicts(TestBase):
	604	"""Test detection of conflicting regions during a merge.
	605
	606	A base version is inserted, then two descendents try to
	607	insert different lines in the same place. These should be
	608	reported as a possible conflict and forwarded to the user."""
	609	def runTest(self):
	610	return # NOT RUN
	611	k = Weave()
	612
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	613	k.add_lines([], ['aaa', 'bbb'])
	614	k.add_lines([0], ['aaa', '111', 'bbb'])
	615	k.add_lines([1], ['aaa', '222', 'bbb'])
0.1.95 by Martin Pool - preliminary merge conflict detection	616
	617	merged = k.merge([1, 2])
	618
	619	self.assertEquals([[['aaa']],
	620	[['111'], ['222']],
	621	[['bbb']]])
	622
	623
	624	class NonConflict(TestBase):
	625	"""Two descendants insert compatible changes.
	626
	627	No conflict should be reported."""
	628	def runTest(self):
	629	return # NOT RUN
	630	k = Weave()
	631
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	632	k.add_lines([], ['aaa', 'bbb'])
	633	k.add_lines([0], ['111', 'aaa', 'ccc', 'bbb'])
	634	k.add_lines([1], ['aaa', 'ccc', 'bbb', '222'])
0.1.95 by Martin Pool - preliminary merge conflict detection	635
	636
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	637	class Khayyam(TestBase):
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	638	"""Test changes to multi-line texts, and read/write"""
1563.2.1 by Robert Collins Merge in a variation of the versionedfile api from versioned-file.	639
	640	def test_multi_line_merge(self):
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	641	rawtexts = [
	642	"""A Book of Verses underneath the Bough,
	643	A Jug of Wine, a Loaf of Bread, -- and Thou
	644	Beside me singing in the Wilderness --
	645	Oh, Wilderness were Paradise enow!""",
	646
	647	"""A Book of Verses underneath the Bough,
	648	A Jug of Wine, a Loaf of Bread, -- and Thou
	649	Beside me singing in the Wilderness --
	650	Oh, Wilderness were Paradise now!""",
0.1.59 by Martin Pool More modification tests	651
	652	"""A Book of poems underneath the tree,
	653	A Jug of Wine, a Loaf of Bread,
	654	and Thou
	655	Beside me singing in the Wilderness --
	656	Oh, Wilderness were Paradise now!
	657
	658	-- O. Khayyam""",
	659
	660	"""A Book of Verses underneath the Bough,
	661	A Jug of Wine, a Loaf of Bread,
	662	and Thou
	663	Beside me singing in the Wilderness --
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	664	Oh, Wilderness were Paradise now!""",
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	665	]
	666	texts = [[l.strip() for l in t.split('\n')] for t in rawtexts]
	667
	668	k = Weave()
	669	parents = set()
1083 by Martin Pool - add space to store revision-id in weave files	670	i = 0
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	671	for t in texts:
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	672	ver = k.add_lines('text%d' % i,
1083 by Martin Pool - add space to store revision-id in weave files	673	list(parents), t)
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	674	parents.add('text%d' % i)
1083 by Martin Pool - add space to store revision-id in weave files	675	i += 1
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	676
944 by Martin Pool - refactor member names in Weave code	677	self.log("k._weave=" + pformat(k._weave))
0.1.59 by Martin Pool More modification tests	678
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	679	for i, t in enumerate(texts):
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	680	self.assertEqual(k.get_lines(i), t)
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	681
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	682	self.check_read_write(k)
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	683
	684
1393.1.48 by Martin Pool - Add stub Weave.join() method	685	class JoinWeavesTests(TestBase):
1393.1.50 by Martin Pool - more development of Weave.join()	686	def setUp(self):
	687	super(JoinWeavesTests, self).setUp()
	688	self.weave1 = Weave()
	689	self.lines1 = ['hello\n']
	690	self.lines3 = ['hello\n', 'cruel\n', 'world\n']
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	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)
1393.1.50 by Martin Pool - more development of Weave.join()	694
1393.1.48 by Martin Pool - Add stub Weave.join() method	695	def test_join_empty(self):
	696	"""Join two empty weaves."""
	697	eq = self.assertEqual
	698	w1 = Weave()
	699	w2 = Weave()
	700	w1.join(w2)
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	701	eq(len(w1), 0)
1393.1.48 by Martin Pool - Add stub Weave.join() method	702
1393.1.50 by Martin Pool - more development of Weave.join()	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)
	707
	708	def test_join_unrelated(self):
	709	"""Join two weaves with no history in common."""
	710	wb = Weave()
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	711	wb.add_lines('b1', [], ['line from b\n'])
1393.1.50 by Martin Pool - more development of Weave.join()	712	w1 = self.weave1
	713	w1.join(wb)
	714	eq = self.assertEqual
	715	eq(len(w1), 4)
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	716	eq(sorted(w1.versions()),
1393.1.50 by Martin Pool - more development of Weave.join()	717	['b1', 'v1', 'v2', 'v3'])
920 by Martin Pool - add more test cases for weave_merge	718
1393.1.51 by Martin Pool - new Weave.copy()	719	def test_join_related(self):
	720	wa = self.weave1.copy()
	721	wb = self.weave1.copy()
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	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'])
1393.1.51 by Martin Pool - new Weave.copy()	724	eq = self.assertEquals
	725	eq(len(wa), 4)
	726	eq(len(wb), 4)
	727	wa.join(wb)
	728	eq(len(wa), 5)
	729	eq(wa.get_lines('b1'),
	730	['hello\n', 'pale blue\n', 'world\n'])
	731
1393.1.67 by Martin Pool - test that we cannot join weaves with different ancestry	732	def test_join_parent_disagreement(self):
1563.2.11 by Robert Collins Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.	733	#join reconciles differening parents into a union.
1393.1.67 by Martin Pool - test that we cannot join weaves with different ancestry	734	wa = Weave()
	735	wb = Weave()
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	736	wa.add_lines('v1', [], ['hello\n'])
	737	wb.add_lines('v0', [], [])
	738	wb.add_lines('v1', ['v0'], ['hello\n'])
1563.2.11 by Robert Collins Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.	739	wa.join(wb)
	740	self.assertEqual(['v0'], wa.get_parents('v1'))
1393.1.67 by Martin Pool - test that we cannot join weaves with different ancestry	741
	742	def test_join_text_disagreement(self):
	743	"""Cannot join weaves with different texts for a version."""
	744	wa = Weave()
	745	wb = Weave()
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	746	wa.add_lines('v1', [], ['hello\n'])
	747	wb.add_lines('v1', [], ['not\n', 'hello\n'])
1393.1.67 by Martin Pool - test that we cannot join weaves with different ancestry	748	self.assertRaises(WeaveError,
	749	wa.join, wb)
	750
1393.1.66 by Martin Pool - fix join of weaves where parents occur at different offsets	751	def test_join_unordered(self):
	752	"""Join weaves where indexes differ.
	753
	754	The source weave contains a different version at index 0."""
	755	wa = self.weave1.copy()
	756	wb = Weave()
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	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'])
1393.1.66 by Martin Pool - fix join of weaves where parents occur at different offsets	760	wa.join(wb)
	761	eq = self.assertEquals
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	762	eq(sorted(wa.versions()), ['v1', 'v2', 'v3', 'x1',])
1393.1.66 by Martin Pool - fix join of weaves where parents occur at different offsets	763	eq(wa.get_text('x1'), 'line from x1\n')
1185.50.23 by John Arbash Meinel Adding sha1 check when weave extracts a text.	764
	765	def test_written_detection(self):
1185.50.29 by John Arbash Meinel Whitespace and other formatting cleanups suggested by Robert.	766	# Test detection of weave file corruption.
	767	#
	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.
1185.50.23 by John Arbash Meinel Adding sha1 check when weave extracts a text.	771	from cStringIO import StringIO
	772
	773	w = Weave()
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	774	w.add_lines('v1', [], ['hello\n'])
	775	w.add_lines('v2', ['v1'], ['hello\n', 'there\n'])
1185.50.23 by John Arbash Meinel Adding sha1 check when weave extracts a text.	776
	777	tmpf = StringIO()
	778	write_weave(w, tmpf)
	779
	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',
	785	tmpf.getvalue())
	786
	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')
	792
	793	w = read_weave(tmpf)
	794
	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')
1185.50.26 by John Arbash Meinel Change Weave.check() so that it checks all revisions in parallel.	798	self.assertRaises(errors.WeaveInvalidChecksum, w.check)
1185.50.23 by John Arbash Meinel Adding sha1 check when weave extracts a text.	799
	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')
	805
	806	w = read_weave(tmpf)
	807
	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')
1185.50.26 by John Arbash Meinel Change Weave.check() so that it checks all revisions in parallel.	811	self.assertRaises(errors.WeaveInvalidChecksum, w.check)
1185.50.23 by John Arbash Meinel Adding sha1 check when weave extracts a text.	812
	813
1551.3.11 by Aaron Bentley Merge from Robert	814	class InstrumentedWeave(Weave):
	815	"""Keep track of how many times functions are called."""
	816
	817	def __init__(self, weave_name=None):
	818	self._extract_count = 0
	819	Weave.__init__(self, weave_name=weave_name)
	820
	821	def _extract(self, versions):
	822	self._extract_count += 1
	823	return Weave._extract(self, versions)
	824
	825
	826	class JoinOptimization(TestCase):
	827	"""Test that Weave.join() doesn't extract all texts, only what must be done."""
	828
	829	def test_join(self):
	830	w1 = InstrumentedWeave()
	831	w2 = InstrumentedWeave()
	832
	833	txt0 = ['a\n']
	834	txt1 = ['a\n', 'b\n']
	835	txt2 = ['a\n', 'c\n']
	836	txt3 = ['a\n', 'b\n', 'c\n']
	837
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	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
1551.3.11 by Aaron Bentley Merge from Robert	842	w1.join(w2) # extract 3a to add txt2
	843	w2.join(w1) # extract 3b to add txt1
	844
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	845	w1.add_lines('txt3', ['txt1', 'txt2'], txt3) # extract 4a
	846	w2.add_lines('txt3', ['txt2', 'txt1'], txt3) # extract 4b
1551.3.11 by Aaron Bentley Merge from Robert	847	# These secretly have inverted parents
	848
	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
	852
	853	self.assertEqual(4, w1._extract_count)
	854	self.assertEqual(4, w2._extract_count)
	855
	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()
	861
	862	txt0 = ['a\n']
	863	txt1 = ['a\n', 'b\n']
	864	txt2 = ['a\n', 'c\n']
	865	txt3 = ['a\n', 'b\n', 'c\n']
	866
1563.2.35 by Robert Collins cleanup deprecation warnings and finish conversion so the inventory is knit based too.	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)
1551.3.11 by Aaron Bentley Merge from Robert	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
	875
	876
1616.1.18 by Martin Pool (weave-merge) don't treat killed-both lines as points of agreement;	877	class TestNeedsReweave(TestCase):
1563.2.24 by Robert Collins Make join cheaper for compatibly inconsistent parents.	878	"""Internal corner cases for when reweave is needed."""
	879
	880	def test_compatible_parents(self):
	881	w1 = Weave('a')
	882	my_parents = set([1, 2, 3])
	883	# subsets are ok
	884	self.assertTrue(w1._compatible_parents(my_parents, set([3])))
	885	# same sets
	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])))
2024.1.1 by John Arbash Meinel When a weave file is empty, we should get WeaveFormatError, not StopIteration	893
	894
	895	class TestWeaveFile(TestCaseInTempDir):
	896
	897	def test_empty_file(self):
	898	f = open('empty.weave', 'wb+')
	899	try:
	900	self.assertRaises(errors.WeaveFormatError,
	901	read_weave, f)
	902	finally:
	903	f.close()