/brz/remove-bazaar : contents of bzrlib/selftest/test

: (revision 1327)

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

0.1.55 by Martin Pool doc	1	#! /usr/bin/python2.4
0.1.55 by Martin Pool doc	2
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	3	# Copyright (C) 2005 by Canonical Ltd
	4
	5	# This program is free software; you can redistribute it and/or modify
	6	# it under the terms of the GNU General Public License as published by
	7	# the Free Software Foundation; either version 2 of the License, or
	8	# (at your option) any later version.
	9
	10	# This program is distributed in the hope that it will be useful,
	11	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	12	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	# GNU General Public License for more details.
	14
	15	# You should have received a copy of the GNU General Public License
	16	# along with this program; if not, write to the Free Software
	17	# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	18
	19
1083 by Martin Pool - add space to store revision-id in weave files	20	# TODO: tests regarding version names
	21
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	22
	23
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	24	"""test suite for weave algorithm"""
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	25
1323 by Martin Pool - caller can pass SHA-1 to Weave.add for efficiency	26	from pprint import pformat
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	27
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	28	import testsweet
1237 by Martin Pool - allow the same version to be repeatedly added to a weave	29	from bzrlib.weave import Weave, WeaveFormatError, WeaveError
872 by Martin Pool - update testweave	30	from bzrlib.weavefile import write_weave, read_weave
1233 by Martin Pool - fix up weave tests for new test framework	31	from bzrlib.selftest import TestCase
1323 by Martin Pool - caller can pass SHA-1 to Weave.add for efficiency	32	from bzrlib.osutils import sha_string
0.1.66 by Martin Pool Cope without set/frozenset classes	33
	34	try:
	35	set
	36	frozenset
	37	except NameError:
	38	from sets import Set, ImmutableSet
	39	set = Set
	40	frozenset = ImmutableSet
0.1.67 by Martin Pool More fixes to try to run on python2.3	41	del Set, ImmutableSet
0.1.66 by Martin Pool Cope without set/frozenset classes	42
	43
	44
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	45	# texts for use in testing
0.1.3 by Martin Pool Change storage of texts for testing	46	TEXT_0 = ["Hello world"]
	47	TEXT_1 = ["Hello world",
	48	"A second line"]
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	49
	50
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	51
1233 by Martin Pool - fix up weave tests for new test framework	52	class TestBase(TestCase):
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	53	def check_read_write(self, k):
	54	"""Check the weave k can be written & re-read."""
	55	from tempfile import TemporaryFile
	56	tf = TemporaryFile()
	57
	58	write_weave(k, tf)
	59	tf.seek(0)
	60	k2 = read_weave(tf)
	61
	62	if k != k2:
	63	tf.seek(0)
	64	self.log('serialized weave:')
	65	self.log(tf.read())
1083 by Martin Pool - add space to store revision-id in weave files	66
	67	self.log('')
	68	self.log('parents: %s' % (k._parents == k2._parents))
	69	self.log(' %r' % k._parents)
	70	self.log(' %r' % k2._parents)
	71	self.log('')
	72
	73
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	74	self.fail('read/write check failed')
	75
	76
	77
	78
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	79	class Easy(TestBase):
	80	def runTest(self):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	81	k = Weave()
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	82
	83
	84	class StoreText(TestBase):
	85	"""Store and retrieve a simple text."""
	86	def runTest(self):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	87	k = Weave()
1083 by Martin Pool - add space to store revision-id in weave files	88	idx = k.add('text0', [], TEXT_0)
0.1.4 by Martin Pool Start indexing knits by both integer and version string.	89	self.assertEqual(k.get(idx), TEXT_0)
	90	self.assertEqual(idx, 0)
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	91
	92
0.1.7 by Martin Pool Add trivial annotate text	93
	94	class AnnotateOne(TestBase):
	95	def runTest(self):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	96	k = Weave()
1083 by Martin Pool - add space to store revision-id in weave files	97	k.add('text0', [], TEXT_0)
0.1.7 by Martin Pool Add trivial annotate text	98	self.assertEqual(k.annotate(0),
	99	[(0, TEXT_0[0])])
	100
	101
0.1.5 by Martin Pool Add test for storing two text versions.	102	class StoreTwo(TestBase):
	103	def runTest(self):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	104	k = Weave()
