diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org')
9 files changed, 108 insertions, 143 deletions
diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/AbstractTest.java b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/AbstractTest.java index a40ef7ee8..7fae9305a 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/AbstractTest.java +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/AbstractTest.java @@ -39,21 +39,23 @@ import com.google.common.collect.Iterators; public abstract class AbstractTest { private EMFCompare emfCompare; - + private PostProcessorDescriptorRegistryImpl<String> postProcessorRegistry; @Before public void before() { postProcessorRegistry = new PostProcessorDescriptorRegistryImpl<String>(); - postProcessorRegistry.put(CompareDiagramPostProcessor.class.getName(), new TestPostProcessor.TestPostProcessorDescriptor( - Pattern.compile("http://www.eclipse.org/gmf/runtime/\\d.\\d.\\d/notation"), null, new CompareDiagramPostProcessor(), 30)); + postProcessorRegistry.put(CompareDiagramPostProcessor.class.getName(), + new TestPostProcessor.TestPostProcessorDescriptor( + Pattern.compile("http://www.eclipse.org/gmf/runtime/\\d.\\d.\\d/notation"), null, + new CompareDiagramPostProcessor(), 30)); emfCompare = EMFCompare.builder().setPostProcessorRegistry(postProcessorRegistry).build(); } protected EMFCompare getCompare() { return emfCompare; } - + protected Comparison compare(Notifier left, Notifier right) { return compare(left, right, null); } @@ -62,7 +64,7 @@ public abstract class AbstractTest { IComparisonScope scope = new DefaultComparisonScope(left, right, origin); return getCompare().compare(scope); } - + @After public void after() { if (getInput() != null && getInput().getSets() != null) { @@ -92,9 +94,9 @@ public abstract class AbstractTest { } return Integer.valueOf(count); } - + protected abstract DiagramInputData getInput(); - + protected void testIntersections(Comparison comparison) { assertFalse(Iterables.any(comparison.getDifferences(), new Predicate<Diff>() { public boolean apply(Diff input) { diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/EdgechangesTest.java b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/EdgechangesTest.java index f6cb56f7f..b69dd0076 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/EdgechangesTest.java +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/EdgechangesTest.java @@ -51,8 +51,7 @@ public class EdgechangesTest extends AbstractTest { final Resource left = input.getA1Left(); final Resource right = input.getA1Right(); - final Comparison comparison = compare(left.getResourceSet(), - right.getResourceSet()); + final Comparison comparison = compare(left.getResourceSet(), right.getResourceSet()); final List<Diff> differences = comparison.getDifferences(); @@ -69,7 +68,7 @@ public class EdgechangesTest extends AbstractTest { assertSame(Integer.valueOf(1), edgeChange.getRefinedBy().size()); assertTrue(edgeChange.getRefinedBy().contains(attributeChange)); - + testIntersections(comparison); } @@ -78,8 +77,7 @@ public class EdgechangesTest extends AbstractTest { final Resource left = input.getA1Left(); final Resource right = input.getA1Right(); - final Comparison comparison = compare(right.getResourceSet(), - left.getResourceSet()); + final Comparison comparison = compare(right.getResourceSet(), left.getResourceSet()); final List<Diff> differences = comparison.getDifferences(); @@ -96,7 +94,7 @@ public class EdgechangesTest extends AbstractTest { assertSame(Integer.valueOf(1), edgeChange.getRefinedBy().size()); assertTrue(edgeChange.getRefinedBy().contains(attributeChange)); - + testIntersections(comparison); } @@ -105,8 +103,7 @@ public class EdgechangesTest extends AbstractTest { final Resource left = input.getA2Left(); final Resource right = input.getA2Right(); - final Comparison comparison = compare(left.getResourceSet(), - right.getResourceSet()); + final Comparison comparison = compare(left.getResourceSet(), right.getResourceSet()); final List<Diff> differences = comparison.getDifferences(); @@ -124,7 +121,7 @@ public class EdgechangesTest extends AbstractTest { assertSame(Integer.valueOf(3), edgeChange.getRefinedBy().size()); assertTrue(edgeChange.getRefinedBy().containsAll(diffs)); - + testIntersections(comparison); } @@ -134,8 +131,7 @@ public class EdgechangesTest extends AbstractTest { final Resource left = input.getA2Left(); final Resource right = input.getA2Right(); - final Comparison comparison = compare(right.getResourceSet(), - left.getResourceSet()); + final Comparison comparison = compare(right.getResourceSet(), left.getResourceSet()); final List<Diff> differences = comparison.getDifferences(); @@ -153,7 +149,7 @@ public class EdgechangesTest extends AbstractTest { assertSame(Integer.valueOf(3), edgeChange.getRefinedBy().size()); assertTrue(edgeChange.getRefinedBy().containsAll(diffs)); - + testIntersections(comparison); } @@ -162,8 +158,7 @@ public class EdgechangesTest extends AbstractTest { final Resource left = input.getA3Left(); final Resource right = input.getA3Right(); - final Comparison comparison = compare(left.getResourceSet(), - right.getResourceSet()); + final Comparison comparison = compare(left.getResourceSet(), right.getResourceSet()); final List<Diff> differences = comparison.getDifferences(); @@ -189,8 +184,7 @@ public class EdgechangesTest extends AbstractTest { final Resource left = input.getA3Left(); final Resource right = input.getA3Right(); - final Comparison comparison = compare(right.getResourceSet(), - left.getResourceSet()); + final Comparison comparison = compare(right.getResourceSet(), left.getResourceSet()); final List<Diff> differences = comparison.getDifferences(); @@ -207,7 +201,7 @@ public class EdgechangesTest extends AbstractTest { assertSame(Integer.valueOf(1), edgeChange.getRefinedBy().size()); assertTrue(edgeChange.getRefinedBy().contains(attributeChange)); - + testIntersections(comparison); } @@ -216,8 +210,7 @@ public class EdgechangesTest extends AbstractTest { final Resource left = input.getA4Left(); final Resource right = input.getA4Right(); - final Comparison comparison = compare(left.getResourceSet(), - right.getResourceSet()); + final Comparison comparison = compare(left.getResourceSet(), right.getResourceSet()); final List<Diff> differences = comparison.getDifferences(); @@ -234,9 +227,10 @@ public class EdgechangesTest extends AbstractTest { assertSame(Integer.valueOf(12), diffs.size()); assertNotNull(edgeChange); - assertSame(Integer.valueOf(12), edgeChange.getRefinedBy().size());// 11 + the add of edge for convenience... + assertSame(Integer.valueOf(12), edgeChange.getRefinedBy().size());// 11 + the add of edge for + // convenience... assertTrue(edgeChange.getRefinedBy().contains(addEdge)); // for convenience... - + testIntersections(comparison); } @@ -246,8 +240,7 @@ public class EdgechangesTest extends AbstractTest { final Resource left = input.getA4Left(); final Resource right = input.getA4Right(); - final Comparison comparison = compare(right.getResourceSet(), - left.getResourceSet()); + final Comparison comparison = compare(right.getResourceSet(), left.getResourceSet()); final List<Diff> differences = comparison.getDifferences(); @@ -266,7 +259,7 @@ public class EdgechangesTest extends AbstractTest { Diff deleteEdge = Iterators.find(differences.iterator(), and(valueIsEdge, ofKind(DifferenceKind.DELETE))); assertTrue(edgeChange.getRefinedBy().contains(deleteEdge)); - + testIntersections(comparison); } diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/data/EdgeChangesInputData.java b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/data/EdgeChangesInputData.java index f186f6b98..823e0971b 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/data/EdgeChangesInputData.java +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/data/EdgeChangesInputData.java @@ -35,7 +35,7 @@ public class EdgeChangesInputData extends DiagramInputData { public Resource getA1Right() throws IOException { return loadFromClassLoader("a1/TC02.ecorediag"); //$NON-NLS-1$ } - + public Resource getA2Left() throws IOException { return loadFromClassLoader("a2/TC01.ecorediag"); //$NON-NLS-1$ } @@ -43,7 +43,7 @@ public class EdgeChangesInputData extends DiagramInputData { public Resource getA2Right() throws IOException { return loadFromClassLoader("a2/TC02.ecorediag"); //$NON-NLS-1$ } - + public Resource getA3Left() throws IOException { return loadFromClassLoader("a3/TC01.ecorediag"); //$NON-NLS-1$ } @@ -51,7 +51,7 @@ public class EdgeChangesInputData extends DiagramInputData { public Resource getA3Right() throws IOException { return loadFromClassLoader("a3/TC02.ecorediag"); //$NON-NLS-1$ } - + public Resource getA4Left() throws IOException { return loadFromClassLoader("a4/TC01.ecorediag"); //$NON-NLS-1$ } @@ -59,7 +59,7 @@ public class EdgeChangesInputData extends DiagramInputData { public Resource getA4Right() throws IOException { return loadFromClassLoader("a4/TC02.ecorediag"); //$NON-NLS-1$ } - + @Override protected Resource loadFromClassLoader(String string) throws IOException { final URL fileURL = getClass().getResource(string); @@ -82,7 +82,7 @@ public class EdgeChangesInputData extends DiagramInputData { resource.load(str, Collections.emptyMap()); str.close(); - + EcoreUtil.resolveAll(resourceSet); return resource; diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/hide/HideTest.java b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/hide/HideTest.java index 7788d5f25..f42cced38 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/hide/HideTest.java +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/hide/HideTest.java @@ -48,27 +48,28 @@ public class HideTest extends AbstractTest { final Resource right = input.getA1Right(); final Comparison comparison = compare(left, right, null); - + final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 2 differences assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - - Predicate<? super Diff> attributeChangeDescription = attributeValueMatch(NotationPackage.Literals.VIEW__VISIBLE.getName(), Boolean.FALSE, false); + + Predicate<? super Diff> attributeChangeDescription = attributeValueMatch( + NotationPackage.Literals.VIEW__VISIBLE.getName(), Boolean.FALSE, false); Predicate<? super Diff> hideDescription = and(instanceOf(Hide.class), ofKind(DifferenceKind.CHANGE)); - + assertSame(Integer.valueOf(1), count(differences, instanceOf(Hide.class))); final Diff attributeChange = Iterators.find(differences.iterator(), attributeChangeDescription); final Diff hide = Iterators.find(differences.iterator(), hideDescription); - + assertNotNull(attributeChange); assertNotNull(hide); - + assertSame(Integer.valueOf(1), Integer.valueOf(hide.getRefinedBy().size())); assertTrue(hide.getRefinedBy().contains(attributeChange)); - - testIntersections(comparison); + + testIntersections(comparison); } @Override diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/merge/ExtensionMergeTest.java b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/merge/ExtensionMergeTest.java index a65bf3dff..f8064234f 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/merge/ExtensionMergeTest.java +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/merge/ExtensionMergeTest.java @@ -46,7 +46,6 @@ public class ExtensionMergeTest extends AbstractTest { testMergeRightToLeft(left, right, null); } - protected void testMergeRightToLeft(Notifier left, Notifier right, Notifier origin) { final IComparisonScope scope = new DefaultComparisonScope(left, right, origin); final Comparison comparisonBefore = getCompare().compare(scope); @@ -71,8 +70,8 @@ public class ExtensionMergeTest extends AbstractTest { merger.copyRightToLeft(diff, null); } final Comparison comparisonAfter = getCompare().compare(scope); - assertTrue("Comparison#getDifferences() must be empty after copyAllRightToLeft", comparisonAfter - .getDifferences().isEmpty()); + assertTrue("Comparison#getDifferences() must be empty after copyAllRightToLeft", + comparisonAfter.getDifferences().isEmpty()); } @Override diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/nodechanges/NodechangesTest.java b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/nodechanges/NodechangesTest.java index 6030dad3d..76ca9eeca 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/nodechanges/NodechangesTest.java +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/nodechanges/NodechangesTest.java @@ -66,8 +66,7 @@ public class NodechangesTest extends AbstractTest { final Resource left = input.getA1Left(); final Resource right = input.getA1Right(); - final Comparison comparison = compare(left.getResourceSet(), - right.getResourceSet()); + final Comparison comparison = compare(left.getResourceSet(), right.getResourceSet()); final List<Diff> differences = comparison.getDifferences(); @@ -76,8 +75,7 @@ public class NodechangesTest extends AbstractTest { final Diff addEPackage = Iterators.find(differences.iterator(), added("tc1.EPackage0")); - final Diff addEPackageView = Iterators.find( - differences.iterator(), + final Diff addEPackageView = Iterators.find(differences.iterator(), and(valueIsView, valueNameMatches("1002", NotationPackage.Literals.VIEW__TYPE), elementIs(((ReferenceChange)addEPackage).getValue()))); final Diff addNodeInEPackageView1 = Iterators.find(differences.iterator(), @@ -101,8 +99,7 @@ public class NodechangesTest extends AbstractTest { final Diff addEClass = Iterators.find(differences.iterator(), added("tc1.EClass0")); - final Diff addEClassView = Iterators.find( - differences.iterator(), + final Diff addEClassView = Iterators.find(differences.iterator(), and(valueIsView, valueNameMatches("1001", NotationPackage.Literals.VIEW__TYPE), elementIs(((ReferenceChange)addEClass).getValue()))); final Diff addNodeInEClassView1 = Iterators.find(differences.iterator(), @@ -132,8 +129,7 @@ public class NodechangesTest extends AbstractTest { final Diff addEDataType = Iterators.find(differences.iterator(), added("tc1.EDataType0")); - final Diff addEDataTypeView = Iterators.find( - differences.iterator(), + final Diff addEDataTypeView = Iterators.find(differences.iterator(), and(valueIsView, valueNameMatches("1004", NotationPackage.Literals.VIEW__TYPE), elementIs(((ReferenceChange)addEDataType).getValue()))); final Diff addNodeInEDataTypeView1 = Iterators.find(differences.iterator(), @@ -149,8 +145,7 @@ public class NodechangesTest extends AbstractTest { final Diff addEEnum = Iterators.find(differences.iterator(), added("tc1.EEnum0")); - final Diff addEEnumView = Iterators.find( - differences.iterator(), + final Diff addEEnumView = Iterators.find(differences.iterator(), and(valueIsView, valueNameMatches("1005", NotationPackage.Literals.VIEW__TYPE), elementIs(((ReferenceChange)addEEnum).getValue()))); final Diff addNodeInEEnumView1 = Iterators.find(differences.iterator(), @@ -170,13 +165,10 @@ public class NodechangesTest extends AbstractTest { final Diff addBoundsInEEnumView = Iterators.find(differences.iterator(), and(valueUnder(addEEnumView), valueIsInstanceof(Bounds.class))); - final Diff addEAnnotation = Iterators.find( - differences.iterator(), - addedToReference("tc1", "eAnnotations", "tc1.EAnnotation0", - EcorePackage.Literals.EANNOTATION__SOURCE)); + final Diff addEAnnotation = Iterators.find(differences.iterator(), addedToReference("tc1", + "eAnnotations", "tc1.EAnnotation0", EcorePackage.Literals.EANNOTATION__SOURCE)); - final Diff addEAnnotationView = Iterators.find( - differences.iterator(), + final Diff addEAnnotationView = Iterators.find(differences.iterator(), and(valueIsView, valueNameMatches("1003", NotationPackage.Literals.VIEW__TYPE), elementIs(((ReferenceChange)addEAnnotation).getValue()))); final Diff addNodeInEAnnotationView1 = Iterators.find(differences.iterator(), @@ -199,29 +191,24 @@ public class NodechangesTest extends AbstractTest { assertSame(Integer.valueOf(5), count(differences, and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD)))); - final Diff addNodeEPackageExtension = Iterators.find( - differences.iterator(), + final Diff addNodeEPackageExtension = Iterators.find(differences.iterator(), and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD), refinedBy(addRefElementInEPackageView))); - final Diff addNodeEClassExtension = Iterators.find( - differences.iterator(), + final Diff addNodeEClassExtension = Iterators.find(differences.iterator(), and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD), refinedBy(addRefElementInEClassView))); - final Diff addNodeEDataTypeExtension = Iterators.find( - differences.iterator(), + final Diff addNodeEDataTypeExtension = Iterators.find(differences.iterator(), and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD), refinedBy(addRefElementInEDataTypeView))); - final Diff addNodeEENumExtension = Iterators.find( - differences.iterator(), + final Diff addNodeEENumExtension = Iterators.find(differences.iterator(), and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD), refinedBy(addRefElementInEEnumView))); - final Diff addNodeEAnnotationExtension = Iterators.find( - differences.iterator(), + final Diff addNodeEAnnotationExtension = Iterators.find(differences.iterator(), and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD), refinedBy(addRefElementInEAnnotationView))); assertSame(Integer.valueOf(10), addNodeEPackageExtension.getRefinedBy().size()); - assertTrue(addNodeEPackageExtension.getRefinedBy().contains(addEPackageView));//for convenience... + assertTrue(addNodeEPackageExtension.getRefinedBy().contains(addEPackageView));// for convenience... assertTrue(addNodeEPackageExtension.getRefinedBy().contains(addNodeInEPackageView1)); assertTrue(addNodeEPackageExtension.getRefinedBy().contains(addNodeInEPackageView2)); assertTrue(addNodeEPackageExtension.getRefinedBy().contains(addDrawerStyleInNodeInEPackageView2)); @@ -233,7 +220,7 @@ public class NodechangesTest extends AbstractTest { assertTrue(addNodeEPackageExtension.getRefinedBy().contains(addRefElementInEPackageView)); assertSame(Integer.valueOf(13), addNodeEClassExtension.getRefinedBy().size()); - assertTrue(addNodeEClassExtension.getRefinedBy().contains(addEClassView));//for convenience... + assertTrue(addNodeEClassExtension.getRefinedBy().contains(addEClassView));// for convenience... assertTrue(addNodeEClassExtension.getRefinedBy().contains(addNodeInEClassView1)); assertTrue(addNodeEClassExtension.getRefinedBy().contains(addNodeInEClassView2)); assertTrue(addNodeEClassExtension.getRefinedBy().contains(addDrawerStyleInNodeInEClassView2)); @@ -267,15 +254,16 @@ public class NodechangesTest extends AbstractTest { assertTrue(addNodeEENumExtension.getRefinedBy().contains(addBoundsInEEnumView)); assertSame(Integer.valueOf(9), addNodeEAnnotationExtension.getRefinedBy().size()); - assertTrue(addNodeEAnnotationExtension.getRefinedBy().contains(addEAnnotationView));// for convenience... + assertTrue(addNodeEAnnotationExtension.getRefinedBy().contains(addEAnnotationView));// for + // convenience... assertTrue(addNodeEAnnotationExtension.getRefinedBy().contains(addNodeInEAnnotationView1)); assertTrue(addNodeEAnnotationExtension.getRefinedBy().contains(addNodeInEAnnotationView2)); + assertTrue( + addNodeEAnnotationExtension.getRefinedBy().contains(addDrawerStyleInNodeInEAnnotationView2)); + assertTrue( + addNodeEAnnotationExtension.getRefinedBy().contains(addSortingStyleInNodeInEAnnotationView2)); assertTrue(addNodeEAnnotationExtension.getRefinedBy() - .contains(addDrawerStyleInNodeInEAnnotationView2)); - assertTrue(addNodeEAnnotationExtension.getRefinedBy().contains( - addSortingStyleInNodeInEAnnotationView2)); - assertTrue(addNodeEAnnotationExtension.getRefinedBy().contains( - addFilteringStyleInNodeInEAnnotationView2)); + .contains(addFilteringStyleInNodeInEAnnotationView2)); assertTrue(addNodeEAnnotationExtension.getRefinedBy().contains(addShapeStyleInEAnnotationView)); assertTrue(addNodeEAnnotationExtension.getRefinedBy().contains(addRefElementInEAnnotationView)); assertTrue(addNodeEAnnotationExtension.getRefinedBy().contains(addBoundsInEAnnotationView)); @@ -311,10 +299,9 @@ public class NodechangesTest extends AbstractTest { assertTrue(addRefElementInEPackageView.getRequires().contains(addEPackage)); assertTrue(addRefElementInEPackageView.getRequires().contains(addEPackageView)); - assertFalse("No resource attachment changes expected", - Iterators.filter(differences.iterator(), instanceOf(ResourceAttachmentChange.class)) - .hasNext()); - + assertFalse("No resource attachment changes expected", Iterators + .filter(differences.iterator(), instanceOf(ResourceAttachmentChange.class)).hasNext()); + testIntersections(comparison); } @@ -323,8 +310,7 @@ public class NodechangesTest extends AbstractTest { final Resource left = input.getA1Left(); final Resource right = input.getA1Right(); - final Comparison comparison = compare(right.getResourceSet(), - left.getResourceSet()); + final Comparison comparison = compare(right.getResourceSet(), left.getResourceSet()); final List<Diff> differences = comparison.getDifferences(); @@ -333,8 +319,7 @@ public class NodechangesTest extends AbstractTest { final Diff addEPackage = Iterators.find(differences.iterator(), removed("tc1.EPackage0")); - final Diff addEPackageView = Iterators.find( - differences.iterator(), + final Diff addEPackageView = Iterators.find(differences.iterator(), and(valueIsView, valueNameMatches("1002", NotationPackage.Literals.VIEW__TYPE), elementIs(((ReferenceChange)addEPackage).getValue()))); final Diff addNodeInEPackageView1 = Iterators.find(differences.iterator(), @@ -358,8 +343,7 @@ public class NodechangesTest extends AbstractTest { final Diff addEClass = Iterators.find(differences.iterator(), removed("tc1.EClass0")); - final Diff addEClassView = Iterators.find( - differences.iterator(), + final Diff addEClassView = Iterators.find(differences.iterator(), and(valueIsView, valueNameMatches("1001", NotationPackage.Literals.VIEW__TYPE), elementIs(((ReferenceChange)addEClass).getValue()))); final Diff addNodeInEClassView1 = Iterators.find(differences.iterator(), @@ -389,8 +373,7 @@ public class NodechangesTest extends AbstractTest { final Diff addEDataType = Iterators.find(differences.iterator(), removed("tc1.EDataType0")); - final Diff addEDataTypeView = Iterators.find( - differences.iterator(), + final Diff addEDataTypeView = Iterators.find(differences.iterator(), and(valueIsView, valueNameMatches("1004", NotationPackage.Literals.VIEW__TYPE), elementIs(((ReferenceChange)addEDataType).getValue()))); final Diff addNodeInEDataTypeView1 = Iterators.find(differences.iterator(), @@ -406,8 +389,7 @@ public class NodechangesTest extends AbstractTest { final Diff addEEnum = Iterators.find(differences.iterator(), removed("tc1.EEnum0")); - final Diff addEEnumView = Iterators.find( - differences.iterator(), + final Diff addEEnumView = Iterators.find(differences.iterator(), and(valueIsView, valueNameMatches("1005", NotationPackage.Literals.VIEW__TYPE), elementIs(((ReferenceChange)addEEnum).getValue()))); final Diff addNodeInEEnumView1 = Iterators.find(differences.iterator(), @@ -427,13 +409,10 @@ public class NodechangesTest extends AbstractTest { final Diff addBoundsInEEnumView = Iterators.find(differences.iterator(), and(valueUnder(addEEnumView), valueIsInstanceof(Bounds.class))); - final Diff addEAnnotation = Iterators.find( - differences.iterator(), - removedFromReference("tc1", "eAnnotations", "tc1.EAnnotation0", - EcorePackage.Literals.EANNOTATION__SOURCE)); + final Diff addEAnnotation = Iterators.find(differences.iterator(), removedFromReference("tc1", + "eAnnotations", "tc1.EAnnotation0", EcorePackage.Literals.EANNOTATION__SOURCE)); - final Diff addEAnnotationView = Iterators.find( - differences.iterator(), + final Diff addEAnnotationView = Iterators.find(differences.iterator(), and(valueIsView, valueNameMatches("1003", NotationPackage.Literals.VIEW__TYPE), elementIs(((ReferenceChange)addEAnnotation).getValue()))); final Diff addNodeInEAnnotationView1 = Iterators.find(differences.iterator(), @@ -460,20 +439,16 @@ public class NodechangesTest extends AbstractTest { and(instanceOf(NodeChange.class), ofKind(DifferenceKind.DELETE), refinedBy(addEPackageView))); final Diff addNodeEClassExtension = Iterators.find(differences.iterator(), and(instanceOf(NodeChange.class), ofKind(DifferenceKind.DELETE), refinedBy(addEClassView))); - final Diff addNodeEDataTypeExtension = Iterators - .find(differences.iterator(), - and(instanceOf(NodeChange.class), ofKind(DifferenceKind.DELETE), - refinedBy(addEDataTypeView))); + final Diff addNodeEDataTypeExtension = Iterators.find(differences.iterator(), and( + instanceOf(NodeChange.class), ofKind(DifferenceKind.DELETE), refinedBy(addEDataTypeView))); final Diff addNodeEENumExtension = Iterators.find(differences.iterator(), and(instanceOf(NodeChange.class), ofKind(DifferenceKind.DELETE), refinedBy(addEEnumView))); - final Diff addNodeEAnnotationExtension = Iterators.find( - differences.iterator(), - and(instanceOf(NodeChange.class), ofKind(DifferenceKind.DELETE), - refinedBy(addEAnnotationView))); - + final Diff addNodeEAnnotationExtension = Iterators.find(differences.iterator(), and( + instanceOf(NodeChange.class), ofKind(DifferenceKind.DELETE), refinedBy(addEAnnotationView))); + assertSame(Integer.valueOf(10), addNodeEPackageExtension.getRefinedBy().size()); assertTrue(addNodeEPackageExtension.getRefinedBy().contains(addEPackageView)); - //for convenience: + // for convenience: assertTrue(addNodeEPackageExtension.getRefinedBy().contains(addNodeInEPackageView1)); assertTrue(addNodeEPackageExtension.getRefinedBy().contains(addNodeInEPackageView2)); assertTrue(addNodeEPackageExtension.getRefinedBy().contains(addDrawerStyleInNodeInEPackageView2)); @@ -486,7 +461,7 @@ public class NodechangesTest extends AbstractTest { assertSame(Integer.valueOf(13), addNodeEClassExtension.getRefinedBy().size()); assertTrue(addNodeEClassExtension.getRefinedBy().contains(addEClassView)); - //for convenience: + // for convenience: assertTrue(addNodeEClassExtension.getRefinedBy().contains(addNodeInEClassView1)); assertTrue(addNodeEClassExtension.getRefinedBy().contains(addNodeInEClassView2)); assertTrue(addNodeEClassExtension.getRefinedBy().contains(addDrawerStyleInNodeInEClassView2)); @@ -526,12 +501,12 @@ public class NodechangesTest extends AbstractTest { // for convenience: assertTrue(addNodeEAnnotationExtension.getRefinedBy().contains(addNodeInEAnnotationView1)); assertTrue(addNodeEAnnotationExtension.getRefinedBy().contains(addNodeInEAnnotationView2)); + assertTrue( + addNodeEAnnotationExtension.getRefinedBy().contains(addDrawerStyleInNodeInEAnnotationView2)); + assertTrue( + addNodeEAnnotationExtension.getRefinedBy().contains(addSortingStyleInNodeInEAnnotationView2)); assertTrue(addNodeEAnnotationExtension.getRefinedBy() - .contains(addDrawerStyleInNodeInEAnnotationView2)); - assertTrue(addNodeEAnnotationExtension.getRefinedBy().contains( - addSortingStyleInNodeInEAnnotationView2)); - assertTrue(addNodeEAnnotationExtension.getRefinedBy().contains( - addFilteringStyleInNodeInEAnnotationView2)); + .contains(addFilteringStyleInNodeInEAnnotationView2)); assertTrue(addNodeEAnnotationExtension.getRefinedBy().contains(addShapeStyleInEAnnotationView)); assertTrue(addNodeEAnnotationExtension.getRefinedBy().contains(addRefElementInEAnnotationView)); assertTrue(addNodeEAnnotationExtension.getRefinedBy().contains(addBoundsInEAnnotationView)); @@ -544,8 +519,7 @@ public class NodechangesTest extends AbstractTest { final Resource left = input.getA3Left(); final Resource right = input.getA3Right(); - final Comparison comparison = compare(left.getResourceSet(), - right.getResourceSet()); + final Comparison comparison = compare(left.getResourceSet(), right.getResourceSet()); final List<Diff> differences = comparison.getDifferences(); @@ -554,8 +528,7 @@ public class NodechangesTest extends AbstractTest { final Diff addEPackage = Iterators.find(differences.iterator(), added("tc1.EPackage0")); - final Diff addEPackageView = Iterators.find( - differences.iterator(), + final Diff addEPackageView = Iterators.find(differences.iterator(), and(valueIsView, valueNameMatches("1002", NotationPackage.Literals.VIEW__TYPE), elementIs(((ReferenceChange)addEPackage).getValue()))); final Diff addNodeInEPackageView1 = Iterators.find(differences.iterator(), @@ -579,8 +552,7 @@ public class NodechangesTest extends AbstractTest { final Diff addEClass = Iterators.find(differences.iterator(), added("tc1.EPackage0.EClass0")); - final Diff addEClassView = Iterators.find( - differences.iterator(), + final Diff addEClassView = Iterators.find(differences.iterator(), and(valueIsView, valueNameMatches("2003", NotationPackage.Literals.VIEW__TYPE), elementIs(((ReferenceChange)addEClass).getValue()))); final Diff addNodeInEClassView1 = Iterators.find(differences.iterator(), @@ -611,12 +583,10 @@ public class NodechangesTest extends AbstractTest { assertSame(Integer.valueOf(2), count(differences, and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD)))); - final Diff addNodeEPackageExtension = Iterators.find( - differences.iterator(), + final Diff addNodeEPackageExtension = Iterators.find(differences.iterator(), and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD), refinedBy(addRefElementInEPackageView))); - final Diff addNodeEClassExtension = Iterators.find( - differences.iterator(), + final Diff addNodeEClassExtension = Iterators.find(differences.iterator(), and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD), refinedBy(addRefElementInEClassView))); @@ -647,10 +617,9 @@ public class NodechangesTest extends AbstractTest { assertTrue(addNodeEClassExtension.getRefinedBy().contains(addRefElementInEClassView)); assertTrue(addNodeEClassExtension.getRefinedBy().contains(addBoundsInEClassView)); - assertFalse("No resource attachment changes expected", - Iterators.filter(differences.iterator(), instanceOf(ResourceAttachmentChange.class)) - .hasNext()); - + assertFalse("No resource attachment changes expected", Iterators + .filter(differences.iterator(), instanceOf(ResourceAttachmentChange.class)).hasNext()); + testIntersections(comparison); } diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/nodechanges/data/NodeChangesInputData.java b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/nodechanges/data/NodeChangesInputData.java index 4829bbd0c..e00f33dcc 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/nodechanges/data/NodeChangesInputData.java +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/nodechanges/data/NodeChangesInputData.java @@ -35,7 +35,7 @@ public class NodeChangesInputData extends DiagramInputData { public Resource getA1Right() throws IOException { return loadFromClassLoader("a1/TC2.ecorediag"); //$NON-NLS-1$ } - + public Resource getA2Left() throws IOException { return loadFromClassLoader("a2/TC01.ecorediag"); //$NON-NLS-1$ } @@ -43,7 +43,7 @@ public class NodeChangesInputData extends DiagramInputData { public Resource getA2Right() throws IOException { return loadFromClassLoader("a2/TC02.ecorediag"); //$NON-NLS-1$ } - + public Resource getA3Left() throws IOException { return loadFromClassLoader("a3/TC1.ecorediag"); //$NON-NLS-1$ } @@ -52,7 +52,6 @@ public class NodeChangesInputData extends DiagramInputData { return loadFromClassLoader("a3/TC2.ecorediag"); //$NON-NLS-1$ } - @Override protected Resource loadFromClassLoader(String string) throws IOException { final URL fileURL = getClass().getResource(string); @@ -75,7 +74,7 @@ public class NodeChangesInputData extends DiagramInputData { resource.load(str, Collections.emptyMap()); str.close(); - + EcoreUtil.resolveAll(resourceSet); return resource; diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/show/ShowTest.java b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/show/ShowTest.java index c0b635626..d886ef0c2 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/show/ShowTest.java +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/show/ShowTest.java @@ -48,26 +48,27 @@ public class ShowTest extends AbstractTest { final Resource right = input.getA1Right(); final Comparison comparison = compare(left, right); - + final List<Diff> differences = comparison.getDifferences(); // We should have no less and no more than 2 differences assertSame(Integer.valueOf(2), Integer.valueOf(differences.size())); - - Predicate<? super Diff> attributeChangeDescription = attributeValueMatch(NotationPackage.Literals.VIEW__VISIBLE.getName(), Boolean.TRUE, false); + + Predicate<? super Diff> attributeChangeDescription = attributeValueMatch( + NotationPackage.Literals.VIEW__VISIBLE.getName(), Boolean.TRUE, false); Predicate<? super Diff> showDescription = and(instanceOf(Show.class), ofKind(DifferenceKind.CHANGE)); - + assertSame(Integer.valueOf(1), count(differences, instanceOf(Show.class))); final Diff attributeChange = Iterators.find(differences.iterator(), attributeChangeDescription); final Diff show = Iterators.find(differences.iterator(), showDescription); - + assertNotNull(attributeChange); assertNotNull(show); - + assertSame(Integer.valueOf(1), Integer.valueOf(show.getRefinedBy().size())); assertTrue(show.getRefinedBy().contains(attributeChange)); - + testIntersections(comparison); } diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/suite/AllTests.java index 027febe87..97b8bf21f 100644 --- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/suite/AllTests.java +++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/suite/AllTests.java @@ -39,7 +39,8 @@ import org.junit.runners.Suite.SuiteClasses; * @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a> */ @RunWith(Suite.class) -@SuiteClasses({HideTest.class, ShowTest.class, NodechangesTest.class, EdgechangesTest.class, ExtensionMergeTest.class}) +@SuiteClasses({HideTest.class, ShowTest.class, NodechangesTest.class, EdgechangesTest.class, + ExtensionMergeTest.class }) public class AllTests { /** |