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
|
/**
* Copyright (c) 2012 Obeo.
* 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:
* Obeo - initial API and implementation
*/
package org.eclipse.emf.compare.tests.fullcomparison;
import static com.google.common.base.Predicates.and;
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertSame;
import static junit.framework.Assert.assertTrue;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedAttribute;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedReference;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.fromSide;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removed;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
import java.io.IOException;
import java.util.List;
import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Conflict;
import org.eclipse.emf.compare.ConflictKind;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceSource;
import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.scope.DefaultComparisonScope;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.fullcomparison.data.identifier.IdentifierMatchInputData;
import org.eclipse.emf.ecore.resource.Resource;
import org.junit.Test;
/**
* Note that part of this is tested in IdentifierComparisonTest, but that class is run with
* EMFCompareTestRunner. We need more generic tests for the conflicts.
*/
@SuppressWarnings("nls")
public class ExtLibraryTest {
private IdentifierMatchInputData inputData = new IdentifierMatchInputData();
@Test
public void testConflicts() throws IOException {
final Resource left = inputData.getExtlibraryLeft();
final Resource origin = inputData.getExtlibraryOrigin();
final Resource right = inputData.getExtlibraryRight();
final IComparisonScope scope = new DefaultComparisonScope(left, right, origin);
final Comparison comparison = EMFCompare.builder().build().compare(scope);
final List<Diff> differences = comparison.getDifferences();
final Predicate<? super Diff> rightAudiovisualName = and(fromSide(DifferenceSource.RIGHT),
changedAttribute("extlibrary.AudioVisualItem.length", "name", "minutesLength", "minutes"));
final Predicate<? super Diff> leftAudiovisualName = and(fromSide(DifferenceSource.LEFT),
changedAttribute("extlibrary.AudioVisualItem.length", "name", "minutesLength", "length"));
final Diff rightAudiovisualNameDiff = Iterators.find(differences.iterator(), rightAudiovisualName);
final Diff leftAudiovisualNameDiff = Iterators.find(differences.iterator(), leftAudiovisualName);
final Conflict audiovisualNameConflict = rightAudiovisualNameDiff.getConflict();
assertNotNull(audiovisualNameConflict);
assertSame(Integer.valueOf(2), Integer.valueOf(audiovisualNameConflict.getDifferences().size()));
assertTrue(audiovisualNameConflict.getDifferences().contains(rightAudiovisualNameDiff));
assertTrue(audiovisualNameConflict.getDifferences().contains(leftAudiovisualNameDiff));
assertSame(audiovisualNameConflict, leftAudiovisualNameDiff.getConflict());
assertSame(ConflictKind.REAL, audiovisualNameConflict.getKind());
final Predicate<? super Diff> rightRemovedReader = and(fromSide(DifferenceSource.RIGHT),
removed("extlibrary.BookOnTape.reader"));
final Predicate<? super Diff> rightUnsetReaderType = and(fromSide(DifferenceSource.RIGHT),
changedReference("extlibrary.BookOnTape.reader", "eType", "extlibrary.Person", null));
final Predicate<? super Diff> leftRemovedReader = and(fromSide(DifferenceSource.LEFT),
removed("extlibrary.BookOnTape.reader"));
final Predicate<? super Diff> leftUnsetReaderType = and(fromSide(DifferenceSource.LEFT),
changedReference("extlibrary.BookOnTape.reader", "eType", "extlibrary.Person", null));
final Diff rightRemovedReaderDiff = Iterators.find(differences.iterator(), rightRemovedReader);
final Diff rightUnsetReaderTypeDiff = Iterators.find(differences.iterator(), rightUnsetReaderType);
final Diff leftRemovedReaderDiff = Iterators.find(differences.iterator(), leftRemovedReader);
final Diff leftUnsetReaderTypeDiff = Iterators.find(differences.iterator(), leftUnsetReaderType);
final Conflict readerConflict = rightRemovedReaderDiff.getConflict();
assertNotNull(readerConflict);
assertSame(Integer.valueOf(4), Integer.valueOf(readerConflict.getDifferences().size()));
assertTrue(readerConflict.getDifferences().contains(rightRemovedReaderDiff));
assertTrue(readerConflict.getDifferences().contains(rightUnsetReaderTypeDiff));
assertTrue(readerConflict.getDifferences().contains(leftRemovedReaderDiff));
assertTrue(readerConflict.getDifferences().contains(leftUnsetReaderTypeDiff));
assertSame(readerConflict, rightUnsetReaderTypeDiff.getConflict());
assertSame(readerConflict, leftRemovedReaderDiff.getConflict());
assertSame(readerConflict, leftUnsetReaderTypeDiff.getConflict());
assertSame(ConflictKind.PSEUDO, readerConflict.getKind());
final Predicate<? super Diff> rightRenamedFamilyname = and(fromSide(DifferenceSource.RIGHT),
changedAttribute("extlibrary.Person.familyName", "name", "lastName", "familyName"));
final Predicate<? super Diff> leftRemovedLastname = and(fromSide(DifferenceSource.LEFT),
removed("extlibrary.Person.lastName"));
final Diff rightRenamedFamilyNameDiff = Iterators
.find(differences.iterator(), rightRenamedFamilyname);
final Diff leftRemovedLastNameDiff = Iterators.find(differences.iterator(), leftRemovedLastname);
final Conflict familyNameConflict = leftRemovedLastNameDiff.getConflict();
assertNotNull(familyNameConflict);
assertSame(Integer.valueOf(2), Integer.valueOf(familyNameConflict.getDifferences().size()));
assertTrue(familyNameConflict.getDifferences().contains(leftRemovedLastNameDiff));
assertTrue(familyNameConflict.getDifferences().contains(rightRenamedFamilyNameDiff));
assertSame(familyNameConflict, rightRenamedFamilyNameDiff.getConflict());
assertSame(ConflictKind.REAL, familyNameConflict.getKind());
final Predicate<? super Diff> rightSetPeriodicalSupertype = and(fromSide(DifferenceSource.RIGHT),
addedToReference("extlibrary.Magazine", "eSuperTypes", "extlibrary.Periodical"));
final Predicate<? super Diff> rightSetTitledItemSupertype = and(fromSide(DifferenceSource.RIGHT),
addedToReference("extlibrary.Periodical", "eSuperTypes", "extlibrary.TitledItem"));
final Predicate<? super Diff> leftRemovedPeriodical = and(fromSide(DifferenceSource.LEFT),
removed("extlibrary.Periodical"));
final Diff rightSetPeriodicalSupertypeDiff = Iterators.find(differences.iterator(),
rightSetPeriodicalSupertype);
final Diff rightSetTitledItemSupertypeDiff = Iterators.find(differences.iterator(),
rightSetTitledItemSupertype);
final Diff leftRemovedPeriodicalDiff = Iterators.find(differences.iterator(), leftRemovedPeriodical);
final Conflict periodicalConflict = rightSetPeriodicalSupertypeDiff.getConflict();
assertNotNull(periodicalConflict);
assertSame(Integer.valueOf(3), Integer.valueOf(periodicalConflict.getDifferences().size()));
assertTrue(periodicalConflict.getDifferences().contains(leftRemovedPeriodicalDiff));
assertTrue(periodicalConflict.getDifferences().contains(rightSetPeriodicalSupertypeDiff));
assertTrue(periodicalConflict.getDifferences().contains(rightSetTitledItemSupertypeDiff));
assertSame(ConflictKind.REAL, periodicalConflict.getKind());
final Predicate<? super Diff> leftRemovedTitle = and(fromSide(DifferenceSource.LEFT),
removed("extlibrary.Periodical.title"));
final Predicate<? super Diff> leftUnsetTitleType = and(fromSide(DifferenceSource.LEFT),
changedReference("extlibrary.Periodical.title", "eType", "ecore.EString", null));
final Predicate<? super Diff> rightRemovedTitle = and(fromSide(DifferenceSource.RIGHT),
removed("extlibrary.Periodical.title"));
final Predicate<? super Diff> rightUnsetTitleType = and(fromSide(DifferenceSource.RIGHT),
changedReference("extlibrary.Periodical.title", "eType", "ecore.EString", null));
final Diff leftRemovedTitleDiff = Iterators.find(differences.iterator(), leftRemovedTitle);
final Diff leftUnsetTitleTypeDiff = Iterators.find(differences.iterator(), leftUnsetTitleType);
final Diff rightRemovedTitleDiff = Iterators.find(differences.iterator(), rightRemovedTitle);
final Diff rightUnsetTitleTypeDiff = Iterators.find(differences.iterator(), rightUnsetTitleType);
final Conflict titleConflict = leftRemovedTitleDiff.getConflict();
assertNotNull(titleConflict);
assertSame(Integer.valueOf(4), Integer.valueOf(titleConflict.getDifferences().size()));
assertTrue(titleConflict.getDifferences().contains(leftRemovedTitleDiff));
assertTrue(titleConflict.getDifferences().contains(leftUnsetTitleTypeDiff));
assertTrue(titleConflict.getDifferences().contains(rightRemovedTitleDiff));
assertTrue(titleConflict.getDifferences().contains(rightUnsetTitleTypeDiff));
assertSame(ConflictKind.PSEUDO, titleConflict.getKind());
assertSame(Integer.valueOf(5), Integer.valueOf(comparison.getConflicts().size()));
}
}
|