0.1.5 by Martin Pool Add test for storing two text versions.	105
1083 by Martin Pool - add space to store revision-id in weave files	106	idx = k.add('text0', [], TEXT_0)
0.1.5 by Martin Pool Add test for storing two text versions.	107	self.assertEqual(idx, 0)
	108
1083 by Martin Pool - add space to store revision-id in weave files	109	idx = k.add('text1', [], TEXT_1)
0.1.5 by Martin Pool Add test for storing two text versions.	110	self.assertEqual(idx, 1)
	111
	112	self.assertEqual(k.get(0), TEXT_0)
	113	self.assertEqual(k.get(1), TEXT_1)
	114
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	115
0.1.21 by Martin Pool Start computing a delta to insert a new revision	116
1323 by Martin Pool - caller can pass SHA-1 to Weave.add for efficiency	117	class AddWithGivenSha(TestBase):
	118	def runTest(self):
	119	"""Add with caller-supplied SHA-1"""
	120	k = Weave()
	121
	122	t = 'text0'
	123	k.add('text0', [], [t], sha1=sha_string(t))
	124
	125
	126
0.1.27 by Martin Pool Check that version numbers passed in are reasonable	127	class InvalidAdd(TestBase):
	128	"""Try to use invalid version number during add."""
	129	def runTest(self):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	130	k = Weave()
0.1.27 by Martin Pool Check that version numbers passed in are reasonable	131
937 by Martin Pool - weave raises IndexError when an invalid revision is given	132	self.assertRaises(IndexError,
0.1.27 by Martin Pool Check that version numbers passed in are reasonable	133	k.add,
1083 by Martin Pool - add space to store revision-id in weave files	134	'text0',
0.1.27 by Martin Pool Check that version numbers passed in are reasonable	135	[69],
	136	['new text!'])
	137
	138
1237 by Martin Pool - allow the same version to be repeatedly added to a weave	139	class RepeatedAdd(TestBase):
	140	"""Add the same version twice; harmless."""
	141	def runTest(self):
	142	k = Weave()
	143	idx = k.add('text0', [], TEXT_0)
	144	idx2 = k.add('text0', [], TEXT_0)
	145	self.assertEqual(idx, idx2)
	146
	147
	148
	149	class InvalidRepeatedAdd(TestBase):
	150	def runTest(self):
	151	k = Weave()
	152	idx = k.add('text0', [], TEXT_0)
	153	self.assertRaises(WeaveError,
	154	k.add,
	155	'text0',
	156	[],
	157	['not the same text'])
	158	self.assertRaises(WeaveError,
	159	k.add,
	160	'text0',
	161	[12], # not the right parents
	162	TEXT_0)
	163
	164
	165
0.1.26 by Martin Pool Refactor parameters to add command	166	class InsertLines(TestBase):
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	167	"""Store a revision that adds one line to the original.
	168
	169	Look at the annotations to make sure that the first line is matched
	170	and not stored repeatedly."""
	171	def runTest(self):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	172	k = Weave()
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	173
1083 by Martin Pool - add space to store revision-id in weave files	174	k.add('text0', [], ['line 1'])
	175	k.add('text1', [0], ['line 1', 'line 2'])
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	176
	177	self.assertEqual(k.annotate(0),
	178	[(0, 'line 1')])
	179
0.1.25 by Martin Pool Handle insertion of new weave layers that insert text on top of the basis	180	self.assertEqual(k.get(1),
	181	['line 1',
	182	'line 2'])
	183
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	184	self.assertEqual(k.annotate(1),
	185	[(0, 'line 1'),
	186	(1, 'line 2')])
	187
1083 by Martin Pool - add space to store revision-id in weave files	188	k.add('text2', [0], ['line 1', 'diverged line'])
0.1.28 by Martin Pool More tests for insertion of lines in new versions.	189
	190	self.assertEqual(k.annotate(2),
	191	[(0, 'line 1'),
	192	(2, 'diverged line')])
	193
0.1.54 by Martin Pool Fix weave line calculation when making deltas	194	text3 = ['line 1', 'middle line', 'line 2']
1083 by Martin Pool - add space to store revision-id in weave files	195	k.add('text3',
	196	[0, 1],
0.1.54 by Martin Pool Fix weave line calculation when making deltas	197	text3)
	198
