diff options
| author | Laurent Goubet | 2013-01-17 15:04:36 +0000 |
|---|---|---|
| committer | Laurent Goubet | 2013-01-17 15:04:36 +0000 |
| commit | a1163a84841b2a191b972e89058d1381735e13e6 (patch) | |
| tree | 27f6ae17958bbb33fdafae017831f3dd8367a5aa /plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf | |
| parent | 373dc65e89ca538c10f26fcf3ec4937cb5a80fc5 (diff) | |
| download | org.eclipse.emf.compare-a1163a84841b2a191b972e89058d1381735e13e6.tar.gz org.eclipse.emf.compare-a1163a84841b2a191b972e89058d1381735e13e6.tar.xz org.eclipse.emf.compare-a1163a84841b2a191b972e89058d1381735e13e6.zip | |
These two unit tests were failing for a good reason : we have included
one more difference in the equivalences of this diff because we now
remove duplicate diffs (handling of UML subset/superset... see
UMLDiffExtensionPostProcessor#copyRequirements()).
The tests are now fixed, though the merge was now failing : we have a
difference that is considered "equivalent" to ... one of its
requirements. The merge is fixed through
ReferenceChange#handleEquivalence(), but it will have to be updated when
we tackle bug 398402.
Diffstat (limited to 'plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf')
2 files changed, 6 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java index 247a910a4..0a4309750 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java @@ -186,8 +186,10 @@ public class AddInterfaceRealizationTest extends AbstractTest { assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getEquivalences().size()));
assertNotNull(addClientInInterfaceRealization.getEquivalence());
- assertSame(Integer.valueOf(1), Integer.valueOf(addClientInInterfaceRealization.getEquivalence()
+ assertSame(Integer.valueOf(2), Integer.valueOf(addClientInInterfaceRealization.getEquivalence()
.getDifferences().size()));
+ assertTrue(addClientInInterfaceRealization.getEquivalence().getDifferences().contains(
+ addInterfaceRealization));
}
@Override
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java index f6596c508..e52b5d3ca 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java @@ -187,8 +187,10 @@ public class AddSubstitutionTest extends AbstractTest { assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getEquivalences().size()));
assertNotNull(addClientInInterfaceRealization.getEquivalence());
- assertSame(Integer.valueOf(1), Integer.valueOf(addClientInInterfaceRealization.getEquivalence()
+ assertSame(Integer.valueOf(2), Integer.valueOf(addClientInInterfaceRealization.getEquivalence()
.getDifferences().size()));
+ assertTrue(addClientInInterfaceRealization.getEquivalence().getDifferences().contains(
+ addInterfaceRealization));
}
@Override
|