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
|
/*******************************************************************************
* Copyright (c) 2016 EclipseSource Services 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:
* Martin Fleck - initial API and implementation
*******************************************************************************/
package org.eclipse.emf.compare.tests.merge;
import static org.eclipse.emf.compare.DifferenceState.MERGED;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import java.util.Arrays;
import java.util.Set;
import org.eclipse.emf.common.util.BasicMonitor;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.internal.spec.DiffSpec;
import org.eclipse.emf.compare.merge.AbstractMerger;
import org.eclipse.emf.compare.merge.BatchMerger;
import org.eclipse.emf.compare.merge.IMerger;
import org.eclipse.emf.compare.merge.IMerger2;
import org.junit.Before;
import org.junit.Test;
/**
* Tests the implication relationship between differences. In EMF Compare, implication means that we always
* merge the antecedent (A) instead of the consequent (B) in a relationship A implies B. B is considered
* merged if A is merged and therefore requires no merging of its own.
*
* @author <a href="mailto:mfleck@eclipsesource.com">Martin Fleck</a>
*/
public class ImplicationsMergeTest {
private static final boolean MERGE_RIGHT_TO_LEFT = false;
private final IMerger.Registry mergerRegistry = IMerger.RegistryImpl.createStandaloneInstance();
private final BatchMerger batchMerger = new BatchMerger(mergerRegistry);
@Before
public void setUp() {
mergerRegistry.add(new AbstractMerger() {
public boolean isMergerFor(Diff target) {
return true;
}
});
}
protected IMerger2 getMerger(Diff diff) {
return (IMerger2)mergerRegistry.getHighestRankingMerger(diff);
}
protected void mergeLeftToRight(Diff diff) {
batchMerger.copyAllLeftToRight(Arrays.asList(diff), new BasicMonitor());
}
protected Set<Diff> getDirectResultingMerges(Diff diff) {
return getMerger(diff).getDirectResultingMerges(diff, MERGE_RIGHT_TO_LEFT);
}
/**
* Tests: A => B <br/>
* Merge: A <br/>
* Resulting Merges: A, B <br/>
* A implies B, therefore if we merge A, B is set to MERGED automatically.
*/
@Test
public void testsAImpliesBMergeA() {
Diff diffA = createDiff("DiffA"); //$NON-NLS-1$
Diff diffB = createDiff("DiffB"); //$NON-NLS-1$
diffA.getImplies().add(diffB);
Set<Diff> resultingMerges = getDirectResultingMerges(diffA);
assertEquals(1, resultingMerges.size());
assertSame(diffB, resultingMerges.iterator().next());
resultingMerges = getDirectResultingMerges(diffB);
assertEquals(1, resultingMerges.size());
assertSame(diffA, resultingMerges.iterator().next());
mergeLeftToRight(diffA);
assertEquals(MERGED, diffA.getState());
assertEquals(MERGED, diffB.getState());
}
/**
* Tests: A => B <br/>
* Merge: B <br/>
* Resulting Merges: A, B <br/>
* In EMF Compare, implication means that we always merge the antecedent (A) instead of the consequent
* (B), i.e., B requires no merging. Therefore A is merged and B is set to MERGED automatically.
*/
@Test
public void testsAImpliesBMergeB() {
Diff diffA = createDiff("DiffA"); //$NON-NLS-1$
Diff diffB = createDiff("DiffB"); //$NON-NLS-1$
diffA.getImplies().add(diffB);
Set<Diff> resultingMerges = getDirectResultingMerges(diffA);
assertEquals(1, resultingMerges.size());
assertSame(diffB, resultingMerges.iterator().next());
resultingMerges = getDirectResultingMerges(diffB);
assertEquals(1, resultingMerges.size());
assertSame(diffA, resultingMerges.iterator().next());
mergeLeftToRight(diffB);
assertEquals(MERGED, diffA.getState());
assertEquals(MERGED, diffB.getState());
}
/**
* Tests: A => B, B => C <br/>
* Merge: A <br/>
* Resulting Merges: A, B, C <br/>
* A implies B, therefore if we merge A, B is set to MERGED automatically (requires no merging). Since B
* also implies C, C is also set to MERGED automatically.
*/
@Test
public void testsAImpliesBImpliesCMergeA() {
Diff diffA = createDiff("DiffA"); //$NON-NLS-1$
Diff diffB = createDiff("DiffB"); //$NON-NLS-1$
Diff diffC = createDiff("DiffC"); //$NON-NLS-1$
diffA.getImplies().add(diffB);
diffB.getImplies().add(diffC);
Set<Diff> resultingMerges = getDirectResultingMerges(diffA);
assertEquals(1, resultingMerges.size());
assertSame(diffB, resultingMerges.iterator().next());
resultingMerges = getDirectResultingMerges(diffB);
assertEquals(2, resultingMerges.size());
assertTrue(resultingMerges.contains(diffA));
assertTrue(resultingMerges.contains(diffC));
resultingMerges = getDirectResultingMerges(diffC);
assertEquals(1, resultingMerges.size());
assertTrue(resultingMerges.contains(diffB));
mergeLeftToRight(diffA);
assertEquals(MERGED, diffA.getState());
assertEquals(MERGED, diffB.getState());
assertEquals(MERGED, diffC.getState());
}
/**
* Tests: A => B, B => C <br/>
* Merge: B <br/>
* Resulting Merges: A, B, C <br/>
* In EMF Compare, implication means that we always merge A instead of B (B requires no merging),
* therefore A is merged and B is set to MERGED automatically. B also implies C, so C is also set to
* MERGED automatically.
*/
@Test
public void testsAImpliesBImpliesCMergeB() {
Diff diffA = createDiff("DiffA"); //$NON-NLS-1$
Diff diffB = createDiff("DiffB"); //$NON-NLS-1$
Diff diffC = createDiff("DiffC"); //$NON-NLS-1$
diffA.getImplies().add(diffB);
diffB.getImplies().add(diffC);
Set<Diff> resultingMerges = getDirectResultingMerges(diffA);
assertEquals(1, resultingMerges.size());
assertSame(diffB, resultingMerges.iterator().next());
resultingMerges = getDirectResultingMerges(diffB);
assertEquals(2, resultingMerges.size());
assertTrue(resultingMerges.contains(diffA));
assertTrue(resultingMerges.contains(diffC));
resultingMerges = getDirectResultingMerges(diffC);
assertEquals(1, resultingMerges.size());
assertTrue(resultingMerges.contains(diffB));
mergeLeftToRight(diffB);
assertEquals(MERGED, diffA.getState());
assertEquals(MERGED, diffB.getState());
assertEquals(MERGED, diffC.getState());
}
/**
* Tests: A => B, B => C <br/>
* Merge: C <br/>
* Resulting Merges: A, B, C <br/>
* In EMF Compare, implication means that we always merge A instead of B (B requires no merging), and B
* instead of C. Therefore A is merged and B and C are set to MERGED automatically.
*/
@Test
public void testsAImpliesBImpliesCMergeC() {
Diff diffA = createDiff("DiffA"); //$NON-NLS-1$
Diff diffB = createDiff("DiffB"); //$NON-NLS-1$
Diff diffC = createDiff("DiffC"); //$NON-NLS-1$
diffA.getImplies().add(diffB);
diffB.getImplies().add(diffC);
Set<Diff> resultingMerges = getDirectResultingMerges(diffA);
assertEquals(1, resultingMerges.size());
assertSame(diffB, resultingMerges.iterator().next());
resultingMerges = getDirectResultingMerges(diffB);
assertEquals(2, resultingMerges.size());
assertTrue(resultingMerges.contains(diffA));
assertTrue(resultingMerges.contains(diffC));
resultingMerges = getDirectResultingMerges(diffC);
assertEquals(1, resultingMerges.size());
assertTrue(resultingMerges.contains(diffB));
mergeLeftToRight(diffC);
assertEquals(MERGED, diffA.getState());
assertEquals(MERGED, diffB.getState());
assertEquals(MERGED, diffC.getState());
}
/**
* Tests: A => B, C <br/>
* Merge: A <br/>
* Resulting Merges: A, B, C <br/>
* A implies B, and C so we merge A and set B and C to MERGED automatically.
*/
@Test
public void testsAImpliesBCMergeA() {
Diff diffA = createDiff("DiffA"); //$NON-NLS-1$
Diff diffB = createDiff("DiffB"); //$NON-NLS-1$
Diff diffC = createDiff("DiffC"); //$NON-NLS-1$
diffA.getImplies().add(diffB);
diffA.getImplies().add(diffC);
Set<Diff> resultingMerges = getDirectResultingMerges(diffA);
assertEquals(2, resultingMerges.size());
assertTrue(resultingMerges.contains(diffB));
assertTrue(resultingMerges.contains(diffC));
resultingMerges = getDirectResultingMerges(diffB);
assertEquals(1, resultingMerges.size());
assertTrue(resultingMerges.contains(diffA));
resultingMerges = getDirectResultingMerges(diffC);
assertEquals(1, resultingMerges.size());
assertTrue(resultingMerges.contains(diffA));
mergeLeftToRight(diffA);
assertEquals(MERGED, diffA.getState());
assertEquals(MERGED, diffB.getState());
assertEquals(MERGED, diffC.getState());
}
/**
* Tests: A => B, C <br/>
* Merge: B <br/>
* Resulting Merges: A, B, C <br/>
* In EMF Compare, implication means that we always merge A instead of B (B and C require no merging).
* Therefore we merge A and set B and C to MERGED automatically.
*/
@Test
public void testsAImpliesBCMergeB() {
Diff diffA = createDiff("DiffA"); //$NON-NLS-1$
Diff diffB = createDiff("DiffB"); //$NON-NLS-1$
Diff diffC = createDiff("DiffC"); //$NON-NLS-1$
diffA.getImplies().add(diffB);
diffA.getImplies().add(diffC);
Set<Diff> resultingMerges = getDirectResultingMerges(diffA);
assertEquals(2, resultingMerges.size());
assertTrue(resultingMerges.contains(diffB));
assertTrue(resultingMerges.contains(diffC));
resultingMerges = getDirectResultingMerges(diffB);
assertEquals(1, resultingMerges.size());
assertTrue(resultingMerges.contains(diffA));
resultingMerges = getDirectResultingMerges(diffC);
assertEquals(1, resultingMerges.size());
assertTrue(resultingMerges.contains(diffA));
mergeLeftToRight(diffB);
assertEquals(MERGED, diffA.getState());
assertEquals(MERGED, diffB.getState());
assertEquals(MERGED, diffC.getState());
}
/**
* Tests: A => B, C <br/>
* Merge: B <br/>
* Resulting Merges: A, B, C <br/>
* In EMF Compare, implication means that we always merge A instead of C (B and C require no merging).
* Therefore we merge A and set B and C to MERGED automatically.
*/
@Test
public void testsAImpliesBCMergeC() {
Diff diffA = createDiff("DiffA"); //$NON-NLS-1$
Diff diffB = createDiff("DiffB"); //$NON-NLS-1$
Diff diffC = createDiff("DiffC"); //$NON-NLS-1$
diffA.getImplies().add(diffB);
diffA.getImplies().add(diffC);
Set<Diff> resultingMerges = getDirectResultingMerges(diffA);
assertEquals(2, resultingMerges.size());
assertTrue(resultingMerges.contains(diffB));
assertTrue(resultingMerges.contains(diffC));
resultingMerges = getDirectResultingMerges(diffB);
assertEquals(1, resultingMerges.size());
assertTrue(resultingMerges.contains(diffA));
resultingMerges = getDirectResultingMerges(diffC);
assertEquals(1, resultingMerges.size());
assertTrue(resultingMerges.contains(diffA));
mergeLeftToRight(diffC);
assertEquals(MERGED, diffA.getState());
assertEquals(MERGED, diffB.getState());
assertEquals(MERGED, diffC.getState());
}
protected Diff createDiff(final String name) {
return new DiffSpec() {
@Override
public String toString() {
return name;
}
};
}
}
|
