diff options
| author | Laurent Goubet | 2012-11-09 14:09:56 +0000 |
|---|---|---|
| committer | Laurent Goubet | 2012-11-09 14:09:56 +0000 |
| commit | 02b9ac4ac6aa5908c2f9f7355ebde95c21f61393 (patch) | |
| tree | fdba7f51d79eaecae03e8d4fe201da12445723fa /plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java | |
| parent | 75e730aad9ed221e42cb5fbd16af07ebf7d3abc2 (diff) | |
| download | org.eclipse.emf.compare-02b9ac4ac6aa5908c2f9f7355ebde95c21f61393.tar.gz org.eclipse.emf.compare-02b9ac4ac6aa5908c2f9f7355ebde95c21f61393.tar.xz org.eclipse.emf.compare-02b9ac4ac6aa5908c2f9f7355ebde95c21f61393.zip | |
Resolve the test failures due to the new detection of stereotype changes
Diffstat (limited to 'plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java index 844a28570..7ba67e5d1 100644 --- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java +++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java @@ -539,9 +539,6 @@ public class DynamicStereotypeTest extends AbstractTest { .contains(addAppliedProfileInProfileApplication));
addUMLStereotypeApplication = Iterators.find(differences.iterator(), and(
instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.ADD)));
- assertNotNull(addUMLProfileApplication);
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLStereotypeApplication.getRefinedBy().size()));
- assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addRefBaseClass));
} else {
addUMLProfileApplication = Iterators.find(differences.iterator(), and(
instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.DELETE)));
@@ -550,11 +547,11 @@ public class DynamicStereotypeTest extends AbstractTest { assertTrue(addUMLProfileApplication.getRefinedBy().contains(addProfileApplication));
addUMLStereotypeApplication = Iterators.find(differences.iterator(), and(
instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
- assertNotNull(addUMLProfileApplication);
- assertSame(Integer.valueOf(2), Integer.valueOf(addUMLStereotypeApplication.getRefinedBy().size()));
- assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addStereotypeApplication));
- assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addRefBaseClass));
}
+ assertNotNull(addUMLProfileApplication);
+ assertSame(Integer.valueOf(2), Integer.valueOf(addUMLStereotypeApplication.getRefinedBy().size()));
+ assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addStereotypeApplication));
+ assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addRefBaseClass));
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
@@ -711,9 +708,6 @@ public class DynamicStereotypeTest extends AbstractTest { .contains(addAppliedProfileInProfileApplication));
addUMLStereotypeApplication = Iterators.find(differences.iterator(), and(
instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.ADD)));
- assertNotNull(addUMLProfileApplication);
- assertSame(Integer.valueOf(1), Integer.valueOf(addUMLStereotypeApplication.getRefinedBy().size()));
- assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addRefBaseClass));
} else {
addUMLProfileApplication = Iterators.find(differences.iterator(), and(
instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.DELETE)));
@@ -722,11 +716,11 @@ public class DynamicStereotypeTest extends AbstractTest { assertTrue(addUMLProfileApplication.getRefinedBy().contains(addProfileApplication));
addUMLStereotypeApplication = Iterators.find(differences.iterator(), and(
instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
- assertNotNull(addUMLProfileApplication);
- assertSame(Integer.valueOf(2), Integer.valueOf(addUMLStereotypeApplication.getRefinedBy().size()));
- assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addStereotypeApplication));
- assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addRefBaseClass));
}
+ assertNotNull(addUMLProfileApplication);
+ assertSame(Integer.valueOf(2), Integer.valueOf(addUMLStereotypeApplication.getRefinedBy().size()));
+ assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addStereotypeApplication));
+ assertTrue(addUMLStereotypeApplication.getRefinedBy().contains(addRefBaseClass));
// CHECK REQUIREMENT
if (kind.equals(TestKind.ADD)) {
|