diff options
| author | Mathieu Cartaud | 2016-06-15 08:13:57 +0000 |
|---|---|---|
| committer | Mathieu Cartaud | 2016-06-15 14:29:59 +0000 |
| commit | 6477d1125eebfd494f4a3d1a666519e24daedf9d (patch) | |
| tree | df98e6aaac6dfb813ea055617a1ce1387064f041 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge | |
| parent | 5722fba2307aeda65d7367dd302bcd9b20f02a7a (diff) | |
| download | org.eclipse.emf.compare-6477d1125eebfd494f4a3d1a666519e24daedf9d.tar.gz org.eclipse.emf.compare-6477d1125eebfd494f4a3d1a666519e24daedf9d.tar.xz org.eclipse.emf.compare-6477d1125eebfd494f4a3d1a666519e24daedf9d.zip | |
Switch to Eclipse mars.2
Format all non generated classes to get ride of formatter
incompatibilities
Migrate checkstyle config for checkstyle 6.19
Change-Id: I8c2b31765053a3686de62320f893bedf4ad81d1f
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge')
12 files changed, 338 insertions, 335 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/Bug485266_MoveDeleteConflict_Test.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/Bug485266_MoveDeleteConflict_Test.java index 692fc8d6c..9d3252c55 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/Bug485266_MoveDeleteConflict_Test.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/Bug485266_MoveDeleteConflict_Test.java @@ -198,8 +198,8 @@ public class Bug485266_MoveDeleteConflict_Test extends AbstractMergerTest { test3RightToLeft, test3LeftToRight, test5RightToLeft, test5LeftToRight); } - public Bug485266_MoveDeleteConflict_Test(final Resource origin, final Resource left, - final Resource right, final boolean rightToLeft, final Resource expected) { + public Bug485266_MoveDeleteConflict_Test(final Resource origin, final Resource left, final Resource right, + final boolean rightToLeft, final Resource expected) { super(origin, left, right, rightToLeft, expected, IMerger.RegistryImpl.createStandaloneInstance()); } diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ComplexMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ComplexMergeTest.java index c7b600962..0b66e2724 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ComplexMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ComplexMergeTest.java @@ -104,17 +104,18 @@ public class ComplexMergeTest { @SuppressWarnings("unchecked") @Parameters public static Iterable<Object[]> data() { - Collection<List<Predicate<? super Diff>>> rightConflictPermutations = permutations(Arrays - .<Predicate<? super Diff>> asList(added("Root.Node0"), //$NON-NLS-1$ - moved("Root.Node1", "containmentRef1"), moved("Root.Node6", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - "containmentRef1"), added("Root.Node9"))); //$NON-NLS-1$ //$NON-NLS-2$ - Collection<List<Predicate<? super Diff>>> leftConflictPermutations = permutations(Arrays - .<Predicate<? super Diff>> asList(added("Root.Node0"), //$NON-NLS-1$ + Collection<List<Predicate<? super Diff>>> rightConflictPermutations = permutations( + Arrays.<Predicate<? super Diff>> asList(added("Root.Node0"), //$NON-NLS-1$ + moved("Root.Node1", "containmentRef1"), moved("Root.Node6", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + "containmentRef1"), //$NON-NLS-1$ + added("Root.Node9"))); //$NON-NLS-1$ + Collection<List<Predicate<? super Diff>>> leftConflictPermutations = permutations( + Arrays.<Predicate<? super Diff>> asList(added("Root.Node0"), //$NON-NLS-1$ moved("Root.Node1", "containmentRef1"), removed("Root.Node5"), removed("Root.Node6"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ added("Root.Node9"))); //$NON-NLS-1$ - Collection<List<Predicate<? super Diff>>> otherPermutations = permutations(Arrays - .<Predicate<? super Diff>> asList( - and(fromSide(LEFT), removed("Root.Node5")), and(fromSide(LEFT), removed("Root.Node7")), and( //$NON-NLS-1$ //$NON-NLS-2$ + Collection<List<Predicate<? super Diff>>> otherPermutations = permutations( + Arrays.<Predicate<? super Diff>> asList(and(fromSide(LEFT), removed("Root.Node5")), //$NON-NLS-1$ + and(fromSide(LEFT), removed("Root.Node7")), and( //$NON-NLS-1$ fromSide(LEFT), added("Root.Node8")))); //$NON-NLS-1$ List<Object[]> data = new ArrayList<Object[]>(); diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ConflictImplicationsTest_Bug484579.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ConflictImplicationsTest_Bug484579.java index 2dbbf7e5a..c7bc8b645 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ConflictImplicationsTest_Bug484579.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ConflictImplicationsTest_Bug484579.java @@ -150,10 +150,10 @@ public class ConflictImplicationsTest_Bug484579 { assertEquals(9, comparison.getDifferences().size()); assertEquals(3, conflicts.size()); - Collection<Conflict> pseudoConflicts = Collections2.filter(conflicts, EMFComparePredicates - .containsConflictOfTypes(PSEUDO)); - Collection<Conflict> realConflicts = Collections2.filter(conflicts, EMFComparePredicates - .containsConflictOfTypes(REAL)); + Collection<Conflict> pseudoConflicts = Collections2.filter(conflicts, + EMFComparePredicates.containsConflictOfTypes(PSEUDO)); + Collection<Conflict> realConflicts = Collections2.filter(conflicts, + EMFComparePredicates.containsConflictOfTypes(REAL)); assertEquals(1, pseudoConflicts.size()); assertEquals(2, realConflicts.size()); @@ -256,10 +256,10 @@ public class ConflictImplicationsTest_Bug484579 { assertEquals(17, comparison.getDifferences().size()); assertEquals(3, conflicts.size()); - Collection<Conflict> pseudoConflicts = Collections2.filter(conflicts, EMFComparePredicates - .containsConflictOfTypes(PSEUDO)); - Collection<Conflict> realConflicts = Collections2.filter(conflicts, EMFComparePredicates - .containsConflictOfTypes(REAL)); + Collection<Conflict> pseudoConflicts = Collections2.filter(conflicts, + EMFComparePredicates.containsConflictOfTypes(PSEUDO)); + Collection<Conflict> realConflicts = Collections2.filter(conflicts, + EMFComparePredicates.containsConflictOfTypes(REAL)); assertEquals(2, pseudoConflicts.size()); assertEquals(1, realConflicts.size()); diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ConflictMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ConflictMergeTest.java index 9c06e5476..9d275deae 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ConflictMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ConflictMergeTest.java @@ -79,24 +79,21 @@ public class ConflictMergeTest { final String featureName = "containmentRef1"; - final Diff diffNodeCLeft = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, - "root.A.C", true))); - final Diff diffNodeCRight = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), referenceValueMatch( - featureName, "root.B.C", true))); - final Diff diffNodeDLeft = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, - "root.A.C.D", true))); - final Diff diffNodeDRight = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), referenceValueMatch( - featureName, "root.B.C.D", true))); - final Diff diffNodeELeft = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, - "root.A.C.E", true))); - final Diff diffNodeFRight = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), referenceValueMatch( - featureName, "root.B.C.F", true))); + final Diff diffNodeCLeft = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), + ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, "root.A.C", true))); + final Diff diffNodeCRight = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), + referenceValueMatch(featureName, "root.B.C", true))); + final Diff diffNodeDLeft = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), + ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, "root.A.C.D", true))); + final Diff diffNodeDRight = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), + referenceValueMatch(featureName, "root.B.C.D", true))); + final Diff diffNodeELeft = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), + ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, "root.A.C.E", true))); + final Diff diffNodeFRight = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), + referenceValueMatch(featureName, "root.B.C.F", true))); // Merge C[containmentRef1 add] from left side from left to right : C[containmentRef1 add] from right // side will be merge from left to right too. @@ -145,24 +142,21 @@ public class ConflictMergeTest { final String featureName = "containmentRef1"; - final Diff diffNodeCLeft = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, - "root.A.C", true))); - final Diff diffNodeCRight = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), referenceValueMatch( - featureName, "root.B.C", true))); - final Diff diffNodeDLeft = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, - "root.A.C.D", true))); - final Diff diffNodeDRight = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), referenceValueMatch( - featureName, "root.B.C.D", true))); - final Diff diffNodeELeft = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, - "root.A.C.E", true))); - final Diff diffNodeFRight = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), referenceValueMatch( - featureName, "root.B.C.F", true))); + final Diff diffNodeCLeft = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), + ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, "root.A.C", true))); + final Diff diffNodeCRight = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), + referenceValueMatch(featureName, "root.B.C", true))); + final Diff diffNodeDLeft = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), + ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, "root.A.C.D", true))); + final Diff diffNodeDRight = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), + referenceValueMatch(featureName, "root.B.C.D", true))); + final Diff diffNodeELeft = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), + ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, "root.A.C.E", true))); + final Diff diffNodeFRight = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), + referenceValueMatch(featureName, "root.B.C.F", true))); // Merge C[containmentRef1 add] from right side from left to right : C[containmentRef1 add] from left // side will not be merge @@ -211,24 +205,21 @@ public class ConflictMergeTest { final String featureName = "containmentRef1"; - final Diff diffNodeCLeft = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, - "root.A.C", true))); - final Diff diffNodeCRight = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), referenceValueMatch( - featureName, "root.B.C", true))); - final Diff diffNodeDLeft = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, - "root.A.C.D", true))); - final Diff diffNodeDRight = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), referenceValueMatch( - featureName, "root.B.C.D", true))); - final Diff diffNodeELeft = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, - "root.A.C.E", true))); - final Diff diffNodeFRight = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), referenceValueMatch( - featureName, "root.B.C.F", true))); + final Diff diffNodeCLeft = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), + ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, "root.A.C", true))); + final Diff diffNodeCRight = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), + referenceValueMatch(featureName, "root.B.C", true))); + final Diff diffNodeDLeft = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), + ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, "root.A.C.D", true))); + final Diff diffNodeDRight = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), + referenceValueMatch(featureName, "root.B.C.D", true))); + final Diff diffNodeELeft = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), + ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, "root.A.C.E", true))); + final Diff diffNodeFRight = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), + referenceValueMatch(featureName, "root.B.C.F", true))); // Merge C[containmentRef1 add] from left side from right to left : C[containmentRef1 add] from right // side will not be merge. @@ -277,24 +268,21 @@ public class ConflictMergeTest { final String featureName = "containmentRef1"; - final Diff diffNodeCLeft = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, - "root.A.C", true))); - final Diff diffNodeCRight = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), referenceValueMatch( - featureName, "root.B.C", true))); - final Diff diffNodeDLeft = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, - "root.A.C.D", true))); - final Diff diffNodeDRight = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), referenceValueMatch( - featureName, "root.B.C.D", true))); - final Diff diffNodeELeft = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, - "root.A.C.E", true))); - final Diff diffNodeFRight = Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), referenceValueMatch( - featureName, "root.B.C.F", true))); + final Diff diffNodeCLeft = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), + ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, "root.A.C", true))); + final Diff diffNodeCRight = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), + referenceValueMatch(featureName, "root.B.C", true))); + final Diff diffNodeDLeft = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), + ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, "root.A.C.D", true))); + final Diff diffNodeDRight = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), + referenceValueMatch(featureName, "root.B.C.D", true))); + final Diff diffNodeELeft = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), + ofKind(DifferenceKind.ADD), referenceValueMatch(featureName, "root.A.C.E", true))); + final Diff diffNodeFRight = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD), + referenceValueMatch(featureName, "root.B.C.F", true))); // Merge C[containmentRef1 add] from right side from right to left : C[containmentRef1 add] from left // side will be merge from right to left too. diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps2wayMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps2wayMergeTest.java index 2120149f9..cfaa3e205 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps2wayMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps2wayMergeTest.java @@ -73,8 +73,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.ADD), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node1[firstKey add] from left to right : the FeatureMapChange // <firstKey> Node node1 [map add] will be merge from left to right too. @@ -118,8 +118,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.ADD), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); // Merge the FeatureMapChange <firstKey> Node node1 [map add] from left to right : the ReferenceChange // Node node1[firstKey add] will be merge from left to right too. @@ -163,8 +163,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.ADD), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node1[firstKey add] from right to left : the FeatureMapChange // <firstKey> Node node1 [map add] will be merge from right to left too. @@ -208,8 +208,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.ADD), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); // Merge the FeatureMapChange <firstKey> Node node1 [map add] from right to left : the // ReferenceChange Node node1[firstKey add] will be merge from right to left too. @@ -253,8 +253,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.DELETE), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node2[firstKey delete] from left to right : the FeatureMapChange // <firstKey> Node node2 [map delete] will be merge from left to right too. @@ -298,8 +298,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.DELETE), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); // Merge the FeatureMapChange <firstKey> Node node2 [map delete] from left to right : the // ReferenceChange Node node2[firstKey delete] will be merge from left to right too. @@ -343,8 +343,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.DELETE), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node2[firstKey delete] from right to left: the FeatureMapChange // <firstKey> Node node2 [map delete] will be merge from right to left too. @@ -388,8 +388,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.DELETE), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); // Merge the ReferenceChange Node node2[firstKey delete] from right to left: the FeatureMapChange // <firstKey> Node node2 [map delete] will be merge from right to left too. @@ -434,8 +434,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node1[firstKey move] from left to right : the FeatureMapChange // <firstKey> Node node1 [map entry key change] will be merge from left to right too. @@ -480,8 +480,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.CHANGE), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.CHANGE), instanceOf(FeatureMapChange.class))); // Merge the FeatureMapChange <firstKey> Node node1 [map entry key change] from left to right : the // ReferenceChange Node node1[firstKey move] will be merge from left to right too. @@ -526,8 +526,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node1[firstKey move] from right to left : the FeatureMapChange // <firstKey> Node node1 [map entry key change] will be merge from right to left too. @@ -572,8 +572,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.CHANGE), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.CHANGE), instanceOf(FeatureMapChange.class))); // Merge the FeatureMapChange <firstKey> Node node1 [map entry key change] from left to right : the // ReferenceChange Node node1[firstKey move] will be merge from left to right too. @@ -618,8 +618,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node1[firstKey move] from left to right : the FeatureMapChange // <firstKey> Node node1 [map move] will be merge from left to right too. @@ -664,8 +664,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); // Merge the FeatureMapChange <firstKey> Node node1 [map move] from left to right : the // ReferenceChange Node node1[firstKey move] will be merge from left to right too. @@ -710,8 +710,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node1[firstKey move] from right to left : the FeatureMapChange // <firstKey> Node node1 [map move] will be merge from right to left too. @@ -756,8 +756,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); // Merge the FeatureMapChange <firstKey> Node node1 [map move] from right to left : the // ReferenceChange Node node1[firstKey move] will be merge from right to left too. @@ -802,8 +802,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node1[firstKey move] from left to right : the FeatureMapChange // <firstKey> Node node1 [map move] will be merge from left to right too. @@ -850,8 +850,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); // Merge the FeatureMapChange <firstKey> Node node1 [map move] from left to right : the // ReferenceChange Node node1[firstKey move] will be merge from left to right too. @@ -898,8 +898,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node1[firstKey move] from right to left : the FeatureMapChange // <firstKey> Node node1 [map move] will be merge from right to left too. @@ -946,8 +946,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); // Merge the FeatureMapChange <firstKey> Node node1 [map move] from right to left : the // ReferenceChange Node node1[firstKey move] will be merge from right to left too. @@ -994,8 +994,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node1[firstKey move] from left to right : the FeatureMapChange // <firstKey> Node node1 [map move] will be merge from left to right too. @@ -1040,8 +1040,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); // Merge the FeatureMapChange <firstKey> Node node1 [map move] from left to right : the // ReferenceChange Node node1[firstKey move] will be merge from left to right too. @@ -1086,8 +1086,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node1[firstKey move] from left to right : the FeatureMapChange // <firstKey> Node node1 [map move] will be merge from left to right too. @@ -1132,8 +1132,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); // Merge the FeatureMapChange <firstKey> Node node1 [map move] from left to right : the // ReferenceChange Node node1[firstKey move] will be merge from left to right too. @@ -1226,12 +1226,12 @@ public class FeatureMaps2wayMergeTest { assertEquals(4, differences.size()); // check if each featuremapchange / referencechange pair is equivalent - final Diff featureMapChangeDiff = Iterators.find(differences.iterator(), and( - instanceOf(FeatureMapChange.class), ofKind(DifferenceKind.MOVE))); + final Diff featureMapChangeDiff = Iterators.find(differences.iterator(), + and(instanceOf(FeatureMapChange.class), ofKind(DifferenceKind.MOVE))); - final Diff referenceChangeDiff = Iterators.find(differences.iterator(), and( - instanceOf(ReferenceChange.class), ofKind(DifferenceKind.MOVE), - not(isEquivalentTo(featureMapChangeDiff)))); + final Diff referenceChangeDiff = Iterators.find(differences.iterator(), + and(instanceOf(ReferenceChange.class), ofKind(DifferenceKind.MOVE), + not(isEquivalentTo(featureMapChangeDiff)))); assertEquals(2, featureMapChangeDiff.getEquivalence().getDifferences().size()); assertEquals(2, referenceChangeDiff.getEquivalence().getDifferences().size()); @@ -1261,12 +1261,12 @@ public class FeatureMaps2wayMergeTest { assertEquals(4, differences.size()); // check if each featuremapchange / referencechange pair is equivalent - final Diff featureMapChangeDiff = Iterators.find(differences.iterator(), and( - instanceOf(FeatureMapChange.class), ofKind(DifferenceKind.MOVE))); + final Diff featureMapChangeDiff = Iterators.find(differences.iterator(), + and(instanceOf(FeatureMapChange.class), ofKind(DifferenceKind.MOVE))); - final Diff referenceChangeDiff = Iterators.find(differences.iterator(), and( - instanceOf(ReferenceChange.class), ofKind(DifferenceKind.MOVE), - not(isEquivalentTo(featureMapChangeDiff)))); + final Diff referenceChangeDiff = Iterators.find(differences.iterator(), + and(instanceOf(ReferenceChange.class), ofKind(DifferenceKind.MOVE), + not(isEquivalentTo(featureMapChangeDiff)))); assertEquals(2, featureMapChangeDiff.getEquivalence().getDifferences().size()); assertEquals(2, referenceChangeDiff.getEquivalence().getDifferences().size()); @@ -1296,8 +1296,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.ADD), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node1[firstKey add] from left to right : the FeatureMapChange // <firstKey> Node node1 [map add] will be merge from left to right too. @@ -1354,8 +1354,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.ADD), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); // Merge the FeatureMapChange <firstKey> Node node1 [map add] from left to right : the ReferenceChange // Node node1[firstKey add] will be merge from left to right too. @@ -1412,8 +1412,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.ADD), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.ADD), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node1[firstKey add] from right to left : the FeatureMapChange // <firstKey> Node node1 [map add] will be merge from right to left too. @@ -1466,8 +1466,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.ADD), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.ADD), instanceOf(FeatureMapChange.class))); // Merge the FeatureMapChange <firstKey> Node node1 [map add] from right to left : the ReferenceChange // Node node1[firstKey add] will be merge from right to left too. @@ -1520,8 +1520,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.DELETE), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node2[firstKey delete] from left to right : the FeatureMapChange // <firstKey> Node node2 [map delete] will be merge from left to right too. @@ -1574,8 +1574,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.DELETE), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); // Merge the FeatureMapChange <firstKey> Node node2 [map delete] from left to right : the // ReferenceChange Node node2[firstKey delete] will be merge from left to right too. @@ -1628,8 +1628,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.DELETE), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.DELETE), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node2[firstKey delete] from right to left : the FeatureMapChange // <firstKey> Node node2 [map delete] will be merge from right to left too. @@ -1686,8 +1686,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.DELETE), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.DELETE), instanceOf(FeatureMapChange.class))); // Merge the FeatureMapChange <firstKey> Node node2 [map delete] from right to left : the // ReferenceChange Node node2[firstKey delete] will be merge from right to left too. @@ -1745,8 +1745,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node1[firstKey move] from left to right : the FeatureMapChange // <firstKey> Node node1 [map move] will be merge from left to right too. @@ -1804,8 +1804,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); // Merge the FeatureMapChange <firstKey> Node node1 [map move] from left to right : the // ReferenceChange Node node1[firstKey move] will be merge from left to right too. @@ -1863,8 +1863,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(ReferenceChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(ReferenceChange.class))); // Merge the ReferenceChange Node node1[firstKey move] from right to left : the FeatureMapChange // <firstKey> Node node1 [map move] will be merge from right to left too. @@ -1922,8 +1922,8 @@ public class FeatureMaps2wayMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(4, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(ofKind(DifferenceKind.MOVE), - instanceOf(FeatureMapChange.class))); + final Diff diff = Iterators.find(differences.iterator(), + and(ofKind(DifferenceKind.MOVE), instanceOf(FeatureMapChange.class))); // Merge the FeatureMapChange <firstKey> Node node1 [map move] from right to left : the // ReferenceChange Node node1[firstKey move] will be merge from right to left too. diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps3wayMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps3wayMergeTest.java index 4a96f7cf8..9494f585f 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps3wayMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps3wayMergeTest.java @@ -1160,12 +1160,12 @@ public class FeatureMaps3wayMergeTest { assertEquals(6, differences.size()); // merge one feature-map-change and one reference-change - final Diff featureMapChangeDiff = Iterators.find(differences.iterator(), and( - instanceOf(FeatureMapChange.class), fromSide(DifferenceSource.LEFT))); + final Diff featureMapChangeDiff = Iterators.find(differences.iterator(), + and(instanceOf(FeatureMapChange.class), fromSide(DifferenceSource.LEFT))); - final Diff referenceChangeDiff = Iterators.find(differences.iterator(), and( - instanceOf(ReferenceChange.class), fromSide(DifferenceSource.LEFT), - not(isEquivalentTo(featureMapChangeDiff)))); + final Diff referenceChangeDiff = Iterators.find(differences.iterator(), + and(instanceOf(ReferenceChange.class), fromSide(DifferenceSource.LEFT), + not(isEquivalentTo(featureMapChangeDiff)))); // accepting -> element a will be moved into a featuremap mergerRegistry.getHighestRankingMerger(featureMapChangeDiff).copyLeftToRight(featureMapChangeDiff, @@ -1195,12 +1195,12 @@ public class FeatureMaps3wayMergeTest { assertEquals(6, differences.size()); // merge one feature-map-change and one reference-change - final Diff featureMapChangeDiff = Iterators.find(differences.iterator(), and( - instanceOf(FeatureMapChange.class), fromSide(DifferenceSource.LEFT))); + final Diff featureMapChangeDiff = Iterators.find(differences.iterator(), + and(instanceOf(FeatureMapChange.class), fromSide(DifferenceSource.LEFT))); - final Diff referenceChangeDiff = Iterators.find(differences.iterator(), and( - instanceOf(ReferenceChange.class), fromSide(DifferenceSource.LEFT), - not(isEquivalentTo(featureMapChangeDiff)))); + final Diff referenceChangeDiff = Iterators.find(differences.iterator(), + and(instanceOf(ReferenceChange.class), fromSide(DifferenceSource.LEFT), + not(isEquivalentTo(featureMapChangeDiff)))); // rejecting means that instead of moving inside the element will be moved outside of the featuremap mergerRegistry.getHighestRankingMerger(featureMapChangeDiff).copyRightToLeft(featureMapChangeDiff, @@ -1230,26 +1230,26 @@ public class FeatureMaps3wayMergeTest { assertEquals(6, differences.size()); // check if each featuremapchange / referencechange pair is equivalent - final Diff leftFeatureMapChangeDiff = Iterators.find(differences.iterator(), and( - instanceOf(FeatureMapChange.class), ofKind(DifferenceKind.MOVE), - fromSide(DifferenceSource.RIGHT))); + final Diff leftFeatureMapChangeDiff = Iterators.find(differences.iterator(), + and(instanceOf(FeatureMapChange.class), ofKind(DifferenceKind.MOVE), + fromSide(DifferenceSource.RIGHT))); - final Diff leftReferenceChangeDiff = Iterators.find(differences.iterator(), and( - instanceOf(ReferenceChange.class), ofKind(DifferenceKind.MOVE), - fromSide(DifferenceSource.RIGHT), not(isEquivalentTo(leftFeatureMapChangeDiff)))); + final Diff leftReferenceChangeDiff = Iterators.find(differences.iterator(), + and(instanceOf(ReferenceChange.class), ofKind(DifferenceKind.MOVE), + fromSide(DifferenceSource.RIGHT), not(isEquivalentTo(leftFeatureMapChangeDiff)))); - final Diff rightReferenceChangeDiff = Iterators.find(differences.iterator(), and( - instanceOf(ReferenceChange.class), fromSide(DifferenceSource.LEFT))); + final Diff rightReferenceChangeDiff = Iterators.find(differences.iterator(), + and(instanceOf(ReferenceChange.class), fromSide(DifferenceSource.LEFT))); assertEquals(2, leftFeatureMapChangeDiff.getEquivalence().getDifferences().size()); assertEquals(2, leftReferenceChangeDiff.getEquivalence().getDifferences().size()); assertEquals(2, rightReferenceChangeDiff.getEquivalence().getDifferences().size()); // accept both - mergerRegistry.getHighestRankingMerger(leftFeatureMapChangeDiff).copyLeftToRight( - leftFeatureMapChangeDiff, new BasicMonitor()); - mergerRegistry.getHighestRankingMerger(leftReferenceChangeDiff).copyLeftToRight( - leftReferenceChangeDiff, new BasicMonitor()); + mergerRegistry.getHighestRankingMerger(leftFeatureMapChangeDiff) + .copyLeftToRight(leftFeatureMapChangeDiff, new BasicMonitor()); + mergerRegistry.getHighestRankingMerger(leftReferenceChangeDiff) + .copyLeftToRight(leftReferenceChangeDiff, new BasicMonitor()); // no differences should be left scope = new DefaultComparisonScope(left, right, null); @@ -1272,26 +1272,26 @@ public class FeatureMaps3wayMergeTest { assertEquals(6, differences.size()); // check if each featuremapchange / referencechange pair is equivalent - final Diff leftFeatureMapChangeDiff = Iterators.find(differences.iterator(), and( - instanceOf(FeatureMapChange.class), ofKind(DifferenceKind.MOVE), - fromSide(DifferenceSource.RIGHT))); + final Diff leftFeatureMapChangeDiff = Iterators.find(differences.iterator(), + and(instanceOf(FeatureMapChange.class), ofKind(DifferenceKind.MOVE), + fromSide(DifferenceSource.RIGHT))); - final Diff leftReferenceChangeDiff = Iterators.find(differences.iterator(), and( - instanceOf(ReferenceChange.class), ofKind(DifferenceKind.MOVE), - fromSide(DifferenceSource.RIGHT), not(isEquivalentTo(leftFeatureMapChangeDiff)))); + final Diff leftReferenceChangeDiff = Iterators.find(differences.iterator(), + and(instanceOf(ReferenceChange.class), ofKind(DifferenceKind.MOVE), + fromSide(DifferenceSource.RIGHT), not(isEquivalentTo(leftFeatureMapChangeDiff)))); - final Diff rightReferenceChangeDiff = Iterators.find(differences.iterator(), and( - instanceOf(ReferenceChange.class), fromSide(DifferenceSource.LEFT))); + final Diff rightReferenceChangeDiff = Iterators.find(differences.iterator(), + and(instanceOf(ReferenceChange.class), fromSide(DifferenceSource.LEFT))); assertEquals(2, leftFeatureMapChangeDiff.getEquivalence().getDifferences().size()); assertEquals(2, leftReferenceChangeDiff.getEquivalence().getDifferences().size()); assertEquals(2, rightReferenceChangeDiff.getEquivalence().getDifferences().size()); // reject both - mergerRegistry.getHighestRankingMerger(leftFeatureMapChangeDiff).copyRightToLeft( - leftFeatureMapChangeDiff, new BasicMonitor()); - mergerRegistry.getHighestRankingMerger(leftReferenceChangeDiff).copyRightToLeft( - leftReferenceChangeDiff, new BasicMonitor()); + mergerRegistry.getHighestRankingMerger(leftFeatureMapChangeDiff) + .copyRightToLeft(leftFeatureMapChangeDiff, new BasicMonitor()); + mergerRegistry.getHighestRankingMerger(leftReferenceChangeDiff) + .copyRightToLeft(leftReferenceChangeDiff, new BasicMonitor()); // no differences should be left scope = new DefaultComparisonScope(left, right, null); diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java index 1e6dc28ca..ed834b0d5 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java @@ -175,8 +175,8 @@ public class IndividualMergeOutOfScopeValuesTest { // We need left and right to point to the same proxy uri after the merge assertEquals(((InternalEObject)leftValue).eProxyURI(), ((InternalEObject)rightValue).eProxyURI()); // Though the origin did not change and still points to the "old" proxy - assertFalse(((InternalEObject)leftValue).eProxyURI().equals( - ((InternalEObject)originValue).eProxyURI())); + assertFalse( + ((InternalEObject)leftValue).eProxyURI().equals(((InternalEObject)originValue).eProxyURI())); // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); @@ -333,8 +333,8 @@ public class IndividualMergeOutOfScopeValuesTest { // We need left and right to point to the same proxy uri after the merge assertEquals(((InternalEObject)leftValue).eProxyURI(), ((InternalEObject)rightValue).eProxyURI()); // Though the origin did not change and still points to the "old" proxy - assertFalse(((InternalEObject)leftValue).eProxyURI().equals( - ((InternalEObject)originValue).eProxyURI())); + assertFalse( + ((InternalEObject)leftValue).eProxyURI().equals(((InternalEObject)originValue).eProxyURI())); // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java index 9c81ee547..e0905df27 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java @@ -763,12 +763,12 @@ public class IndividualMergeTest { assertEquals(3, differences.size()); final String featureName = "multiValueEEnumAttribute"; - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - addedToAttribute("root", featureName, NodeEnum.A))); - final Diff diff2 = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - addedToAttribute("root", featureName, NodeEnum.B))); - final Diff diff3 = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - addedToAttribute("root", featureName, NodeEnum.C))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), addedToAttribute("root", featureName, NodeEnum.A))); + final Diff diff2 = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), addedToAttribute("root", featureName, NodeEnum.B))); + final Diff diff3 = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), addedToAttribute("root", featureName, NodeEnum.C))); mergerRegistry.getHighestRankingMerger(diff).copyLeftToRight(diff, new BasicMonitor()); mergerRegistry.getHighestRankingMerger(diff2).copyLeftToRight(diff2, new BasicMonitor()); @@ -799,12 +799,12 @@ public class IndividualMergeTest { assertEquals(3, differences.size()); final String featureName = "multiValueEEnumAttribute"; - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - addedToAttribute("root", featureName, NodeEnum.A))); - final Diff diff2 = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - addedToAttribute("root", featureName, NodeEnum.B))); - final Diff diff3 = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - addedToAttribute("root", featureName, NodeEnum.C))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), addedToAttribute("root", featureName, NodeEnum.A))); + final Diff diff2 = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), addedToAttribute("root", featureName, NodeEnum.B))); + final Diff diff3 = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), addedToAttribute("root", featureName, NodeEnum.C))); mergerRegistry.getHighestRankingMerger(diff).copyRightToLeft(diff, new BasicMonitor()); mergerRegistry.getHighestRankingMerger(diff2).copyRightToLeft(diff2, new BasicMonitor()); @@ -836,12 +836,12 @@ public class IndividualMergeTest { assertEquals(3, differences.size()); final String featureName = "multiValueEEnumAttribute"; - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - addedToAttribute("root", featureName, NodeEnum.A))); - final Diff diff2 = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - addedToAttribute("root", featureName, NodeEnum.B))); - final Diff diff3 = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - addedToAttribute("root", featureName, NodeEnum.C))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), addedToAttribute("root", featureName, NodeEnum.A))); + final Diff diff2 = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), addedToAttribute("root", featureName, NodeEnum.B))); + final Diff diff3 = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), addedToAttribute("root", featureName, NodeEnum.C))); mergerRegistry.getHighestRankingMerger(diff).copyLeftToRight(diff, new BasicMonitor()); mergerRegistry.getHighestRankingMerger(diff2).copyLeftToRight(diff2, new BasicMonitor()); @@ -853,8 +853,8 @@ public class IndividualMergeTest { final Object featureValue = originNode.eGet(feature); assertTrue(featureValue instanceof Collection<?>); - assertTrue(((Collection<?>)featureValue).containsAll(Lists.newArrayList(NodeEnum.A, NodeEnum.B, - NodeEnum.C))); + assertTrue(((Collection<?>)featureValue) + .containsAll(Lists.newArrayList(NodeEnum.A, NodeEnum.B, NodeEnum.C))); // We should have no difference between left and right ... though they might be different from origin scope = new DefaultComparisonScope(left, right, null); @@ -875,12 +875,12 @@ public class IndividualMergeTest { assertEquals(3, differences.size()); final String featureName = "multiValueEEnumAttribute"; - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - addedToAttribute("root", featureName, NodeEnum.A))); - final Diff diff2 = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - addedToAttribute("root", featureName, NodeEnum.B))); - final Diff diff3 = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - addedToAttribute("root", featureName, NodeEnum.C))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), addedToAttribute("root", featureName, NodeEnum.A))); + final Diff diff2 = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), addedToAttribute("root", featureName, NodeEnum.B))); + final Diff diff3 = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), addedToAttribute("root", featureName, NodeEnum.C))); mergerRegistry.getHighestRankingMerger(diff).copyRightToLeft(diff, new BasicMonitor()); mergerRegistry.getHighestRankingMerger(diff2).copyRightToLeft(diff2, new BasicMonitor()); @@ -913,12 +913,12 @@ public class IndividualMergeTest { assertEquals(3, differences.size()); final String featureName = "multiValueEEnumAttribute"; - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), - addedToAttribute("root", featureName, NodeEnum.A))); - final Diff diff2 = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), - addedToAttribute("root", featureName, NodeEnum.B))); - final Diff diff3 = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), - addedToAttribute("root", featureName, NodeEnum.C))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), addedToAttribute("root", featureName, NodeEnum.A))); + final Diff diff2 = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), addedToAttribute("root", featureName, NodeEnum.B))); + final Diff diff3 = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), addedToAttribute("root", featureName, NodeEnum.C))); mergerRegistry.getHighestRankingMerger(diff).copyLeftToRight(diff, new BasicMonitor()); mergerRegistry.getHighestRankingMerger(diff2).copyLeftToRight(diff2, new BasicMonitor()); @@ -983,8 +983,8 @@ public class IndividualMergeTest { assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - addedToAttribute("root.origin", featureName, "value1"))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), addedToAttribute("root.origin", featureName, "value1"))); mergerRegistry.getHighestRankingMerger(diff).copyLeftToRight(diff, new BasicMonitor()); final EObject originNode = getNodeNamed(right, "origin"); @@ -1012,8 +1012,8 @@ public class IndividualMergeTest { assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - addedToAttribute("root.origin", featureName, "value1"))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), addedToAttribute("root.origin", featureName, "value1"))); mergerRegistry.getHighestRankingMerger(diff).copyRightToLeft(diff, new BasicMonitor()); final EObject originNode = getNodeNamed(left, "origin"); @@ -1042,8 +1042,8 @@ public class IndividualMergeTest { assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - addedToAttribute("root.origin", featureName, "value1"))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), addedToAttribute("root.origin", featureName, "value1"))); mergerRegistry.getHighestRankingMerger(diff).copyLeftToRight(diff, new BasicMonitor()); final EObject originNode = getNodeNamed(right, "origin"); @@ -1074,8 +1074,8 @@ public class IndividualMergeTest { assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - addedToAttribute("root.origin", featureName, "value1"))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), addedToAttribute("root.origin", featureName, "value1"))); mergerRegistry.getHighestRankingMerger(diff).copyRightToLeft(diff, new BasicMonitor()); final EObject originNode = getNodeNamed(left, "origin"); @@ -1352,8 +1352,8 @@ public class IndividualMergeTest { assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - movedInAttribute("root.origin", featureName, "value1"))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), movedInAttribute("root.origin", featureName, "value1"))); mergerRegistry.getHighestRankingMerger(diff).copyLeftToRight(diff, new BasicMonitor()); final EObject targetNode = getNodeNamed(right, "origin"); @@ -1386,8 +1386,8 @@ public class IndividualMergeTest { assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - movedInAttribute("root.origin", featureName, "value1"))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), movedInAttribute("root.origin", featureName, "value1"))); mergerRegistry.getHighestRankingMerger(diff).copyRightToLeft(diff, new BasicMonitor()); final EObject targetNode = getNodeNamed(left, "origin"); @@ -1421,8 +1421,8 @@ public class IndividualMergeTest { assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - movedInAttribute("root.origin", featureName, "value1"))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), movedInAttribute("root.origin", featureName, "value1"))); mergerRegistry.getHighestRankingMerger(diff).copyLeftToRight(diff, new BasicMonitor()); final EObject targetNode = getNodeNamed(right, "origin"); @@ -1458,8 +1458,8 @@ public class IndividualMergeTest { assertEquals(1, differences.size()); final String featureName = "multiValuedAttribute"; - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - movedInAttribute("root.origin", featureName, "value1"))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), movedInAttribute("root.origin", featureName, "value1"))); mergerRegistry.getHighestRankingMerger(diff).copyRightToLeft(diff, new BasicMonitor()); final EObject targetNode = getNodeNamed(left, "origin"); @@ -2717,8 +2717,8 @@ public class IndividualMergeTest { assertEquals(1, differences.size()); final String featureName = "containmentRef1"; - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), moved( - "root.value2", featureName))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), moved("root.value2", featureName))); mergerRegistry.getHighestRankingMerger(diff).copyLeftToRight(diff, new BasicMonitor()); final EObject targetNode = getNodeNamed(right, "value2"); @@ -2751,8 +2751,8 @@ public class IndividualMergeTest { assertEquals(1, differences.size()); final String featureName = "containmentRef1"; - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), moved( - "root.value2", featureName))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), moved("root.value2", featureName))); mergerRegistry.getHighestRankingMerger(diff).copyRightToLeft(diff, new BasicMonitor()); final EObject targetNode = getNodeNamed(right, "value2"); diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java index b4292a6ee..2d92d7186 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java @@ -120,15 +120,15 @@ public class MultipleMergeTest { // First, reject all conflicts on the right // left: 8923410, right: 62930147 - final ReferenceChange rightAdOfNode9 = (ReferenceChange)Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), added("Root.Node9"))); + final ReferenceChange rightAdOfNode9 = (ReferenceChange)Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), added("Root.Node9"))); mergerRegistry.getHighestRankingMerger(rightAdOfNode9).copyLeftToRight(rightAdOfNode9, new BasicMonitor()); // left: 8923410, right: 6230147 - final ReferenceChange rightMoveOfNode1 = (ReferenceChange)Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), moved("Root.Node1", "containmentRef1"))); + final ReferenceChange rightMoveOfNode1 = (ReferenceChange)Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), moved("Root.Node1", "containmentRef1"))); // revert move of Node 1 in right. It should be re-positioned right before 2 mergerRegistry.getHighestRankingMerger(rightMoveOfNode1).copyLeftToRight(rightMoveOfNode1, new BasicMonitor()); @@ -136,16 +136,16 @@ public class MultipleMergeTest { // left: 8923410, right: 6123047 - final ReferenceChange rightAddOfNode0 = (ReferenceChange)Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), added("Root.Node0"))); + final ReferenceChange rightAddOfNode0 = (ReferenceChange)Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), added("Root.Node0"))); // revert addition of 0 in right mergerRegistry.getHighestRankingMerger(rightAddOfNode0).copyLeftToRight(rightAddOfNode0, new BasicMonitor()); // left: 8923410, right: 612347 - final ReferenceChange rightMoveOfNode6 = (ReferenceChange)Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), moved("Root.Node6", "containmentRef1"))); + final ReferenceChange rightMoveOfNode6 = (ReferenceChange)Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), moved("Root.Node6", "containmentRef1"))); // Revert move of 6 in right. mergerRegistry.getHighestRankingMerger(rightMoveOfNode6).copyLeftToRight(rightMoveOfNode6, new BasicMonitor()); @@ -165,8 +165,8 @@ public class MultipleMergeTest { // And now, accept all other changes // add Node8 - final ReferenceChange leftAddOfNode8 = (ReferenceChange)Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), added("Root.Node8"))); + final ReferenceChange leftAddOfNode8 = (ReferenceChange)Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), added("Root.Node8"))); // LCS is currently {2, 3, 4}. Insertion index is right before 2. mergerRegistry.getHighestRankingMerger(leftAddOfNode8).copyLeftToRight(leftAddOfNode8, new BasicMonitor()); @@ -175,8 +175,8 @@ public class MultipleMergeTest { // left: 8923410, right: 1823467 // add Node9 - final ReferenceChange leftAddOfNode9 = (ReferenceChange)Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), added("Root.Node9"))); + final ReferenceChange leftAddOfNode9 = (ReferenceChange)Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), added("Root.Node9"))); // LCS is now {8, 2, 3, 4}. Insertion should be right after 8 mergerRegistry.getHighestRankingMerger(leftAddOfNode9).copyLeftToRight(leftAddOfNode9, new BasicMonitor()); @@ -185,8 +185,8 @@ public class MultipleMergeTest { // left: 8923410, right: 18923467 // move Node1 - final ReferenceChange leftMoveOfNode1 = (ReferenceChange)Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), moved("Root.Node1", "containmentRef1"))); + final ReferenceChange leftMoveOfNode1 = (ReferenceChange)Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), moved("Root.Node1", "containmentRef1"))); // LCS is {8, 9, 2, 3, 4}. 1 should be moved right after 4. mergerRegistry.getHighestRankingMerger(leftMoveOfNode1).copyLeftToRight(leftMoveOfNode1, new BasicMonitor()); @@ -195,8 +195,8 @@ public class MultipleMergeTest { // left: 8923410, right: 89234167 // add Node0 - final ReferenceChange leftAddOfNode0 = (ReferenceChange)Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), added("Root.Node0"))); + final ReferenceChange leftAddOfNode0 = (ReferenceChange)Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), added("Root.Node0"))); // LCS is now {8, 9, 2, 3, 4, 1}. 0 should be added right after 1 mergerRegistry.getHighestRankingMerger(leftAddOfNode0).copyLeftToRight(leftAddOfNode0, new BasicMonitor()); @@ -224,8 +224,8 @@ public class MultipleMergeTest { // left: 8923410, right: 89234107 // merge 7 (remove Node7) - final ReferenceChange diff7 = (ReferenceChange)Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), removed("Root.Node7"))); + final ReferenceChange diff7 = (ReferenceChange)Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), removed("Root.Node7"))); mergerRegistry.getHighestRankingMerger(diff7).copyLeftToRight(diff7, new BasicMonitor()); assertValueIndexIs(diff7, false, -1); @@ -270,8 +270,8 @@ public class MultipleMergeTest { // left: 89234610, right: 62930147 // Revert add of 9 on the left side - final ReferenceChange leftAddOfNode9 = (ReferenceChange)Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), added("Root.Node9"))); + final ReferenceChange leftAddOfNode9 = (ReferenceChange)Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), added("Root.Node9"))); mergerRegistry.getHighestRankingMerger(leftAddOfNode9).copyRightToLeft(leftAddOfNode9, new BasicMonitor()); assertValueIndexIs(leftAddOfNode9, true, -1); @@ -288,8 +288,8 @@ public class MultipleMergeTest { // left: 8234610, right: 62930147 // Revert add of 0 on the left side - final ReferenceChange leftAddOfNode0 = (ReferenceChange)Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), added("Root.Node0"))); + final ReferenceChange leftAddOfNode0 = (ReferenceChange)Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), added("Root.Node0"))); mergerRegistry.getHighestRankingMerger(leftAddOfNode0).copyRightToLeft(leftAddOfNode0, new BasicMonitor()); assertValueIndexIs(leftAddOfNode0, true, -1); @@ -297,8 +297,8 @@ public class MultipleMergeTest { // left: 823461, right: 62930147 // Revert move of 1 in left - final ReferenceChange leftMoveOfNode1 = (ReferenceChange)Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), moved("Root.Node1", "containmentRef1"))); + final ReferenceChange leftMoveOfNode1 = (ReferenceChange)Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), moved("Root.Node1", "containmentRef1"))); mergerRegistry.getHighestRankingMerger(leftMoveOfNode1).copyRightToLeft(leftMoveOfNode1, new BasicMonitor()); assertValueIndexIs(leftMoveOfNode1, true, 1); @@ -308,8 +308,8 @@ public class MultipleMergeTest { // And now, let's merge all the others right to left // move 6 - final ReferenceChange rightMoveOfNode6 = (ReferenceChange)Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), moved("Root.Node6", "containmentRef1"))); + final ReferenceChange rightMoveOfNode6 = (ReferenceChange)Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), moved("Root.Node6", "containmentRef1"))); mergerRegistry.getHighestRankingMerger(rightMoveOfNode6).copyRightToLeft(rightMoveOfNode6, new BasicMonitor()); assertValueIndexIs(rightMoveOfNode6, true, 2); @@ -317,8 +317,8 @@ public class MultipleMergeTest { // left: 816234, right: 62930147 // add 9 - final ReferenceChange rightAddOfNode9 = (ReferenceChange)Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), added("Root.Node9"))); + final ReferenceChange rightAddOfNode9 = (ReferenceChange)Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), added("Root.Node9"))); mergerRegistry.getHighestRankingMerger(rightAddOfNode9).copyRightToLeft(rightAddOfNode9, new BasicMonitor()); assertValueIndexIs(rightAddOfNode9, true, 4); @@ -326,8 +326,8 @@ public class MultipleMergeTest { // left: 8162934, right: 62930147 // add 0 - final ReferenceChange rightAddOfNode0 = (ReferenceChange)Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), added("Root.Node0"))); + final ReferenceChange rightAddOfNode0 = (ReferenceChange)Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), added("Root.Node0"))); mergerRegistry.getHighestRankingMerger(rightAddOfNode0).copyRightToLeft(rightAddOfNode0, new BasicMonitor()); assertValueIndexIs(rightAddOfNode0, true, 6); @@ -335,8 +335,8 @@ public class MultipleMergeTest { // left: 81629304, right: 62930147 // move 1 - final ReferenceChange rightMoveOfNode1 = (ReferenceChange)Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.RIGHT), moved("Root.Node1", "containmentRef1"))); + final ReferenceChange rightMoveOfNode1 = (ReferenceChange)Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), moved("Root.Node1", "containmentRef1"))); mergerRegistry.getHighestRankingMerger(rightMoveOfNode1).copyRightToLeft(rightMoveOfNode1, new BasicMonitor()); assertValueIndexIs(rightMoveOfNode1, true, 6); @@ -353,8 +353,8 @@ public class MultipleMergeTest { // left: 86293014, right: 62930147 // revert add 8 - final ReferenceChange leftAddOfNode8 = (ReferenceChange)Iterators.find(differences.iterator(), and( - fromSide(DifferenceSource.LEFT), added("Root.Node8"))); + final ReferenceChange leftAddOfNode8 = (ReferenceChange)Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), added("Root.Node8"))); mergerRegistry.getHighestRankingMerger(leftAddOfNode8).copyRightToLeft(leftAddOfNode8, new BasicMonitor()); assertValueIndexIs(leftAddOfNode8, false, -1); diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/PseudoConflictMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/PseudoConflictMergeTest.java index c3517a19e..5a0fc2dd6 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/PseudoConflictMergeTest.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/PseudoConflictMergeTest.java @@ -69,8 +69,8 @@ public class PseudoConflictMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(2, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - ofKind(DifferenceKind.ADD))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD))); // Merge -> Node A[containmentRef1 add] from left to right : <- Node A[containmentRef1 add] will be // merge from left to right too. @@ -109,8 +109,8 @@ public class PseudoConflictMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(2, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), - ofKind(DifferenceKind.ADD))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD))); // Merge <- Node A[containmentRef1 add] from left to right : -> Node A[containmentRef1 add] will be // merge from left to right too. @@ -149,8 +149,8 @@ public class PseudoConflictMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(2, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - ofKind(DifferenceKind.ADD))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.ADD))); // Merge -> Node A[containmentRef1 add] from right to left : <- Node A[containmentRef1 add] will be // merge from right to left too. @@ -189,8 +189,8 @@ public class PseudoConflictMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(2, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), - ofKind(DifferenceKind.ADD))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.ADD))); // Merge <- Node A[containmentRef1 add] from right to left : -> Node A[containmentRef1 add] will be // merge from right to left too. @@ -229,8 +229,8 @@ public class PseudoConflictMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(2, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - ofKind(DifferenceKind.DELETE))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE))); // Merge -> Node B[containmentRef1 delete] from left to right : <- Node B[containmentRef1 delete] will // be merge from left to right too. @@ -269,8 +269,8 @@ public class PseudoConflictMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(2, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), - ofKind(DifferenceKind.DELETE))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.DELETE))); // Merge <- Node B[containmentRef1 delete] from left to right : -> Node B[containmentRef1 delete] will // be merge from left to right too. @@ -309,8 +309,8 @@ public class PseudoConflictMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(2, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - ofKind(DifferenceKind.DELETE))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.DELETE))); // Merge -> Node B[containmentRef1 delete] from right to left : <- Node B[containmentRef1 delete] will // be merge from right to left too. @@ -349,8 +349,8 @@ public class PseudoConflictMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(2, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), - ofKind(DifferenceKind.DELETE))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.DELETE))); // Merge <- Node B[containmentRef1 delete] from right to left : -> Node B[containmentRef1 delete] will // be merge from right to left too. @@ -389,8 +389,8 @@ public class PseudoConflictMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(2, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - ofKind(DifferenceKind.CHANGE))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.CHANGE))); // Merge -> Hello[singleValuedAttribute changed] from left to right : <- Hello[singleValuedAttribute // changed] will be merge from left to right too. @@ -431,8 +431,8 @@ public class PseudoConflictMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(2, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), - ofKind(DifferenceKind.CHANGE))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.CHANGE))); // Merge <- Hello[singleValuedAttribute changed] from left to right : -> Hello[singleValuedAttribute // changed] will be merge from left to right too. @@ -473,8 +473,8 @@ public class PseudoConflictMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(2, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.LEFT), - ofKind(DifferenceKind.CHANGE))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.LEFT), ofKind(DifferenceKind.CHANGE))); // Merge -> Hello[singleValuedAttribute changed] from right to left : <- Hello[singleValuedAttribute // changed] will be merge from right to left too. @@ -515,8 +515,8 @@ public class PseudoConflictMergeTest { List<Diff> differences = comparison.getDifferences(); assertEquals(2, differences.size()); - final Diff diff = Iterators.find(differences.iterator(), and(fromSide(DifferenceSource.RIGHT), - ofKind(DifferenceKind.CHANGE))); + final Diff diff = Iterators.find(differences.iterator(), + and(fromSide(DifferenceSource.RIGHT), ofKind(DifferenceKind.CHANGE))); // Merge -> Hello[singleValuedAttribute changed] from right to left : <- Hello[singleValuedAttribute // changed] will be merge from right to left too. diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/IndividualDiffInputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/IndividualDiffInputData.java index eab07a4fc..805f5d1b6 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/IndividualDiffInputData.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/IndividualDiffInputData.java @@ -536,7 +536,8 @@ public class IndividualDiffInputData extends AbstractInputData { return loadFromClassLoader("featuremapscope/noncontainment/delete/ancestor.nodes", resourceSet); } - public Resource getFeatureMapNonContainmentLeftMoveOrderScope(ResourceSet resourceSet) throws IOException { + public Resource getFeatureMapNonContainmentLeftMoveOrderScope(ResourceSet resourceSet) + throws IOException { return loadFromClassLoader("featuremapscope/noncontainment/moveorder/left.nodes", resourceSet); } @@ -554,7 +555,8 @@ public class IndividualDiffInputData extends AbstractInputData { return loadFromClassLoader("featuremapscope/containment/conflicts/leftadd_rightadd/left.nodes"); } - public Resource getFeatureMapContainmentRightConflictLeftAddRightAddWithSameKeyScope() throws IOException { + public Resource getFeatureMapContainmentRightConflictLeftAddRightAddWithSameKeyScope() + throws IOException { return loadFromClassLoader("featuremapscope/containment/conflicts/leftadd_rightadd/right.nodes"); } @@ -579,15 +581,18 @@ public class IndividualDiffInputData extends AbstractInputData { } public Resource getFeatureMapContainmentLeftConflictLeftKeyChangeRightDeleteScope() throws IOException { - return loadFromClassLoader("featuremapscope/containment/conflicts/leftkeychange_rightdelete/left.nodes"); + return loadFromClassLoader( + "featuremapscope/containment/conflicts/leftkeychange_rightdelete/left.nodes"); } public Resource getFeatureMapContainmentRightConflictLeftKeyChangeRightDeleteScope() throws IOException { - return loadFromClassLoader("featuremapscope/containment/conflicts/leftkeychange_rightdelete/right.nodes"); + return loadFromClassLoader( + "featuremapscope/containment/conflicts/leftkeychange_rightdelete/right.nodes"); } public Resource getFeatureMapContainmentOriginConflictLeftKeyChangeRightDeleteScope() throws IOException { - return loadFromClassLoader("featuremapscope/containment/conflicts/leftkeychange_rightdelete/ancestor.nodes"); + return loadFromClassLoader( + "featuremapscope/containment/conflicts/leftkeychange_rightdelete/ancestor.nodes"); } public Resource getFeatureMapContainmentLeftConflictLeftMoveRightMoveScope() throws IOException { @@ -602,18 +607,22 @@ public class IndividualDiffInputData extends AbstractInputData { return loadFromClassLoader("featuremapscope/containment/conflicts/leftmove_rightmove/ancestor.nodes"); } - public Resource getFeatureMapContainmentLeftConflictLeftMoveOrderRightMoveOrderScope() throws IOException { - return loadFromClassLoader("featuremapscope/containment/conflicts/leftmoveorder_rightmoveorder/left.nodes"); + public Resource getFeatureMapContainmentLeftConflictLeftMoveOrderRightMoveOrderScope() + throws IOException { + return loadFromClassLoader( + "featuremapscope/containment/conflicts/leftmoveorder_rightmoveorder/left.nodes"); } public Resource getFeatureMapContainmentRightConflictLeftMoveOrderRightMoveOrderScope() throws IOException { - return loadFromClassLoader("featuremapscope/containment/conflicts/leftmoveorder_rightmoveorder/right.nodes"); + return loadFromClassLoader( + "featuremapscope/containment/conflicts/leftmoveorder_rightmoveorder/right.nodes"); } public Resource getFeatureMapContainmentOriginConflictLeftMoveOrderRightMoveOrderScope() throws IOException { - return loadFromClassLoader("featuremapscope/containment/conflicts/leftmoveorder_rightmoveorder/ancestor.nodes"); + return loadFromClassLoader( + "featuremapscope/containment/conflicts/leftmoveorder_rightmoveorder/ancestor.nodes"); } public Resource getFeatureMapNonContainmentLeftConflictLeftMoveOrderRightMoveOrderScope( diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/TwoWayMergeInputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/TwoWayMergeInputData.java index f45222c33..4b9b7a092 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/TwoWayMergeInputData.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/TwoWayMergeInputData.java @@ -37,19 +37,23 @@ public class TwoWayMergeInputData extends AbstractInputData { } public Resource getOppositeReferenceChangeWithoutMatchingOrignalContainerL2RLeft() throws IOException { - return loadFromClassLoader("twoway/oppositereferencechangewithoutmatchingorignalcontainer/ltr/left.nodes"); + return loadFromClassLoader( + "twoway/oppositereferencechangewithoutmatchingorignalcontainer/ltr/left.nodes"); } public Resource getOppositeReferenceChangeWithoutMatchingOrignalContainerL2RRight() throws IOException { - return loadFromClassLoader("twoway/oppositereferencechangewithoutmatchingorignalcontainer/ltr/right.nodes"); + return loadFromClassLoader( + "twoway/oppositereferencechangewithoutmatchingorignalcontainer/ltr/right.nodes"); } public Resource getOppositeReferenceChangeWithAddAndDeleteOnMultivaluedSideLeft() throws IOException { - return loadFromClassLoader("twoway/oppositereferencechangewithaddanddeleteonmultivaluedside/rtl/left.nodes"); + return loadFromClassLoader( + "twoway/oppositereferencechangewithaddanddeleteonmultivaluedside/rtl/left.nodes"); } public Resource getOppositeReferenceChangeWithAddAndDeleteOnMultivaluedSideRight() throws IOException { - return loadFromClassLoader("twoway/oppositereferencechangewithaddanddeleteonmultivaluedside/rtl/right.nodes"); + return loadFromClassLoader( + "twoway/oppositereferencechangewithaddanddeleteonmultivaluedside/rtl/right.nodes"); } public Resource getMoveFromSingleValueReferenceToMultiValueReferenceR2LLeft() throws IOException { @@ -57,7 +61,8 @@ public class TwoWayMergeInputData extends AbstractInputData { } public Resource getMoveFromSingleValueReferenceToMultiValueReferenceR2LRight() throws IOException { - return loadFromClassLoader("twoway/movefromsinglevaluereferencetomultivaluereference/rtl/right.nodes"); + return loadFromClassLoader( + "twoway/movefromsinglevaluereferencetomultivaluereference/rtl/right.nodes"); } public Resource getMoveToNewContainerInADifferentOrderR2LLeft() throws IOException { |