File: NoteMapMergerTest.cs

package info (click to toggle)
monodevelop 3.0.3.2%2Bdfsg-1
  • links: PTS, VCS
  • area: main
  • in suites: wheezy
  • size: 153,256 kB
  • sloc: cs: 1,020,242; xml: 751,053; makefile: 9,596; sh: 1,529; objc: 302; sql: 129; ansic: 96
file content (490 lines) | stat: -rwxr-xr-x 18,803 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
/*
This code is derived from jgit (http://eclipse.org/jgit).
Copyright owners are documented in jgit's IP log.

This program and the accompanying materials are made available
under the terms of the Eclipse Distribution License v1.0 which
accompanies this distribution, is reproduced below, and is
available at http://www.eclipse.org/org/documents/edl-v10.php

All rights reserved.

Redistribution and use in source and binary forms, with or
without modification, are permitted provided that the following
conditions are met:

- Redistributions of source code must retain the above copyright
  notice, this list of conditions and the following disclaimer.

- Redistributions in binary form must reproduce the above
  copyright notice, this list of conditions and the following
  disclaimer in the documentation and/or other materials provided
  with the distribution.

- Neither the name of the Eclipse Foundation, Inc. nor the
  names of its contributors may be used to endorse or promote
  products derived from this software without specific prior
  written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

using NGit;
using NGit.Junit;
using NGit.Merge;
using NGit.Notes;
using NGit.Revwalk;
using Sharpen;

namespace NGit.Notes
{
	[NUnit.Framework.TestFixture]
	public class NoteMapMergerTest : RepositoryTestCase
	{
		private TestRepository<Repository> tr;

		private ObjectReader reader;

		private ObjectInserter inserter;

		private NoteMap noRoot;

		private NoteMap empty;

		private NoteMap map_a;

		private NoteMap map_a_b;

		private RevBlob noteAId;

		private string noteAContent;

		private RevBlob noteABlob;

		private RevBlob noteBId;

		private string noteBContent;

		private RevBlob noteBBlob;

		private RevCommit sampleTree_a;

		private RevCommit sampleTree_a_b;

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.SetUp]
		public override void SetUp()
		{
			base.SetUp();
			tr = new TestRepository<Repository>(db);
			reader = db.NewObjectReader();
			inserter = db.NewObjectInserter();
			noRoot = NoteMap.NewMap(null, reader);
			empty = NoteMap.NewEmptyMap();
			noteAId = tr.Blob("a");
			noteAContent = "noteAContent";
			noteABlob = tr.Blob(noteAContent);
			sampleTree_a = tr.Commit().Add(noteAId.Name, noteABlob).Create();
			tr.ParseBody(sampleTree_a);
			map_a = NoteMap.Read(reader, sampleTree_a);
			noteBId = tr.Blob("b");
			noteBContent = "noteBContent";
			noteBBlob = tr.Blob(noteBContent);
			sampleTree_a_b = tr.Commit().Add(noteAId.Name, noteABlob).Add(noteBId.Name, noteBBlob
				).Create();
			tr.ParseBody(sampleTree_a_b);
			map_a_b = NoteMap.Read(reader, sampleTree_a_b);
		}

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.TearDown]
		public override void TearDown()
		{
			reader.Release();
			inserter.Release();
			base.TearDown();
		}

		/// <exception cref="System.IO.IOException"></exception>
		[NUnit.Framework.Test]
		public virtual void TestNoChange()
		{
			NoteMapMerger merger = new NoteMapMerger(db, null, null);
			NoteMap result;
			NUnit.Framework.Assert.AreEqual(0, CountNotes(merger.Merge(noRoot, noRoot, noRoot
				)));
			NUnit.Framework.Assert.AreEqual(0, CountNotes(merger.Merge(empty, empty, empty)));
			result = merger.Merge(map_a, map_a, map_a);
			NUnit.Framework.Assert.AreEqual(1, CountNotes(result));
			NUnit.Framework.Assert.AreEqual(noteABlob, result.Get(noteAId));
		}

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.Test]
		public virtual void TestOursEqualsTheirs()
		{
			NoteMapMerger merger = new NoteMapMerger(db, null, null);
			NoteMap result;
			NUnit.Framework.Assert.AreEqual(0, CountNotes(merger.Merge(empty, noRoot, noRoot)
				));
			NUnit.Framework.Assert.AreEqual(0, CountNotes(merger.Merge(map_a, noRoot, noRoot)
				));
			NUnit.Framework.Assert.AreEqual(0, CountNotes(merger.Merge(noRoot, empty, empty))
				);
			NUnit.Framework.Assert.AreEqual(0, CountNotes(merger.Merge(map_a, empty, empty)));
			result = merger.Merge(noRoot, map_a, map_a);
			NUnit.Framework.Assert.AreEqual(1, CountNotes(result));
			NUnit.Framework.Assert.AreEqual(noteABlob, result.Get(noteAId));
			result = merger.Merge(empty, map_a, map_a);
			NUnit.Framework.Assert.AreEqual(1, CountNotes(result));
			NUnit.Framework.Assert.AreEqual(noteABlob, result.Get(noteAId));
			result = merger.Merge(map_a_b, map_a, map_a);
			NUnit.Framework.Assert.AreEqual(1, CountNotes(result));
			NUnit.Framework.Assert.AreEqual(noteABlob, result.Get(noteAId));
			result = merger.Merge(map_a, map_a_b, map_a_b);
			NUnit.Framework.Assert.AreEqual(2, CountNotes(result));
			NUnit.Framework.Assert.AreEqual(noteABlob, result.Get(noteAId));
			NUnit.Framework.Assert.AreEqual(noteBBlob, result.Get(noteBId));
		}

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.Test]
		public virtual void TestBaseEqualsOurs()
		{
			NoteMapMerger merger = new NoteMapMerger(db, null, null);
			NoteMap result;
			NUnit.Framework.Assert.AreEqual(0, CountNotes(merger.Merge(noRoot, noRoot, empty)
				));
			result = merger.Merge(noRoot, noRoot, map_a);
			NUnit.Framework.Assert.AreEqual(1, CountNotes(result));
			NUnit.Framework.Assert.AreEqual(noteABlob, result.Get(noteAId));
			NUnit.Framework.Assert.AreEqual(0, CountNotes(merger.Merge(empty, empty, noRoot))
				);
			result = merger.Merge(empty, empty, map_a);
			NUnit.Framework.Assert.AreEqual(1, CountNotes(result));
			NUnit.Framework.Assert.AreEqual(noteABlob, result.Get(noteAId));
			NUnit.Framework.Assert.AreEqual(0, CountNotes(merger.Merge(map_a, map_a, noRoot))
				);
			NUnit.Framework.Assert.AreEqual(0, CountNotes(merger.Merge(map_a, map_a, empty)));
			result = merger.Merge(map_a, map_a, map_a_b);
			NUnit.Framework.Assert.AreEqual(2, CountNotes(result));
			NUnit.Framework.Assert.AreEqual(noteABlob, result.Get(noteAId));
			NUnit.Framework.Assert.AreEqual(noteBBlob, result.Get(noteBId));
		}

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.Test]
		public virtual void TestBaseEqualsTheirs()
		{
			NoteMapMerger merger = new NoteMapMerger(db, null, null);
			NoteMap result;
			NUnit.Framework.Assert.AreEqual(0, CountNotes(merger.Merge(noRoot, empty, noRoot)
				));
			result = merger.Merge(noRoot, map_a, noRoot);
			NUnit.Framework.Assert.AreEqual(1, CountNotes(result));
			NUnit.Framework.Assert.AreEqual(noteABlob, result.Get(noteAId));
			NUnit.Framework.Assert.AreEqual(0, CountNotes(merger.Merge(empty, noRoot, empty))
				);
			result = merger.Merge(empty, map_a, empty);
			NUnit.Framework.Assert.AreEqual(1, CountNotes(result));
			NUnit.Framework.Assert.AreEqual(noteABlob, result.Get(noteAId));
			NUnit.Framework.Assert.AreEqual(0, CountNotes(merger.Merge(map_a, noRoot, map_a))
				);
			NUnit.Framework.Assert.AreEqual(0, CountNotes(merger.Merge(map_a, empty, map_a)));
			result = merger.Merge(map_a, map_a_b, map_a);
			NUnit.Framework.Assert.AreEqual(2, CountNotes(result));
			NUnit.Framework.Assert.AreEqual(noteABlob, result.Get(noteAId));
			NUnit.Framework.Assert.AreEqual(noteBBlob, result.Get(noteBId));
		}

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.Test]
		public virtual void TestAddDifferentNotes()
		{
			NoteMapMerger merger = new NoteMapMerger(db, null, null);
			NoteMap result;
			NoteMap map_a_c = NoteMap.Read(reader, sampleTree_a);
			RevBlob noteCId = tr.Blob("c");
			RevBlob noteCBlob = tr.Blob("noteCContent");
			map_a_c.Set(noteCId, noteCBlob);
			map_a_c.WriteTree(inserter);
			result = merger.Merge(map_a, map_a_b, map_a_c);
			NUnit.Framework.Assert.AreEqual(3, CountNotes(result));
			NUnit.Framework.Assert.AreEqual(noteABlob, result.Get(noteAId));
			NUnit.Framework.Assert.AreEqual(noteBBlob, result.Get(noteBId));
			NUnit.Framework.Assert.AreEqual(noteCBlob, result.Get(noteCId));
		}

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.Test]
		public virtual void TestAddSameNoteDifferentContent()
		{
			NoteMapMerger merger = new NoteMapMerger(db, new DefaultNoteMerger(), null);
			NoteMap result;
			NoteMap map_a_b1 = NoteMap.Read(reader, sampleTree_a);
			string noteBContent1 = noteBContent + "change";
			RevBlob noteBBlob1 = tr.Blob(noteBContent1);
			map_a_b1.Set(noteBId, noteBBlob1);
			map_a_b1.WriteTree(inserter);
			result = merger.Merge(map_a, map_a_b, map_a_b1);
			NUnit.Framework.Assert.AreEqual(2, CountNotes(result));
			NUnit.Framework.Assert.AreEqual(noteABlob, result.Get(noteAId));
			NUnit.Framework.Assert.AreEqual(tr.Blob(noteBContent + noteBContent1), result.Get
				(noteBId));
		}

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.Test]
		public virtual void TestEditSameNoteDifferentContent()
		{
			NoteMapMerger merger = new NoteMapMerger(db, new DefaultNoteMerger(), null);
			NoteMap result;
			NoteMap map_a1 = NoteMap.Read(reader, sampleTree_a);
			string noteAContent1 = noteAContent + "change1";
			RevBlob noteABlob1 = tr.Blob(noteAContent1);
			map_a1.Set(noteAId, noteABlob1);
			map_a1.WriteTree(inserter);
			NoteMap map_a2 = NoteMap.Read(reader, sampleTree_a);
			string noteAContent2 = noteAContent + "change2";
			RevBlob noteABlob2 = tr.Blob(noteAContent2);
			map_a2.Set(noteAId, noteABlob2);
			map_a2.WriteTree(inserter);
			result = merger.Merge(map_a, map_a1, map_a2);
			NUnit.Framework.Assert.AreEqual(1, CountNotes(result));
			NUnit.Framework.Assert.AreEqual(tr.Blob(noteAContent1 + noteAContent2), result.Get
				(noteAId));
		}

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.Test]
		public virtual void TestEditDifferentNotes()
		{
			NoteMapMerger merger = new NoteMapMerger(db, null, null);
			NoteMap result;
			NoteMap map_a1_b = NoteMap.Read(reader, sampleTree_a_b);
			string noteAContent1 = noteAContent + "change";
			RevBlob noteABlob1 = tr.Blob(noteAContent1);
			map_a1_b.Set(noteAId, noteABlob1);
			map_a1_b.WriteTree(inserter);
			NoteMap map_a_b1 = NoteMap.Read(reader, sampleTree_a_b);
			string noteBContent1 = noteBContent + "change";
			RevBlob noteBBlob1 = tr.Blob(noteBContent1);
			map_a_b1.Set(noteBId, noteBBlob1);
			map_a_b1.WriteTree(inserter);
			result = merger.Merge(map_a_b, map_a1_b, map_a_b1);
			NUnit.Framework.Assert.AreEqual(2, CountNotes(result));
			NUnit.Framework.Assert.AreEqual(noteABlob1, result.Get(noteAId));
			NUnit.Framework.Assert.AreEqual(noteBBlob1, result.Get(noteBId));
		}

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.Test]
		public virtual void TestDeleteDifferentNotes()
		{
			NoteMapMerger merger = new NoteMapMerger(db, null, null);
			NoteMap map_b = NoteMap.Read(reader, sampleTree_a_b);
			map_b.Set(noteAId, null);
			// delete note a
			map_b.WriteTree(inserter);
			NUnit.Framework.Assert.AreEqual(0, CountNotes(merger.Merge(map_a_b, map_a, map_b)
				));
		}

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.Test]
		public virtual void TestEditDeleteConflict()
		{
			NoteMapMerger merger = new NoteMapMerger(db, new DefaultNoteMerger(), null);
			NoteMap result;
			NoteMap map_a_b1 = NoteMap.Read(reader, sampleTree_a_b);
			string noteBContent1 = noteBContent + "change";
			RevBlob noteBBlob1 = tr.Blob(noteBContent1);
			map_a_b1.Set(noteBId, noteBBlob1);
			map_a_b1.WriteTree(inserter);
			result = merger.Merge(map_a_b, map_a_b1, map_a);
			NUnit.Framework.Assert.AreEqual(2, CountNotes(result));
			NUnit.Framework.Assert.AreEqual(noteABlob, result.Get(noteAId));
			NUnit.Framework.Assert.AreEqual(noteBBlob1, result.Get(noteBId));
		}

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.Test]
		public virtual void TestLargeTreesWithoutConflict()
		{
			NoteMapMerger merger = new NoteMapMerger(db, null, null);
			NoteMap map1 = CreateLargeNoteMap("note_1_", "content_1_", 300, 0);
			NoteMap map2 = CreateLargeNoteMap("note_2_", "content_2_", 300, 0);
			NoteMap result = merger.Merge(empty, map1, map2);
			NUnit.Framework.Assert.AreEqual(600, CountNotes(result));
			// check a few random notes
			NUnit.Framework.Assert.AreEqual(tr.Blob("content_1_59"), result.Get(tr.Blob("note_1_59"
				)));
			NUnit.Framework.Assert.AreEqual(tr.Blob("content_2_10"), result.Get(tr.Blob("note_2_10"
				)));
			NUnit.Framework.Assert.AreEqual(tr.Blob("content_2_99"), result.Get(tr.Blob("note_2_99"
				)));
		}

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.Test]
		public virtual void TestLargeTreesWithConflict()
		{
			NoteMapMerger merger = new NoteMapMerger(db, new DefaultNoteMerger(), null);
			NoteMap largeTree1 = CreateLargeNoteMap("note_1_", "content_1_", 300, 0);
			NoteMap largeTree2 = CreateLargeNoteMap("note_1_", "content_2_", 300, 0);
			NoteMap result = merger.Merge(empty, largeTree1, largeTree2);
			NUnit.Framework.Assert.AreEqual(300, CountNotes(result));
			// check a few random notes
			NUnit.Framework.Assert.AreEqual(tr.Blob("content_1_59content_2_59"), result.Get(tr
				.Blob("note_1_59")));
			NUnit.Framework.Assert.AreEqual(tr.Blob("content_1_10content_2_10"), result.Get(tr
				.Blob("note_1_10")));
			NUnit.Framework.Assert.AreEqual(tr.Blob("content_1_99content_2_99"), result.Get(tr
				.Blob("note_1_99")));
		}

		/// <exception cref="System.Exception"></exception>
		private NoteMap CreateLargeNoteMap(string noteNamePrefix, string noteContentPrefix
			, int notesCount, int firstIndex)
		{
			NoteMap result = NoteMap.NewEmptyMap();
			for (int i = 0; i < notesCount; i++)
			{
				result.Set(tr.Blob(noteNamePrefix + (firstIndex + i)), tr.Blob(noteContentPrefix 
					+ (firstIndex + i)));
			}
			result.WriteTree(inserter);
			return result;
		}

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.Test]
		public virtual void TestFanoutAndLeafWithoutConflict()
		{
			NoteMapMerger merger = new NoteMapMerger(db, null, null);
			NoteMap largeTree = CreateLargeNoteMap("note_1_", "content_1_", 300, 0);
			NoteMap result = merger.Merge(map_a, map_a_b, largeTree);
			NUnit.Framework.Assert.AreEqual(301, CountNotes(result));
		}

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.Test]
		public virtual void TestFanoutAndLeafWitConflict()
		{
			NoteMapMerger merger = new NoteMapMerger(db, new DefaultNoteMerger(), null);
			NoteMap largeTree_b1 = CreateLargeNoteMap("note_1_", "content_1_", 300, 0);
			string noteBContent1 = noteBContent + "change";
			largeTree_b1.Set(noteBId, tr.Blob(noteBContent1));
			largeTree_b1.WriteTree(inserter);
			NoteMap result = merger.Merge(map_a, map_a_b, largeTree_b1);
			NUnit.Framework.Assert.AreEqual(301, CountNotes(result));
			NUnit.Framework.Assert.AreEqual(tr.Blob(noteBContent + noteBContent1), result.Get
				(noteBId));
		}

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.Test]
		public virtual void TestCollapseFanoutAfterMerge()
		{
			NoteMapMerger merger = new NoteMapMerger(db, null, null);
			NoteMap largeTree = CreateLargeNoteMap("note_", "content_", 257, 0);
			NUnit.Framework.Assert.IsTrue(largeTree.GetRoot() is FanoutBucket);
			NoteMap deleteFirstHundredNotes = CreateLargeNoteMap("note_", "content_", 157, 100
				);
			NoteMap deleteLastHundredNotes = CreateLargeNoteMap("note_", "content_", 157, 0);
			NoteMap result = merger.Merge(largeTree, deleteFirstHundredNotes, deleteLastHundredNotes
				);
			NUnit.Framework.Assert.AreEqual(57, CountNotes(result));
			NUnit.Framework.Assert.IsTrue(result.GetRoot() is LeafBucket);
		}

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.Test]
		public virtual void TestNonNotesWithoutNonNoteConflict()
		{
			NoteMapMerger merger = new NoteMapMerger(db, null, MergeStrategy.RESOLVE);
			RevCommit treeWithNonNotes = tr.Commit().Add(noteAId.Name, noteABlob).Add("a.txt"
				, tr.Blob("content of a.txt")).Create();
			// this is a note
			// this is a non-note
			tr.ParseBody(treeWithNonNotes);
			NoteMap @base = NoteMap.Read(reader, treeWithNonNotes);
			treeWithNonNotes = tr.Commit().Add(noteAId.Name, noteABlob).Add("a.txt", tr.Blob(
				"content of a.txt")).Add("b.txt", tr.Blob("content of b.txt")).Create();
			tr.ParseBody(treeWithNonNotes);
			NoteMap ours = NoteMap.Read(reader, treeWithNonNotes);
			treeWithNonNotes = tr.Commit().Add(noteAId.Name, noteABlob).Add("a.txt", tr.Blob(
				"content of a.txt")).Add("c.txt", tr.Blob("content of c.txt")).Create();
			tr.ParseBody(treeWithNonNotes);
			NoteMap theirs = NoteMap.Read(reader, treeWithNonNotes);
			NoteMap result = merger.Merge(@base, ours, theirs);
			NUnit.Framework.Assert.AreEqual(3, CountNonNotes(result));
		}

		/// <exception cref="System.Exception"></exception>
		[NUnit.Framework.Test]
		public virtual void TestNonNotesWithNonNoteConflict()
		{
			NoteMapMerger merger = new NoteMapMerger(db, null, MergeStrategy.RESOLVE);
			RevCommit treeWithNonNotes = tr.Commit().Add(noteAId.Name, noteABlob).Add("a.txt"
				, tr.Blob("content of a.txt")).Create();
			// this is a note
			// this is a non-note
			tr.ParseBody(treeWithNonNotes);
			NoteMap @base = NoteMap.Read(reader, treeWithNonNotes);
			treeWithNonNotes = tr.Commit().Add(noteAId.Name, noteABlob).Add("a.txt", tr.Blob(
				"change 1")).Create();
			tr.ParseBody(treeWithNonNotes);
			NoteMap ours = NoteMap.Read(reader, treeWithNonNotes);
			treeWithNonNotes = tr.Commit().Add(noteAId.Name, noteABlob).Add("a.txt", tr.Blob(
				"change 2")).Create();
			tr.ParseBody(treeWithNonNotes);
			NoteMap theirs = NoteMap.Read(reader, treeWithNonNotes);
			try
			{
				merger.Merge(@base, ours, theirs);
				NUnit.Framework.Assert.Fail("NotesMergeConflictException was expected");
			}
			catch (NotesMergeConflictException)
			{
			}
		}

		// expected
		private static int CountNotes(NoteMap map)
		{
			int c = 0;
			Iterator<Note> it = map.Iterator();
			while (it.HasNext())
			{
				it.Next();
				c++;
			}
			return c;
		}

		private static int CountNonNotes(NoteMap map)
		{
			int c = 0;
			NonNoteEntry nonNotes = map.GetRoot().nonNotes;
			while (nonNotes != null)
			{
				c++;
				nonNotes = nonNotes.next;
			}
			return c;
		}
	}
}