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
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
|
/*******************************************************************************
* Copyright (c) 2014, 2015 EclipseSource Muenchen GmbH and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Philip Langer - initial API and implementation
*******************************************************************************/
package org.eclipse.emf.compare.tests.diff;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
import org.eclipse.emf.compare.internal.ThreeWayTextDiff;
import org.junit.Test;
/**
* Tests the {@link ThreeWayTextDiff three-way text differencing utility}.
*
* @author Philip Langer <planger@eclipsesource.com>
*/
@SuppressWarnings({"nls", "restriction" })
public class ThreeWayTextDiffTest {
private static final String NL = "\n";
@Test
public void changeSingleLineTextOnOneSide() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?";
final String left = "They don't call it a Quarter Pounder with Cheese?";
final String right = "They do not call it a Quarter Pounder with Cheese?"; // changed
final String merged = right;
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void setSingleLineTextOnOneSide() throws IOException {
final String origin = null;
final String left = "They don't call it a Quarter Pounder with Cheese?";
final String right = null;
final String merged = left;
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void addSingleLineTextOnOneSide() throws IOException {
final String origin = "";
final String left = "They don't call it a Quarter Pounder with Cheese?";
final String right = "";
final String merged = left;
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void changeSingleLineTextOnBothSides() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?";
final String left = "They don't call it a Quarter Pounder?"; // changed
final String right = "They do not call it a Quarter Pounder with Cheese?"; // changed
assertConflictingBidirectional(origin, left, right);
}
@Test
public void unsetSingleLineTextOnOneSide() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?";
final String left = "They don't call it a Quarter Pounder with Cheese?";
final String right = null; // removed
final String merged = right;
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void removeSingleLineTextOnOneSide() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?";
final String left = "They don't call it a Quarter Pounder with Cheese?";
final String right = ""; // removed
final String merged = right;
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void changeAndRemoveSingleLine() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?";
final String left = "";
final String right = "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is.";
assertConflictingBidirectional(origin, left, right);
}
@Test
public void addDifferentSingleLineTextOnBothSide() throws IOException {
final String origin = "";
final String left = "They don't call it a Quarter Pounder with Cheese?";
final String right = "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is.";
assertConflictingBidirectional(origin, left, right);
}
@Test
public void changeAndRemoveLinesInMultiLineTextOnOneSide() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What do they call it?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?" + NL //
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
final String left = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What do they call it?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?" + NL //
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
final String right = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What _do_ they call it?" + NL // changed
+ "They call it a Royale with Cheese." + NL //
+ "" // removed
+ "That's right." + NL //
+ "What do they call a Big Mac?" + NL //
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
final String merged = right;
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void changeAndRemoveDifferentLinesInMultiLineOnTextBothSides() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What do they call it?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?" + NL //
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
final String left = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What do they call it?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a \"Big Mac\"?" // changed
+ ""; // removed
final String right = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What _do_ they call it?" + NL // changed
+ "They call it a Royale with Cheese." + NL //
+ "" // removed
+ "That's right." + NL //
+ "What do they call a Big Mac?" + NL //
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
final String merged = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What _do_ they call it?" + NL // changed right
+ "They call it a Royale with Cheese." + NL //
+ "" // removed right
+ "That's right." + NL //
+ "What do they call a \"Big Mac\"?" // changed left
+ ""; // removed left
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void changeSameLineInMultiLineTextOnBothSides() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What do they call it?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?" + NL //
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
final String left = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What do they call it?" + NL //
+ "They call it a \"Royale with Cheese\"." + NL // changed
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?" + NL //
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
final String right = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What do they call it?" + NL //
+ "They'd call it a Royale with Cheese." + NL // changed
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?" + NL //
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
assertConflictingBidirectional(origin, left, right);
}
@Test
public void changeLineAndRemoveSameLineInMultiLineText() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What do they call it?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?" + NL //
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
final String left = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What do they call it?" + NL //
+ "They call it a \"Royale with Cheese\"." + NL // changed
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?" + NL //
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
final String right = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What do they call it?" + NL //
+ "" // removed
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?" + NL //
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
assertConflictingBidirectional(origin, left, right);
}
@Test
public void changeLineAndRemoveSameAreaInMultiLineTextOnBothSides() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What do they call it?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?" + NL //
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
final String left = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What do they call it?" + NL //
+ "They call it a \"Royale with Cheese\"." + NL // changed
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?" + NL //
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
final String right = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "" // deleted
+ "" // deleted
+ "" // deleted
+ "" // deleted
+ "What _do_ they call a Big Mac?" + NL // changed
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
assertConflictingBidirectional(origin, left, right);
}
@Test
public void changeLineAndAddMultipleLinesInSameAreaInMultiLineTextOnBothSides() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What do they call it?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?" + NL //
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
final String left = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What do they call it?" + NL //
+ "They call it a \"Royale with Cheese\"." + NL // changed
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?" + NL //
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
final String right = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What do they call it?" + NL //
+ "I asked, what do they call it?" + NL // changed
+ "Do you hear me?" + NL // added
+ "They call it a Royale with Cheese." + NL //
+ "Alright." + NL // added
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?" + NL //
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
final String merged = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL //
+ "What do they call it?" + NL //
+ "I asked, what do they call it?" + NL // changed right
+ "Do you hear me?" + NL // added right
+ "They call it a \"Royale with Cheese\"." + NL // changed left
+ "Alright." + NL // added right
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?" + NL //
+ "A Big Mac's a Big Mac, but they call it Le Big Mac.";
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void addDifferentLineAtSameLineInMultiLineText() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right.";
final String left = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL // added
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right.";
final String right = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "What do they call it?" + NL // added
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right.";
assertConflictingBidirectional(origin, left, right);
}
@Test
public void addDifferentLineAtTheBeginningInMultiLineText() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
final String left = "Whose chopper is this?" + NL // added
+ "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
final String right = "Who's Zed?" + NL // added
+ "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
assertConflictingBidirectional(origin, left, right);
}
@Test
public void addDifferentLineAtTheEndOfMultiLineText() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
final String left = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Whose chopper is this?" + NL; // added
final String right = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Who's Zed?" + NL; // added
assertConflictingBidirectional(origin, left, right);
}
@Test
public void addDifferentMultipleLinesAtTheBeginningInMultiLineText() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
final String left = "Whose chopper is this?" + NL // added same as right
+ "It's Zed's!" + NL // added same as right
+ "Who is Zed?" + NL // added different from right
+ "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
final String right = "Whose chopper is this?" + NL // added same as left
+ "It's Zed's!" + NL // added same as left
+ "Who's Zed?" + NL // added different from left
+ "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
assertConflictingBidirectional(origin, left, right);
}
@Test
public void addSameMultipleLinesAtTheBeginningOfFirstLineInMultiLineText() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
final String left = "Whose chopper is this?" + NL // added same as right
+ "It's Zed's!" + NL // added same as right
+ "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
final String right = "Whose chopper is this?" + NL // added same as left
+ "It's Zed's!" + NL // added same as left
+ "Who's Zed?" + NL // added additionally to left
+ "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
// The merge result should be the right side, since right inserts an additional line and the rest are
// equal insertions
final String merged = right;
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void addSameMultipleLinesAtTheBeginningAndChangeOfFirstLineInMultiLineText() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
final String left = "Whose chopper is this?" + NL // added same as right
+ "It's Zed's!" + NL // added same as right
+ "They do not call it a Quarter Pounder with Cheese?" + NL // changed
+ "They call it a Royale with Cheese.";
final String right = "Whose chopper is this?" + NL // added same as left
+ "It's Zed's!" + NL // added same as left
+ "Who's Zed?" + NL // added additionally to left
+ "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
final String merged = "Whose chopper is this?" + NL // added
+ "It's Zed's!" + NL // added
+ "Who's Zed?" + NL // added additionally to left
+ "They do not call it a Quarter Pounder with Cheese?" + NL // changed left
+ "They call it a Royale with Cheese.";
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void addSameMultipleLinesAtTheBeginningAndChangeOfFirstLine2InMultiLineText() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
final String left = "Whose chopper is this?"
+ NL // added same as right
+ "It's Zed's!"
+ NL // added same as right
+ "They don't call it a Quarter Pounder with Cheese?" + NL
+ "They call it a Royale with Cheese.";
final String right = "Whose chopper is this?" + NL // added same as left
+ "It's Zed's!" + NL // added same as left
+ "Who's Zed?" + NL // added additionally to left
+ "They do not call it a Quarter Pounder with Cheese?" + NL // changed
+ "They call it a Royale with Cheese.";
final String merged = "Whose chopper is this?" + NL // added
+ "It's Zed's!" + NL // added
+ "Who's Zed?" + NL // added additionally to left
+ "They do not call it a Quarter Pounder with Cheese?" + NL // changed left
+ "They call it a Royale with Cheese.";
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void addDifferentLinesAtTheBeginningInMultiLineText() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
final String left = "Whose chopper is this?" + NL // added
+ "Whose chopper is this?" + NL // added
+ "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
final String right = "Who's Zed?" + NL // added
+ "It's Zed's." + NL // added
+ "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
assertConflictingBidirectional(origin, left, right);
}
@Test
public void addSameLineAtTheBeginningInMultiLineText() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
final String left = "Who's Zed?" + NL // added
+ "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
final String right = "Who's Zed?" + NL // added
+ "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese.";
final String merged = right;
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void changeAndAddDifferentLinesOnBothSides() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right.";
final String left = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system.1" + NL // added
+ "Nah, they got the metric system.2" + NL // added
+ "Nah, they got the metric system.3" + NL // added
+ "They call it a \"Royale\" with Cheese." + NL // changed
+ "Royale with Cheese." + NL //
+ "That's right.";
final String right = "What do they call it?" + NL // changed
+ "They call it a Royale with Cheese." + NL//
+ "Royale with Cheese." + NL //
+ "That's right!"; // changed
final String merged = "What do they call it?" + NL // changed line 1 from right
+ "Nah, they got the metric system.1" + NL // added left
+ "Nah, they got the metric system.2" + NL // added left
+ "Nah, they got the metric system.3" + NL // added left
+ "They call it a \"Royale\" with Cheese." + NL// changed line 3 from left
+ "Royale with Cheese." + NL // unchanged on both sides
+ "That's right!"; // changed right
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void addDifferentLineAtDifferentLineInMultiLineText() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right.";
final String left = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL // added
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right.";
final String right = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?"; // added
final String merged = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL // added
// left
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?"; // added right;
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void addSameLineAtSameLineOnBothSidesInMultiLineText() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Royale with Cheese." + NL //
+ "That's right.";
final String left = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese." + NL // added
+ "Royale with Cheese." + NL //
+ "That's right!!!"; // changed
final String right = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese." + NL // added
+ "Royale with Cheese." + NL //
+ "That's right.";
final String merged = left; // right didn't contribute a unique change
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void changeSameLineToSameContentOnBothSidesInMultiLineText() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right.";
final String left = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese!!!" + NL // changed
+ "Royale with Cheese." + NL //
+ "That's right!!!" + NL // changed
+ "They call it a Royale with Cheese!!!"; // added
final String right = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese!!!" + NL // changed
+ "Royale with Cheese." + NL //
+ "That's right.";
final String merged = left; // right didn't contribute a unique change
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void removeAndChangeVersusSameChangeInMultiLineText() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right.";
final String left = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Royale with Cheese." + NL //
+ "That's right!"; // changed
final String right = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right!"; // changed
final String merged = left; // right didn't contribute a unique change
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void removeSameLineOnBothSidesInMultiLineText() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right.";
final String left = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "" // removed
+ "Royale with Cheese." + NL //
+ "That's right!!!"; // changed
final String right = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "" // removed
+ "Royale with Cheese." + NL //
+ "That's right.";
final String merged = left; // right didn't contribute a unique change
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
@Test
public void removeLineAndAddLineAtSameLineInMultiLineText() throws IOException {
final String origin = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right.";
final String left = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL // added
+ "They call it a Royale with Cheese." + NL //
+ "Royale with Cheese." + NL //
+ "That's right.";
final String right = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "" // removed
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?"; // added
final String merged = "They don't call it a Quarter Pounder with Cheese?" + NL //
+ "Nah, they got the metric system, they wouldn't know what a Quarter Pounder is." + NL // added
// left
+ "" // removed right
+ "Royale with Cheese." + NL //
+ "That's right." + NL //
+ "What do they call a Big Mac?"; // added right
assertNonConflictingBidirectional(origin, left, right);
assertMergedBidirectional(origin, left, right, merged);
}
private void assertNonConflictingBidirectional(String origin, String left, String right) {
assertNonConflicting(origin, left, right);
assertNonConflicting(origin, right, left);
}
private void assertNonConflicting(String origin, String left, String right) {
final ThreeWayTextDiff diff = new ThreeWayTextDiff(origin, left, right);
assertFalse(diff.isConflicting());
}
private void assertConflictingBidirectional(String origin, String left, String right) {
assertConflicting(origin, left, right);
assertConflicting(origin, right, left);
}
private void assertConflicting(String origin, String left, String right) {
final ThreeWayTextDiff diff = new ThreeWayTextDiff(origin, left, right);
assertTrue(diff.isConflicting());
}
private void assertMergedBidirectional(String origin, String left, String right, String merged) {
assertMerged(origin, left, right, merged);
assertMerged(origin, right, left, merged);
}
private void assertMerged(String origin, String left, String right, String merged) {
final ThreeWayTextDiff diff = new ThreeWayTextDiff(origin, left, right);
assertEquals(merged, diff.getMerged());
}
}
|