937 by Martin Pool - weave raises IndexError when an invalid revision is given	199	# 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	200
944 by Martin Pool - refactor member names in Weave code	201	self.log("k._weave=" + pformat(k._weave))
0.1.28 by Martin Pool More tests for insertion of lines in new versions.	202
	203	self.assertEqual(k.annotate(3),
	204	[(0, 'line 1'),
	205	(3, 'middle line'),
	206	(1, 'line 2')])
	207
0.1.31 by Martin Pool Fix insertion of multiple regions, calculating the right line offset as we go.	208	# now multiple insertions at different places
1083 by Martin Pool - add space to store revision-id in weave files	209	k.add('text4',
	210	[0, 1, 3],
0.1.31 by Martin Pool Fix insertion of multiple regions, calculating the right line offset as we go.	211	['line 1', 'aaa', 'middle line', 'bbb', 'line 2', 'ccc'])
	212
	213	self.assertEqual(k.annotate(4),
	214	[(0, 'line 1'),
	215	(4, 'aaa'),
	216	(3, 'middle line'),
	217	(4, 'bbb'),
	218	(1, 'line 2'),
	219	(4, 'ccc')])
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	220
0.1.40 by Martin Pool Add test for extracting from weave with nested insertions	221
0.1.48 by Martin Pool Basic parsing of delete instructions.	222
0.1.56 by Martin Pool Handle deletion of lines by marking the region with a deletion	223	class DeleteLines(TestBase):
	224	"""Deletion of lines from existing text.
	225
	226	Try various texts all based on a common ancestor."""
	227	def runTest(self):
	228	k = Weave()
	229
	230	base_text = ['one', 'two', 'three', 'four']
	231
1083 by Martin Pool - add space to store revision-id in weave files	232	k.add('text0', [], base_text)
0.1.56 by Martin Pool Handle deletion of lines by marking the region with a deletion	233
	234	texts = [['one', 'two', 'three'],
	235	['two', 'three', 'four'],
	236	['one', 'four'],
	237	['one', 'two', 'three', 'four'],
	238	]
	239
1083 by Martin Pool - add space to store revision-id in weave files	240	i = 1
0.1.56 by Martin Pool Handle deletion of lines by marking the region with a deletion	241	for t in texts:
1083 by Martin Pool - add space to store revision-id in weave files	242	ver = k.add('text%d' % i,
	243	[0], t)
	244	i += 1
0.1.56 by Martin Pool Handle deletion of lines by marking the region with a deletion	245
	246	self.log('final weave:')
944 by Martin Pool - refactor member names in Weave code	247	self.log('k._weave=' + pformat(k._weave))
0.1.56 by Martin Pool Handle deletion of lines by marking the region with a deletion	248
	249	for i in range(len(texts)):
	250	self.assertEqual(k.get(i+1),
	251	texts[i])
	252
	253
	254
	255
