Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorcletavernie2013-05-14 07:47:59 -0400
committercletavernie2013-05-14 07:47:59 -0400
commit8ac3ed63b36e0265304e3b63af75836a6caf0f3a (patch)
tree10fd472c611f2eb7013cbe3528b3a007636b3257 /tests
parent475416175cb8fefbf4c2d6dbc5782e04142aa2b5 (diff)
downloadorg.eclipse.papyrus-8ac3ed63b36e0265304e3b63af75836a6caf0f3a.tar.gz
org.eclipse.papyrus-8ac3ed63b36e0265304e3b63af75836a6caf0f3a.tar.xz
org.eclipse.papyrus-8ac3ed63b36e0265304e3b63af75836a6caf0f3a.zip
Update the Service Edit tests according to changes in Bug 401109:
[PageManager] Deleting an element which contains an opened page leads to critical model corruption https://bugs.eclipse.org/bugs/show_bug.cgi?id=401109
Diffstat (limited to 'tests')
-rw-r--r--tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditServiceProvider.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditServiceProvider.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditServiceProvider.java
index d34aacef50e..ee5e3b39d54 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditServiceProvider.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditServiceProvider.java
@@ -52,7 +52,7 @@ public class TestElementEditServiceProvider extends AbstractTestElementEditServi
IElementEditService attService = provider.getEditService(EcorePackage.eINSTANCE.getEAttribute());
assertNotNull("No IElementEditService found for EAttribute.", attService);
String attServiceDisplayName = attService.getDisplayName();
- assertEquals("Default IElementEditService should match EAttribute.", "Generic Element", attServiceDisplayName);
+ assertEquals("Default IElementEditService should match EAttribute.", "EObject", attServiceDisplayName); //There is an EObject element type introduced in infra.emf
IElementEditService packService = provider.getEditService(EcorePackage.eINSTANCE.getEPackage());
assertNotNull("No IElementEditService found for EPackage.", packService);
@@ -74,7 +74,7 @@ public class TestElementEditServiceProvider extends AbstractTestElementEditServi
IElementEditService attService = provider.getEditService(att);
assertNotNull("No IElementEditService found for EAttribute.", attService);
String attServiceDisplayName = attService.getDisplayName();
- assertEquals("Default IElementEditService should match EAttribute.", "Generic Element", attServiceDisplayName);
+ assertEquals("Default IElementEditService should match EAttribute.", "EObject", attServiceDisplayName); //There is an EObject element type introduced in infra.emf
IElementEditService packService = provider.getEditService(pack);
assertNotNull("No IElementEditService found for EPackage.", packService);
@@ -142,7 +142,8 @@ public class TestElementEditServiceProvider extends AbstractTestElementEditServi
assertTrue("The IElementEditService should be EPackage related.", service.getDisplayName().equals("EPACKG"));
List<IElementEditService> class_EOperations = provider.getContainedTypeEditServices(aClass, EcorePackage.eINSTANCE.getEClass_EOperations());
- assertEquals("No IElementEditService should match EcorePackage.eINSTANCE.getEClass_EOperations()", 0, class_EOperations.size());
+ assertEquals("The default IElementEditService should match EcorePackage.eINSTANCE.getEClass_EOperations()", 1, class_EOperations.size());
+ assertEquals("The default IElementEditService should match EcorePackage.eINSTANCE.getEClass_EOperations()", "EObject", class_EOperations.get(0).getDisplayName());
} catch (ServiceException e) {
fail("Test aborted - Service exception in ElementEditServiceProvider::getContainedTypeEditServices.");

Back to the top