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
|
/*******************************************************************************
* Copyright (c) 2010 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.compare.tests;
import junit.framework.TestCase;
import org.eclipse.compare.contentmergeviewer.ITokenComparator;
import org.eclipse.compare.internal.DocLineComparator;
import org.eclipse.compare.rangedifferencer.RangeDifference;
import org.eclipse.compare.rangedifferencer.RangeDifferencer;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.text.Document;
public class RangeDifferencerThreeWayDiffTest extends TestCase {
static final String S= System.getProperty("line.separator"); //$NON-NLS-1$
public RangeDifferencerThreeWayDiffTest(String name) {
super(name);
}
public void testInsertConflict() {
String a = "A" + S + "B" + S + "C" + S + "D"; //$NON-NLS-1$
String l = "A" + S + "B" + S + "x" + S + "C" + S + "D"; //$NON-NLS-1$
String r = "A" + S + "B" + S + "y" + S + "C" + S + "D"; //$NON-NLS-1$
RangeDifference[] diffs= findRange(a, l, r);
assertEquals(3, diffs.length);
assertEquals(RangeDifference.NOCHANGE, diffs[0].kind());
assertEquals(RangeDifference.CONFLICT, diffs[1].kind());
assertEquals(RangeDifference.NOCHANGE, diffs[2].kind());
}
public void testChangeConflict() {
String a = "A" + S + "B" + S + "C" + S + "D"; //$NON-NLS-1$
String l = "A" + S + "b1" + S + "C" + S + "D"; //$NON-NLS-1$
String r = "A" + S + "b2" + S + "C" + S + "D"; //$NON-NLS-1$
RangeDifference[] diffs= findRange(a, l, r);
assertEquals(3, diffs.length);
assertEquals(RangeDifference.NOCHANGE, diffs[0].kind());
assertEquals(RangeDifference.CONFLICT, diffs[1].kind());
assertEquals(RangeDifference.NOCHANGE, diffs[2].kind());
}
public void testDeleteAndChangeConflict() {
String a = "A" + S + "B" + S + "C"; //$NON-NLS-1$
String l = "A" + S + "C"; //$NON-NLS-1$
String r = "A" + S + "b1" + S + "C"; //$NON-NLS-1$
RangeDifference[] diffs= findRange(a, l, r);
assertEquals(3, diffs.length);
assertEquals(RangeDifference.NOCHANGE, diffs[0].kind());
assertEquals(RangeDifference.CONFLICT, diffs[1].kind());
assertEquals(RangeDifference.NOCHANGE, diffs[2].kind());
}
public void testInsertWithinMultilineChangeConflict() {
String a = "A" + S + "B" + S + "C" + S + "D"; //$NON-NLS-1$
String l = "A" + S + "B" + S + "x" + S + "C" + S + "D"; //$NON-NLS-1$
String r = "A" + S + "x" + S + "y" + S + "D"; //$NON-NLS-1$
RangeDifference[] diffs= findRange(a, l, r);
assertEquals(3, diffs.length);
assertEquals(RangeDifference.NOCHANGE, diffs[0].kind());
assertEquals(RangeDifference.CONFLICT, diffs[1].kind());
assertEquals(RangeDifference.NOCHANGE, diffs[2].kind());
}
public void testAdjoiningChangesNoConflict() {
String a = "A" + S + "B" + S + "C" + S + "D"; //$NON-NLS-1$
String l = "A" + S + "b1" + S + "C" + S + "D"; //$NON-NLS-1$
String r = "A" + S + "B" + S + "c1" + S + "D"; //$NON-NLS-1$
RangeDifference[] diffs= findRange(a, l, r);
assertEquals(4, diffs.length);
assertEquals(RangeDifference.NOCHANGE, diffs[0].kind());
assertEquals(RangeDifference.LEFT, diffs[1].kind());
assertEquals(RangeDifference.RIGHT, diffs[2].kind());
assertEquals(RangeDifference.NOCHANGE, diffs[3].kind());
}
public void testAdjoiningInsertAndChangeNoConflict() {
String a = "A" + S + "B" + S + "C" + S + "D"; //$NON-NLS-1$
String l = "A" + S + "B" + S + "x" + S + "C" + S + "D"; //$NON-NLS-1$
String r = "A" + S + "B" + S + "c1" + S + "D"; //$NON-NLS-1$
RangeDifference[] diffs= findRange(a, l, r);
assertEquals(4, diffs.length);
assertEquals(RangeDifference.NOCHANGE, diffs[0].kind());
assertEquals(RangeDifference.LEFT, diffs[1].kind());
assertEquals(RangeDifference.RIGHT, diffs[2].kind());
assertEquals(RangeDifference.NOCHANGE, diffs[3].kind());
}
public void testAdjoiningMultilineChangeNoConflict() {
String a = "A" + S + "B" + S + "C" + S + "D"; //$NON-NLS-1$
String l = "A" + S + "x" + S + "y" + S + "D"; //$NON-NLS-1$
String r = "A" + S + "B" + S + "C" + S + "d1"; //$NON-NLS-1$
RangeDifference[] diffs= findRange(a, l, r);
assertEquals(3, diffs.length);
assertEquals(RangeDifference.NOCHANGE, diffs[0].kind());
assertEquals(RangeDifference.LEFT, diffs[1].kind());
assertEquals(RangeDifference.RIGHT, diffs[2].kind());
}
private RangeDifference[] findRange(String a, String l, String r) {
ITokenComparator ancestor= new DocLineComparator(new Document(a), null, false);
ITokenComparator left= new DocLineComparator(new Document(l), null, false);
ITokenComparator right= new DocLineComparator(new Document(r), null, false);
return RangeDifferencer.findRanges(new NullProgressMonitor(), ancestor, left, right);
}
}
|