0.1.49 by Martin Pool Add another constraint: revisions should not delete text that they	256	class SuicideDelete(TestBase):
0.1.55 by Martin Pool doc	257	"""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	258	def runTest(self):
	259	k = Weave()
	260
944 by Martin Pool - refactor member names in Weave code	261	k._parents = [(),
0.1.49 by Martin Pool Add another constraint: revisions should not delete text that they	262	]
944 by Martin Pool - refactor member names in Weave code	263	k._weave = [('{', 0),
0.1.49 by Martin Pool Add another constraint: revisions should not delete text that they	264	'first line',
	265	('[', 0),
	266	'deleted in 0',
	267	(']', 0),
	268	('}', 0),
	269	]
891 by Martin Pool - fix up refactoring of weave	270	################################### SKIPPED
	271	# Weave.get doesn't trap this anymore
	272	return
0.1.49 by Martin Pool Add another constraint: revisions should not delete text that they	273
	274	self.assertRaises(WeaveFormatError,
	275	k.get,
	276	0)
	277
	278
	279
0.1.48 by Martin Pool Basic parsing of delete instructions.	280	class CannedDelete(TestBase):
	281	"""Unpack canned weave with deleted lines."""
	282	def runTest(self):
	283	k = Weave()
	284
944 by Martin Pool - refactor member names in Weave code	285	k._parents = [(),
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	286	frozenset([0]),
0.1.48 by Martin Pool Basic parsing of delete instructions.	287	]
944 by Martin Pool - refactor member names in Weave code	288	k._weave = [('{', 0),
0.1.48 by Martin Pool Basic parsing of delete instructions.	289	'first line',
	290	('[', 1),
	291	'line to be deleted',
	292	(']', 1),
	293	'last line',
	294	('}', 0),
	295	]
	296
	297	self.assertEqual(k.get(0),
	298	['first line',
	299	'line to be deleted',
	300	'last line',
	301	])
	302
0.1.50 by Martin Pool Basic implementation of deletion markers	303	self.assertEqual(k.get(1),
	304	['first line',
	305	'last line',
	306	])
	307
0.1.48 by Martin Pool Basic parsing of delete instructions.	308
0.1.48 by Martin Pool Basic parsing of delete instructions.	309
0.1.51 by Martin Pool Add test for replacement lines	310	class CannedReplacement(TestBase):
	311	"""Unpack canned weave with deleted lines."""
	312	def runTest(self):
	313	k = Weave()
	314
944 by Martin Pool - refactor member names in Weave code	315	k._parents = [frozenset(),
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	316	frozenset([0]),
0.1.51 by Martin Pool Add test for replacement lines	317	]
944 by Martin Pool - refactor member names in Weave code	318	k._weave = [('{', 0),
0.1.51 by Martin Pool Add test for replacement lines	319	'first line',
	320	('[', 1),
	321	'line to be deleted',
	322	(']', 1),
	323	('{', 1),
	324	'replacement line',
	325	('}', 1),
	326	'last line',
	327	('}', 0),
	328	]
	329
	330	self.assertEqual(k.get(0),
	331	['first line',
	332	'line to be deleted',
	333	'last line',
	334	])
	335
	336	self.assertEqual(k.get(1),
	337	['first line',
	338	'replacement line',
	339	'last line',
	340	])
	341
	342
	343
0.1.46 by Martin Pool More constraints on structure of weave, and checks that they work	344	class BadWeave(TestBase):
	345	"""Test that we trap an insert which should not occur."""
	346	def runTest(self):
	347	k = Weave()
	348
944 by Martin Pool - refactor member names in Weave code	349	k._parents = [frozenset(),
0.1.46 by Martin Pool More constraints on structure of weave, and checks that they work	350	]
944 by Martin Pool - refactor member names in Weave code	351	k._weave = ['bad line',
0.1.46 by Martin Pool More constraints on structure of weave, and checks that they work	352	('{', 0),
	353	'foo {',
	354	('{', 1),
	355	' added in version 1',
	356	('{', 2),
	357	' added in v2',
	358	('}', 2),
	359	' also from v1',
	360	('}', 1),
	361	'}',
	362	('}', 0)]
	363
891 by Martin Pool - fix up refactoring of weave	364	################################### SKIPPED
	365	# Weave.get doesn't trap this anymore
	366	return
	367
	368
0.1.47 by Martin Pool New WeaveError and WeaveFormatError rather than assertions.	369	self.assertRaises(WeaveFormatError,
0.1.46 by Martin Pool More constraints on structure of weave, and checks that they work	370	k.get,
	371	0)
	372
	373
	374	class BadInsert(TestBase):
	375	"""Test that we trap an insert which should not occur."""
	376	def runTest(self):
	377	k = Weave()
	378
944 by Martin Pool - refactor member names in Weave code	379	k._parents = [frozenset(),
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	380	frozenset([0]),
	381	frozenset([0]),
	382	frozenset([0,1,2]),
0.1.46 by Martin Pool More constraints on structure of weave, and checks that they work	383	]
944 by Martin Pool - refactor member names in Weave code	384	k._weave = [('{', 0),
0.1.46 by Martin Pool More constraints on structure of weave, and checks that they work	385	'foo {',
	386	('{', 1),
	387	' added in version 1',
	388	('{', 1),
	389	' more in 1',
	390	('}', 1),
	391	('}', 1),
	392	('}', 0)]
	393
891 by Martin Pool - fix up refactoring of weave	394
	395	# this is not currently enforced by get
	396	return ##########################################
	397
0.1.47 by Martin Pool New WeaveError and WeaveFormatError rather than assertions.	398	self.assertRaises(WeaveFormatError,
0.1.46 by Martin Pool More constraints on structure of weave, and checks that they work	399	k.get,
	400	0)
	401
0.1.47 by Martin Pool New WeaveError and WeaveFormatError rather than assertions.	402	self.assertRaises(WeaveFormatError,
0.1.46 by Martin Pool More constraints on structure of weave, and checks that they work	403	k.get,
	404	1)
	405
0.1.40 by Martin Pool Add test for extracting from weave with nested insertions	406
	407	class InsertNested(TestBase):
	408	"""Insertion with nested instructions."""
	409	def runTest(self):
	410	k = Weave()
	411
944 by Martin Pool - refactor member names in Weave code	412	k._parents = [frozenset(),
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	413	frozenset([0]),
	414	frozenset([0]),
	415	frozenset([0,1,2]),
0.1.40 by Martin Pool Add test for extracting from weave with nested insertions	416	]
944 by Martin Pool - refactor member names in Weave code	417	k._weave = [('{', 0),
0.1.40 by Martin Pool Add test for extracting from weave with nested insertions	418	'foo {',
	419	('{', 1),
	420	' added in version 1',
0.1.42 by Martin Pool More tests for nested insert instructions	421	('{', 2),
	422	' added in v2',
	423	('}', 2),
	424	' also from v1',
0.1.40 by Martin Pool Add test for extracting from weave with nested insertions	425	('}', 1),
	426	'}',
	427	('}', 0)]
	428
	429	self.assertEqual(k.get(0),
	430	['foo {',
	431	'}'])
	432
	433	self.assertEqual(k.get(1),
	434	['foo {',
	435	' added in version 1',
0.1.42 by Martin Pool More tests for nested insert instructions	436	' also from v1',
0.1.40 by Martin Pool Add test for extracting from weave with nested insertions	437	'}'])
	438
0.1.44 by Martin Pool More tests for nested insert instructions	439	self.assertEqual(k.get(2),
	440	['foo {',
	441	' added in v2',
	442	'}'])
	443
	444	self.assertEqual(k.get(3),
	445	['foo {',
	446	' added in version 1',
	447	' added in v2',
	448	' also from v1',
	449	'}'])
	450
0.1.45 by Martin Pool doc	451
0.1.40 by Martin Pool Add test for extracting from weave with nested insertions	452
0.1.56 by Martin Pool Handle deletion of lines by marking the region with a deletion	453	class DeleteLines2(TestBase):
0.1.30 by Martin Pool Start adding tests for line deletion	454	"""Test recording revisions that delete lines.
	455
	456	This relies on the weave having a way to represent lines knocked
	457	out by a later revision."""
	458	def runTest(self):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	459	k = Weave()
0.1.30 by Martin Pool Start adding tests for line deletion	460
1083 by Martin Pool - add space to store revision-id in weave files	461	k.add('text0', [], ["line the first",
0.1.30 by Martin Pool Start adding tests for line deletion	462	"line 2",
	463	"line 3",
	464	"fine"])
	465
	466	self.assertEqual(len(k.get(0)), 4)
	467
1083 by Martin Pool - add space to store revision-id in weave files	468	k.add('text1', [0], ["line the first",
0.1.30 by Martin Pool Start adding tests for line deletion	469	"fine"])
	470
	471	self.assertEqual(k.get(1),
	472	["line the first",
	473	"fine"])
	474
0.1.56 by Martin Pool Handle deletion of lines by marking the region with a deletion	475	self.assertEqual(k.annotate(1),
	476	[(0, "line the first"),
	477	(0, "fine")])
	478
0.1.30 by Martin Pool Start adding tests for line deletion	479
0.1.26 by Martin Pool Refactor parameters to add command	480
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	481	class IncludeVersions(TestBase):
	482	"""Check texts that are stored across multiple revisions.
	483
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	484	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	485	sure it unpacks properly.
	486
	487	Text 0 includes nothing; text 1 includes text 0 and adds some
	488	lines.
	489	"""
	490
	491	def runTest(self):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	492	k = Weave()
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	493
944 by Martin Pool - refactor member names in Weave code	494	k._parents = [frozenset(), frozenset([0])]
944 by Martin Pool - refactor member names in Weave code	495	k._weave = [('{', 0),
0.1.39 by Martin Pool Change to a more realistic weave structure which can represent insertions and	496	"first line",
	497	('}', 0),
	498	('{', 1),
	499	"second line",
	500	('}', 1)]
0.1.13 by Martin Pool Knit structure now allows for versions to include the lines present in other	501
	502	self.assertEqual(k.get(1),
	503	["first line",
	504	"second line"])
	505
	506	self.assertEqual(k.get(0),
	507	["first line"])
	508
0.1.5 by Martin Pool Add test for storing two text versions.	509
0.1.14 by Martin Pool Another test for version inclusion	510	class DivergedIncludes(TestBase):
0.1.38 by Martin Pool Rename knit to weave. (I don't think there's an existing module called weave.)	511	"""Weave with two diverged texts based on version 0.
0.1.14 by Martin Pool Another test for version inclusion	512	"""
0.1.14 by Martin Pool Another test for version inclusion	513	def runTest(self):
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
944 by Martin Pool - refactor member names in Weave code	516	k._parents = [frozenset(),
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	517	frozenset([0]),
	518	frozenset([0]),
0.1.17 by Martin Pool Use objects rather than tuples for tracking VerInfo for	519	]
944 by Martin Pool - refactor member names in Weave code	520	k._weave = [('{', 0),
0.1.39 by Martin Pool Change to a more realistic weave structure which can represent insertions and	521	"first line",
	522	('}', 0),
	523	('{', 1),
	524	"second line",
	525	('}', 1),
	526	('{', 2),
	527	"alternative second line",
	528	('}', 2),
	529	]
0.1.14 by Martin Pool Another test for version inclusion	530
	531	self.assertEqual(k.get(0),
	532	["first line"])
	533
	534	self.assertEqual(k.get(1),
	535	["first line",
	536	"second line"])
	537
	538	self.assertEqual(k.get(2),
	539	["first line",
	540	"alternative second line"])
	541
924 by Martin Pool - Add IntSet class	542	self.assertEqual(list(k.inclusions([2])),
924 by Martin Pool - Add IntSet class	543	[0, 2])
0.1.77 by Martin Pool New Weave.get_included() does transitive expansion	544
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	545
	546
	547	class ReplaceLine(TestBase):
	548	def runTest(self):
	549	k = Weave()
	550
	551	text0 = ['cheddar', 'stilton', 'gruyere']
	552	text1 = ['cheddar', 'blue vein', 'neufchatel', 'chevre']
	553
1083 by Martin Pool - add space to store revision-id in weave files	554	k.add('text0', [], text0)
	555	k.add('text1', [0], text1)
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	556
944 by Martin Pool - refactor member names in Weave code	557	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	558
0.1.59 by Martin Pool More modification tests	559	self.assertEqual(k.get(0), text0)
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	560	self.assertEqual(k.get(1), text1)
	561
0.1.64 by Martin Pool Add test for merging versions	562
	563
	564	class Merge(TestBase):
0.1.95 by Martin Pool - preliminary merge conflict detection	565	"""Storage of versions that merge diverged parents"""
0.1.64 by Martin Pool Add test for merging versions	566	def runTest(self):
	567	k = Weave()
	568
	569	texts = [['header'],
	570	['header', '', 'line from 1'],
	571	['header', '', 'line from 2', 'more from 2'],
	572	['header', '', 'line from 1', 'fixup line', 'line from 2'],
	573	]
	574
1083 by Martin Pool - add space to store revision-id in weave files	575	k.add('text0', [], texts[0])
	576	k.add('text1', [0], texts[1])
	577	k.add('text2', [0], texts[2])
	578	k.add('merge', [0, 1, 2], texts[3])
0.1.64 by Martin Pool Add test for merging versions	579
	580	for i, t in enumerate(texts):
	581	self.assertEqual(k.get(i), t)
	582
	583	self.assertEqual(k.annotate(3),
	584	[(0, 'header'),
	585	(1, ''),
	586	(1, 'line from 1'),
	587	(3, 'fixup line'),
	588	(2, 'line from 2'),
	589	])
	590
924 by Martin Pool - Add IntSet class	591	self.assertEqual(list(k.inclusions([3])),
924 by Martin Pool - Add IntSet class	592	[0, 1, 2, 3])
0.1.77 by Martin Pool New Weave.get_included() does transitive expansion	593
944 by Martin Pool - refactor member names in Weave code	594	self.log('k._weave=' + pformat(k._weave))
0.1.64 by Martin Pool Add test for merging versions	595
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	596	self.check_read_write(k)
0.1.65 by Martin Pool Add Weave.merge_iter to get automerged lines	597
	598
0.1.95 by Martin Pool - preliminary merge conflict detection	599	class Conflicts(TestBase):
	600	"""Test detection of conflicting regions during a merge.
	601
	602	A base version is inserted, then two descendents try to
	603	insert different lines in the same place. These should be
	604	reported as a possible conflict and forwarded to the user."""
	605	def runTest(self):
	606	return # NOT RUN
	607	k = Weave()
	608
	609	k.add([], ['aaa', 'bbb'])
	610	k.add([0], ['aaa', '111', 'bbb'])
	611	k.add([1], ['aaa', '222', 'bbb'])
	612
	613	merged = k.merge([1, 2])
	614
	615	self.assertEquals([[['aaa']],
	616	[['111'], ['222']],
	617	[['bbb']]])
	618
	619
	620
	621	class NonConflict(TestBase):
	622	"""Two descendants insert compatible changes.
	623
	624	No conflict should be reported."""
	625	def runTest(self):
	626	return # NOT RUN
	627	k = Weave()
	628
	629	k.add([], ['aaa', 'bbb'])
	630	k.add([0], ['111', 'aaa', 'ccc', 'bbb'])
	631	k.add([1], ['aaa', 'ccc', 'bbb', '222'])
	632
	633
	634
	635
	636
0.1.65 by Martin Pool Add Weave.merge_iter to get automerged lines	637	class AutoMerge(TestBase):
	638	def runTest(self):
	639	k = Weave()
	640
	641	texts = [['header', 'aaa', 'bbb'],
	642	['header', 'aaa', 'line from 1', 'bbb'],
	643	['header', 'aaa', 'bbb', 'line from 2', 'more from 2'],
	644	]
	645
1083 by Martin Pool - add space to store revision-id in weave files	646	k.add('text0', [], texts[0])
	647	k.add('text1', [0], texts[1])
	648	k.add('text2', [0], texts[2])
0.1.65 by Martin Pool Add Weave.merge_iter to get automerged lines	649
944 by Martin Pool - refactor member names in Weave code	650	self.log('k._weave=' + pformat(k._weave))
0.1.65 by Martin Pool Add Weave.merge_iter to get automerged lines	651
0.1.95 by Martin Pool - preliminary merge conflict detection	652	m = list(k.mash_iter([0, 1, 2]))
0.1.65 by Martin Pool Add Weave.merge_iter to get automerged lines	653
	654	self.assertEqual(m,
	655	['header', 'aaa',
	656	'line from 1',
	657	'bbb',
	658	'line from 2', 'more from 2'])
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	659
	660
	661
	662	class Khayyam(TestBase):
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	663	"""Test changes to multi-line texts, and read/write"""
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	664	def runTest(self):
	665	rawtexts = [
	666	"""A Book of Verses underneath the Bough,
	667	A Jug of Wine, a Loaf of Bread, -- and Thou
	668	Beside me singing in the Wilderness --
	669	Oh, Wilderness were Paradise enow!""",
	670
	671	"""A Book of Verses underneath the Bough,
	672	A Jug of Wine, a Loaf of Bread, -- and Thou
	673	Beside me singing in the Wilderness --
	674	Oh, Wilderness were Paradise now!""",
0.1.59 by Martin Pool More modification tests	675
	676	"""A Book of poems underneath the tree,
	677	A Jug of Wine, a Loaf of Bread,
	678	and Thou
	679	Beside me singing in the Wilderness --
	680	Oh, Wilderness were Paradise now!
	681
	682	-- O. Khayyam""",
	683
	684	"""A Book of Verses underneath the Bough,
	685	A Jug of Wine, a Loaf of Bread,
	686	and Thou
	687	Beside me singing in the Wilderness --
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	688	Oh, Wilderness were Paradise now!""",
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	689	]
	690	texts = [[l.strip() for l in t.split('\n')] for t in rawtexts]
	691
	692	k = Weave()
	693	parents = set()
1083 by Martin Pool - add space to store revision-id in weave files	694	i = 0
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	695	for t in texts:
1083 by Martin Pool - add space to store revision-id in weave files	696	ver = k.add('text%d' % i,
	697	list(parents), t)
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	698	parents.add(ver)
1083 by Martin Pool - add space to store revision-id in weave files	699	i += 1
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	700
944 by Martin Pool - refactor member names in Weave code	701	self.log("k._weave=" + pformat(k._weave))
0.1.59 by Martin Pool More modification tests	702
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	703	for i, t in enumerate(texts):
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	704	self.assertEqual(k.get(i), t)
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	705
0.1.75 by Martin Pool Remove VerInfo class; just store sets directly in the list of	706	self.check_read_write(k)
0.1.57 by Martin Pool Fix bug in an update edit that both deletes and inserts -- previously	707
	708
920 by Martin Pool - add more test cases for weave_merge	709
	710	class MergeCases(TestBase):
	711	def doMerge(self, base, a, b, mp):
	712	from cStringIO import StringIO
	713	from textwrap import dedent
	714
	715	def addcrlf(x):
	716	return x + '\n'
	717
	718	w = Weave()
1083 by Martin Pool - add space to store revision-id in weave files	719	w.add('text0', [], map(addcrlf, base))
	720	w.add('text1', [0], map(addcrlf, a))
	721	w.add('text2', [0], map(addcrlf, b))
920 by Martin Pool - add more test cases for weave_merge	722
935 by Martin Pool - log weave for merge tests to help debugging	723	self.log('weave is:')
	724	tmpf = StringIO()
	725	write_weave(w, tmpf)
	726	self.log(tmpf.getvalue())
	727
920 by Martin Pool - add more test cases for weave_merge	728	self.log('merge plan:')
	729	p = list(w.plan_merge(1, 2))
	730	for state, line in p:
	731	if line:
	732	self.log('%12s \| %s' % (state, line[:-1]))
	733
	734	self.log('merge:')
	735	mt = StringIO()
	736	mt.writelines(w.weave_merge(p))
	737	mt.seek(0)
	738	self.log(mt.getvalue())
	739
	740	mp = map(addcrlf, mp)
	741	self.assertEqual(mt.readlines(), mp)
	742
	743
	744	def testOneInsert(self):
	745	self.doMerge([],
	746	['aa'],
	747	[],
	748	['aa'])
	749
	750	def testSeparateInserts(self):
	751	self.doMerge(['aaa', 'bbb', 'ccc'],
	752	['aaa', 'xxx', 'bbb', 'ccc'],
	753	['aaa', 'bbb', 'yyy', 'ccc'],
	754	['aaa', 'xxx', 'bbb', 'yyy', 'ccc'])
	755
	756	def testSameInsert(self):
	757	self.doMerge(['aaa', 'bbb', 'ccc'],
	758	['aaa', 'xxx', 'bbb', 'ccc'],
	759	['aaa', 'xxx', 'bbb', 'yyy', 'ccc'],
	760	['aaa', 'xxx', 'bbb', 'yyy', 'ccc'])
	761
	762	def testOverlappedInsert(self):
	763	self.doMerge(['aaa', 'bbb'],
	764	['aaa', 'xxx', 'yyy', 'bbb'],
	765	['aaa', 'xxx', 'bbb'],
	766	['aaa', '<<<<', 'xxx', 'yyy', '====', 'xxx', '>>>>', 'bbb'])
	767
	768	# really it ought to reduce this to
	769	# ['aaa', 'xxx', 'yyy', 'bbb']
	770
	771
	772	def testClashReplace(self):
	773	self.doMerge(['aaa'],
	774	['xxx'],
	775	['yyy', 'zzz'],
	776	['<<<<', 'xxx', '====', 'yyy', 'zzz', '>>>>'])
	777
	778	def testNonClashInsert(self):
	779	self.doMerge(['aaa'],
	780	['xxx', 'aaa'],
	781	['yyy', 'zzz'],
	782	['<<<<', 'xxx', 'aaa', '====', 'yyy', 'zzz', '>>>>'])
	783
	784	self.doMerge(['aaa'],
	785	['aaa'],
	786	['yyy', 'zzz'],
	787	['yyy', 'zzz'])
945 by Martin Pool - add stubbed-out test for clashing replace and delete	788
	789
	790	def testDeleteAndModify(self):
	791	"""Clashing delete and modification.
	792
	793	If one side modifies a region and the other deletes it then
	794	there should be a conflict with one side blank.
	795	"""
	796
	797	#######################################
	798	# skippd, not working yet
	799	return
	800
	801	self.doMerge(['aaa', 'bbb', 'ccc'],
	802	['aaa', 'ddd', 'ccc'],
	803	['aaa', 'ccc'],
	804	['<<<<', 'aaa', '====', '>>>>', 'ccc'])
920 by Martin Pool - add more test cases for weave_merge	805
	806
	807
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	808	if __name__ == '__main__':
	809	import sys
1233 by Martin Pool - fix up weave tests for new test framework	810	import unittest
	811	sys.exit(unittest.main())
0.1.2 by Martin Pool Import testsweet module adapted from bzr.	812