Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChristian W. Damus2016-02-10 21:48:20 -0500
committerGerrit Code Review @ Eclipse.org2016-02-12 10:31:41 -0500
commitecd4928b327f5561364c5068c9ff5f1668e92d13 (patch)
tree7c34f46cf82a1d65ac753fa92c2a5d55371b8dba /tests
parent751a204d74e15eb2db6b41c937691fc56dcc1252 (diff)
downloadorg.eclipse.papyrus-ecd4928b327f5561364c5068c9ff5f1668e92d13.tar.gz
org.eclipse.papyrus-ecd4928b327f5561364c5068c9ff5f1668e92d13.tar.xz
org.eclipse.papyrus-ecd4928b327f5561364c5068c9ff5f1668e92d13.zip
Bug 485220: [Architecture] Provide a more modular architecture
https://bugs.eclipse.org/bugs/show_bug.cgi?id=485220 Factor UI dependencies out of the UML Element Types bundle. This includes moving some advices that interact with the user into a new org.eclipse.papyrus.uml.service.types.ui bundle. Pull up the PasteCommandService and IPasteCommandProvider API into the Infra Diagram layer where the extension point is defined. Deprecate the old API in the UML layer. Introduce a service for participation of languages in CSS styling: * styling reset actions in the Reset Style command * access to semantic model classes and properties to make available to CSS Factor PapyrusObservableValue and cohorts out of the UML Tools bundle into the Infra Layer for more general reuse and to relieve the Diagram Infrastructure layer of UML dependencies. The old API remains as deprecated. Remove the Infra Diagram Layer dependency on UML Layer for property testers governing deletion in the diagram. Includes introduction of a new IGraphicalDeletionHelper OSGi service for delegation of the determination of whether an element can be deleted from the diagram and replacement of the XML expression properties * org.eclipse.papyrus.uml.diagram.common.isSemanticDeletion * org.eclipse.papyrus.uml.diagram.common.isReadOnly by * org.eclipse.papyrus.infra.gmfdiag.common.isSemanticDeletion * org.eclipse.papyrus.infra.gmfdiag.common.canDelete (where the latter is the negation of the property that it supersedes) Extract UML dependencies from the Diagram Outline and CSS Editor bundles. Remove unused MDTUtil APIs that referenced a UML-specific annotation. Move the Diagram Infrastructure CSS Palette bundle into the UML layer because it serves to provide extensions on the Palette Service, which is an overtly UML-specific capability. All client APIs for the Properties View are moved from org.eclipse.papyrus.views.properties bundle to a new org.eclipse.papyrus.infra.properties.ui bundle. This includes renaming of: * extension points * label-provider contexts * XWT namespaces Add an "all UI tests" suite. Define a componentized hierarchical build layout of the main plug-ins Change-Id: I43f8f3644857a18b69715f5a2f1da9b1cf286d67
Diffstat (limited to 'tests')
-rw-r--r--tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF70
-rw-r--r--tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/controlmode/tests/CDOControlModeTest.java33
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditingScenariosMemoryLeakTest.java2
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java1134
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/RecoveryTest.java350
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModel.java105
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/cyclicAdvices.elementtypesconfigurations34
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/elementtypetest.elementtypesconfigurations214
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/validAdvicesOrder.elementtypesconfigurations28
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/WorkspaceTest.elementtypesconfigurations22
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/elementtypetestui.elementtypesconfigurations20
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/ui/SingleStereotypeWithFeaturesToSet.xwt4
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.ui.tests/model/ui/SingleStereotypeWithFeaturesToSet.xwt2
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF239
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus All UI tests.launch45
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java323
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllUITests.java45
-rw-r--r--tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/SingleClass.xwt70
-rw-r--r--tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/src/org/eclipse/papyrus/infra/editor/welcome/tests/AbstractWelcomePageTest.java7
-rw-r--r--tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.elementtypesconfigurations194
-rw-r--r--tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations362
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF35
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/TestExpansionDiagram.elementtypesconfigurations26
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/org.eclipse.papyrus.infra.gmfdiag.menu.tests.launch2
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF2
-rwxr-xr-xtests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/OpenTableTest.java172
-rwxr-xr-xtests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableCreationTest2.java534
-rwxr-xr-xtests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableVerifyContents.java426
-rw-r--r--tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF58
-rw-r--r--tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/StrategyChooserFixture.java28
-rw-r--r--tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/control/AbstractControlModeTest.java5
-rw-r--r--tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/uncontrol/AbstractUncontrolModelTest.java6
-rw-r--r--tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/edit/advice/MarkerDeletionAdviceTest.java2
-rw-r--r--tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF36
-rw-r--r--tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/StrategyChooserFixture.java19
-rw-r--r--tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/runner/ITestSuiteClass.java86
-rw-r--r--tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/resources/EcoreModel.java12
-rw-r--r--tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF101
-rw-r--r--tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF62
-rw-r--r--tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF54
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF72
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/org.eclipse.papyrus.uml.diagram.dnd.tests.launch2
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations26
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations26
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF64
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF3
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestInstanceSpecification.java256
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/bugs/OpenAndDeleteTest.java310
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/creation/outside/AbstractCreateElementTableTest.java2
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/markers/ValidationMarkerInTableHeaderTest.java2
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/overwrite/AbstractPasteInsertTest.java2
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesTests.java4
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AbstractOpenTableTest.java174
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/bugs/OpenAndDeleteTest.java304
-rwxr-xr-xtests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AbstractGenericTableTest.java2
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/org.eclipse.papyrus.uml.service.types.tests.launch3
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreatePureUMLElementTest.java2
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeletePureUMLElementTest.java404
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/suites/AllTests.java97
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.classpath7
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.project28
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.settings/org.eclipse.jdt.core.prefs291
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.settings/org.eclipse.jdt.ui.prefs68
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/META-INF/MANIFEST.MF18
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/about.html28
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/build.properties9
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/icons/sample.gifbin0 -> 983 bytes
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/org.eclipse.papyrus.uml.service.types.ui.tests.launch43
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/plugin.properties15
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/pom.xml15
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/AssociationTestModel.di (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/testprofile.profile.di)0
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/AssociationTestModel.notation (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/AssociationTestModel.notation)160
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/AssociationTestModel.uml (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/AssociationTestModel.uml)32
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/TestModel.di (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestModel.di)18
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/TestModel.notation (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestModel.notation)4
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/TestModel.uml (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestModel.uml)0
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/testprofile.profile.di (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/AssociationTestModel.di)4
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/testprofile.profile.notation (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/testprofile.profile.notation)0
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/testprofile.profile.uml (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/testprofile.profile.uml)0
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/AbstractCreateRelationshipTest.java (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/AbstractCreateRelationshipTest.java)6
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/CreateElementTest.java (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreateElementTest.java)4
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/CreateProfileRelationshipTest.java (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreateProfileRelationshipTest.java)6
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/CreateRelationshipTest.java (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreateRelationshipTest.java)231
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/MoveElementTest.java (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/MoveElementTest.java)4
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/SetFeatureTest.java (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/SetFeatureTest.java)4
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/auxtests/AuxTransitionTests.java (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/auxtests/AuxTransitionTests.java)2
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/auxtests/IAuxTest.java (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/auxtests/IAuxTest.java)2
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/deletion/DeleteAssociationTest.java (renamed from tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeleteAssociationTest.java)2
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/suites/AllTests.java42
-rw-r--r--tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/PropertyGrammarTests.launch2
-rw-r--r--tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.valuespecification.tests/ValueSpecficationGrammarTests.launch2
-rw-r--r--tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestOCLConstraintOnInstanceSpec.java2
-rw-r--r--tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestOCLValidationRuleFromFile.java2
-rw-r--r--tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestStereotypeValidation.java2
-rw-r--r--tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestUMLValidationRules.java2
-rw-r--r--tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestValidationRulesInPluginXML.java2
-rw-r--r--tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestValidationRulesInProfile.java2
98 files changed, 4259 insertions, 3526 deletions
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
index ad238dde17c..5608079726f 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
@@ -1,35 +1,35 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.cdo.core;bundle-version="1.2.0";visibility:=reexport,
- org.junit;bundle-version="4.11.0";visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="4.0.0";visibility:=reexport,
- org.eclipse.emf.cdo.server.net4j;bundle-version="[4.1.0,5.0.0)",
- org.eclipse.emf.cdo.net4j;bundle-version="[4.1.0,5.0.0)",
- org.eclipse.net4j.jvm;bundle-version="[4.1.0,5.0.0)",
- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.core.expressions;bundle-version="3.4.0",
- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.cdo.core.resource.tests,
- org.eclipse.papyrus.cdo.core.tests,
- org.eclipse.papyrus.cdo.core.util.tests,
- org.eclipse.papyrus.cdo.internal.core.controlmode.tests;x-internal:=true,
- org.eclipse.papyrus.cdo.internal.core.exporter.tests;x-internal:=true,
- org.eclipse.papyrus.cdo.internal.core.expressions.tests;x-internal:=true,
- org.eclipse.papyrus.cdo.internal.core.importer.tests;x-internal:=true,
- org.eclipse.papyrus.cdo.internal.core.tests;x-internal:=true
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.cdo.core.tests
-Import-Package: com.google.common.base;version="10.0.1",
- com.google.common.collect;version="10.0.1",
- com.google.common.io;version="10.0.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.cdo.core;bundle-version="1.2.0";visibility:=reexport,
+ org.junit;bundle-version="4.11.0";visibility:=reexport,
+ org.eclipse.uml2.uml;bundle-version="4.0.0";visibility:=reexport,
+ org.eclipse.emf.cdo.server.net4j;bundle-version="[4.1.0,5.0.0)",
+ org.eclipse.emf.cdo.net4j;bundle-version="[4.1.0,5.0.0)",
+ org.eclipse.net4j.jvm;bundle-version="[4.1.0,5.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.eclipse.core.expressions;bundle-version="3.4.0",
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0";visibility:=reexport,
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.cdo.core.resource.tests,
+ org.eclipse.papyrus.cdo.core.tests,
+ org.eclipse.papyrus.cdo.core.util.tests,
+ org.eclipse.papyrus.cdo.internal.core.controlmode.tests;x-internal:=true,
+ org.eclipse.papyrus.cdo.internal.core.exporter.tests;x-internal:=true,
+ org.eclipse.papyrus.cdo.internal.core.expressions.tests;x-internal:=true,
+ org.eclipse.papyrus.cdo.internal.core.importer.tests;x-internal:=true,
+ org.eclipse.papyrus.cdo.internal.core.tests;x-internal:=true
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.cdo.core.tests
+Import-Package: com.google.common.base;version="10.0.1",
+ com.google.common.collect;version="10.0.1",
+ com.google.common.io;version="10.0.1"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/controlmode/tests/CDOControlModeTest.java b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/controlmode/tests/CDOControlModeTest.java
index 9649a57ace2..da656dec0bb 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/controlmode/tests/CDOControlModeTest.java
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/controlmode/tests/CDOControlModeTest.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2013, 2015 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,7 @@
* Contributors:
* CEA LIST - Initial API and implementation
* Christian W. Damus (CEA) - bug 431953 (fix start-up of selective services to require only their dependencies)
- * Christian W. Damus - bug 436998
+ * Christian W. Damus - bugs 436998, 485220
* Eike Stepper (CEA) - bug 466520
*
*****************************************************************************/
@@ -53,7 +53,7 @@ import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceSet;
import org.eclipse.papyrus.infra.services.controlmode.ControlModeManager;
import org.eclipse.papyrus.infra.services.controlmode.ControlModeRequest;
-import org.eclipse.papyrus.infra.services.resourceloading.preferences.StrategyChooser;
+import org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser;
import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.UMLFactory;
import org.junit.After;
@@ -71,6 +71,7 @@ public class CDOControlModeTest extends AbstractPapyrusCDOTest {
private final List<Runnable> cleanupActions = Lists.newArrayListWithExpectedSize(2);
+ private ServicesRegistry strategyRegistry;
private int oldControlModeStrategy;
public CDOControlModeTest() {
@@ -158,16 +159,32 @@ public class CDOControlModeTest extends AbstractPapyrusCDOTest {
//
@Before
- public void setControlModeStrategy() {
+ public void setControlModeStrategy() throws Exception {
final int MAGIC_NUMBER_OF_DONT_LOAD_ANYTHING_STRATEGY = 2;
- oldControlModeStrategy = new StrategyChooser().getCurrentStrategy();
- StrategyChooser.setCurrentStrategy(MAGIC_NUMBER_OF_DONT_LOAD_ANYTHING_STRATEGY);
+ strategyRegistry = new ExtensionServicesRegistry(Activator.PLUGIN_ID);
+
+ // We know that it has no dependencies
+ strategyRegistry.startServicesByClassKeys(IStrategyChooser.class);
+ IStrategyChooser chooser = strategyRegistry.getService(IStrategyChooser.class);
+
+ oldControlModeStrategy = chooser.getCurrentStrategy();
+ chooser.setStrategy(MAGIC_NUMBER_OF_DONT_LOAD_ANYTHING_STRATEGY);
}
@After
- public void restoreControlModeStrategy() {
- StrategyChooser.setCurrentStrategy(oldControlModeStrategy);
+ public void restoreControlModeStrategy() throws Exception {
+ if (strategyRegistry != null) {
+ try {
+ strategyRegistry.getService(IStrategyChooser.class).setStrategy(oldControlModeStrategy);
+ } finally {
+ try {
+ strategyRegistry.disposeRegistry();
+ } finally {
+ strategyRegistry = null;
+ }
+ }
+ }
}
@After
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditingScenariosMemoryLeakTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditingScenariosMemoryLeakTest.java
index f3a04ec9349..01efb159900 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditingScenariosMemoryLeakTest.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/EditingScenariosMemoryLeakTest.java
@@ -22,7 +22,7 @@ import org.eclipse.gef.commands.Command;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java
index 6371f14123e..4bbcfb5f3c1 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java
@@ -1,567 +1,567 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 433371
- * Christian W. Damus - bug 485220
- *
- *****************************************************************************/
-package org.eclipse.papyrus.editor.integration.tests.tests;
-
-import static org.hamcrest.CoreMatchers.hasItem;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.commands.DestroyElementPapyrusCommand;
-import org.eclipse.papyrus.commands.ICreationCommand;
-import org.eclipse.papyrus.commands.OpenDiagramCommand;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.editor.integration.tests.Activator;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
-import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
-import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.core.utils.DiResourceSet;
-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.infra.ui.extension.commands.IModelCreationCommand;
-import org.eclipse.papyrus.junit.utils.EditorUtils;
-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
-import org.eclipse.papyrus.uml.diagram.clazz.UmlClassDiagramForMultiEditor;
-import org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand;
-import org.eclipse.papyrus.uml.diagram.sequence.UmlSequenceDiagramForMultiEditor;
-import org.eclipse.papyrus.uml.diagram.timing.custom.UmlTimingDiagramForMultiEditor;
-import org.eclipse.papyrus.uml.tools.model.UmlModel;
-import org.eclipse.papyrus.uml.tools.model.UmlUtils;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.uml2.uml.Behavior;
-import org.eclipse.uml2.uml.BehavioredClassifier;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Model;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Tests the basic PageManager cases, integrated with the CoreMultiDiagramEditor
- * and a few UML Diagrams/Tables
- *
- * @author Camille Letavernier
- *
- */
-public class PageManagerTests extends AbstractEditorIntegrationTest {
-
- public static final String SOURCE_PATH = "/model/basic/";
-
- @Test
- public void testModelWithDiagramCreation() throws Exception {
- ModelSet modelSet = new DiResourceSet();
- IProject emptyModelCreationProject = ResourcesPlugin.getWorkspace().getRoot().getProject("diagramModelCreation");
- emptyModelCreationProject.create(new NullProgressMonitor());
- emptyModelCreationProject.open(new NullProgressMonitor());
-
- final IFile emptyModelDi = emptyModelCreationProject.getFile("diagram_model_creation.di");
-
- modelSet.createsModels(emptyModelDi);
-
- IFile emptyModelNotation = emptyModelCreationProject.getFile("diagram_model_creation.notation");
- IFile emptyModelUml = emptyModelCreationProject.getFile("diagram_model_creation.uml");
-
- ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);
- try {
- registry.add(ModelSet.class, Integer.MAX_VALUE, modelSet);
- registry.startRegistry();
- } catch (ServiceException ex) {
- // Ignore
- }
-
- IModelCreationCommand creationCommand = new CreateUMLModelCommand();
- creationCommand.createModel(modelSet);
-
- // Create the root UML Model
- UmlModel umlModel = (UmlModel) modelSet.getModel(UmlModel.MODEL_ID);
- Model model = (Model) umlModel.lookupRoot();
-
- // Creates and opens a Papyrus Class Diagram
- ICreationCommand diagramCreationCommand = new CreateClassDiagramCommand();
- diagramCreationCommand.createDiagram(modelSet, model, "TestDiagram1");
-
- modelSet.save(new NullProgressMonitor());
-
- Assert.assertTrue("The DI file has not been created", emptyModelDi.exists());
- Assert.assertTrue("The Notation file has not been created", emptyModelNotation.exists());
- Assert.assertTrue("The UML file has not been created", emptyModelUml.exists());
-
- Display.getDefault().syncExec(new Runnable() {
-
- public void run() {
- try {
- editor = EditorUtils.openPapyrusEditor(emptyModelDi);
- } catch (Exception ex) {
- Activator.log.error(ex);
- Assert.fail(ex.getMessage());
- }
- }
- });
-
- Assert.assertNotNull("Cannot open the Papyrus editor", editor);
- Assert.assertTrue("The active editor should be a Papyrus Class Diagram editor", editor.getActiveEditor() instanceof UmlClassDiagramForMultiEditor);
-
- try {
- registry.disposeRegistry();
- } catch (ServiceException ex) {
- // Ignore
- }
- }
-
- @Test
- public void testEmptyModelCreation() throws Exception {
- final IFile emptyModelDi = createEmptyModel();
- Assert.assertNotNull(emptyModelDi);
-
- Display.getDefault().syncExec(new Runnable() {
-
- public void run() {
- try {
- editor = EditorUtils.openPapyrusEditor(emptyModelDi);
- } catch (Exception ex) {
- Activator.log.error(ex);
- Assert.fail(ex.getMessage());
- }
- }
- });
-
- Assert.assertNotNull("Cannot open the editor", editor);
- openAndCheckCreatedModel(emptyModelDi);
- }
-
- private IFile createEmptyModel() throws Exception {
- ModelSet modelSet = new DiResourceSet();
- IProject emptyModelCreationProject = ResourcesPlugin.getWorkspace().getRoot().getProject("emptyModelCreation");
- emptyModelCreationProject.create(new NullProgressMonitor());
- emptyModelCreationProject.open(new NullProgressMonitor());
-
- final IFile emptyModelDi = emptyModelCreationProject.getFile("empty_model_creation.di");
-
- modelSet.createsModels(emptyModelDi);
-
- IModelCreationCommand creationCommand = new CreateUMLModelCommand();
- creationCommand.createModel(modelSet);
-
- modelSet.save(new NullProgressMonitor());
-
- IFile emptyModelNotation = emptyModelCreationProject.getFile("empty_model_creation.notation");
- IFile emptyModelUml = emptyModelCreationProject.getFile("empty_model_creation.uml");
-
- Assert.assertTrue("The DI file has not been created", emptyModelDi.exists());
- Assert.assertTrue("The Notation file has not been created", emptyModelNotation.exists());
- Assert.assertTrue("The UML file has not been created", emptyModelUml.exists());
- return emptyModelDi;
- }
-
- private void openAndCheckCreatedModel(IFile emptyModelDi) throws Exception {
- IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
- Assert.assertNotNull("Cannot retrieve the PageManager", pageManager);
- Assert.assertTrue(pageManager.allPages().isEmpty());
-
- ModelSet modelSet = editor.getServicesRegistry().getService(ModelSet.class);
- Assert.assertNotNull("Cannot retrieve the ModelSet", modelSet);
-
- UmlModel umlModel = (UmlModel) modelSet.getModel(UmlModel.MODEL_ID);
- Assert.assertNotNull("Cannot retrieve the UML Model", umlModel);
-
- EObject rootEObject = umlModel.lookupRoot();
- Assert.assertTrue("The rootElement is not a model", rootEObject instanceof Model);
- }
-
- @Test
- public void testOpenEmptyModel() throws Exception {
- initModel("openEmptyModel", "empty_model", getBundle());
- IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
- Assert.assertEquals(0, pageManager.allPages().size());
- }
-
- @Test
- public void testAvailableAndActivePage() throws Exception {
- initModel("availableAndActivePage", "two_diagrams_model", getBundle());
- IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
- Assert.assertEquals(2, pageManager.allPages().size());
-
- Assert.assertTrue(editor.getActiveEditor() instanceof UmlClassDiagramForMultiEditor); // TODO: The PageManager doesn't provide the getActivePage() method
-
- Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();
-
- Diagram classDiagram = (Diagram) notationResource.getContents().get(0);
- Diagram timingDiagram = (Diagram) notationResource.getContents().get(1);
-
- TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
- editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, timingDiagram)));
- Assert.assertTrue(editor.getActiveEditor() instanceof UmlTimingDiagramForMultiEditor);
-
-
- // Check type requested by selectPage
- ISashWindowsContainer container = editor.getServicesRegistry().getService(ISashWindowsContainer.class);
- IPage selectedPage = container.getActiveSashWindowsPage();
-
- // FIXME: Does not work yet. See Bug 401107: [IPageManager] selectPage does not work
- // TODO: There should be a specific test for selectPage, with a basic and a complex model
- pageManager.selectPage(classDiagram);
- Assert.assertTrue("Couldn't change the page selection", editor.getActiveEditor() instanceof UmlClassDiagramForMultiEditor);
-
- pageManager.selectPage(timingDiagram);
- Assert.assertTrue("Couldn't change the page selection", editor.getActiveEditor() instanceof UmlTimingDiagramForMultiEditor);
- }
-
- /**
- * @author vincent lorenzo
- * @throws Exception
- */
- @Test
- @Ignore("new papyrus table are not yet in the main build")
- public void testAvailableAndActivePageWithNatTable() throws Exception {
- // initModel("availableAndActivePage2", "two_tables_model");
- // IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
- // Assert.assertEquals(2, pageManager.allPages().size());
- // IEditorPart tableEditor = editor.getActiveEditor();
- // Assert.assertTrue(tableEditor instanceof NatTableEditor); //TODO: The PageManager doesn't provide the getActivePage() method
- // INattableModelManager manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);
- // Assert.assertNotNull(manager);
- // Assert.assertEquals("PapyrusGenericTable", manager.getTable().getTableConfiguration().getType());
- //
- // Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();
- //
- // Table genericTable = (Table)notationResource.getContents().get(0);
- // Table tableOfViews = (Table)notationResource.getContents().get(1);
- //
- // TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
- // editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, tableOfViews)));
- // tableEditor = editor.getActiveEditor();
- // Assert.assertTrue(tableEditor instanceof NatTableEditor);
- // manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);
- // Assert.assertNotNull(manager);
- // Assert.assertEquals("PapyrusViewsTable", manager.getTable().getTableConfiguration().getType());
- //
- // //FIXME: Does not work yet. See Bug 401107: [IPageManager] selectPage does not work
- // //TODO: There should be a specific test for selectPage, with a basic and a complex model
- // pageManager.selectPage(genericTable);
- // tableEditor = editor.getActiveEditor();
- // Assert.assertTrue(tableEditor instanceof NatTableEditor); //TODO: The PageManager doesn't provide the getActivePage() method
- // manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);
- // Assert.assertNotNull(manager);
- // Assert.assertEquals("Couldn't change the page selection", "PapyrusGenericTable", manager.getTable().getTableConfiguration().getType());
- //
- //
- // pageManager.selectPage(tableOfViews);
- // tableEditor = editor.getActiveEditor();
- // Assert.assertTrue(tableEditor instanceof NatTableEditor); //TODO: The PageManager doesn't provide the getActivePage() method
- // manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);
- // Assert.assertNotNull(manager);
- // Assert.assertEquals("Couldn't change the page selection", "PapyrusViewsTable", manager.getTable().getTableConfiguration().getType());
- }
-
- @Test
- public void testDiagramCreation() throws Exception {
- initModel("diagramCreation", "empty_model", getBundle());
- ICreationCommand diagramCreationCommand = new CreateClassDiagramCommand();
- ModelSet modelSet = editor.getServicesRegistry().getService(ModelSet.class);
-
- TransactionalEditingDomain editingDomain = modelSet.getTransactionalEditingDomain();
-
- CompositeCommand createAndOpenDiagram = new CompositeCommand("Create diagram");
- ICommand creationCommand = diagramCreationCommand.getCreateDiagramCommand(modelSet, null, "DiagramCreationTestDiagram");
- createAndOpenDiagram.add(creationCommand);
- createAndOpenDiagram.add(new OpenDiagramCommand(editingDomain, creationCommand));
-
- testPageCreation(createAndOpenDiagram, UmlClassDiagramForMultiEditor.class);
- }
-
- @Test
- public void testDiagramDeletion() throws Exception {
- initModel("diagramDeletion", "simple_class_model", getBundle());
- ModelSet modelSet = getModelSet();
- final Diagram diagram = (Diagram) NotationUtils.getNotationModel(modelSet).getResource().getContents().get(0);
- testPageDeletion(diagram, UmlClassDiagramForMultiEditor.class);
- }
-
- @Test
- public void testDiagramIndirectDeletion_bug433371() throws Exception {
- initModel("bug433371", "delete_sash_page", getBundle());
- ModelSet modelSet = getModelSet();
- final Diagram diagram = (Diagram) NotationUtils.getNotationModel(modelSet).getResource().getContents().get(1);
-
- IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
- pageManager.selectPage(diagram); // Make sure the one we want deleted is active
-
- testPageDeletion(diagram.getElement(), diagram, UmlSequenceDiagramForMultiEditor.class);
- }
-
- /**
- * @author vincent lorenzo
- * @throws Exception
- */
- @Test
- @Ignore("new papyrus table are not yet in the main build")
- public void testNatTableDeletion() throws Exception {
- // initModel("tableDeletion", "simple_uml_generic_table_model");
- // ModelSet modelSet = getModelSet();
- // final Table diagram = (Table)NotationUtils.getNotationModel(modelSet).getResource().getContents().get(0);
- // testPageDeletion(diagram, NatTableEditor.class);
- }
-
- // Does not work. The table creation produces two executable commands (Create Table Editor and Identity)
- // Only Identity (which does nothing) is undoable. Undoing the table creation does nothing
- // This is an EMF Facet Table bug, which tries to delete columns for an empty table as soon as the table is created
- @Test
- public void testTableCreation() throws Exception {
- initModel("tableCreation", "empty_model", getBundle());
-
- final ServicesRegistry registry = editor.getServicesRegistry();
- ModelSet modelSet = registry.getService(ModelSet.class);
- TransactionalEditingDomain editingDomain = modelSet.getTransactionalEditingDomain();
-
- final EObject tableContext = UmlUtils.getUmlModel(modelSet).getResource().getContents().get(0);
-
-
- }
-
-
- private void testPageCreation(ICommand creationCommand, Class<?> expectedEditorClass) throws Exception {
- IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
-
- // Check initial state
- Assert.assertTrue(pageManager.allPages().isEmpty());
- Assert.assertNull(editor.getActiveEditor());
-
- EditingDomain editingDomain = editor.getServicesRegistry().getService(EditingDomain.class);
-
- editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(creationCommand));
-
- for (int i = 0; i < 3; i++) { // Undo/Redo 3 times
- Assert.assertEquals("The page has not been correctly created", 1, pageManager.allPages().size());
- Assert.assertTrue("The editor has not been correctly opened", expectedEditorClass.isInstance(editor.getActiveEditor()));
-
- editingDomain.getCommandStack().undo();
-
- Assert.assertNull("The editor should be closed", editor.getActiveEditor());
- Assert.assertTrue("The page has not been correctly deleted", pageManager.allPages().isEmpty());
-
- editingDomain.getCommandStack().redo();
- }
- }
-
- private void testPageDeletion(final EObject page, Class<?> expectedEditorClass) throws Exception {
- final IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
-
- // Check initial state
- Assert.assertFalse(pageManager.allPages().isEmpty());
- int initialPagesSize = pageManager.allPages().size();
-
- Assert.assertTrue(expectedEditorClass.isInstance(editor.getActiveEditor()));
-
- TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
-
- CompoundCommand command = new CompoundCommand("Delete diagram");
-
- Command sashRemoveComd = new RecordingCommand(editingDomain, "Remove page") {
-
- @Override
- protected void doExecute() {
- pageManager.closeAllOpenedPages(page);
- }
-
- };
-
- command.append(sashRemoveComd);
- command.append(new GMFtoEMFCommandWrapper(new DestroyElementPapyrusCommand(new DestroyElementRequest(page, false))));
-
- editingDomain.getCommandStack().execute(command);
-
- for (int i = 0; i < 3; i++) { // Undo/Redo 3 times
- Assert.assertNull("The editor should be closed", editor.getActiveEditor());
- Assert.assertEquals("The page has not been correctly deleted", initialPagesSize - 1, pageManager.allPages().size());
-
- editingDomain.getCommandStack().undo();
-
- Assert.assertEquals("The has not been correctly created", initialPagesSize, pageManager.allPages().size());
- Assert.assertTrue("The editor has not been correctly opened", expectedEditorClass.isInstance(editor.getActiveEditor()));
-
- editingDomain.getCommandStack().redo();
- }
- }
-
- private void testPageDeletion(final EObject elementToDelete, final Object dependentPage, Class<?> expectedEditorClass) throws Exception {
- final IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
-
- // Check initial state
- assertThat("Page not open", pageManager.allPages(), hasItem(dependentPage));
-
- assertThat("Wrong kind of page", editor.getActiveEditor(), instanceOf(expectedEditorClass));
-
- TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
-
- Element clazz = getRootUMLModel().getOwnedType("Class1");
- Behavior toDelete = ((BehavioredClassifier) clazz).getOwnedBehaviors().get(0);
- IElementEditService edit = ElementEditServiceUtils.getCommandProvider(clazz);
- ICommand command = edit.getEditCommand(new DestroyElementRequest(toDelete, false));
-
- editingDomain.getCommandStack().execute(GMFtoEMFCommandWrapper.wrap(command));
-
- for (int i = 0; i < 3; i++) { // Undo/Redo 3 times
- assertThat("The editor page should be closed", pageManager.allPages(), not(hasItem(dependentPage)));
-
- editingDomain.getCommandStack().undo();
-
- assertThat("The page has not been correctly restored", pageManager.allPages(), hasItem(dependentPage));
-
- editingDomain.getCommandStack().redo();
- }
- }
-
- @Test
- public void testContainedDiagramDeletion() throws Exception {
- initModel("deleteContainedDiagrams", "delete_contained_diagram", getBundle());
- ModelSet modelSet = getModelSet();
- IPageManager pageManager = getPageManager();
- TransactionalEditingDomain editingDomain = getTransactionalEditingDomain();
-
- final int initialSize = pageManager.allPages().size();
- Model model = (Model) UmlUtils.getUmlModel(modelSet).getResource().getContents().get(0);
-
- IElementEditService provider;
-
- Element firstRootElement = model.getOwnedElements().get(0);
- Element secondRootElement = model.getOwnedElements().get(1);
-
- {
- DestroyElementRequest destroyFirstElementRequest = new DestroyElementRequest(firstRootElement, false);
- provider = ElementEditServiceUtils.getCommandProvider(firstRootElement);
- ICommand destroyFirstElementCommand = provider.getEditCommand(destroyFirstElementRequest);
-
- editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(destroyFirstElementCommand));
- Assert.assertEquals("The page should have been destroyed", initialSize - 1, pageManager.allPages().size());
- // TODO: Test the opened pages too
- }
-
- {
- DestroyElementRequest destroySecondElementRequest = new DestroyElementRequest(secondRootElement, false);
- provider = ElementEditServiceUtils.getCommandProvider(secondRootElement);
- ICommand destroySecondElementCommand = provider.getEditCommand(destroySecondElementRequest);
-
- editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(destroySecondElementCommand));
- Assert.assertTrue("All remaining pages should have been destroyed", pageManager.allPages().isEmpty());
- }
-
- editingDomain.getCommandStack().undo();
-
- Assert.assertEquals("The deleted pages should have been restored", initialSize - 1, pageManager.allPages().size());
-
- editingDomain.getCommandStack().undo();
-
- Assert.assertEquals("All pages should have been restored", initialSize, pageManager.allPages().size());
-
- editingDomain.getCommandStack().redo();
- editingDomain.getCommandStack().redo();
-
- Assert.assertTrue("All remaining pages should have been destroyed", pageManager.allPages().isEmpty());
- }
-
- /**
- * @author vincent lorenzo
- * @throws Exception
- */
- @Test
- public void testContainedNatTableDeletion() throws Exception {
- initModel("deleteContainedNatTable", "delete_contained_table", getBundle());
- ModelSet modelSet = getModelSet();
- IPageManager pageManager = getPageManager();
- TransactionalEditingDomain editingDomain = getTransactionalEditingDomain();
-
- final int initialSize = pageManager.allPages().size();
- Model model = (Model) UmlUtils.getUmlModel(modelSet).lookupRoot();
-
- IElementEditService provider;
-
- Element firstRootElement = model.getOwnedElements().get(0);
- Element secondRootElement = model.getOwnedElements().get(1);
-
- {
- DestroyElementRequest destroyFirstElementRequest = new DestroyElementRequest(firstRootElement, false);
- provider = ElementEditServiceUtils.getCommandProvider(firstRootElement);
- ICommand destroyFirstElementCommand = provider.getEditCommand(destroyFirstElementRequest);
-
- editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(destroyFirstElementCommand));
- Assert.assertEquals("The page should have been destroyed", initialSize - 1, pageManager.allPages().size());
- // TODO: Test the opened pages too
- }
-
- {
- DestroyElementRequest destroySecondElementRequest = new DestroyElementRequest(secondRootElement, false);
- provider = ElementEditServiceUtils.getCommandProvider(secondRootElement);
- ICommand destroySecondElementCommand = provider.getEditCommand(destroySecondElementRequest);
-
- editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(destroySecondElementCommand));
- Assert.assertTrue("All remaining pages should have been destroyed", pageManager.allPages().isEmpty());
- }
-
- editingDomain.getCommandStack().undo();
-
- Assert.assertEquals("The deleted pages should have been restored", initialSize - 1, pageManager.allPages().size());
-
- editingDomain.getCommandStack().undo();
-
- Assert.assertEquals("All pages should have been restored", initialSize, pageManager.allPages().size());
-
- editingDomain.getCommandStack().redo();
- editingDomain.getCommandStack().redo();
-
- Assert.assertTrue("All remaining pages should have been destroyed", pageManager.allPages().isEmpty());
- }
-
- @Ignore("Unsupported yet")
- @Test
- public void testContainedTableDeletion() throws Exception {
- throw new UnsupportedOperationException("Not implemented yet");
- }
-
- @Test
- public void testMultipageEditor() throws Exception {
- initModel("multipageEditor", "complex_multipage_model", getBundle());
- }
-
- @Test
- public void testOpenModel() throws Exception {
- initModel("openModel", "complex_multipage_model", getBundle());
- }
-
- @Override
- protected String getSourcePath() {
- return SOURCE_PATH;
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 433371
+ * Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.editor.integration.tests.tests;
+
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.commands.DestroyElementPapyrusCommand;
+import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.commands.OpenDiagramCommand;
+import org.eclipse.papyrus.editor.integration.tests.Activator;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
+import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.DiResourceSet;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.ui.extension.commands.IModelCreationCommand;
+import org.eclipse.papyrus.junit.utils.EditorUtils;
+import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
+import org.eclipse.papyrus.uml.diagram.clazz.UmlClassDiagramForMultiEditor;
+import org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand;
+import org.eclipse.papyrus.uml.diagram.sequence.UmlSequenceDiagramForMultiEditor;
+import org.eclipse.papyrus.uml.diagram.timing.custom.UmlTimingDiagramForMultiEditor;
+import org.eclipse.papyrus.uml.tools.model.UmlModel;
+import org.eclipse.papyrus.uml.tools.model.UmlUtils;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.uml2.uml.Behavior;
+import org.eclipse.uml2.uml.BehavioredClassifier;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Model;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * Tests the basic PageManager cases, integrated with the CoreMultiDiagramEditor
+ * and a few UML Diagrams/Tables
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class PageManagerTests extends AbstractEditorIntegrationTest {
+
+ public static final String SOURCE_PATH = "/model/basic/";
+
+ @Test
+ public void testModelWithDiagramCreation() throws Exception {
+ ModelSet modelSet = new DiResourceSet();
+ IProject emptyModelCreationProject = ResourcesPlugin.getWorkspace().getRoot().getProject("diagramModelCreation");
+ emptyModelCreationProject.create(new NullProgressMonitor());
+ emptyModelCreationProject.open(new NullProgressMonitor());
+
+ final IFile emptyModelDi = emptyModelCreationProject.getFile("diagram_model_creation.di");
+
+ modelSet.createsModels(emptyModelDi);
+
+ IFile emptyModelNotation = emptyModelCreationProject.getFile("diagram_model_creation.notation");
+ IFile emptyModelUml = emptyModelCreationProject.getFile("diagram_model_creation.uml");
+
+ ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);
+ try {
+ registry.add(ModelSet.class, Integer.MAX_VALUE, modelSet);
+ registry.startRegistry();
+ } catch (ServiceException ex) {
+ // Ignore
+ }
+
+ IModelCreationCommand creationCommand = new CreateUMLModelCommand();
+ creationCommand.createModel(modelSet);
+
+ // Create the root UML Model
+ UmlModel umlModel = (UmlModel) modelSet.getModel(UmlModel.MODEL_ID);
+ Model model = (Model) umlModel.lookupRoot();
+
+ // Creates and opens a Papyrus Class Diagram
+ ICreationCommand diagramCreationCommand = new CreateClassDiagramCommand();
+ diagramCreationCommand.createDiagram(modelSet, model, "TestDiagram1");
+
+ modelSet.save(new NullProgressMonitor());
+
+ Assert.assertTrue("The DI file has not been created", emptyModelDi.exists());
+ Assert.assertTrue("The Notation file has not been created", emptyModelNotation.exists());
+ Assert.assertTrue("The UML file has not been created", emptyModelUml.exists());
+
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ try {
+ editor = EditorUtils.openPapyrusEditor(emptyModelDi);
+ } catch (Exception ex) {
+ Activator.log.error(ex);
+ Assert.fail(ex.getMessage());
+ }
+ }
+ });
+
+ Assert.assertNotNull("Cannot open the Papyrus editor", editor);
+ Assert.assertTrue("The active editor should be a Papyrus Class Diagram editor", editor.getActiveEditor() instanceof UmlClassDiagramForMultiEditor);
+
+ try {
+ registry.disposeRegistry();
+ } catch (ServiceException ex) {
+ // Ignore
+ }
+ }
+
+ @Test
+ public void testEmptyModelCreation() throws Exception {
+ final IFile emptyModelDi = createEmptyModel();
+ Assert.assertNotNull(emptyModelDi);
+
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ try {
+ editor = EditorUtils.openPapyrusEditor(emptyModelDi);
+ } catch (Exception ex) {
+ Activator.log.error(ex);
+ Assert.fail(ex.getMessage());
+ }
+ }
+ });
+
+ Assert.assertNotNull("Cannot open the editor", editor);
+ openAndCheckCreatedModel(emptyModelDi);
+ }
+
+ private IFile createEmptyModel() throws Exception {
+ ModelSet modelSet = new DiResourceSet();
+ IProject emptyModelCreationProject = ResourcesPlugin.getWorkspace().getRoot().getProject("emptyModelCreation");
+ emptyModelCreationProject.create(new NullProgressMonitor());
+ emptyModelCreationProject.open(new NullProgressMonitor());
+
+ final IFile emptyModelDi = emptyModelCreationProject.getFile("empty_model_creation.di");
+
+ modelSet.createsModels(emptyModelDi);
+
+ IModelCreationCommand creationCommand = new CreateUMLModelCommand();
+ creationCommand.createModel(modelSet);
+
+ modelSet.save(new NullProgressMonitor());
+
+ IFile emptyModelNotation = emptyModelCreationProject.getFile("empty_model_creation.notation");
+ IFile emptyModelUml = emptyModelCreationProject.getFile("empty_model_creation.uml");
+
+ Assert.assertTrue("The DI file has not been created", emptyModelDi.exists());
+ Assert.assertTrue("The Notation file has not been created", emptyModelNotation.exists());
+ Assert.assertTrue("The UML file has not been created", emptyModelUml.exists());
+ return emptyModelDi;
+ }
+
+ private void openAndCheckCreatedModel(IFile emptyModelDi) throws Exception {
+ IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
+ Assert.assertNotNull("Cannot retrieve the PageManager", pageManager);
+ Assert.assertTrue(pageManager.allPages().isEmpty());
+
+ ModelSet modelSet = editor.getServicesRegistry().getService(ModelSet.class);
+ Assert.assertNotNull("Cannot retrieve the ModelSet", modelSet);
+
+ UmlModel umlModel = (UmlModel) modelSet.getModel(UmlModel.MODEL_ID);
+ Assert.assertNotNull("Cannot retrieve the UML Model", umlModel);
+
+ EObject rootEObject = umlModel.lookupRoot();
+ Assert.assertTrue("The rootElement is not a model", rootEObject instanceof Model);
+ }
+
+ @Test
+ public void testOpenEmptyModel() throws Exception {
+ initModel("openEmptyModel", "empty_model", getBundle());
+ IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
+ Assert.assertEquals(0, pageManager.allPages().size());
+ }
+
+ @Test
+ public void testAvailableAndActivePage() throws Exception {
+ initModel("availableAndActivePage", "two_diagrams_model", getBundle());
+ IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
+ Assert.assertEquals(2, pageManager.allPages().size());
+
+ Assert.assertTrue(editor.getActiveEditor() instanceof UmlClassDiagramForMultiEditor); // TODO: The PageManager doesn't provide the getActivePage() method
+
+ Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();
+
+ Diagram classDiagram = (Diagram) notationResource.getContents().get(0);
+ Diagram timingDiagram = (Diagram) notationResource.getContents().get(1);
+
+ TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
+ editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, timingDiagram)));
+ Assert.assertTrue(editor.getActiveEditor() instanceof UmlTimingDiagramForMultiEditor);
+
+
+ // Check type requested by selectPage
+ ISashWindowsContainer container = editor.getServicesRegistry().getService(ISashWindowsContainer.class);
+ IPage selectedPage = container.getActiveSashWindowsPage();
+
+ // FIXME: Does not work yet. See Bug 401107: [IPageManager] selectPage does not work
+ // TODO: There should be a specific test for selectPage, with a basic and a complex model
+ pageManager.selectPage(classDiagram);
+ Assert.assertTrue("Couldn't change the page selection", editor.getActiveEditor() instanceof UmlClassDiagramForMultiEditor);
+
+ pageManager.selectPage(timingDiagram);
+ Assert.assertTrue("Couldn't change the page selection", editor.getActiveEditor() instanceof UmlTimingDiagramForMultiEditor);
+ }
+
+ /**
+ * @author vincent lorenzo
+ * @throws Exception
+ */
+ @Test
+ @Ignore("new papyrus table are not yet in the main build")
+ public void testAvailableAndActivePageWithNatTable() throws Exception {
+ // initModel("availableAndActivePage2", "two_tables_model");
+ // IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
+ // Assert.assertEquals(2, pageManager.allPages().size());
+ // IEditorPart tableEditor = editor.getActiveEditor();
+ // Assert.assertTrue(tableEditor instanceof NatTableEditor); //TODO: The PageManager doesn't provide the getActivePage() method
+ // INattableModelManager manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);
+ // Assert.assertNotNull(manager);
+ // Assert.assertEquals("PapyrusGenericTable", manager.getTable().getTableConfiguration().getType());
+ //
+ // Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();
+ //
+ // Table genericTable = (Table)notationResource.getContents().get(0);
+ // Table tableOfViews = (Table)notationResource.getContents().get(1);
+ //
+ // TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
+ // editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, tableOfViews)));
+ // tableEditor = editor.getActiveEditor();
+ // Assert.assertTrue(tableEditor instanceof NatTableEditor);
+ // manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);
+ // Assert.assertNotNull(manager);
+ // Assert.assertEquals("PapyrusViewsTable", manager.getTable().getTableConfiguration().getType());
+ //
+ // //FIXME: Does not work yet. See Bug 401107: [IPageManager] selectPage does not work
+ // //TODO: There should be a specific test for selectPage, with a basic and a complex model
+ // pageManager.selectPage(genericTable);
+ // tableEditor = editor.getActiveEditor();
+ // Assert.assertTrue(tableEditor instanceof NatTableEditor); //TODO: The PageManager doesn't provide the getActivePage() method
+ // manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);
+ // Assert.assertNotNull(manager);
+ // Assert.assertEquals("Couldn't change the page selection", "PapyrusGenericTable", manager.getTable().getTableConfiguration().getType());
+ //
+ //
+ // pageManager.selectPage(tableOfViews);
+ // tableEditor = editor.getActiveEditor();
+ // Assert.assertTrue(tableEditor instanceof NatTableEditor); //TODO: The PageManager doesn't provide the getActivePage() method
+ // manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);
+ // Assert.assertNotNull(manager);
+ // Assert.assertEquals("Couldn't change the page selection", "PapyrusViewsTable", manager.getTable().getTableConfiguration().getType());
+ }
+
+ @Test
+ public void testDiagramCreation() throws Exception {
+ initModel("diagramCreation", "empty_model", getBundle());
+ ICreationCommand diagramCreationCommand = new CreateClassDiagramCommand();
+ ModelSet modelSet = editor.getServicesRegistry().getService(ModelSet.class);
+
+ TransactionalEditingDomain editingDomain = modelSet.getTransactionalEditingDomain();
+
+ CompositeCommand createAndOpenDiagram = new CompositeCommand("Create diagram");
+ ICommand creationCommand = diagramCreationCommand.getCreateDiagramCommand(modelSet, null, "DiagramCreationTestDiagram");
+ createAndOpenDiagram.add(creationCommand);
+ createAndOpenDiagram.add(new OpenDiagramCommand(editingDomain, creationCommand));
+
+ testPageCreation(createAndOpenDiagram, UmlClassDiagramForMultiEditor.class);
+ }
+
+ @Test
+ public void testDiagramDeletion() throws Exception {
+ initModel("diagramDeletion", "simple_class_model", getBundle());
+ ModelSet modelSet = getModelSet();
+ final Diagram diagram = (Diagram) NotationUtils.getNotationModel(modelSet).getResource().getContents().get(0);
+ testPageDeletion(diagram, UmlClassDiagramForMultiEditor.class);
+ }
+
+ @Test
+ public void testDiagramIndirectDeletion_bug433371() throws Exception {
+ initModel("bug433371", "delete_sash_page", getBundle());
+ ModelSet modelSet = getModelSet();
+ final Diagram diagram = (Diagram) NotationUtils.getNotationModel(modelSet).getResource().getContents().get(1);
+
+ IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
+ pageManager.selectPage(diagram); // Make sure the one we want deleted is active
+
+ testPageDeletion(diagram.getElement(), diagram, UmlSequenceDiagramForMultiEditor.class);
+ }
+
+ /**
+ * @author vincent lorenzo
+ * @throws Exception
+ */
+ @Test
+ @Ignore("new papyrus table are not yet in the main build")
+ public void testNatTableDeletion() throws Exception {
+ // initModel("tableDeletion", "simple_uml_generic_table_model");
+ // ModelSet modelSet = getModelSet();
+ // final Table diagram = (Table)NotationUtils.getNotationModel(modelSet).getResource().getContents().get(0);
+ // testPageDeletion(diagram, NatTableEditor.class);
+ }
+
+ // Does not work. The table creation produces two executable commands (Create Table Editor and Identity)
+ // Only Identity (which does nothing) is undoable. Undoing the table creation does nothing
+ // This is an EMF Facet Table bug, which tries to delete columns for an empty table as soon as the table is created
+ @Test
+ public void testTableCreation() throws Exception {
+ initModel("tableCreation", "empty_model", getBundle());
+
+ final ServicesRegistry registry = editor.getServicesRegistry();
+ ModelSet modelSet = registry.getService(ModelSet.class);
+ TransactionalEditingDomain editingDomain = modelSet.getTransactionalEditingDomain();
+
+ final EObject tableContext = UmlUtils.getUmlModel(modelSet).getResource().getContents().get(0);
+
+
+ }
+
+
+ private void testPageCreation(ICommand creationCommand, Class<?> expectedEditorClass) throws Exception {
+ IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
+
+ // Check initial state
+ Assert.assertTrue(pageManager.allPages().isEmpty());
+ Assert.assertNull(editor.getActiveEditor());
+
+ EditingDomain editingDomain = editor.getServicesRegistry().getService(EditingDomain.class);
+
+ editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(creationCommand));
+
+ for (int i = 0; i < 3; i++) { // Undo/Redo 3 times
+ Assert.assertEquals("The page has not been correctly created", 1, pageManager.allPages().size());
+ Assert.assertTrue("The editor has not been correctly opened", expectedEditorClass.isInstance(editor.getActiveEditor()));
+
+ editingDomain.getCommandStack().undo();
+
+ Assert.assertNull("The editor should be closed", editor.getActiveEditor());
+ Assert.assertTrue("The page has not been correctly deleted", pageManager.allPages().isEmpty());
+
+ editingDomain.getCommandStack().redo();
+ }
+ }
+
+ private void testPageDeletion(final EObject page, Class<?> expectedEditorClass) throws Exception {
+ final IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
+
+ // Check initial state
+ Assert.assertFalse(pageManager.allPages().isEmpty());
+ int initialPagesSize = pageManager.allPages().size();
+
+ Assert.assertTrue(expectedEditorClass.isInstance(editor.getActiveEditor()));
+
+ TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
+
+ CompoundCommand command = new CompoundCommand("Delete diagram");
+
+ Command sashRemoveComd = new RecordingCommand(editingDomain, "Remove page") {
+
+ @Override
+ protected void doExecute() {
+ pageManager.closeAllOpenedPages(page);
+ }
+
+ };
+
+ command.append(sashRemoveComd);
+ command.append(new GMFtoEMFCommandWrapper(new DestroyElementPapyrusCommand(new DestroyElementRequest(page, false))));
+
+ editingDomain.getCommandStack().execute(command);
+
+ for (int i = 0; i < 3; i++) { // Undo/Redo 3 times
+ Assert.assertNull("The editor should be closed", editor.getActiveEditor());
+ Assert.assertEquals("The page has not been correctly deleted", initialPagesSize - 1, pageManager.allPages().size());
+
+ editingDomain.getCommandStack().undo();
+
+ Assert.assertEquals("The has not been correctly created", initialPagesSize, pageManager.allPages().size());
+ Assert.assertTrue("The editor has not been correctly opened", expectedEditorClass.isInstance(editor.getActiveEditor()));
+
+ editingDomain.getCommandStack().redo();
+ }
+ }
+
+ private void testPageDeletion(final EObject elementToDelete, final Object dependentPage, Class<?> expectedEditorClass) throws Exception {
+ final IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
+
+ // Check initial state
+ assertThat("Page not open", pageManager.allPages(), hasItem(dependentPage));
+
+ assertThat("Wrong kind of page", editor.getActiveEditor(), instanceOf(expectedEditorClass));
+
+ TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
+
+ Element clazz = getRootUMLModel().getOwnedType("Class1");
+ Behavior toDelete = ((BehavioredClassifier) clazz).getOwnedBehaviors().get(0);
+ IElementEditService edit = ElementEditServiceUtils.getCommandProvider(clazz);
+ ICommand command = edit.getEditCommand(new DestroyElementRequest(toDelete, false));
+
+ editingDomain.getCommandStack().execute(GMFtoEMFCommandWrapper.wrap(command));
+
+ for (int i = 0; i < 3; i++) { // Undo/Redo 3 times
+ assertThat("The editor page should be closed", pageManager.allPages(), not(hasItem(dependentPage)));
+
+ editingDomain.getCommandStack().undo();
+
+ assertThat("The page has not been correctly restored", pageManager.allPages(), hasItem(dependentPage));
+
+ editingDomain.getCommandStack().redo();
+ }
+ }
+
+ @Test
+ public void testContainedDiagramDeletion() throws Exception {
+ initModel("deleteContainedDiagrams", "delete_contained_diagram", getBundle());
+ ModelSet modelSet = getModelSet();
+ IPageManager pageManager = getPageManager();
+ TransactionalEditingDomain editingDomain = getTransactionalEditingDomain();
+
+ final int initialSize = pageManager.allPages().size();
+ Model model = (Model) UmlUtils.getUmlModel(modelSet).getResource().getContents().get(0);
+
+ IElementEditService provider;
+
+ Element firstRootElement = model.getOwnedElements().get(0);
+ Element secondRootElement = model.getOwnedElements().get(1);
+
+ {
+ DestroyElementRequest destroyFirstElementRequest = new DestroyElementRequest(firstRootElement, false);
+ provider = ElementEditServiceUtils.getCommandProvider(firstRootElement);
+ ICommand destroyFirstElementCommand = provider.getEditCommand(destroyFirstElementRequest);
+
+ editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(destroyFirstElementCommand));
+ Assert.assertEquals("The page should have been destroyed", initialSize - 1, pageManager.allPages().size());
+ // TODO: Test the opened pages too
+ }
+
+ {
+ DestroyElementRequest destroySecondElementRequest = new DestroyElementRequest(secondRootElement, false);
+ provider = ElementEditServiceUtils.getCommandProvider(secondRootElement);
+ ICommand destroySecondElementCommand = provider.getEditCommand(destroySecondElementRequest);
+
+ editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(destroySecondElementCommand));
+ Assert.assertTrue("All remaining pages should have been destroyed", pageManager.allPages().isEmpty());
+ }
+
+ editingDomain.getCommandStack().undo();
+
+ Assert.assertEquals("The deleted pages should have been restored", initialSize - 1, pageManager.allPages().size());
+
+ editingDomain.getCommandStack().undo();
+
+ Assert.assertEquals("All pages should have been restored", initialSize, pageManager.allPages().size());
+
+ editingDomain.getCommandStack().redo();
+ editingDomain.getCommandStack().redo();
+
+ Assert.assertTrue("All remaining pages should have been destroyed", pageManager.allPages().isEmpty());
+ }
+
+ /**
+ * @author vincent lorenzo
+ * @throws Exception
+ */
+ @Test
+ public void testContainedNatTableDeletion() throws Exception {
+ initModel("deleteContainedNatTable", "delete_contained_table", getBundle());
+ ModelSet modelSet = getModelSet();
+ IPageManager pageManager = getPageManager();
+ TransactionalEditingDomain editingDomain = getTransactionalEditingDomain();
+
+ final int initialSize = pageManager.allPages().size();
+ Model model = (Model) UmlUtils.getUmlModel(modelSet).lookupRoot();
+
+ IElementEditService provider;
+
+ Element firstRootElement = model.getOwnedElements().get(0);
+ Element secondRootElement = model.getOwnedElements().get(1);
+
+ {
+ DestroyElementRequest destroyFirstElementRequest = new DestroyElementRequest(firstRootElement, false);
+ provider = ElementEditServiceUtils.getCommandProvider(firstRootElement);
+ ICommand destroyFirstElementCommand = provider.getEditCommand(destroyFirstElementRequest);
+
+ editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(destroyFirstElementCommand));
+ Assert.assertEquals("The page should have been destroyed", initialSize - 1, pageManager.allPages().size());
+ // TODO: Test the opened pages too
+ }
+
+ {
+ DestroyElementRequest destroySecondElementRequest = new DestroyElementRequest(secondRootElement, false);
+ provider = ElementEditServiceUtils.getCommandProvider(secondRootElement);
+ ICommand destroySecondElementCommand = provider.getEditCommand(destroySecondElementRequest);
+
+ editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(destroySecondElementCommand));
+ Assert.assertTrue("All remaining pages should have been destroyed", pageManager.allPages().isEmpty());
+ }
+
+ editingDomain.getCommandStack().undo();
+
+ Assert.assertEquals("The deleted pages should have been restored", initialSize - 1, pageManager.allPages().size());
+
+ editingDomain.getCommandStack().undo();
+
+ Assert.assertEquals("All pages should have been restored", initialSize, pageManager.allPages().size());
+
+ editingDomain.getCommandStack().redo();
+ editingDomain.getCommandStack().redo();
+
+ Assert.assertTrue("All remaining pages should have been destroyed", pageManager.allPages().isEmpty());
+ }
+
+ @Ignore("Unsupported yet")
+ @Test
+ public void testContainedTableDeletion() throws Exception {
+ throw new UnsupportedOperationException("Not implemented yet");
+ }
+
+ @Test
+ public void testMultipageEditor() throws Exception {
+ initModel("multipageEditor", "complex_multipage_model", getBundle());
+ }
+
+ @Test
+ public void testOpenModel() throws Exception {
+ initModel("openModel", "complex_multipage_model", getBundle());
+ }
+
+ @Override
+ protected String getSourcePath() {
+ return SOURCE_PATH;
+ }
+
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/RecoveryTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/RecoveryTest.java
index d1d039a09d3..18fb0ba9019 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/RecoveryTest.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/RecoveryTest.java
@@ -1,175 +1,175 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- * Christian W. Damus - bug 485220
- *
- *****************************************************************************/
-package org.eclipse.papyrus.editor.integration.tests.tests;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.commands.DestroyElementPapyrusCommand;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
-import org.eclipse.papyrus.uml.diagram.clazz.UmlClassDiagramForMultiEditor;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Tests the cases where the di model is not totally valid
- * The Editor should be able to load the valid parts and should not
- * fail on the invalid ones
- *
- * In most cases, we're simply interested in opening the Papyrus Editor
- * (i.e. the model is invalid, so we don't expect to be able to manipulate
- * the diagrams; but we should still be able to manipulate the editor
- * and the semantic model, create new digrams, etc).
- *
- * @author Camille Letavernier
- *
- */
-public class RecoveryTest extends AbstractEditorIntegrationTest {
-
- private static final String SOURCE_PATH = "/model/recovery/";
-
- // Should work
- @Test
- public void testInvalidAvailablePage() throws Exception {
- initModel("invalidAvailablePage", "invalidAvailablePage", getBundle());
- Assert.assertTrue(editor.getActiveEditor() instanceof UmlClassDiagramForMultiEditor);
- // IPageManager manager = editor.getServicesRegistry().getService(IPageManager.class);
- // Is the page manager supposed to filter the invalid pages..?
- // Assert.assertEquals(2, manager.allPages().size());
- }
-
- // Should work
- // Bug 401109: [PageManager] Deleting an element which contains an opened page leads to critical model corruption
- @Test
- public void testInvalidTab() throws Exception {
- initModel("invalidTab", "invalid_child_tab", getBundle());
- IPageManager manager = editor.getServicesRegistry().getService(IPageManager.class);
- Assert.assertEquals(1, manager.allPages().size());
- }
-
- @Ignore("Recovery not supported")
- // Not fixed yet
- // Starts with an empty Di Model (All the contents have been erased, except the root xmi tag)
- // We should be able to open a Papyrus editor and manipulate the PageManager
- @Test
- public void testEmptyDiModel() throws Exception {
- initModel("emptyDiModel", "empty_di_model", getBundle());
- IPageManager manager = editor.getServicesRegistry().getService(IPageManager.class);
- Assert.assertEquals(0, manager.allPages().size());
- NotationModel notationModel = (NotationModel) editor.getServicesRegistry().getService(ModelSet.class).getModel(NotationModel.MODEL_ID);
- Assert.assertEquals(1, notationModel.getResource().getContents().size());
- Diagram diagram = (Diagram) notationModel.getResource().getContents().get(0);
- manager.openPage(diagram);
- Assert.assertEquals(1, manager.allPages().size());
- }
-
- // We should be able to open a page even if is not (yet) in the availablePages list
- @Test
- @Ignore("This test is not required anymore, as the allPages() is computed dynamically (Bug 429239)")
- public void testUnavailablePageRecovery() throws Exception {
- initModel("unavailablePageRecovery", "missing_page_recovery", getBundle());
- final IPageManager manager = editor.getServicesRegistry().getService(IPageManager.class);
- int availablePages = manager.allPages().size();
- NotationModel notationModel = (NotationModel) editor.getServicesRegistry().getService(ModelSet.class).getModel(NotationModel.MODEL_ID);
- Assert.assertEquals("Cannot find the diagram to open", 1, notationModel.getResource().getContents().size());
-
- final Diagram diagram = (Diagram) notationModel.getResource().getContents().get(0);
-
- TransactionalEditingDomain domain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
- domain.getCommandStack().execute(new RecordingCommand(domain, "Open diagram") {
-
- @Override
- protected void doExecute() {
- manager.openPage(diagram);
- }
- });
-
- Assert.assertEquals("A new page should be available", availablePages + 1, manager.allPages().size());
- }
-
- // Should work. The invalid tab is loaded as an "unresolved tab" and displays a warning.
- @Test
- public void testProxyDiagram() throws Exception {
- initModel("proxyDiagram", "proxy_diagram_recovery", getBundle());
- IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
- Assert.assertEquals(2, pageManager.allPages().size());
- }
-
- @Ignore("Disabled because the Papyrus Editor opens a user dialog. Won't run on Hudson.")
- // Should work
- /** @see {link #testInvalidTab()} */
- @Test
- public void testProxyTable() throws Exception {
- initModel("proxyTable", "proxy_table_recovery", getBundle());
- // IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
- // Assert.assertEquals(2, pageManager.allPages());
- }
-
- // This model contains a few different errors (Unresolved proxy, invalid tabs, invalid available pages, ...)
- @Test
- public void testCompleteCase() throws Exception {
- initModel("completeCase", "complex_invalid_model", getBundle());
- // IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
- // Assert.assertEquals(3, pageManager.allPages().size());
- }
-
- // We should be able to delete a diagram, even when there is an invalid page in the model
- @Test
- public void testDeleteDiagramWithInvalidAvailablePage() throws Exception {
- initModel("deleteDiagramWithInvalidPage", "invalidAvailablePage", getBundle());
-
- // Di layout: Diagram 0 - Invalid page - Diagram 1
- // We take the diagram at index 1 (i.e. after the invalid page) and try to delete it
- final Diagram diagram = (Diagram) NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource().getContents().get(1);
-
- final IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
-
- // Check initial state
- int availablePages = pageManager.allPages().size();
-
- TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
-
- CompoundCommand command = new CompoundCommand("Delete diagram");
-
- Command sashRemoveComd = new RecordingCommand(editingDomain, "Remove page") {
-
- @Override
- protected void doExecute() {
- pageManager.closeAllOpenedPages(diagram);
- }
-
- };
-
- command.append(sashRemoveComd);
- command.append(new GMFtoEMFCommandWrapper(new DestroyElementPapyrusCommand(new DestroyElementRequest(diagram, false))));
-
- editingDomain.getCommandStack().execute(command);
-
- Assert.assertEquals("The page has not been correctly removed", availablePages - 1, pageManager.allPages().size());
- Assert.assertNull("The diagram should not be contained in the resource anymore", diagram.eResource());
- }
-
- @Override
- protected String getSourcePath() {
- return SOURCE_PATH;
- }
-}
+/*****************************************************************************
+ * Copyright (c) 2013, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ * Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.editor.integration.tests.tests;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.commands.DestroyElementPapyrusCommand;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.uml.diagram.clazz.UmlClassDiagramForMultiEditor;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * Tests the cases where the di model is not totally valid
+ * The Editor should be able to load the valid parts and should not
+ * fail on the invalid ones
+ *
+ * In most cases, we're simply interested in opening the Papyrus Editor
+ * (i.e. the model is invalid, so we don't expect to be able to manipulate
+ * the diagrams; but we should still be able to manipulate the editor
+ * and the semantic model, create new digrams, etc).
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class RecoveryTest extends AbstractEditorIntegrationTest {
+
+ private static final String SOURCE_PATH = "/model/recovery/";
+
+ // Should work
+ @Test
+ public void testInvalidAvailablePage() throws Exception {
+ initModel("invalidAvailablePage", "invalidAvailablePage", getBundle());
+ Assert.assertTrue(editor.getActiveEditor() instanceof UmlClassDiagramForMultiEditor);
+ // IPageManager manager = editor.getServicesRegistry().getService(IPageManager.class);
+ // Is the page manager supposed to filter the invalid pages..?
+ // Assert.assertEquals(2, manager.allPages().size());
+ }
+
+ // Should work
+ // Bug 401109: [PageManager] Deleting an element which contains an opened page leads to critical model corruption
+ @Test
+ public void testInvalidTab() throws Exception {
+ initModel("invalidTab", "invalid_child_tab", getBundle());
+ IPageManager manager = editor.getServicesRegistry().getService(IPageManager.class);
+ Assert.assertEquals(1, manager.allPages().size());
+ }
+
+ @Ignore("Recovery not supported")
+ // Not fixed yet
+ // Starts with an empty Di Model (All the contents have been erased, except the root xmi tag)
+ // We should be able to open a Papyrus editor and manipulate the PageManager
+ @Test
+ public void testEmptyDiModel() throws Exception {
+ initModel("emptyDiModel", "empty_di_model", getBundle());
+ IPageManager manager = editor.getServicesRegistry().getService(IPageManager.class);
+ Assert.assertEquals(0, manager.allPages().size());
+ NotationModel notationModel = (NotationModel) editor.getServicesRegistry().getService(ModelSet.class).getModel(NotationModel.MODEL_ID);
+ Assert.assertEquals(1, notationModel.getResource().getContents().size());
+ Diagram diagram = (Diagram) notationModel.getResource().getContents().get(0);
+ manager.openPage(diagram);
+ Assert.assertEquals(1, manager.allPages().size());
+ }
+
+ // We should be able to open a page even if is not (yet) in the availablePages list
+ @Test
+ @Ignore("This test is not required anymore, as the allPages() is computed dynamically (Bug 429239)")
+ public void testUnavailablePageRecovery() throws Exception {
+ initModel("unavailablePageRecovery", "missing_page_recovery", getBundle());
+ final IPageManager manager = editor.getServicesRegistry().getService(IPageManager.class);
+ int availablePages = manager.allPages().size();
+ NotationModel notationModel = (NotationModel) editor.getServicesRegistry().getService(ModelSet.class).getModel(NotationModel.MODEL_ID);
+ Assert.assertEquals("Cannot find the diagram to open", 1, notationModel.getResource().getContents().size());
+
+ final Diagram diagram = (Diagram) notationModel.getResource().getContents().get(0);
+
+ TransactionalEditingDomain domain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
+ domain.getCommandStack().execute(new RecordingCommand(domain, "Open diagram") {
+
+ @Override
+ protected void doExecute() {
+ manager.openPage(diagram);
+ }
+ });
+
+ Assert.assertEquals("A new page should be available", availablePages + 1, manager.allPages().size());
+ }
+
+ // Should work. The invalid tab is loaded as an "unresolved tab" and displays a warning.
+ @Test
+ public void testProxyDiagram() throws Exception {
+ initModel("proxyDiagram", "proxy_diagram_recovery", getBundle());
+ IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
+ Assert.assertEquals(2, pageManager.allPages().size());
+ }
+
+ @Ignore("Disabled because the Papyrus Editor opens a user dialog. Won't run on Hudson.")
+ // Should work
+ /** @see {link #testInvalidTab()} */
+ @Test
+ public void testProxyTable() throws Exception {
+ initModel("proxyTable", "proxy_table_recovery", getBundle());
+ // IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
+ // Assert.assertEquals(2, pageManager.allPages());
+ }
+
+ // This model contains a few different errors (Unresolved proxy, invalid tabs, invalid available pages, ...)
+ @Test
+ public void testCompleteCase() throws Exception {
+ initModel("completeCase", "complex_invalid_model", getBundle());
+ // IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
+ // Assert.assertEquals(3, pageManager.allPages().size());
+ }
+
+ // We should be able to delete a diagram, even when there is an invalid page in the model
+ @Test
+ public void testDeleteDiagramWithInvalidAvailablePage() throws Exception {
+ initModel("deleteDiagramWithInvalidPage", "invalidAvailablePage", getBundle());
+
+ // Di layout: Diagram 0 - Invalid page - Diagram 1
+ // We take the diagram at index 1 (i.e. after the invalid page) and try to delete it
+ final Diagram diagram = (Diagram) NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource().getContents().get(1);
+
+ final IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
+
+ // Check initial state
+ int availablePages = pageManager.allPages().size();
+
+ TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
+
+ CompoundCommand command = new CompoundCommand("Delete diagram");
+
+ Command sashRemoveComd = new RecordingCommand(editingDomain, "Remove page") {
+
+ @Override
+ protected void doExecute() {
+ pageManager.closeAllOpenedPages(diagram);
+ }
+
+ };
+
+ command.append(sashRemoveComd);
+ command.append(new GMFtoEMFCommandWrapper(new DestroyElementPapyrusCommand(new DestroyElementRequest(diagram, false))));
+
+ editingDomain.getCommandStack().execute(command);
+
+ Assert.assertEquals("The page has not been correctly removed", availablePages - 1, pageManager.allPages().size());
+ Assert.assertNull("The diagram should not be contained in the resource anymore", diagram.eResource());
+ }
+
+ @Override
+ protected String getSourcePath() {
+ return SOURCE_PATH;
+ }
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModel.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModel.java
index 363df1a3ff8..5d1ac8edb78 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModel.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/resource/FakeModel.java
@@ -1,42 +1,63 @@
-/**
- *
- */
-package org.eclipse.papyrus.infra.core.resource;
-
-
-
-/**
- * @author dumoulin
- *
- */
-public class FakeModel extends AbstractBaseModel {
-
- private String identifier;
-
- public FakeModel(String identifier) {
- this.identifier = identifier;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()
- *
- * @return
- */
- @Override
- public String getIdentifier() {
- // TODO Auto-generated method stub
- return identifier;
- }
-
- /**
- * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()
- *
- * @return
- */
- @Override
- protected String getModelFileExtension() {
- // TODO Auto-generated method stub
- return identifier;
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2011, 2016 LIFL, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * LIFL - Initial API and implementation
+ * Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.resource;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * @author dumoulin
+ *
+ */
+public class FakeModel extends AbstractBaseModel {
+
+ private String identifier;
+
+ public FakeModel(String identifier) {
+ this.identifier = identifier;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getIdentifier()
+ *
+ * @return
+ */
+ @Override
+ public String getIdentifier() {
+ // TODO Auto-generated method stub
+ return identifier;
+ }
+
+ /**
+ * @see org.eclipse.papyrus.infra.core.resource.AbstractBaseModel#getModelFileExtension()
+ *
+ * @return
+ */
+ @Override
+ protected String getModelFileExtension() {
+ // TODO Auto-generated method stub
+ return identifier;
+ }
+
+ @Override
+ public boolean canPersist(EObject object) {
+ return false;
+ }
+
+ @Override
+ public void persist(EObject object) {
+ throw new IllegalArgumentException("cannot persist " + object); //$NON-NLS-1$
+ }
+
+
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/cyclicAdvices.elementtypesconfigurations b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/cyclicAdvices.elementtypesconfigurations
index 13bd33a53ae..c32fb3d2c89 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/cyclicAdvices.elementtypesconfigurations
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/cyclicAdvices.elementtypesconfigurations
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.cyclicAdvices.elementtypesconfigurations" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="Test cyclic edvices dependencies" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
- <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1" identifier="TestEditHelperAdvice1" xmi:id="_SGAo4LK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
- <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2</after>
- <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice3</after>
- <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2" identifier="TestEditHelperAdvice2" xmi:id="_nSyIoLK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
- <before>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1</before>
- <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice3</after>
- <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice3" identifier="TestEditHelperAdvice3" xmi:id="_ojuzILK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
- <before>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1</before>
- <before>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2</before>
- <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1</after>
- <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
- </adviceBindingsConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.cyclicAdvices.elementtypesconfigurations" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="Test cyclic edvices dependencies" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
+ <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1" identifier="TestEditHelperAdvice1" xmi:id="_SGAo4LK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
+ <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2</after>
+ <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice3</after>
+ <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2" identifier="TestEditHelperAdvice2" xmi:id="_nSyIoLK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
+ <before>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1</before>
+ <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice3</after>
+ <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice3" identifier="TestEditHelperAdvice3" xmi:id="_ojuzILK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
+ <before>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1</before>
+ <before>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2</before>
+ <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1</after>
+ <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+ </adviceBindingsConfigurations>
</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/elementtypetest.elementtypesconfigurations b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/elementtypetest.elementtypesconfigurations
index 9efd504605b..770872864b5 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/elementtypetest.elementtypesconfigurations
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/elementtypetest.elementtypesconfigurations
@@ -1,108 +1,108 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:invariantcontainerruleconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/containerruleconfiguration/1.1" xmlns:invariantstereotyperuleconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invariantstereotyperule/1.1" xmlns:invarianttypeconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.1" xmlns:setvaluesadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.1" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tests" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="Test element types" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
- <elementTypeConfigurations description="" hint="ElementTypes" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.specificcomponent" name="Component in specific package only" xmi:id="_JIwuQLg9EeS0cu6lbJ9jDQ" xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration">
- <iconEntry bundleId="org.eclipse.ui" iconPath="icons/full/obj16/add_obj.gif" xmi:id="_FW5wwLg-EeS0cu6lbJ9jDQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
- <invariantRuleConfiguration xmi:id="_N9YeYLg-EeS0cu6lbJ9jDQ" xsi:type="invariantcontainerruleconfiguration:InvariantContainerRuleConfiguration">
- <permissions containerType="org.eclipse.papyrus.uml.Package" xmi:id="_Ow-egLg-EeS0cu6lbJ9jDQ"/>
- <permissions containerType="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.packagewithcomponentsonly" permitted="true" strict="true" xmi:id="_QsZCULg-EeS0cu6lbJ9jDQ"/>
- </invariantRuleConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations description="Package that can contain only components" hint="ElementTypes" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.packagewithcomponentsonly" name="PackageWithComponentsOnly" xmi:id="_Zn1TULg-EeS0cu6lbJ9jDQ" xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration">
- <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
- <invariantRuleConfiguration requiredProfile="" stereotypeQualifiedName="ElementTypesTestsProfile::PackageWithComponents" xmi:id="_mzVEQLg-EeS0cu6lbJ9jDQ" xsi:type="invariantstereotyperuleconfiguration:InvariantStereotypeRuleConfiguration"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations description="Semantic element type to create abstract classes" hint="Abstract Class Creation Action" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.aspectabstractclass" name="Abstract Class Creation Action" xmi:id="_mhW74My1EeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
- <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_qI4JwNLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations description="Test elementTypeConfigurations" hint="ElementElementTypeConfigurations" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotype" name="Class With Stereotype" xmi:id="_CSBmcMy2EeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
- <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_8kqIkNLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations description="Test elementTypeConfigurations" hint="ElementElementTypeConfigurations" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRename" name="Package With Stereotype And Renamed" xmi:id="_5vXW8My3EeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
- <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_8yABANLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations description="Test elementTypeConfigurations" hint="ElementElementTypeConfigurations" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeSetValues" name="Package With Stereotype And Renamed" xmi:id="_HT1okMy4EeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
- <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_8-EHENLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
- </elementTypeConfigurations>
- <elementTypeConfigurations description="Test elementTypeConfigurations" hint="ElementElementTypeConfigurations" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.abstractclassSimpleStereotype" name="Package With Stereotype And Renamed" xmi:id="_mrg2EMy4EeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <specializedTypesID>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.aspectabstractclass</specializedTypesID>
- <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_9KgAkNLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
- </elementTypeConfigurations>
- <adviceBindingsConfigurations description="Aspect Semantic element type to create abstract classes" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.aspectabstractclass.advice" target="_mhW74My1EeS2aYvfnAB4ZA" xmi:id="_6Zq8QLg_EeS0cu6lbJ9jDQ" xsi:type="setvaluesadviceconfiguration:SetValuesAdviceConfiguration">
- <featuresToSet featureName="isAbstract" xmi:id="_7FIUELg_EeS0cu6lbJ9jDQ">
- <value xmi:id="_-d4_oLg_EeS0cu6lbJ9jDQ" xsi:type="setvaluesadviceconfiguration:ConstantValue">
- <valueInstance value="true" xmi:id="__mUnULg_EeS0cu6lbJ9jDQ" xsi:type="uml:LiteralBoolean"/>
- </value>
- </featuresToSet>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotype.advice" target="_CSBmcMy2EeS2aYvfnAB4ZA" xmi:id="_NEmxYLhAEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet" xmi:id="_PuEG8LhAEeS0cu6lbJ9jDQ">
- <requiredProfiles>ElementTypesTestProfile</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRename.advice" target="_5vXW8My3EeS2aYvfnAB4ZA" xmi:id="_Z3bfkMy4EeS2aYvfnAB4ZA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet" updateName="true" xmi:id="_Z3bfkcy4EeS2aYvfnAB4ZA">
- <requiredProfiles>ElementTypesTestProfile</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeSetValues.advice" target="_HT1okMy4EeS2aYvfnAB4ZA" xmi:id="_havkELhAEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet" updateName="true" xmi:id="_vA53wLhAEeS0cu6lbJ9jDQ">
- <requiredProfiles>ElementTypesTestsProfile</requiredProfiles>
- <featuresToSet featureName="stringFeature" xmi:id="__E3qoLhAEeS0cu6lbJ9jDQ">
- <value xmi:id="_DFSzILhBEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ConstantValue">
- <valueInstance value="MyStringValue" xmi:id="_MDKGALhBEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralString"/>
- </value>
- </featuresToSet>
- <featuresToSet featureName="value" xmi:id="_A8odgLhBEeS0cu6lbJ9jDQ">
- <value xmi:id="_Eb_gULhBEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ConstantValue">
- <valueInstance value="3" xmi:id="_Gt4qcLhBEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralInteger"/>
- </value>
- </featuresToSet>
- <featuresToSet featureName="boolean" xmi:id="_BSTykLhBEeS0cu6lbJ9jDQ">
- <value xmi:id="_ExAHALhBEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ConstantValue">
- <valueInstance value="true" xmi:id="_QFRQkLhBEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralBoolean"/>
- </value>
- </featuresToSet>
- <featuresToSet featureName="enumeration" xmi:id="_Bm_pILhBEeS0cu6lbJ9jDQ">
- <value xmi:id="_FFqIYLhBEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ConstantValue">
- <valueInstance xmi:id="_VToy4LhBEeS0cu6lbJ9jDQ" xsi:type="uml:InstanceValue">
- <instance href="ElementTypesTestsProfile.profile.uml#_T4hRALhHEeS0cu6lbJ9jDQ"/>
- </valueInstance>
- </value>
- </featuresToSet>
- <featuresToSet featureName="multiStrings" xmi:id="_B7jj4LhBEeS0cu6lbJ9jDQ">
- <value xmi:id="_rQRXYLhDEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ListValue"/>
- </featuresToSet>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.abstractclassSimpleStereotype.advice" target="_mrg2EMy4EeS2aYvfnAB4ZA" xmi:id="_ls9AILhAEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeatureToSet" xmi:id="_u0-NMLhDEeS0cu6lbJ9jDQ">
- <requiredProfiles>ElementTypesTestsProfile</requiredProfiles>
- <featuresToSet featureName="stringFeature" xmi:id="_6XspgLhDEeS0cu6lbJ9jDQ">
- <value xmi:id="_7YVAELhDEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ConstantValue">
- <valueInstance name="" value="MyOtherValue" xmi:id="_-BmvcLhDEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralString"/>
- </value>
- </featuresToSet>
- <featuresToSet featureName="value" xmi:id="_Bj7msLhEEeS0cu6lbJ9jDQ">
- <value xmi:id="_Dd4x8LhEEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ConstantValue">
- <valueInstance value="18" xmi:id="_HdrBQLhEEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralInteger"/>
- </value>
- </featuresToSet>
- <featuresToSet featureName="boolean" xmi:id="_CKkv8LhEEeS0cu6lbJ9jDQ">
- <value xmi:id="_It5TALhEEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ConstantValue">
- <valueInstance value="true" xmi:id="_JxtgcLhEEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralBoolean"/>
- </value>
- </featuresToSet>
- <featuresToSet featureName="enumeration" xmi:id="_CqCTILhEEeS0cu6lbJ9jDQ">
- <value xmi:id="_LYi7YLhEEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ConstantValue">
- <valueInstance name="" xmi:id="_NPf18LhEEeS0cu6lbJ9jDQ" xsi:type="uml:InstanceValue">
- <instance href="ElementTypesTestsProfile.profile.uml#_T4hRALhHEeS0cu6lbJ9jDQ"/>
- </valueInstance>
- </value>
- </featuresToSet>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:invariantcontainerruleconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/containerruleconfiguration/1.1" xmlns:invariantstereotyperuleconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invariantstereotyperule/1.1" xmlns:invarianttypeconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.1" xmlns:setvaluesadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.1" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tests" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="Test element types" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
+ <elementTypeConfigurations description="" hint="ElementTypes" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.specificcomponent" name="Component in specific package only" xmi:id="_JIwuQLg9EeS0cu6lbJ9jDQ" xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.ui" iconPath="icons/full/obj16/add_obj.gif" xmi:id="_FW5wwLg-EeS0cu6lbJ9jDQ"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
+ <invariantRuleConfiguration xmi:id="_N9YeYLg-EeS0cu6lbJ9jDQ" xsi:type="invariantcontainerruleconfiguration:InvariantContainerRuleConfiguration">
+ <permissions containerType="org.eclipse.papyrus.uml.Package" xmi:id="_Ow-egLg-EeS0cu6lbJ9jDQ"/>
+ <permissions containerType="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.packagewithcomponentsonly" permitted="true" strict="true" xmi:id="_QsZCULg-EeS0cu6lbJ9jDQ"/>
+ </invariantRuleConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations description="Package that can contain only components" hint="ElementTypes" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.packagewithcomponentsonly" name="PackageWithComponentsOnly" xmi:id="_Zn1TULg-EeS0cu6lbJ9jDQ" xsi:type="invarianttypeconfiguration:InvariantTypeConfiguration">
+ <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
+ <invariantRuleConfiguration requiredProfile="" stereotypeQualifiedName="ElementTypesTestsProfile::PackageWithComponents" xmi:id="_mzVEQLg-EeS0cu6lbJ9jDQ" xsi:type="invariantstereotyperuleconfiguration:InvariantStereotypeRuleConfiguration"/>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations description="Semantic element type to create abstract classes" hint="Abstract Class Creation Action" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.aspectabstractclass" name="Abstract Class Creation Action" xmi:id="_mhW74My1EeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+ <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_qI4JwNLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations description="Test elementTypeConfigurations" hint="ElementElementTypeConfigurations" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotype" name="Class With Stereotype" xmi:id="_CSBmcMy2EeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+ <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_8kqIkNLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations description="Test elementTypeConfigurations" hint="ElementElementTypeConfigurations" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRename" name="Package With Stereotype And Renamed" xmi:id="_5vXW8My3EeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+ <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_8yABANLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations description="Test elementTypeConfigurations" hint="ElementElementTypeConfigurations" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeSetValues" name="Package With Stereotype And Renamed" xmi:id="_HT1okMy4EeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+ <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_8-EHENLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations description="Test elementTypeConfigurations" hint="ElementElementTypeConfigurations" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.abstractclassSimpleStereotype" name="Package With Stereotype And Renamed" xmi:id="_mrg2EMy4EeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <specializedTypesID>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.aspectabstractclass</specializedTypesID>
+ <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_9KgAkNLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
+ </elementTypeConfigurations>
+ <adviceBindingsConfigurations description="Aspect Semantic element type to create abstract classes" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.aspectabstractclass.advice" target="_mhW74My1EeS2aYvfnAB4ZA" xmi:id="_6Zq8QLg_EeS0cu6lbJ9jDQ" xsi:type="setvaluesadviceconfiguration:SetValuesAdviceConfiguration">
+ <featuresToSet featureName="isAbstract" xmi:id="_7FIUELg_EeS0cu6lbJ9jDQ">
+ <value xmi:id="_-d4_oLg_EeS0cu6lbJ9jDQ" xsi:type="setvaluesadviceconfiguration:ConstantValue">
+ <valueInstance value="true" xmi:id="__mUnULg_EeS0cu6lbJ9jDQ" xsi:type="uml:LiteralBoolean"/>
+ </value>
+ </featuresToSet>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotype.advice" target="_CSBmcMy2EeS2aYvfnAB4ZA" xmi:id="_NEmxYLhAEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet" xmi:id="_PuEG8LhAEeS0cu6lbJ9jDQ">
+ <requiredProfiles>ElementTypesTestProfile</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRename.advice" target="_5vXW8My3EeS2aYvfnAB4ZA" xmi:id="_Z3bfkMy4EeS2aYvfnAB4ZA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet" updateName="true" xmi:id="_Z3bfkcy4EeS2aYvfnAB4ZA">
+ <requiredProfiles>ElementTypesTestProfile</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeSetValues.advice" target="_HT1okMy4EeS2aYvfnAB4ZA" xmi:id="_havkELhAEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet" updateName="true" xmi:id="_vA53wLhAEeS0cu6lbJ9jDQ">
+ <requiredProfiles>ElementTypesTestsProfile</requiredProfiles>
+ <featuresToSet featureName="stringFeature" xmi:id="__E3qoLhAEeS0cu6lbJ9jDQ">
+ <value xmi:id="_DFSzILhBEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ConstantValue">
+ <valueInstance value="MyStringValue" xmi:id="_MDKGALhBEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralString"/>
+ </value>
+ </featuresToSet>
+ <featuresToSet featureName="value" xmi:id="_A8odgLhBEeS0cu6lbJ9jDQ">
+ <value xmi:id="_Eb_gULhBEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ConstantValue">
+ <valueInstance value="3" xmi:id="_Gt4qcLhBEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralInteger"/>
+ </value>
+ </featuresToSet>
+ <featuresToSet featureName="boolean" xmi:id="_BSTykLhBEeS0cu6lbJ9jDQ">
+ <value xmi:id="_ExAHALhBEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ConstantValue">
+ <valueInstance value="true" xmi:id="_QFRQkLhBEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralBoolean"/>
+ </value>
+ </featuresToSet>
+ <featuresToSet featureName="enumeration" xmi:id="_Bm_pILhBEeS0cu6lbJ9jDQ">
+ <value xmi:id="_FFqIYLhBEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ConstantValue">
+ <valueInstance xmi:id="_VToy4LhBEeS0cu6lbJ9jDQ" xsi:type="uml:InstanceValue">
+ <instance href="ElementTypesTestsProfile.profile.uml#_T4hRALhHEeS0cu6lbJ9jDQ"/>
+ </valueInstance>
+ </value>
+ </featuresToSet>
+ <featuresToSet featureName="multiStrings" xmi:id="_B7jj4LhBEeS0cu6lbJ9jDQ">
+ <value xmi:id="_rQRXYLhDEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ListValue"/>
+ </featuresToSet>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.abstractclassSimpleStereotype.advice" target="_mrg2EMy4EeS2aYvfnAB4ZA" xmi:id="_ls9AILhAEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeatureToSet" xmi:id="_u0-NMLhDEeS0cu6lbJ9jDQ">
+ <requiredProfiles>ElementTypesTestsProfile</requiredProfiles>
+ <featuresToSet featureName="stringFeature" xmi:id="_6XspgLhDEeS0cu6lbJ9jDQ">
+ <value xmi:id="_7YVAELhDEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ConstantValue">
+ <valueInstance name="" value="MyOtherValue" xmi:id="_-BmvcLhDEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralString"/>
+ </value>
+ </featuresToSet>
+ <featuresToSet featureName="value" xmi:id="_Bj7msLhEEeS0cu6lbJ9jDQ">
+ <value xmi:id="_Dd4x8LhEEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ConstantValue">
+ <valueInstance value="18" xmi:id="_HdrBQLhEEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralInteger"/>
+ </value>
+ </featuresToSet>
+ <featuresToSet featureName="boolean" xmi:id="_CKkv8LhEEeS0cu6lbJ9jDQ">
+ <value xmi:id="_It5TALhEEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ConstantValue">
+ <valueInstance value="true" xmi:id="_JxtgcLhEEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralBoolean"/>
+ </value>
+ </featuresToSet>
+ <featuresToSet featureName="enumeration" xmi:id="_CqCTILhEEeS0cu6lbJ9jDQ">
+ <value xmi:id="_LYi7YLhEEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadviceconfiguration:ConstantValue">
+ <valueInstance name="" xmi:id="_NPf18LhEEeS0cu6lbJ9jDQ" xsi:type="uml:InstanceValue">
+ <instance href="ElementTypesTestsProfile.profile.uml#_T4hRALhHEeS0cu6lbJ9jDQ"/>
+ </valueInstance>
+ </value>
+ </featuresToSet>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/validAdvicesOrder.elementtypesconfigurations b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/validAdvicesOrder.elementtypesconfigurations
index e7fbf3b5a94..0194bd46a76 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/validAdvicesOrder.elementtypesconfigurations
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/validAdvicesOrder.elementtypesconfigurations
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.cyclicAdvices.elementtypesconfigurations" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="Test cyclic edvices dependencies" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
- <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1" identifier="TestEditHelperAdvice1" xmi:id="_SGAo4LK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
- <before>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2</before>
- <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2" identifier="TestEditHelperAdvice2" xmi:id="_nSyIoLK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
- <before>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice3</before>
- <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1</after>
- <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice3" identifier="TestEditHelperAdvice3" xmi:id="_ojuzILK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
- <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2</after>
- <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
- </adviceBindingsConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.cyclicAdvices.elementtypesconfigurations" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="Test cyclic edvices dependencies" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
+ <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1" identifier="TestEditHelperAdvice1" xmi:id="_SGAo4LK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
+ <before>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2</before>
+ <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2" identifier="TestEditHelperAdvice2" xmi:id="_nSyIoLK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
+ <before>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice3</before>
+ <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1</after>
+ <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice3" identifier="TestEditHelperAdvice3" xmi:id="_ojuzILK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
+ <after>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2</after>
+ <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
+ </adviceBindingsConfigurations>
</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/WorkspaceTest.elementtypesconfigurations b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/WorkspaceTest.elementtypesconfigurations
index 2480bdd4f7c..bdd90d7cf45 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/WorkspaceTest.elementtypesconfigurations
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/WorkspaceTest.elementtypesconfigurations
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:setvaluesadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.1" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.workspacetype" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="WorkspaceTypeTests" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
- <elementTypeConfigurations hint="WorkspaceType_AbstractClass" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool" name="WorkspaceType_AbstractClass" xmi:id="_Sg8B4MyyEeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
- </elementTypeConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool" target="_Sg8B4MyyEeS2aYvfnAB4ZA" xmi:id="_1JyvELtVEeSfJNL-2_VlLg" xsi:type="setvaluesadviceconfiguration:SetValuesAdviceConfiguration">
- <featuresToSet featureName="isAbstract" xmi:id="_CNnKsLtWEeSfJNL-2_VlLg">
- <value xmi:id="_E2SdILtWEeSfJNL-2_VlLg" xsi:type="setvaluesadviceconfiguration:ConstantValue">
- <valueInstance value="true" xmi:id="_FySLULtWEeSfJNL-2_VlLg" xsi:type="uml:LiteralBoolean"/>
- </value>
- </featuresToSet>
- </adviceBindingsConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:setvaluesadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.1" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.workspacetype" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="WorkspaceTypeTests" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
+ <elementTypeConfigurations hint="WorkspaceType_AbstractClass" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool" name="WorkspaceType_AbstractClass" xmi:id="_Sg8B4MyyEeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+ </elementTypeConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool" target="_Sg8B4MyyEeS2aYvfnAB4ZA" xmi:id="_1JyvELtVEeSfJNL-2_VlLg" xsi:type="setvaluesadviceconfiguration:SetValuesAdviceConfiguration">
+ <featuresToSet featureName="isAbstract" xmi:id="_CNnKsLtWEeSfJNL-2_VlLg">
+ <value xmi:id="_E2SdILtWEeSfJNL-2_VlLg" xsi:type="setvaluesadviceconfiguration:ConstantValue">
+ <valueInstance value="true" xmi:id="_FySLULtWEeSfJNL-2_VlLg" xsi:type="uml:LiteralBoolean"/>
+ </value>
+ </featuresToSet>
+ </adviceBindingsConfigurations>
</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/elementtypetestui.elementtypesconfigurations b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/elementtypetestui.elementtypesconfigurations
index 4e82edba727..08a8080b204 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/elementtypetestui.elementtypesconfigurations
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/elementtypetestui.elementtypesconfigurations
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:runtimevalueseditionadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tests.ui" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="Test element types UI" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
- <elementTypeConfigurations description="Test elementTypeConfigurations" hint="ElementElementTypeConfigurations" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView" name="Package With Stereotype And Renamed - View" xmi:id="_SKcvUMzEEeSJ0sn3znt87w" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <specializedTypesID>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRename</specializedTypesID>
- <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_9WxiANLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
- </elementTypeConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView.advice" target="_SKcvUMzEEeSJ0sn3znt87w" xmi:id="_bmwRsMzEEeSJ0sn3znt87w" xsi:type="runtimevalueseditionadviceconfiguration:RuntimeValuesEditionAdviceConfiguration">
- <viewsToDisplay xmi:id="_d7FEwMzEEeSJ0sn3znt87w">
- <view href="ElementTypesTestsProfile.ctx#__31rg8pnEeWJM5S7C-EqVg"/>
- </viewsToDisplay>
- </adviceBindingsConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:runtimevalueseditionadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tests.ui" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="Test element types UI" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
+ <elementTypeConfigurations description="Test elementTypeConfigurations" hint="ElementElementTypeConfigurations" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView" name="Package With Stereotype And Renamed - View" xmi:id="_SKcvUMzEEeSJ0sn3znt87w" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <specializedTypesID>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRename</specializedTypesID>
+ <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_9WxiANLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
+ </elementTypeConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView.advice" target="_SKcvUMzEEeSJ0sn3znt87w" xmi:id="_bmwRsMzEEeSJ0sn3znt87w" xsi:type="runtimevalueseditionadviceconfiguration:RuntimeValuesEditionAdviceConfiguration">
+ <viewsToDisplay xmi:id="_d7FEwMzEEeSJ0sn3znt87w">
+ <view href="ElementTypesTestsProfile.ctx#__31rg8pnEeWJM5S7C-EqVg"/>
+ </viewsToDisplay>
+ </adviceBindingsConfigurations>
</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/ui/SingleStereotypeWithFeaturesToSet.xwt b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/ui/SingleStereotypeWithFeaturesToSet.xwt
index deea76ec25f..7fb556f3431 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/ui/SingleStereotypeWithFeaturesToSet.xwt
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/ui/SingleStereotypeWithFeaturesToSet.xwt
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Composite xmlns="http://www.eclipse.org/xwt/presentation"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
xmlns:x="http://www.eclipse.org/xwt"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
xmlns:j="clr-namespace:java.lang">
<Composite.layout>
<ppel:PropertiesLayout></ppel:PropertiesLayout>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.ui.tests/model/ui/SingleStereotypeWithFeaturesToSet.xwt b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.ui.tests/model/ui/SingleStereotypeWithFeaturesToSet.xwt
index 96f0e567f05..e2fc24b0a68 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.ui.tests/model/ui/SingleStereotypeWithFeaturesToSet.xwt
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.ui.tests/model/ui/SingleStereotypeWithFeaturesToSet.xwt
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="ExtendedTypesTestsProfile:StereotypeWithFeaturesToSet:stringFeature"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="ExtendedTypesTestsProfile:StereotypeWithFeaturesToSet:boolean"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="ExtendedTypesTestsProfile:StereotypeWithFeaturesToSet:value"></ppe:IntegerEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="ExtendedTypesTestsProfile:StereotypeWithFeaturesToSet:enumeration"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:MultiString input="{Binding}" property="ExtendedTypesTestsProfile:StereotypeWithFeaturesToSet:multiStrings"></ppe:MultiString></Composite></Composite> \ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="ExtendedTypesTestsProfile:StereotypeWithFeaturesToSet:stringFeature"></ppe:StringEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:BooleanRadio input="{Binding}" property="ExtendedTypesTestsProfile:StereotypeWithFeaturesToSet:boolean"></ppe:BooleanRadio></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout></Composite.layout><ppe:IntegerEditor input="{Binding}" property="ExtendedTypesTestsProfile:StereotypeWithFeaturesToSet:value"></ppe:IntegerEditor></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:EnumCombo input="{Binding}" property="ExtendedTypesTestsProfile:StereotypeWithFeaturesToSet:enumeration"></ppe:EnumCombo></Composite><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:MultiString input="{Binding}" property="ExtendedTypesTestsProfile:StereotypeWithFeaturesToSet:multiStrings"></ppe:MultiString></Composite></Composite> \ No newline at end of file
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
index 9aecbd59485..6b9f1a116c7 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
@@ -1,119 +1,120 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.clazz.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.bundles.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.deployment.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.component.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.usecase.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.statemachine.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.communication.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.dnd.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml.diagram.blockdefinition;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml.diagram.requirement.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml.modelexplorer;bundle-version="1.2.0",
- org.eclipse.papyrus.customization.properties.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.timing.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.editor.integration.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.search.tests;bundle-version="1.2.0",
- org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.uml.tools.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.nattable.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.nattable.clazz.config.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable.model.editor.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.sequence.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.composite.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.extendedtypes.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.wizards.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.modelrepair;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.profile.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.controlmode.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml.nattable.allocation.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable.views.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.nattable.generic.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml.modelexplorer.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.modelexplorer.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml.nattable.requirement.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.textedit.port.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.textedit.property.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.textedit.parameter.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.decoratormodel.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.decoratormodel.controlmode.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.menu.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.nattable.model.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.tests.diagramassistants;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile.drafter;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.canonical.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.alf.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.textedit.valuespecification.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.clipboard.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.nattable.stereotype.display.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.tests.framework;bundle-version="1.2.0",
- org.eclipse.xtend.lib;bundle-version="2.8.1",
- org.eclipse.papyrus.infra.nattable.common.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.editor.welcome.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.welcome.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.validation.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit.ui.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.extendedtypes.ui.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.semantic.tests;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.tests.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.tests
-Import-Package: org.eclipse.papyrus.infra.core.sasheditor.di.tests,
- org.eclipse.papyrus.infra.core.sasheditor.tests,
- org.eclipse.papyrus.infra.core.tests,
- org.eclipse.papyrus.infra.emf.readonly.tests,
- org.eclipse.papyrus.infra.emf.tests,
- org.eclipse.papyrus.infra.gmfdiag.commands.tests,
- org.eclipse.papyrus.infra.gmfdiag.common.tests,
- org.eclipse.papyrus.infra.services.edit.tests,
- org.eclipse.papyrus.infra.services.resourceloading.tests,
- org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.suites,
- org.eclipse.papyrus.sysml.diagram.internalblock.tests.suites,
- org.eclipse.papyrus.sysml.diagram.parametric.tests.suites,
- org.eclipse.papyrus.sysml.service.types.tests.suites,
- org.eclipse.papyrus.uml.modelrepair.tests,
- org.eclipse.papyrus.uml.service.types.tests.suites,
- org.eclipse.papyrus.uml.profile.drafter.tests,
- org.eclipse.papyrus.uml.profile.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.common.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
+ org.eclipse.papyrus.sysml.service.types;bundle-version="1.2.0",
+ org.eclipse.papyrus.sysml.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.clazz.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.bundles.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.deployment.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.component.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.usecase.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.statemachine.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.communication.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.dnd.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.sysml.diagram.blockdefinition;bundle-version="1.2.0",
+ org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="1.2.0",
+ org.eclipse.papyrus.sysml.diagram.requirement.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.sysml.modelexplorer;bundle-version="1.2.0",
+ org.eclipse.papyrus.customization.properties.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.labelprovider.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.timing.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.editor.integration.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.search.tests;bundle-version="1.2.0",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.uml.tools.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.tools.utils.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.nattable.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.nattable.clazz.config.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.nattable.model.editor.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.sequence.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.composite.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.elementtypesconfigurations.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.extendedtypes.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.tools.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.wizards.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.modelrepair;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.profile;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.profile.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.controlmode.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.nattable.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
+ org.eclipse.papyrus.sysml.nattable.allocation.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.nattable.views.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.nattable.generic.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.sysml.modelexplorer.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.modelexplorer.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.sysml.nattable.requirement.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.textedit.port.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.textedit.property.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.textedit.parameter.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.decoratormodel.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.decoratormodel.controlmode.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.menu.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.nattable.model.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.tests.diagramassistants;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.profile.drafter;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.canonical.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.alf.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.textedit.valuespecification.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.viewpoints.configuration.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.clipboard.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.nattable.stereotype.display.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.tests.framework;bundle-version="1.2.0",
+ org.eclipse.xtend.lib;bundle-version="2.8.1",
+ org.eclipse.papyrus.infra.nattable.common.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.editor.welcome.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.welcome.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.validation.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit.ui.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.extendedtypes.ui.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.semantic.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.tests
+Import-Package: org.eclipse.papyrus.infra.core.sasheditor.di.tests,
+ org.eclipse.papyrus.infra.core.sasheditor.tests,
+ org.eclipse.papyrus.infra.core.tests,
+ org.eclipse.papyrus.infra.emf.readonly.tests,
+ org.eclipse.papyrus.infra.emf.tests,
+ org.eclipse.papyrus.infra.gmfdiag.commands.tests,
+ org.eclipse.papyrus.infra.gmfdiag.common.tests,
+ org.eclipse.papyrus.infra.services.edit.tests,
+ org.eclipse.papyrus.infra.services.resourceloading.tests,
+ org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.suites,
+ org.eclipse.papyrus.sysml.diagram.internalblock.tests.suites,
+ org.eclipse.papyrus.sysml.diagram.parametric.tests.suites,
+ org.eclipse.papyrus.sysml.service.types.tests.suites,
+ org.eclipse.papyrus.uml.modelrepair.tests,
+ org.eclipse.papyrus.uml.service.types.tests.suites,
+ org.eclipse.papyrus.uml.profile.drafter.tests,
+ org.eclipse.papyrus.uml.profile.tests
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus All UI tests.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus All UI tests.launch
new file mode 100644
index 00000000000..961de8ec740
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus All UI tests.launch
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus All UI tests"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-all-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllUITests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="skip.long.junit.tests" value="false"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllUITests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.8 -Xms512m -Xmx1024m -DsuppressRawWhenUnchecked=true"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="true"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="true"/>
+<stringAttribute key="yk-options" value="&#10;additional-options2=onexit\=snapshot&#10;"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
index 07e02054daf..80e1ab33e27 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
@@ -1,161 +1,162 @@
-/*****************************************************************************
- * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bugs 402525, 323802, 431953, 433310, 434993
- * Christian W. Damus - bugs 399859, 451230, 433206, 463156, 474610, 469188, 485220
- *
- *****************************************************************************/
-package org.eclipse.papyrus.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner;
-import org.eclipse.papyrus.junit.framework.runner.FragmentTestSuiteClass;
-import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass;
-import org.eclipse.papyrus.junit.framework.runner.PluginTestSuiteClass;
-import org.eclipse.papyrus.junit.framework.runner.SuiteSpot;
-import org.junit.runner.RunWith;
-
-
-/**
- * Test class for all tests for Papyrus
- */
-@SuppressWarnings("restriction")
-@RunWith(AllTestsRunner.class)
-public class AllTests {
-
- @SuiteSpot
- public static final List<ITestSuiteClass> suiteClasses;
-
- /** list of classes to launch */
- static {
- suiteClasses = new ArrayList<ITestSuiteClass>();
-
- /* **************** plugins *********************** */
- /* developper */
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.bundles.tests.AllTests.class));
-
- /* core */
- suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.core.tests.AllTests"));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.clipboard.tests.AllTests.class));
- suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.core.sasheditor.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.core.sasheditor.tests.AllTests"));
- suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.infra.core.sasheditor.di", "org.eclipse.papyrus.infra.core.sasheditor.di.tests.AllTests"));
-
- /* infra */
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.tools.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.ui.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.edit.tests.suites.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.edit.ui.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.labelprovider.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.semantic.tests.AllTests.class));
- suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.emf.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.emf.tests.AllTests"));
- suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.ui.internal.emf.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.ui.emf.tests.AllTests"));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.extendedtypes.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.extendedtypes.ui.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.elementtypesconfigurations.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests.AllTests.class));
- // suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.openelement.tests.AllTests.class));
- suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.commands.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.gmfdiag.commands.tests.AllTests"));
- suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.common.Activator.ID, "org.eclipse.papyrus.infra.gmfdiag.common.tests.AllTests"));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.canonical.tests.AllTests.class));
- suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.emf.readonly.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.emf.readonly.tests.AllTests"));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.viewpoints.configuration.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.editor.welcome.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.welcome.tests.AllTests.class));
-
- /* views */
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.views.modelexplorer.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.customization.properties.tests.AllTests.class));
-
- /* integration */
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.editor.integration.tests.AllTests.class));
-
- // FIXME: Workaround for Bug 441246: Move the ResourceLoading tests after EditorReloadTest, since they are currently conflicting
- suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.services.resourceloading.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.services.resourceloading.tests.AllTests"));
-
- /* search */
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.search.tests.suites.AllTests.class));
-
- /* css */
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.css.tests.tests.AllTests.class));
-
- /* menu */
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.menu.tests.tests.AllTests.class));
-
- /* control mode */
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.controlmode.tests.AllTests.class));
-
- /* Diagram Assistants test suite */
- org.eclipse.papyrus.tests.diagramassistants.AllTests.appendTo(suiteClasses);
-
- if (System.getProperty("no.SysML.tests") == null) {
- // SysML tests
- suiteClasses.addAll(AllSysMLTests.suiteClasses);
- }
-
- /* Profile Drafter */
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.profile.drafter.tests.AllTests.class));
-
- /* uml */
- suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.uml.service.types.Activator.PLUGIN_ID, "org.eclipse.papyrus.uml.service.types.tests.suites.AllTests"));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.modelexplorer.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.dnd.tests.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.tools.tests.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.tools.utils.tests.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.stereotypeproperty.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.wizards.AllTests.class));
- suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.uml.modelrepair.Activator.PLUGIN_ID, "org.eclipse.papyrus.uml.modelrepair.tests.AllTests"));
- suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.uml.profile.Activator.PLUGIN_ID, "org.eclipse.papyrus.uml.profile.tests.AllTests"));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.decoratormodel.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.decoratormodel.controlmode.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.validation.tests.AllTests.class));
-
- /* uml diagrams */
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.common.tests.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.clazz.test.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.activity.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.deployment.test.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.component.test.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.timing.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.usecase.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.composite.test.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.statemachine.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.communication.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.profile.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.sequence.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.interactionoverview.tests.AllTests.class));
- //
-
- // nattable tests
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.views.tests.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.common.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.model.editor.tests.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.model.tests.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.tests.tests.AllTests.class));
-
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.tests.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.generic.tests.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.clazz.config.tests.tests.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.stereotype.display.tests.tests.AllTests.class));
-
- // uml textedit tests
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.port.tests.suites.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.property.tests.suites.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.parameter.tests.suites.AllTests.class));
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.valuespecification.tests.suites.AllTests.class));
-
- // Alf
- suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.alf.tests.AllTests.class));
-
- // end
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bugs 402525, 323802, 431953, 433310, 434993
+ * Christian W. Damus - bugs 399859, 451230, 433206, 463156, 474610, 469188, 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.tests;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner;
+import org.eclipse.papyrus.junit.framework.runner.FragmentTestSuiteClass;
+import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass;
+import org.eclipse.papyrus.junit.framework.runner.PluginTestSuiteClass;
+import org.eclipse.papyrus.junit.framework.runner.SuiteSpot;
+import org.junit.runner.RunWith;
+
+
+/**
+ * Test class for all tests for Papyrus
+ */
+@SuppressWarnings("restriction")
+@RunWith(AllTestsRunner.class)
+public class AllTests {
+
+ @SuiteSpot
+ public static final List<ITestSuiteClass> suiteClasses;
+
+ /** list of classes to launch */
+ static {
+ suiteClasses = new ArrayList<ITestSuiteClass>();
+
+ /* **************** plugins *********************** */
+ /* developper */
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.bundles.tests.AllTests.class));
+
+ /* core */
+ suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.core.tests.AllTests"));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.clipboard.tests.AllTests.class));
+ suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.core.sasheditor.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.core.sasheditor.tests.AllTests"));
+ suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.infra.core.sasheditor.di", "org.eclipse.papyrus.infra.core.sasheditor.di.tests.AllTests"));
+
+ /* infra */
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.tools.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.ui.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.edit.tests.suites.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.edit.ui.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.labelprovider.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.semantic.tests.AllTests.class));
+ suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.emf.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.emf.tests.AllTests"));
+ suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.ui.internal.emf.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.ui.emf.tests.AllTests"));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.extendedtypes.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.extendedtypes.ui.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.elementtypesconfigurations.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests.AllTests.class));
+ // suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.openelement.tests.AllTests.class));
+ suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.commands.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.gmfdiag.commands.tests.AllTests"));
+ suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.common.Activator.ID, "org.eclipse.papyrus.infra.gmfdiag.common.tests.AllTests"));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.canonical.tests.AllTests.class));
+ suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.emf.readonly.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.emf.readonly.tests.AllTests"));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.viewpoints.configuration.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.editor.welcome.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.welcome.tests.AllTests.class));
+
+ /* views */
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.views.modelexplorer.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.customization.properties.tests.AllTests.class));
+
+ /* integration */
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.editor.integration.tests.AllTests.class));
+
+ // FIXME: Workaround for Bug 441246: Move the ResourceLoading tests after EditorReloadTest, since they are currently conflicting
+ suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.services.resourceloading.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.services.resourceloading.tests.AllTests"));
+
+ /* search */
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.search.tests.suites.AllTests.class));
+
+ /* css */
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.css.tests.tests.AllTests.class));
+
+ /* menu */
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.menu.tests.tests.AllTests.class));
+
+ /* control mode */
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.controlmode.tests.AllTests.class));
+
+ /* Diagram Assistants test suite */
+ org.eclipse.papyrus.tests.diagramassistants.AllTests.appendTo(suiteClasses);
+
+ if (System.getProperty("no.SysML.tests") == null) {
+ // SysML tests
+ suiteClasses.addAll(AllSysMLTests.suiteClasses);
+ }
+
+ /* Profile Drafter */
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.profile.drafter.tests.AllTests.class));
+
+ /* uml */
+ suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.uml.service.types.Activator.PLUGIN_ID, "org.eclipse.papyrus.uml.service.types.tests.suites.AllTests"));
+ suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.uml.service.types.internal.ui.Activator.PLUGIN_ID, "org.eclipse.papyrus.uml.service.types.ui.tests.suites.AllTests"));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.modelexplorer.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.dnd.tests.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.tools.tests.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.tools.utils.tests.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.stereotypeproperty.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.wizards.AllTests.class));
+ suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.uml.modelrepair.Activator.PLUGIN_ID, "org.eclipse.papyrus.uml.modelrepair.tests.AllTests"));
+ suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.uml.profile.Activator.PLUGIN_ID, "org.eclipse.papyrus.uml.profile.tests.AllTests"));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.decoratormodel.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.decoratormodel.controlmode.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.validation.tests.AllTests.class));
+
+ /* uml diagrams */
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.common.tests.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.clazz.test.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.activity.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.deployment.test.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.component.test.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.timing.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.usecase.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.composite.test.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.statemachine.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.communication.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.profile.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.sequence.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.interactionoverview.tests.AllTests.class));
+ //
+
+ // nattable tests
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.views.tests.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.common.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.model.editor.tests.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.model.tests.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.tests.tests.AllTests.class));
+
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.tests.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.generic.tests.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.clazz.config.tests.tests.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.stereotype.display.tests.tests.AllTests.class));
+
+ // uml textedit tests
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.port.tests.suites.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.property.tests.suites.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.parameter.tests.suites.AllTests.class));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.valuespecification.tests.suites.AllTests.class));
+
+ // Alf
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.alf.tests.AllTests.class));
+
+ // end
+ }
+
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllUITests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllUITests.java
new file mode 100644
index 00000000000..ed028a380e5
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllUITests.java
@@ -0,0 +1,45 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Christian W. Damus - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.tests;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner;
+import org.eclipse.papyrus.junit.framework.runner.Headless;
+import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass;
+import org.eclipse.papyrus.junit.framework.runner.SuiteSpot;
+import org.junit.runner.RunWith;
+
+/**
+ * A test suite that automatically selects all non-{@linkplain Headless headless} tests
+ * from the {@link AllTests} suite.
+ */
+@RunWith(AllTestsRunner.class)
+public class AllUITests {
+
+ @SuiteSpot
+ public static final List<ITestSuiteClass> suiteClasses;
+
+ static {
+ suiteClasses = AllTests.suiteClasses.stream()
+ .filter(ITestSuiteClass::isUI)
+ .collect(Collectors.toList());
+ }
+
+ public AllUITests() {
+ super();
+ }
+
+}
diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/SingleClass.xwt b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/SingleClass.xwt
index fef178e1fe2..d9017e62de7 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/SingleClass.xwt
+++ b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/resources/SingleClass.xwt
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
- xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
- xmlns:creation="clr-namespace:org.eclipse.papyrus.views.properties.creation"
- xmlns="http://www.eclipse.org/xwt/presentation" xmlns:umlXtext="clr-namespace:org.eclipse.papyrus.uml.properties.xtext"
- xmlns:xtext="clr-namespace:org.eclipse.papyrus.infra.widgets.xtext.creation"
- xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets">
- <Composite.layout>
- <ppel:PropertiesLayout></ppel:PropertiesLayout>
- </Composite.layout>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
- <ppe:StringEditor input="{Binding}"
- property="UML:NamedElement:qualifiedName"></ppe:StringEditor>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
- <ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
- <ppe:BooleanRadio input="{Binding}"
- property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
- </Composite>
- <Composite>
- <Composite.layout>
- <ppel:PropertiesLayout></ppel:PropertiesLayout>
- </Composite.layout>
- <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
- <ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference>
- </Composite>
-</Composite> \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+ xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+ xmlns:creation="clr-namespace:org.eclipse.papyrus.infra.properties.ui.creation"
+ xmlns="http://www.eclipse.org/xwt/presentation" xmlns:umlXtext="clr-namespace:org.eclipse.papyrus.uml.properties.xtext"
+ xmlns:xtext="clr-namespace:org.eclipse.papyrus.infra.widgets.xtext.creation"
+ xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
+ <Composite.layout>
+ <ppel:PropertiesLayout></ppel:PropertiesLayout>
+ </Composite.layout>
+ <Composite>
+ <Composite.layout>
+ <ppel:PropertiesLayout></ppel:PropertiesLayout>
+ </Composite.layout>
+ <ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+ <ppe:StringEditor input="{Binding}"
+ property="UML:NamedElement:qualifiedName"></ppe:StringEditor>
+ </Composite>
+ <Composite>
+ <Composite.layout>
+ <ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+ </Composite.layout>
+ <ppe:BooleanRadio input="{Binding}" property="UML:Classifier:isAbstract"></ppe:BooleanRadio>
+ <ppe:BooleanRadio input="{Binding}" property="UML:Class:isActive"></ppe:BooleanRadio>
+ <ppe:BooleanRadio input="{Binding}"
+ property="UML:RedefinableElement:isLeaf"></ppe:BooleanRadio>
+ </Composite>
+ <Composite>
+ <Composite.layout>
+ <ppel:PropertiesLayout></ppel:PropertiesLayout>
+ </Composite.layout>
+ <ppe:EnumCombo input="{Binding}" property="UML:NamedElement:visibility"></ppe:EnumCombo>
+ <ppe:MultiReference input="{Binding}" property="UML:Classifier:useCase"></ppe:MultiReference>
+ </Composite>
+</Composite>
diff --git a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF
index 2ec93a2e3d3..25e432a0ef3 100644
--- a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
org.eclipse.core.databinding;bundle-version="1.6.0",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
diff --git a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/src/org/eclipse/papyrus/infra/editor/welcome/tests/AbstractWelcomePageTest.java b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/src/org/eclipse/papyrus/infra/editor/welcome/tests/AbstractWelcomePageTest.java
index 60036cf148d..5e01c6c026e 100644
--- a/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/src/org/eclipse/papyrus/infra/editor/welcome/tests/AbstractWelcomePageTest.java
+++ b/tests/junit/plugins/infra/editor/org.eclipse.papyrus.infra.editor.welcome.tests/src/org/eclipse/papyrus/infra/editor/welcome/tests/AbstractWelcomePageTest.java
@@ -32,11 +32,12 @@ import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.editor.welcome.IWelcomePageService;
import org.eclipse.papyrus.infra.editor.welcome.Welcome;
import org.eclipse.papyrus.infra.editor.welcome.internal.WelcomePage;
+import org.eclipse.papyrus.infra.properties.ui.runtime.IConfigurationManager;
+import org.eclipse.papyrus.infra.properties.ui.runtime.PropertiesRuntime;
import org.eclipse.papyrus.infra.tools.util.PlatformHelper;
import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.DisplayUtils;
import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
-import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
import org.eclipse.swt.widgets.Display;
import org.hamcrest.Matcher;
import org.junit.BeforeClass;
@@ -59,9 +60,9 @@ public abstract class AbstractWelcomePageTest extends AbstractPapyrusTest {
// Preƫmptively load the configuration manager to avoid deadlocks in
// diagram bundle loading and preferences initialization
ExecutorService exec = Executors.newSingleThreadExecutor();
- CompletionService<ConfigurationManager> completion = new ExecutorCompletionService<ConfigurationManager>(exec);
+ CompletionService<IConfigurationManager> completion = new ExecutorCompletionService<IConfigurationManager>(exec);
- Future<ConfigurationManager> waitFor = completion.submit(() -> ConfigurationManager.getInstance());
+ Future<IConfigurationManager> waitFor = completion.submit(() -> PropertiesRuntime.getConfigurationManager());
try {
// Wait for these bundles to finish activating
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.elementtypesconfigurations b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.elementtypesconfigurations
index bc003205c6c..f2b9d9b3e18 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.elementtypesconfigurations
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.elementtypesconfigurations
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" metamodelNsURI="j2ee" name="j2ee" xmi:id="_JHkF8Jg0EeSrbqbUdG1DAA" xmi:version="2.0">
- <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.Bean" name="Bean" xmi:id="_JHkF8Zg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_JHkF8pg0EeSrbqbUdG1DAA"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
- <matcherConfiguration xmi:id="_JHkF85g0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::Bean</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.Finder" name="Finder" xmi:id="_JHkF9Jg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_JHkF9Zg0EeSrbqbUdG1DAA"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
- <matcherConfiguration xmi:id="_JHkF9pg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::Finder</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.Import" name="Import" xmi:id="_JHkF95g0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_JHkF-Jg0EeSrbqbUdG1DAA"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
- <matcherConfiguration xmi:id="_JHkF-Zg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="UML::Association" identifier="org.eclipse.papyrus.example.j2ee.Web" name="Web" xmi:id="_JHkF-pg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_JHkF-5g0EeSrbqbUdG1DAA"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
- <matcherConfiguration xmi:id="_JHkF_Jg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.User" name="User" xmi:id="_JHkF_Zg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_JHkF_pg0EeSrbqbUdG1DAA"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>
- <matcherConfiguration xmi:id="_JHkF_5g0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.Browser" name="Browser" xmi:id="_JHkGAJg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_JHkGAZg0EeSrbqbUdG1DAA"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>
- <matcherConfiguration xmi:id="_JHkGApg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.BranchPoint" name="BranchPoint" xmi:id="_JHkGA5g0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_JHkGBJg0EeSrbqbUdG1DAA"/>
- <specializedTypesID>org.eclipse.papyrus.uml.ExtensionPoint</specializedTypesID>
- <matcherConfiguration xmi:id="_JHkGBZg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.WebScenario" name="WebScenario" xmi:id="_JHkGBpg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_JHkGB5g0EeSrbqbUdG1DAA"/>
- <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>
- <matcherConfiguration xmi:id="_JHkGCJg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.bean" target="_JHkF8Zg0EeSrbqbUdG1DAA" xmi:id="_JHkGCZg0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::Bean" updateName="true" xmi:id="_JHkGCpg0EeSrbqbUdG1DAA">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.finder" target="_JHkF9Jg0EeSrbqbUdG1DAA" xmi:id="_JHkGC5g0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::Finder" updateName="true" xmi:id="_JHkGDJg0EeSrbqbUdG1DAA">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.import" target="_JHkF95g0EeSrbqbUdG1DAA" xmi:id="_JHkGDZg0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::Import" updateName="true" xmi:id="_JHkGDpg0EeSrbqbUdG1DAA">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.web" target="_JHkF-pg0EeSrbqbUdG1DAA" xmi:id="_JHkGD5g0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::Web" updateName="true" xmi:id="_JHkGEJg0EeSrbqbUdG1DAA">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user" target="_JHkF_Zg0EeSrbqbUdG1DAA" xmi:id="_JHkGEZg0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_JHkGEpg0EeSrbqbUdG1DAA">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser" target="_JHkGAJg0EeSrbqbUdG1DAA" xmi:id="_JHkGE5g0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_JHkGFJg0EeSrbqbUdG1DAA">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.branchPoint" target="_JHkGA5g0EeSrbqbUdG1DAA" xmi:id="_JHkGFZg0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::BranchPoint" updateName="true" xmi:id="_JHkGFpg0EeSrbqbUdG1DAA">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario" target="_JHkGBpg0EeSrbqbUdG1DAA" xmi:id="_JHkGF5g0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_JHkGGJg0EeSrbqbUdG1DAA">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" metamodelNsURI="j2ee" name="j2ee" xmi:id="_JHkF8Jg0EeSrbqbUdG1DAA" xmi:version="2.0">
+ <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.Bean" name="Bean" xmi:id="_JHkF8Zg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_JHkF8pg0EeSrbqbUdG1DAA"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+ <matcherConfiguration xmi:id="_JHkF85g0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::Bean</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.Finder" name="Finder" xmi:id="_JHkF9Jg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_JHkF9Zg0EeSrbqbUdG1DAA"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
+ <matcherConfiguration xmi:id="_JHkF9pg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::Finder</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.Import" name="Import" xmi:id="_JHkF95g0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_JHkF-Jg0EeSrbqbUdG1DAA"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
+ <matcherConfiguration xmi:id="_JHkF-Zg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations hint="UML::Association" identifier="org.eclipse.papyrus.example.j2ee.Web" name="Web" xmi:id="_JHkF-pg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_JHkF-5g0EeSrbqbUdG1DAA"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
+ <matcherConfiguration xmi:id="_JHkF_Jg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.User" name="User" xmi:id="_JHkF_Zg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_JHkF_pg0EeSrbqbUdG1DAA"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>
+ <matcherConfiguration xmi:id="_JHkF_5g0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.Browser" name="Browser" xmi:id="_JHkGAJg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_JHkGAZg0EeSrbqbUdG1DAA"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>
+ <matcherConfiguration xmi:id="_JHkGApg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.BranchPoint" name="BranchPoint" xmi:id="_JHkGA5g0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_JHkGBJg0EeSrbqbUdG1DAA"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.ExtensionPoint</specializedTypesID>
+ <matcherConfiguration xmi:id="_JHkGBZg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.WebScenario" name="WebScenario" xmi:id="_JHkGBpg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_JHkGB5g0EeSrbqbUdG1DAA"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>
+ <matcherConfiguration xmi:id="_JHkGCJg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.bean" target="_JHkF8Zg0EeSrbqbUdG1DAA" xmi:id="_JHkGCZg0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::Bean" updateName="true" xmi:id="_JHkGCpg0EeSrbqbUdG1DAA">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.finder" target="_JHkF9Jg0EeSrbqbUdG1DAA" xmi:id="_JHkGC5g0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::Finder" updateName="true" xmi:id="_JHkGDJg0EeSrbqbUdG1DAA">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.import" target="_JHkF95g0EeSrbqbUdG1DAA" xmi:id="_JHkGDZg0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::Import" updateName="true" xmi:id="_JHkGDpg0EeSrbqbUdG1DAA">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.web" target="_JHkF-pg0EeSrbqbUdG1DAA" xmi:id="_JHkGD5g0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::Web" updateName="true" xmi:id="_JHkGEJg0EeSrbqbUdG1DAA">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user" target="_JHkF_Zg0EeSrbqbUdG1DAA" xmi:id="_JHkGEZg0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_JHkGEpg0EeSrbqbUdG1DAA">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser" target="_JHkGAJg0EeSrbqbUdG1DAA" xmi:id="_JHkGE5g0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_JHkGFJg0EeSrbqbUdG1DAA">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.branchPoint" target="_JHkGA5g0EeSrbqbUdG1DAA" xmi:id="_JHkGFZg0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::BranchPoint" updateName="true" xmi:id="_JHkGFpg0EeSrbqbUdG1DAA">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario" target="_JHkGBpg0EeSrbqbUdG1DAA" xmi:id="_JHkGF5g0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_JHkGGJg0EeSrbqbUdG1DAA">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations
index a5057bcc52f..d2010af4d3c 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations
@@ -1,182 +1,182 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" metamodelNsURI="j2ee" name="j2ee" xmi:id="_PDKksJgTEeSXtOdwR_uKBQ" xmi:version="2.0">
- <elementTypeConfigurations hint="4013" identifier="org.eclipse.papyrus.example.j2ee.Import_4013" name="Import" xmi:id="_PDKksZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_PDKkspgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKks5gTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="4011" identifier="org.eclipse.papyrus.example.j2ee.Web_4011" name="Web" xmi:id="_PDKktJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_PDKktZgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Association_4011</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKktpgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.example.j2ee.User_3018" name="User (3018)" xmi:id="_PDKkt5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkuJgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3018</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKkuZgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.example.j2ee.User_3011" name="User (3011)" xmi:id="_PDKkupgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKku5gTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3011</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKkvJgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.example.j2ee.User_2011" name="User (2011)" xmi:id="_PDKkvZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkvpgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2011</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKkv5gTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.example.j2ee.User_2012" name="User (2012)" xmi:id="_PDKkwJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkwZgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2012</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKkwpgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.example.j2ee.Browser_3018" name="Browser (3018)" xmi:id="_PDKkw5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkxJgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3018</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKkxZgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.example.j2ee.Browser_3011" name="Browser (3011)" xmi:id="_PDKkxpgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkx5gTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3011</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKkyJgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.example.j2ee.Browser_2011" name="Browser (2011)" xmi:id="_PDKkyZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkypgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2011</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKky5gTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.example.j2ee.Browser_2012" name="Browser (2012)" xmi:id="_PDKkzJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkzZgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2012</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKkzpgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3007" name="BranchPoint (3007)" xmi:id="_PDKkz5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_PDKk0JgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKk0ZgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3008" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3008" name="BranchPoint (3008)" xmi:id="_PDKk0pgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_PDKk05gTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3008</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKk1JgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="3012" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_3012" name="WebScenario (3012)" xmi:id="_PDKk1ZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk1pgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_3012</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKk15gTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2013" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2013" name="WebScenario (2013)" xmi:id="_PDKk2JgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk2ZgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKk2pgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="2014" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2014" name="WebScenario (2014)" xmi:id="_PDKk25gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk3JgTEeSXtOdwR_uKBQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014</specializedTypesID>
- <matcherConfiguration xmi:id="_PDKk3ZgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.import_4013" target="_PDKksZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk3pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::Import" updateName="true" xmi:id="_PDKk35gTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.web_4011" target="_PDKktJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk4JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::Web" updateName="true" xmi:id="_PDKk4ZgTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_3018" target="_PDKkt5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk4pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk45gTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_3011" target="_PDKkupgTEeSXtOdwR_uKBQ" xmi:id="_PDKk5JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk5ZgTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_2011" target="_PDKkvZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk5pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk55gTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_2012" target="_PDKkwJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk6JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk6ZgTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_3018" target="_PDKkw5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk6pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk65gTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_3011" target="_PDKkxpgTEeSXtOdwR_uKBQ" xmi:id="_PDKk7JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk7ZgTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_2011" target="_PDKkyZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk7pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk75gTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_2012" target="_PDKkzJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk8JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk8ZgTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3007" target="_PDKkz5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk8pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::BranchPoint" updateName="true" xmi:id="_PDKk85gTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3008" target="_PDKk0pgTEeSXtOdwR_uKBQ" xmi:id="_PDKk9JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::BranchPoint" updateName="true" xmi:id="_PDKk9ZgTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_3012" target="_PDKk1ZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk9pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk95gTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_2013" target="_PDKk2JgTEeSXtOdwR_uKBQ" xmi:id="_PDKk-JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk-ZgTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_2014" target="_PDKk25gTEeSXtOdwR_uKBQ" xmi:id="_PDKk-pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk-5gTEeSXtOdwR_uKBQ">
- <requiredProfiles>j2ee</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" metamodelNsURI="j2ee" name="j2ee" xmi:id="_PDKksJgTEeSXtOdwR_uKBQ" xmi:version="2.0">
+ <elementTypeConfigurations hint="4013" identifier="org.eclipse.papyrus.example.j2ee.Import_4013" name="Import" xmi:id="_PDKksZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_PDKkspgTEeSXtOdwR_uKBQ"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013</specializedTypesID>
+ <matcherConfiguration xmi:id="_PDKks5gTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations hint="4011" identifier="org.eclipse.papyrus.example.j2ee.Web_4011" name="Web" xmi:id="_PDKktJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_PDKktZgTEeSXtOdwR_uKBQ"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Association_4011</specializedTypesID>
+ <matcherConfiguration xmi:id="_PDKktpgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.example.j2ee.User_3018" name="User (3018)" xmi:id="_PDKkt5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkuJgTEeSXtOdwR_uKBQ"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3018</specializedTypesID>
+ <matcherConfiguration xmi:id="_PDKkuZgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.example.j2ee.User_3011" name="User (3011)" xmi:id="_PDKkupgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKku5gTEeSXtOdwR_uKBQ"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3011</specializedTypesID>
+ <matcherConfiguration xmi:id="_PDKkvJgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.example.j2ee.User_2011" name="User (2011)" xmi:id="_PDKkvZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkvpgTEeSXtOdwR_uKBQ"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2011</specializedTypesID>
+ <matcherConfiguration xmi:id="_PDKkv5gTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.example.j2ee.User_2012" name="User (2012)" xmi:id="_PDKkwJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkwZgTEeSXtOdwR_uKBQ"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2012</specializedTypesID>
+ <matcherConfiguration xmi:id="_PDKkwpgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.example.j2ee.Browser_3018" name="Browser (3018)" xmi:id="_PDKkw5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkxJgTEeSXtOdwR_uKBQ"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3018</specializedTypesID>
+ <matcherConfiguration xmi:id="_PDKkxZgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.example.j2ee.Browser_3011" name="Browser (3011)" xmi:id="_PDKkxpgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkx5gTEeSXtOdwR_uKBQ"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3011</specializedTypesID>
+ <matcherConfiguration xmi:id="_PDKkyJgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.example.j2ee.Browser_2011" name="Browser (2011)" xmi:id="_PDKkyZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkypgTEeSXtOdwR_uKBQ"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2011</specializedTypesID>
+ <matcherConfiguration xmi:id="_PDKky5gTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.example.j2ee.Browser_2012" name="Browser (2012)" xmi:id="_PDKkzJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkzZgTEeSXtOdwR_uKBQ"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2012</specializedTypesID>
+ <matcherConfiguration xmi:id="_PDKkzpgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3007" name="BranchPoint (3007)" xmi:id="_PDKkz5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_PDKk0JgTEeSXtOdwR_uKBQ"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007</specializedTypesID>
+ <matcherConfiguration xmi:id="_PDKk0ZgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations hint="3008" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3008" name="BranchPoint (3008)" xmi:id="_PDKk0pgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_PDKk05gTEeSXtOdwR_uKBQ"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3008</specializedTypesID>
+ <matcherConfiguration xmi:id="_PDKk1JgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations hint="3012" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_3012" name="WebScenario (3012)" xmi:id="_PDKk1ZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk1pgTEeSXtOdwR_uKBQ"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_3012</specializedTypesID>
+ <matcherConfiguration xmi:id="_PDKk15gTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations hint="2013" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2013" name="WebScenario (2013)" xmi:id="_PDKk2JgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk2ZgTEeSXtOdwR_uKBQ"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013</specializedTypesID>
+ <matcherConfiguration xmi:id="_PDKk2pgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations hint="2014" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2014" name="WebScenario (2014)" xmi:id="_PDKk25gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk3JgTEeSXtOdwR_uKBQ"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014</specializedTypesID>
+ <matcherConfiguration xmi:id="_PDKk3ZgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.import_4013" target="_PDKksZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk3pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::Import" updateName="true" xmi:id="_PDKk35gTEeSXtOdwR_uKBQ">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.web_4011" target="_PDKktJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk4JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::Web" updateName="true" xmi:id="_PDKk4ZgTEeSXtOdwR_uKBQ">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_3018" target="_PDKkt5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk4pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk45gTEeSXtOdwR_uKBQ">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_3011" target="_PDKkupgTEeSXtOdwR_uKBQ" xmi:id="_PDKk5JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk5ZgTEeSXtOdwR_uKBQ">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_2011" target="_PDKkvZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk5pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk55gTEeSXtOdwR_uKBQ">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_2012" target="_PDKkwJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk6JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk6ZgTEeSXtOdwR_uKBQ">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_3018" target="_PDKkw5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk6pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk65gTEeSXtOdwR_uKBQ">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_3011" target="_PDKkxpgTEeSXtOdwR_uKBQ" xmi:id="_PDKk7JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk7ZgTEeSXtOdwR_uKBQ">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_2011" target="_PDKkyZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk7pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk75gTEeSXtOdwR_uKBQ">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_2012" target="_PDKkzJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk8JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk8ZgTEeSXtOdwR_uKBQ">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3007" target="_PDKkz5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk8pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::BranchPoint" updateName="true" xmi:id="_PDKk85gTEeSXtOdwR_uKBQ">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3008" target="_PDKk0pgTEeSXtOdwR_uKBQ" xmi:id="_PDKk9JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::BranchPoint" updateName="true" xmi:id="_PDKk9ZgTEeSXtOdwR_uKBQ">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_3012" target="_PDKk1ZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk9pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk95gTEeSXtOdwR_uKBQ">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_2013" target="_PDKk2JgTEeSXtOdwR_uKBQ" xmi:id="_PDKk-JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk-ZgTEeSXtOdwR_uKBQ">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_2014" target="_PDKk25gTEeSXtOdwR_uKBQ" xmi:id="_PDKk-pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk-5gTEeSXtOdwR_uKBQ">
+ <requiredProfiles>j2ee</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
index 5495bb31244..8646b69811c 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
@@ -1,17 +1,18 @@
-Manifest-Version: 1.0
-Require-Bundle: org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.gmfdiag.assistant,
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.tests,
- org.eclipse.papyrus.infra.gmfdiag.common.utils
-Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0"
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: fragment
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.assistant,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0",
+ org.eclipse.uml2.uml;bundle-version="5.1.0"
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.tests,
+ org.eclipse.papyrus.infra.gmfdiag.common.utils
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0"
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: fragment
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/TestExpansionDiagram.elementtypesconfigurations b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/TestExpansionDiagram.elementtypesconfigurations
index 41dc1093548..9c3d8509c79 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/TestExpansionDiagram.elementtypesconfigurations
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/TestExpansionDiagram.elementtypesconfigurations
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="TestExpansionDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="TestExpansionDiagram" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" xmi:version="2.0">
- <elementTypeConfigurations hint="Interface_Label" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label" name="Interface" xmi:id="_rWNxVHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_rWNxVXPzEeSnGJwaJWHCSg"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="Interface_BorderItem" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItem" name="Interface" xmi:id="_C-1XION1EeSPY_4fjIBntw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_C-1XIeN1EeSPY_4fjIBntw"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
- </elementTypeConfigurations>
- <elementTypeConfigurations hint="Dependency_Link" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Dependency_Link" name="Dependency" xmi:id="_Tm5Y0PPMEeSh3rAaWaQzhQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_Tm5Y0fPMEeSh3rAaWaQzhQ"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
- </elementTypeConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="TestExpansionDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="TestExpansionDiagram" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" xmi:version="2.0">
+ <elementTypeConfigurations hint="Interface_Label" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label" name="Interface" xmi:id="_rWNxVHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_rWNxVXPzEeSnGJwaJWHCSg"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations hint="Interface_BorderItem" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItem" name="Interface" xmi:id="_C-1XION1EeSPY_4fjIBntw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_C-1XIeN1EeSPY_4fjIBntw"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
+ </elementTypeConfigurations>
+ <elementTypeConfigurations hint="Dependency_Link" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Dependency_Link" name="Dependency" xmi:id="_Tm5Y0PPMEeSh3rAaWaQzhQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_Tm5Y0fPMEeSh3rAaWaQzhQ"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
+ </elementTypeConfigurations>
</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/org.eclipse.papyrus.infra.gmfdiag.menu.tests.launch b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/org.eclipse.papyrus.infra.gmfdiag.menu.tests.launch
index 583302f6447..a9924eadfda 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/org.eclipse.papyrus.infra.gmfdiag.menu.tests.launch
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/org.eclipse.papyrus.infra.gmfdiag.menu.tests.launch
@@ -33,7 +33,7 @@
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,lpg.runtime.java@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.acceleo.common@default:default,org.eclipse.acceleo.engine@default:default,org.eclipse.acceleo.model@default:default,org.eclipse.acceleo.profiler@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation.ocl@default:default,org.eclipse.emf.validation.ui@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.gmf.bridge.trace@default:default,org.eclipse.gmf.bridge.ui.dashboard@default:default,org.eclipse.gmf.bridge.ui@default:default,org.eclipse.gmf.bridge@default:default,org.eclipse.gmf.codegen.edit@default:default,org.eclipse.gmf.codegen.ui@default:default,org.eclipse.gmf.codegen.xtend.ui@default:default,org.eclipse.gmf.codegen.xtend@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.graphdef.codegen.ui@default:default,org.eclipse.gmf.graphdef.codegen@default:default,org.eclipse.gmf.graphdef.edit@default:default,org.eclipse.gmf.graphdef@default:default,org.eclipse.gmf.map.edit@default:default,org.eclipse.gmf.map@default:default,org.eclipse.gmf.runtime.common.core@default:default,org.eclipse.gmf.runtime.common.ui.action.ide@default:default,org.eclipse.gmf.runtime.common.ui.action@default:default,org.eclipse.gmf.runtime.common.ui.printing@default:default,org.eclipse.gmf.runtime.common.ui.services.action@default:default,org.eclipse.gmf.runtime.common.ui.services.properties@default:default,org.eclipse.gmf.runtime.common.ui.services@default:default,org.eclipse.gmf.runtime.common.ui@default:default,org.eclipse.gmf.runtime.diagram.core@default:default,org.eclipse.gmf.runtime.diagram.ui.actions@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default,org.eclipse.gmf.runtime.diagram.ui.printing@default:default,org.eclipse.gmf.runtime.diagram.ui.properties@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.providers@default:default,org.eclipse.gmf.runtime.diagram.ui.render@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default,org.eclipse.gmf.runtime.diagram.ui@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default,org.eclipse.gmf.runtime.draw2d.ui.render@default:default,org.eclipse.gmf.runtime.draw2d.ui@default:default,org.eclipse.gmf.runtime.emf.clipboard.core@default:default,org.eclipse.gmf.runtime.emf.commands.core@default:default,org.eclipse.gmf.runtime.emf.core@default:default,org.eclipse.gmf.runtime.emf.type.core@default:default,org.eclipse.gmf.runtime.emf.ui.properties@default:default,org.eclipse.gmf.runtime.emf.ui@default:default,org.eclipse.gmf.runtime.gef.ui@default:default,org.eclipse.gmf.runtime.notation.edit@default:default,org.eclipse.gmf.runtime.notation@default:default,org.eclipse.gmf.tooldef.edit@default:default,org.eclipse.gmf.tooldef@default:default,org.eclipse.gmf.tooling.runtime@default:default,org.eclipse.gmf.validate@default:default,org.eclipse.gmf.xpand.qvtlibrary@default:default,org.eclipse.gmf.xpand@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2m.qvt.oml.common@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.emf.util@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime@default:default,org.eclipse.m2m.qvt.oml@default:default,org.eclipse.nebula.widgets.nattable.core@default:default,org.eclipse.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.examples.common@default:default,org.eclipse.ocl.examples.debug.vm@default:default,org.eclipse.ocl.examples.debug@default:default,org.eclipse.ocl.examples.domain@default:default,org.eclipse.ocl.examples.emf.validation.validity.ui@default:default,org.eclipse.ocl.examples.emf.validation.validity@default:default,org.eclipse.ocl.examples.library@default:default,org.eclipse.ocl.examples.pivot@default:default,org.eclipse.ocl.examples.ui@default:default,org.eclipse.ocl.examples.xtext.base.ui@default:default,org.eclipse.ocl.examples.xtext.base@default:default,org.eclipse.ocl.examples.xtext.completeocl@default:default,org.eclipse.ocl.examples.xtext.console@default:default,org.eclipse.ocl.examples.xtext.essentialocl.ui@default:default,org.eclipse.ocl.examples.xtext.essentialocl@default:default,org.eclipse.ocl.examples.xtext.markup.ui@default:default,org.eclipse.ocl.examples.xtext.markup@default:default,org.eclipse.ocl.examples.xtext.oclinecore@default:default,org.eclipse.ocl.examples.xtext.oclstdlib@default:default,org.eclipse.ocl@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.standard@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml.validation@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.gmf.codegen@default:default,org.eclipse.papyrus.cdo.ui.doc@default:default,org.eclipse.papyrus.codegen@default:default,org.eclipse.papyrus.copypaste.ui.doc@default:default,org.eclipse.papyrus.customization.extendedtypes.emf@default:default,org.eclipse.papyrus.customization.extendedtypes.uml@default:default,org.eclipse.papyrus.customization.extendedtypes@default:default,org.eclipse.papyrus.customization.palette@default:default,org.eclipse.papyrus.customization.paletteconfiguration@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.model.xwt@default:default,org.eclipse.papyrus.customization.properties@default:default,org.eclipse.papyrus.customization@default:default,org.eclipse.papyrus.def@default:default,org.eclipse.papyrus.dev.java.utils@default:default,org.eclipse.papyrus.developer.profile@default:default,org.eclipse.papyrus.doc@default:default,org.eclipse.papyrus.documentation.plugin.edit@default:default,org.eclipse.papyrus.documentation.plugin.editor@default:default,org.eclipse.papyrus.documentation.plugin@default:default,org.eclipse.papyrus.domaincodegen.ui@default:default,org.eclipse.papyrus.domaincontextcodegen.edit@default:default,org.eclipse.papyrus.domaincontextcodegen.editor@default:default,org.eclipse.papyrus.domaincontextcodegen@default:default,org.eclipse.papyrus.dsml.validation.doc@default:default,org.eclipse.papyrus.eclipse.project.editors@default:default,org.eclipse.papyrus.editor.perspectiveconfiguration@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.emf.commandstack@default:default,org.eclipse.papyrus.emf.facet.common.core@default:default,org.eclipse.papyrus.emf.facet.common.sdk.core@default:default,org.eclipse.papyrus.emf.facet.common.ui@default:default,org.eclipse.papyrus.emf.facet.custom.core@default:default,org.eclipse.papyrus.emf.facet.custom.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.core@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.custom.ui@default:default,org.eclipse.papyrus.emf.facet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.catalog@default:default,org.eclipse.papyrus.emf.facet.efacet.core@default:default,org.eclipse.papyrus.emf.facet.efacet.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.editor@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel@default:default,org.eclipse.papyrus.emf.facet.efacet.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.ui@default:default,org.eclipse.papyrus.emf.facet.efacet@default:default,org.eclipse.papyrus.emf.facet.query.java.core@default:default,org.eclipse.papyrus.emf.facet.query.java.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.java.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.java@default:default,org.eclipse.papyrus.emf.facet.query.ocl.core@default:default,org.eclipse.papyrus.emf.facet.query.ocl.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.util.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.catalog@default:default,org.eclipse.papyrus.emf.facet.util.emf.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.ui@default:default,org.eclipse.papyrus.emf.facet.util.jface.ui@default:default,org.eclipse.papyrus.emf.facet.util.pde.core@default:default,org.eclipse.papyrus.emf.facet.util.swt@default:default,org.eclipse.papyrus.emf.facet.util.ui@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors@default:default,org.eclipse.papyrus.emf.facet.widgets@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.gmf.editpartview@default:default,org.eclipse.papyrus.gmf.editpoliciesstates@default:default,org.eclipse.papyrus.gmf.figureview@default:default,org.eclipse.papyrus.gmfgenextension@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.pluginexplorer@default:default,org.eclipse.papyrus.infra.core.sasheditor.di.tests@default:false,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor.tests@default:false,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core.serviceregistry.edit@default:default,org.eclipse.papyrus.infra.core.serviceregistry.editor@default:default,org.eclipse.papyrus.infra.core.serviceregistry.tests@default:false,org.eclipse.papyrus.infra.core.serviceregistry@default:default,org.eclipse.papyrus.infra.core.tests@default:false,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.doc@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.newchild@default:default,org.eclipse.papyrus.infra.emf.readonly.tests@default:false,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf.tests@default:false,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.extendedtypes.edit@default:default,org.eclipse.papyrus.infra.extendedtypes.editor@default:default,org.eclipse.papyrus.infra.extendedtypes.emf@default:default,org.eclipse.papyrus.infra.extendedtypes@default:default,org.eclipse.papyrus.infra.gmfdiag.commands.tests@default:false,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.common.tests@default:false,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.controlmode@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.debug@default:default,org.eclipse.papyrus.infra.gmfdiag.css.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.infra.gmfdiag.css.palette@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.css.xtext@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.export@default:default,org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter@default:default,org.eclipse.papyrus.infra.gmfdiag.hyperlink@default:default,org.eclipse.papyrus.infra.gmfdiag.menu.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.menu@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.viewersearcher@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.newchild.doc@default:default,org.eclipse.papyrus.infra.newchild.edit@default:default,org.eclipse.papyrus.infra.newchild.editor@default:default,org.eclipse.papyrus.infra.newchild@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.psf@default:default,org.eclipse.papyrus.infra.services.controlmode.doc@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit.tests@default:false,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.labelprovider@default:default,org.eclipse.papyrus.infra.services.localizer@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.navigation@default:default,org.eclipse.papyrus.infra.services.openelement@default:default,org.eclipse.papyrus.infra.services.resourceloading.preferences@default:default,org.eclipse.papyrus.infra.services.resourceloading.tests@default:false,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.semantic@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.services.viewersearch@default:default,org.eclipse.papyrus.infra.services.viewlabelprovider@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.edit@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.editor@default:default,org.eclipse.papyrus.infra.viewpoints.configuration@default:default,org.eclipse.papyrus.infra.viewpoints.doc@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010.edit@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010@default:default,org.eclipse.papyrus.infra.viewpoints.policy@default:default,org.eclipse.papyrus.infra.viewpoints.preferences@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.junit.framework@default:default,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.papyrus.layers.documentation@default:default,org.eclipse.papyrus.moka.doc@default:default,org.eclipse.papyrus.mwe2.utils@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition.tests@default:false,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.css@default:default,org.eclipse.papyrus.sysml.diagram.internalblock.tests@default:false,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.parametric.tests@default:false,org.eclipse.papyrus.sysml.diagram.parametric@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.nattable.allocation.config@default:default,org.eclipse.papyrus.sysml.nattable.allocation@default:default,org.eclipse.papyrus.sysml.nattable.menu@default:default,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement@default:default,org.eclipse.papyrus.sysml.nattable@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types.tests@default:false,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.uml.alf.common.ui@default:default,org.eclipse.papyrus.uml.alf.common@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode@default:default,org.eclipse.papyrus.uml.decoratormodel.doc@default:default,org.eclipse.papyrus.uml.decoratormodel.properties@default:default,org.eclipse.papyrus.uml.decoratormodel.ui@default:default,org.eclipse.papyrus.uml.decoratormodel@default:default,org.eclipse.papyrus.uml.developer.mde@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.common.doc@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.css@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.emftree@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile.doc@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.stereotype.edition@default:default,org.eclipse.papyrus.uml.diagram.symbols.properties@default:default,org.eclipse.papyrus.uml.diagram.symbols@default:default,org.eclipse.papyrus.uml.diagram.synchronizeview.test@default:default,org.eclipse.papyrus.uml.diagram.synchronizeview@default:default,org.eclipse.papyrus.uml.diagram.timing@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.doc@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.modelrepair.tests@default:false,org.eclipse.papyrus.uml.modelrepair@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable@default:default,org.eclipse.papyrus.uml.navigation@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties.xtext@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.search.ui.doc@default:default,org.eclipse.papyrus.uml.search.ui@default:default,org.eclipse.papyrus.uml.service.types.tests@default:false,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.service.validation@default:default,org.eclipse.papyrus.uml.services.decoration@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.uml.textedit.javaconstraint@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.port.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.port.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.tools.extendedtypes@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.ui.perspectiveconfiguration@default:default,org.eclipse.papyrus.uml.xtext.integration.core@default:default,org.eclipse.papyrus.uml.xtext.integration.ui@default:default,org.eclipse.papyrus.uml.xtext.integration.validation@default:default,org.eclipse.papyrus.views.modelexplorer.newchild@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.properties.doc@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.views.search@default:default,org.eclipse.papyrus.views.validation@default:default,org.eclipse.papyrus.xwt@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.gmf.codegen@default:default,org.eclipse.papyrus.cdo.ui.doc@default:default,org.eclipse.papyrus.codegen@default:default,org.eclipse.papyrus.copypaste.ui.doc@default:default,org.eclipse.papyrus.customization.extendedtypes.emf@default:default,org.eclipse.papyrus.customization.extendedtypes.uml@default:default,org.eclipse.papyrus.customization.extendedtypes@default:default,org.eclipse.papyrus.customization.palette@default:default,org.eclipse.papyrus.customization.paletteconfiguration@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.model.xwt@default:default,org.eclipse.papyrus.customization.properties@default:default,org.eclipse.papyrus.customization@default:default,org.eclipse.papyrus.def@default:default,org.eclipse.papyrus.dev.java.utils@default:default,org.eclipse.papyrus.developer.profile@default:default,org.eclipse.papyrus.doc@default:default,org.eclipse.papyrus.documentation.plugin.edit@default:default,org.eclipse.papyrus.documentation.plugin.editor@default:default,org.eclipse.papyrus.documentation.plugin@default:default,org.eclipse.papyrus.domaincodegen.ui@default:default,org.eclipse.papyrus.domaincontextcodegen.edit@default:default,org.eclipse.papyrus.domaincontextcodegen.editor@default:default,org.eclipse.papyrus.domaincontextcodegen@default:default,org.eclipse.papyrus.dsml.validation.doc@default:default,org.eclipse.papyrus.eclipse.project.editors@default:default,org.eclipse.papyrus.editor.perspectiveconfiguration@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.emf.commandstack@default:default,org.eclipse.papyrus.emf.facet.common.core@default:default,org.eclipse.papyrus.emf.facet.common.sdk.core@default:default,org.eclipse.papyrus.emf.facet.common.ui@default:default,org.eclipse.papyrus.emf.facet.custom.core@default:default,org.eclipse.papyrus.emf.facet.custom.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.core@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.custom.ui@default:default,org.eclipse.papyrus.emf.facet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.catalog@default:default,org.eclipse.papyrus.emf.facet.efacet.core@default:default,org.eclipse.papyrus.emf.facet.efacet.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.editor@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel@default:default,org.eclipse.papyrus.emf.facet.efacet.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.ui@default:default,org.eclipse.papyrus.emf.facet.efacet@default:default,org.eclipse.papyrus.emf.facet.query.java.core@default:default,org.eclipse.papyrus.emf.facet.query.java.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.java.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.java@default:default,org.eclipse.papyrus.emf.facet.query.ocl.core@default:default,org.eclipse.papyrus.emf.facet.query.ocl.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.util.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.catalog@default:default,org.eclipse.papyrus.emf.facet.util.emf.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.ui@default:default,org.eclipse.papyrus.emf.facet.util.jface.ui@default:default,org.eclipse.papyrus.emf.facet.util.pde.core@default:default,org.eclipse.papyrus.emf.facet.util.swt@default:default,org.eclipse.papyrus.emf.facet.util.ui@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors@default:default,org.eclipse.papyrus.emf.facet.widgets@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.gmf.editpartview@default:default,org.eclipse.papyrus.gmf.editpoliciesstates@default:default,org.eclipse.papyrus.gmf.figureview@default:default,org.eclipse.papyrus.gmfgenextension@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.pluginexplorer@default:default,org.eclipse.papyrus.infra.core.sasheditor.di.tests@default:false,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor.tests@default:false,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core.serviceregistry.edit@default:default,org.eclipse.papyrus.infra.core.serviceregistry.editor@default:default,org.eclipse.papyrus.infra.core.serviceregistry.tests@default:false,org.eclipse.papyrus.infra.core.serviceregistry@default:default,org.eclipse.papyrus.infra.core.tests@default:false,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.doc@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.newchild@default:default,org.eclipse.papyrus.infra.emf.readonly.tests@default:false,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf.tests@default:false,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.extendedtypes.edit@default:default,org.eclipse.papyrus.infra.extendedtypes.editor@default:default,org.eclipse.papyrus.infra.extendedtypes.emf@default:default,org.eclipse.papyrus.infra.extendedtypes@default:default,org.eclipse.papyrus.infra.gmfdiag.commands.tests@default:false,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.common.tests@default:false,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.controlmode@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.debug@default:default,org.eclipse.papyrus.infra.gmfdiag.css.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.uml.diagram.css.palette@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.css.xtext@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.export@default:default,org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter@default:default,org.eclipse.papyrus.infra.gmfdiag.hyperlink@default:default,org.eclipse.papyrus.infra.gmfdiag.menu.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.menu@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.viewersearcher@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.newchild.doc@default:default,org.eclipse.papyrus.infra.newchild.edit@default:default,org.eclipse.papyrus.infra.newchild.editor@default:default,org.eclipse.papyrus.infra.newchild@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.psf@default:default,org.eclipse.papyrus.infra.services.controlmode.doc@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit.tests@default:false,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.labelprovider@default:default,org.eclipse.papyrus.infra.services.localizer@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.navigation@default:default,org.eclipse.papyrus.infra.services.openelement@default:default,org.eclipse.papyrus.infra.services.resourceloading.preferences@default:default,org.eclipse.papyrus.infra.services.resourceloading.tests@default:false,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.semantic@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.services.viewersearch@default:default,org.eclipse.papyrus.infra.services.viewlabelprovider@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.edit@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.editor@default:default,org.eclipse.papyrus.infra.viewpoints.configuration@default:default,org.eclipse.papyrus.infra.viewpoints.doc@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010.edit@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010@default:default,org.eclipse.papyrus.infra.viewpoints.policy@default:default,org.eclipse.papyrus.infra.viewpoints.preferences@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.junit.framework@default:default,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.papyrus.layers.documentation@default:default,org.eclipse.papyrus.moka.doc@default:default,org.eclipse.papyrus.mwe2.utils@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition.tests@default:false,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.css@default:default,org.eclipse.papyrus.sysml.diagram.internalblock.tests@default:false,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.parametric.tests@default:false,org.eclipse.papyrus.sysml.diagram.parametric@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.nattable.allocation.config@default:default,org.eclipse.papyrus.sysml.nattable.allocation@default:default,org.eclipse.papyrus.sysml.nattable.menu@default:default,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement@default:default,org.eclipse.papyrus.sysml.nattable@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types.tests@default:false,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.uml.alf.common.ui@default:default,org.eclipse.papyrus.uml.alf.common@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode@default:default,org.eclipse.papyrus.uml.decoratormodel.doc@default:default,org.eclipse.papyrus.uml.decoratormodel.properties@default:default,org.eclipse.papyrus.uml.decoratormodel.ui@default:default,org.eclipse.papyrus.uml.decoratormodel@default:default,org.eclipse.papyrus.uml.developer.mde@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.common.doc@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.css@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.emftree@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile.doc@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.stereotype.edition@default:default,org.eclipse.papyrus.uml.diagram.symbols.properties@default:default,org.eclipse.papyrus.uml.diagram.symbols@default:default,org.eclipse.papyrus.uml.diagram.synchronizeview.test@default:default,org.eclipse.papyrus.uml.diagram.synchronizeview@default:default,org.eclipse.papyrus.uml.diagram.timing@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.doc@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.modelrepair.tests@default:false,org.eclipse.papyrus.uml.modelrepair@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable@default:default,org.eclipse.papyrus.uml.navigation@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties.xtext@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.search.ui.doc@default:default,org.eclipse.papyrus.uml.search.ui@default:default,org.eclipse.papyrus.uml.service.types.tests@default:false,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.service.validation@default:default,org.eclipse.papyrus.uml.services.decoration@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.uml.textedit.javaconstraint@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.port.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.port.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.tools.extendedtypes@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.ui.perspectiveconfiguration@default:default,org.eclipse.papyrus.uml.xtext.integration.core@default:default,org.eclipse.papyrus.uml.xtext.integration.ui@default:default,org.eclipse.papyrus.uml.xtext.integration.validation@default:default,org.eclipse.papyrus.views.modelexplorer.newchild@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.properties.doc@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.views.search@default:default,org.eclipse.papyrus.views.validation@default:default,org.eclipse.papyrus.xwt@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF
index e2360716544..a3a1ebdf301 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
org.eclipse.core.databinding;bundle-version="1.6.0",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/OpenTableTest.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/OpenTableTest.java
index a7ccb80807e..fd05fc0e12e 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/OpenTableTest.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/OpenTableTest.java
@@ -1,86 +1,86 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.nattable.views.tests.tests;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.commands.OpenDiagramCommand;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.editor.integration.tests.tests.AbstractEditorIntegrationTest;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
-import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.junit.utils.GenericUtils;
-import org.eclipse.ui.IEditorPart;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-
-/**
- * Test the opening of an existing table
- *
- * @author vl222926
- *
- */
-public class OpenTableTest extends AbstractEditorIntegrationTest {
-
- @BeforeClass
- public static void startOfTest() {
-// GenericUtils.closeAllEditors();
- }
-
- /**
- * This test allows to be sure that we doesn't break existing table model
- *
- * @throws Exception
- */
- @Test
- public void testOpenExistingTable() throws Exception {
- initModel("tableOfViewsTest", "openTest", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
- IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
- Assert.assertEquals(1, pageManager.allPages().size());
- IEditorPart tableEditor = editor.getActiveEditor();
- Assert.assertNull(tableEditor);
- Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();
- Table requirementTable = (Table)notationResource.getContents().get(0);
- TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
- editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, requirementTable)));
- DisplayUtils.safeReadAndDispatch();
- tableEditor = editor.getActiveEditor();
- Assert.assertTrue(tableEditor instanceof NatTableEditor);
- INattableModelManager manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);
- Assert.assertNotNull(manager);
- }
-
- @Override
- protected String getSourcePath() {
- return "/resources/"; //$NON-NLS-1$
- }
-
- @Override
- protected Bundle getBundle() {
- return org.eclipse.papyrus.infra.nattable.views.tests.Activator.getDefault().getBundle();
- }
-
- @AfterClass
- public static void endOfTest() {
- GenericUtils.closeAllEditors();
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.tests.tests;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.commands.OpenDiagramCommand;
+import org.eclipse.papyrus.editor.integration.tests.tests.AbstractEditorIntegrationTest;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.junit.utils.GenericUtils;
+import org.eclipse.ui.IEditorPart;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+
+/**
+ * Test the opening of an existing table
+ *
+ * @author vl222926
+ *
+ */
+public class OpenTableTest extends AbstractEditorIntegrationTest {
+
+ @BeforeClass
+ public static void startOfTest() {
+// GenericUtils.closeAllEditors();
+ }
+
+ /**
+ * This test allows to be sure that we doesn't break existing table model
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testOpenExistingTable() throws Exception {
+ initModel("tableOfViewsTest", "openTest", getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+ IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
+ Assert.assertEquals(1, pageManager.allPages().size());
+ IEditorPart tableEditor = editor.getActiveEditor();
+ Assert.assertNull(tableEditor);
+ Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();
+ Table requirementTable = (Table)notationResource.getContents().get(0);
+ TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
+ editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, requirementTable)));
+ DisplayUtils.safeReadAndDispatch();
+ tableEditor = editor.getActiveEditor();
+ Assert.assertTrue(tableEditor instanceof NatTableEditor);
+ INattableModelManager manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);
+ Assert.assertNotNull(manager);
+ }
+
+ @Override
+ protected String getSourcePath() {
+ return "/resources/"; //$NON-NLS-1$
+ }
+
+ @Override
+ protected Bundle getBundle() {
+ return org.eclipse.papyrus.infra.nattable.views.tests.Activator.getDefault().getBundle();
+ }
+
+ @AfterClass
+ public static void endOfTest() {
+ GenericUtils.closeAllEditors();
+ }
+
+}
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableCreationTest2.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableCreationTest2.java
index 7d42fb00753..35beec4b3be 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableCreationTest2.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableCreationTest2.java
@@ -1,267 +1,267 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2014 CEA LIST and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 434993
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.nattable.views.tests.tests;
-
-import java.io.IOException;
-import java.util.Collection;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.commands.OpenDiagramCommand;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
-import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.infra.nattable.views.tests.Activator;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.junit.utils.GenericUtils;
-import org.eclipse.papyrus.junit.utils.ModelExplorerUtils;
-import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
-import org.eclipse.papyrus.junit.utils.ProjectUtils;
-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
-import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.uml2.uml.Model;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-public class TableCreationTest2 extends AbstractPapyrusTest {
-
- @ClassRule
- public static final HouseKeeper.Static houseKeeper = new HouseKeeper.Static();
-
- private static final String MODEL_PATH = "/resources/model2"; //$NON-NLS-1$
-
- private static final String SOURCE_PATH = "/resources/"; //$NON-NLS-1$
-
- private static final String FILE_ROOT_NAME = "model2"; //$NON-NLS-1$
-
- private static final String PROJECT_NAME = "test"; //$NON-NLS-1$
-
- private static IMultiDiagramEditor papyrusEditor;
-
- private static final String BUNDLE_ID = Activator.getDefault().getBundle().getSymbolicName();
-
- protected static Model rootModel;
-
- protected static Model subModel;
-
- protected static Table table1;
-
- protected static Diagram diagram1;
-
- protected static Diagram diagram2;
-
- protected static ModelExplorerView view;
-
- @BeforeClass
- public static void init() throws Exception {
- try {
- initTests(Activator.getDefault().getBundle(), PROJECT_NAME, MODEL_PATH);
- } catch (CoreException e) {
- Activator.log.error(e);
- } catch (IOException e) {
- Activator.log.error(e);
- } catch (BundleException e) {
- Activator.log.error(e);
- }
- }
-
- public static void initTests(final Bundle bundle, final String projectName, final String papyrusModelPath) throws CoreException, IOException, BundleException, Exception {
- ProjectUtils.removeAllProjectFromTheWorkspace();
- IProject testProject = houseKeeper.createProject(projectName);
- final IFile file = PapyrusProjectUtils.copyPapyrusModel(testProject, bundle, SOURCE_PATH, FILE_ROOT_NAME);
- RunnableWithResult<?> runnableWithResult = new RunnableWithResult.Impl<Object>() {
-
- @Override
- public void run() {
- try {
- papyrusEditor = houseKeeper.openPapyrusEditor(file);
- } catch (Exception ex){
- Activator.log.error(ex);
- return;
- }
-
- try {
- TableCreationTest2.view = ModelExplorerUtils.openModelExplorerView();
- } catch (PartInitException e) {
- setStatus(new Status(IStatus.ERROR, bundle.getSymbolicName(), e.getMessage()));
- }
- EObject root = ModelExplorerUtils.getRootInModelExplorer(TableCreationTest2.view);
- TableCreationTest2.rootModel = (Model)root;
- subModel = (Model)TableCreationTest2.rootModel.getMember("SubModel1"); //$NON-NLS-1$
-
- PageList pageList = getPageList(rootModel);
- for(final PageRef pageRef : pageList.getAvailablePage()) {
- Object identifier = pageRef.getPageIdentifier();
- if(identifier instanceof Diagram) {
- if("ClassDiagram2".equals(((Diagram)identifier).getName())) {
- diagram2 = (Diagram)identifier;
- } else if("ClassDiagram1".equals(((Diagram)identifier).getName())) {
- diagram1 = (Diagram)identifier;
- }
-
- } else if(identifier instanceof Table) {
- if("TableOfViews0".equals(((Table)identifier).getName())) {
- table1 = (Table)identifier;
- }
- }
-
- }
- setStatus(Status.OK_STATUS);
- }
-
- };
- Display.getDefault().syncExec(runnableWithResult);
- Assert.assertEquals(runnableWithResult.getStatus().getMessage(), IStatus.OK, runnableWithResult.getStatus().getSeverity());
- Assert.assertNotNull(subModel);
- Assert.assertNotNull(diagram1);
- Assert.assertNotNull(diagram2);
- Assert.assertNotNull(table1);
- Assert.assertNotNull(TableCreationTest2.rootModel);
- Assert.assertEquals(subModel, table1.getContext());
- Assert.assertEquals(subModel, diagram2.getElement());
- Assert.assertEquals(rootModel, diagram1.getElement());
-
-
- }
-
- /**
- *
- * @return
- * the page list used for this model
- */
- private static final PageList getPageList(final EObject object) {
- final Resource resource = object.eResource();
- final ModelSet modelSet = (ModelSet)resource.getResourceSet();
- final Resource diResource = modelSet.getAssociatedResource(resource, DiModel.DI_FILE_EXTENSION, false);
- final SashWindowsMngr windowMngr = DiUtils.lookupSashWindowsMngr(diResource);
- final PageList pageList = windowMngr.getPageList();
- assert pageList != null;
- return pageList;
- }
-
-
-
- @Test
- public void createTable2AndDestroyAnOwnedElement() throws ServiceException {
- final Object result1 = ModelExplorerUtils.executeCreateNestedEditorHandlerInModelExplorer(papyrusEditor, TableCreationTest2.view, AllTests.COMMAND_ID, TableCreationTest2.rootModel, BUNDLE_ID);
- DisplayUtils.safeReadAndDispatch();
- Assert.assertTrue(result1 instanceof NatTableEditor);
- final NatTableEditor editor2 = (NatTableEditor)result1;
- editor2.setFocus();
- DisplayUtils.safeReadAndDispatch();
- final NattableModelManager manager2 = (NattableModelManager)editor2.getAdapter(INattableModelManager.class);
- Assert.assertNotNull(manager2);
- final Table table2 = manager2.getTable();
- Assert.assertEquals(AllTests.VIEWS_TABLE_ID, table2.getTableConfiguration().getType());
-
- final IAxisManager rowAxisManager = manager2.getRowAxisManager();
- Collection<Object> managedAxis_Table1 = rowAxisManager.getAllManagedAxis();
- Assert.assertEquals(4, managedAxis_Table1.size());
- Assert.assertTrue(managedAxis_Table1.contains(table1));
- Assert.assertTrue(managedAxis_Table1.contains(table2));
- Assert.assertTrue(managedAxis_Table1.contains(diagram1));
- Assert.assertTrue(managedAxis_Table1.contains(diagram2));
- Assert.assertEquals(managedAxis_Table1.size(), rowAxisManager.getTableManager().getRowElementsList().size());
- Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(table2));
- Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(table1));
- Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(diagram1));
- Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(diagram2));
-
-
- TransactionalEditingDomain editingDomain = papyrusEditor.getServicesRegistry().getService(TransactionalEditingDomain.class);
- DestroyElementRequest request = new DestroyElementRequest(editingDomain, diagram2, false);
- IElementEditService provider = ElementEditServiceUtils.getCommandProvider(diagram2);
- ICommand cmd = provider.getEditCommand(request);
- editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
-
-
- DisplayUtils.safeReadAndDispatch();
- //verify the contents of table2
- managedAxis_Table1 = rowAxisManager.getAllManagedAxis();
- Assert.assertEquals(3, managedAxis_Table1.size());
- Assert.assertTrue(managedAxis_Table1.contains(table1));
- Assert.assertTrue(managedAxis_Table1.contains(table2));
- Assert.assertTrue(managedAxis_Table1.contains(diagram1));
-
-
-
- Assert.assertEquals(managedAxis_Table1.size(), rowAxisManager.getTableManager().getRowElementsList().size());
- Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(table2));
- Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(table1));
- Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(diagram1));
-
-
- //verify the contents of table1 (we open it)
- IPageManager pageManager = papyrusEditor.getServicesRegistry().getService(IPageManager.class);
- Assert.assertEquals(3, pageManager.allPages().size());
- IEditorPart tableEditor = papyrusEditor.getActiveEditor();
- editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, table1)));
- DisplayUtils.safeReadAndDispatch();
- tableEditor = papyrusEditor.getActiveEditor();
- Assert.assertTrue(tableEditor instanceof NatTableEditor);
- INattableModelManager manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);
- Assert.assertNotNull(manager);
- Assert.assertEquals(AllTests.VIEWS_TABLE_ID, manager.getTable().getTableConfiguration().getType());
-
- IAxisManager axisManager = manager.getRowAxisManager();
- final Collection<Object> managedAxis_Table2 = axisManager.getAllManagedAxis();
- Assert.assertEquals(1, managedAxis_Table2.size());
- Assert.assertTrue(managedAxis_Table2.contains(table1));
-
- Assert.assertEquals(managedAxis_Table2.size(), axisManager.getTableManager().getRowElementsList().size());
- Assert.assertTrue(axisManager.getTableManager().getRowElementsList().contains(table1));
-
-
- }
-
- @AfterClass
- public static void endOfTest() {
- GenericUtils.closeAllEditors();
- }
-
-
-}
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 434993
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.tests.tests;
+
+import java.io.IOException;
+import java.util.Collection;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.commands.OpenDiagramCommand;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.views.tests.Activator;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.GenericUtils;
+import org.eclipse.papyrus.junit.utils.ModelExplorerUtils;
+import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
+import org.eclipse.papyrus.junit.utils.ProjectUtils;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.uml2.uml.Model;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleException;
+
+public class TableCreationTest2 extends AbstractPapyrusTest {
+
+ @ClassRule
+ public static final HouseKeeper.Static houseKeeper = new HouseKeeper.Static();
+
+ private static final String MODEL_PATH = "/resources/model2"; //$NON-NLS-1$
+
+ private static final String SOURCE_PATH = "/resources/"; //$NON-NLS-1$
+
+ private static final String FILE_ROOT_NAME = "model2"; //$NON-NLS-1$
+
+ private static final String PROJECT_NAME = "test"; //$NON-NLS-1$
+
+ private static IMultiDiagramEditor papyrusEditor;
+
+ private static final String BUNDLE_ID = Activator.getDefault().getBundle().getSymbolicName();
+
+ protected static Model rootModel;
+
+ protected static Model subModel;
+
+ protected static Table table1;
+
+ protected static Diagram diagram1;
+
+ protected static Diagram diagram2;
+
+ protected static ModelExplorerView view;
+
+ @BeforeClass
+ public static void init() throws Exception {
+ try {
+ initTests(Activator.getDefault().getBundle(), PROJECT_NAME, MODEL_PATH);
+ } catch (CoreException e) {
+ Activator.log.error(e);
+ } catch (IOException e) {
+ Activator.log.error(e);
+ } catch (BundleException e) {
+ Activator.log.error(e);
+ }
+ }
+
+ public static void initTests(final Bundle bundle, final String projectName, final String papyrusModelPath) throws CoreException, IOException, BundleException, Exception {
+ ProjectUtils.removeAllProjectFromTheWorkspace();
+ IProject testProject = houseKeeper.createProject(projectName);
+ final IFile file = PapyrusProjectUtils.copyPapyrusModel(testProject, bundle, SOURCE_PATH, FILE_ROOT_NAME);
+ RunnableWithResult<?> runnableWithResult = new RunnableWithResult.Impl<Object>() {
+
+ @Override
+ public void run() {
+ try {
+ papyrusEditor = houseKeeper.openPapyrusEditor(file);
+ } catch (Exception ex){
+ Activator.log.error(ex);
+ return;
+ }
+
+ try {
+ TableCreationTest2.view = ModelExplorerUtils.openModelExplorerView();
+ } catch (PartInitException e) {
+ setStatus(new Status(IStatus.ERROR, bundle.getSymbolicName(), e.getMessage()));
+ }
+ EObject root = ModelExplorerUtils.getRootInModelExplorer(TableCreationTest2.view);
+ TableCreationTest2.rootModel = (Model)root;
+ subModel = (Model)TableCreationTest2.rootModel.getMember("SubModel1"); //$NON-NLS-1$
+
+ PageList pageList = getPageList(rootModel);
+ for(final PageRef pageRef : pageList.getAvailablePage()) {
+ Object identifier = pageRef.getPageIdentifier();
+ if(identifier instanceof Diagram) {
+ if("ClassDiagram2".equals(((Diagram)identifier).getName())) {
+ diagram2 = (Diagram)identifier;
+ } else if("ClassDiagram1".equals(((Diagram)identifier).getName())) {
+ diagram1 = (Diagram)identifier;
+ }
+
+ } else if(identifier instanceof Table) {
+ if("TableOfViews0".equals(((Table)identifier).getName())) {
+ table1 = (Table)identifier;
+ }
+ }
+
+ }
+ setStatus(Status.OK_STATUS);
+ }
+
+ };
+ Display.getDefault().syncExec(runnableWithResult);
+ Assert.assertEquals(runnableWithResult.getStatus().getMessage(), IStatus.OK, runnableWithResult.getStatus().getSeverity());
+ Assert.assertNotNull(subModel);
+ Assert.assertNotNull(diagram1);
+ Assert.assertNotNull(diagram2);
+ Assert.assertNotNull(table1);
+ Assert.assertNotNull(TableCreationTest2.rootModel);
+ Assert.assertEquals(subModel, table1.getContext());
+ Assert.assertEquals(subModel, diagram2.getElement());
+ Assert.assertEquals(rootModel, diagram1.getElement());
+
+
+ }
+
+ /**
+ *
+ * @return
+ * the page list used for this model
+ */
+ private static final PageList getPageList(final EObject object) {
+ final Resource resource = object.eResource();
+ final ModelSet modelSet = (ModelSet)resource.getResourceSet();
+ final Resource diResource = modelSet.getAssociatedResource(resource, DiModel.DI_FILE_EXTENSION, false);
+ final SashWindowsMngr windowMngr = DiUtils.lookupSashWindowsMngr(diResource);
+ final PageList pageList = windowMngr.getPageList();
+ assert pageList != null;
+ return pageList;
+ }
+
+
+
+ @Test
+ public void createTable2AndDestroyAnOwnedElement() throws ServiceException {
+ final Object result1 = ModelExplorerUtils.executeCreateNestedEditorHandlerInModelExplorer(papyrusEditor, TableCreationTest2.view, AllTests.COMMAND_ID, TableCreationTest2.rootModel, BUNDLE_ID);
+ DisplayUtils.safeReadAndDispatch();
+ Assert.assertTrue(result1 instanceof NatTableEditor);
+ final NatTableEditor editor2 = (NatTableEditor)result1;
+ editor2.setFocus();
+ DisplayUtils.safeReadAndDispatch();
+ final NattableModelManager manager2 = (NattableModelManager)editor2.getAdapter(INattableModelManager.class);
+ Assert.assertNotNull(manager2);
+ final Table table2 = manager2.getTable();
+ Assert.assertEquals(AllTests.VIEWS_TABLE_ID, table2.getTableConfiguration().getType());
+
+ final IAxisManager rowAxisManager = manager2.getRowAxisManager();
+ Collection<Object> managedAxis_Table1 = rowAxisManager.getAllManagedAxis();
+ Assert.assertEquals(4, managedAxis_Table1.size());
+ Assert.assertTrue(managedAxis_Table1.contains(table1));
+ Assert.assertTrue(managedAxis_Table1.contains(table2));
+ Assert.assertTrue(managedAxis_Table1.contains(diagram1));
+ Assert.assertTrue(managedAxis_Table1.contains(diagram2));
+ Assert.assertEquals(managedAxis_Table1.size(), rowAxisManager.getTableManager().getRowElementsList().size());
+ Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(table2));
+ Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(table1));
+ Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(diagram1));
+ Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(diagram2));
+
+
+ TransactionalEditingDomain editingDomain = papyrusEditor.getServicesRegistry().getService(TransactionalEditingDomain.class);
+ DestroyElementRequest request = new DestroyElementRequest(editingDomain, diagram2, false);
+ IElementEditService provider = ElementEditServiceUtils.getCommandProvider(diagram2);
+ ICommand cmd = provider.getEditCommand(request);
+ editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
+
+
+ DisplayUtils.safeReadAndDispatch();
+ //verify the contents of table2
+ managedAxis_Table1 = rowAxisManager.getAllManagedAxis();
+ Assert.assertEquals(3, managedAxis_Table1.size());
+ Assert.assertTrue(managedAxis_Table1.contains(table1));
+ Assert.assertTrue(managedAxis_Table1.contains(table2));
+ Assert.assertTrue(managedAxis_Table1.contains(diagram1));
+
+
+
+ Assert.assertEquals(managedAxis_Table1.size(), rowAxisManager.getTableManager().getRowElementsList().size());
+ Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(table2));
+ Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(table1));
+ Assert.assertTrue(rowAxisManager.getTableManager().getRowElementsList().contains(diagram1));
+
+
+ //verify the contents of table1 (we open it)
+ IPageManager pageManager = papyrusEditor.getServicesRegistry().getService(IPageManager.class);
+ Assert.assertEquals(3, pageManager.allPages().size());
+ IEditorPart tableEditor = papyrusEditor.getActiveEditor();
+ editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, table1)));
+ DisplayUtils.safeReadAndDispatch();
+ tableEditor = papyrusEditor.getActiveEditor();
+ Assert.assertTrue(tableEditor instanceof NatTableEditor);
+ INattableModelManager manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);
+ Assert.assertNotNull(manager);
+ Assert.assertEquals(AllTests.VIEWS_TABLE_ID, manager.getTable().getTableConfiguration().getType());
+
+ IAxisManager axisManager = manager.getRowAxisManager();
+ final Collection<Object> managedAxis_Table2 = axisManager.getAllManagedAxis();
+ Assert.assertEquals(1, managedAxis_Table2.size());
+ Assert.assertTrue(managedAxis_Table2.contains(table1));
+
+ Assert.assertEquals(managedAxis_Table2.size(), axisManager.getTableManager().getRowElementsList().size());
+ Assert.assertTrue(axisManager.getTableManager().getRowElementsList().contains(table1));
+
+
+ }
+
+ @AfterClass
+ public static void endOfTest() {
+ GenericUtils.closeAllEditors();
+ }
+
+
+}
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableVerifyContents.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableVerifyContents.java
index 786a7e189ec..f4267e9abe5 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableVerifyContents.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableVerifyContents.java
@@ -1,213 +1,213 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2014 CEA LIST and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 434993
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.nattable.views.tests.tests;
-
-import java.io.IOException;
-import java.util.Collection;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.commands.OpenDiagramCommand;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
-import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
-import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.infra.nattable.views.tests.Activator;
-import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.junit.utils.GenericUtils;
-import org.eclipse.papyrus.junit.utils.ModelExplorerUtils;
-import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
-import org.eclipse.papyrus.junit.utils.ProjectUtils;
-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
-import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.uml2.uml.Model;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-public class TableVerifyContents extends AbstractPapyrusTest {
-
- @ClassRule
- public static final HouseKeeper.Static houseKeeper = new HouseKeeper.Static();
-
- private static final String MODEL_PATH = "/resources/model2"; //$NON-NLS-1$
-
- private static final String SOURCE_PATH = "/resources/"; //$NON-NLS-1$
-
- private static final String FILE_ROOT_NAME = "model2"; //$NON-NLS-1$
-
- private static final String PROJECT_NAME = "test"; //$NON-NLS-1$
-
- private static IMultiDiagramEditor papyrusEditor;
-
- private static final String BUNDLE_ID = Activator.getDefault().getBundle().getSymbolicName();
-
- private static Model rootModel;
-
- private static Model subModel;
-
- private static Table table1;
-
- private static Diagram diagram1;
-
- private static Diagram diagram2;
-
- private static ModelExplorerView view;
-
- @BeforeClass
- public static void init() {
- try {
- GenericUtils.closeAllEditors();
- initTests(Activator.getDefault().getBundle(), PROJECT_NAME, MODEL_PATH);
-
- } catch (CoreException e) {
- Activator.log.error(e);
- } catch (IOException e) {
- Activator.log.error(e);
- } catch (BundleException e) {
- Activator.log.error(e);
- }
- }
-
- public static void initTests(final Bundle bundle, final String projectName, final String papyrusModelPath) throws CoreException, IOException, BundleException {
- ProjectUtils.removeAllProjectFromTheWorkspace();
- IProject testProject = houseKeeper.createProject(projectName);
- final IFile file = PapyrusProjectUtils.copyPapyrusModel(testProject, bundle, SOURCE_PATH, FILE_ROOT_NAME);
- RunnableWithResult<?> runnableWithResult = new RunnableWithResult.Impl<Object>() {
-
- @Override
- public void run() {
- try {
- papyrusEditor = houseKeeper.openPapyrusEditor(file);
- } catch (Exception ex) {
- Activator.log.error(ex);
- }
-
- try {
- TableVerifyContents.view = ModelExplorerUtils.openModelExplorerView();
- } catch (PartInitException e) {
- setStatus(new Status(IStatus.ERROR, bundle.getSymbolicName(), e.getMessage()));
- }
- EObject root = ModelExplorerUtils.getRootInModelExplorer(TableVerifyContents.view);
- TableVerifyContents.rootModel = (Model) root;
- subModel = (Model) TableVerifyContents.rootModel.getMember("SubModel1"); //$NON-NLS-1$
-
- PageList pageList = getPageList(rootModel);
- for (final PageRef pageRef : pageList.getAvailablePage()) {
- Object identifier = pageRef.getPageIdentifier();
- if (identifier instanceof Diagram) {
- if ("ClassDiagram2".equals(((Diagram) identifier).getName())) {
- diagram2 = (Diagram) identifier;
- } else if ("ClassDiagram1".equals(((Diagram) identifier).getName())) {
- diagram1 = (Diagram) identifier;
- }
-
- } else if (identifier instanceof Table) {
- if ("TableOfViews0".equals(((Table) identifier).getName())) {
- table1 = (Table) identifier;
- }
- }
-
- }
- setStatus(Status.OK_STATUS);
- }
-
- };
- Display.getDefault().syncExec(runnableWithResult);
- Assert.assertEquals(runnableWithResult.getStatus().getMessage(), IStatus.OK, runnableWithResult.getStatus().getSeverity());
- Assert.assertNotNull(subModel);
- Assert.assertNotNull(diagram1);
- Assert.assertNotNull(diagram2);
- Assert.assertNotNull(table1);
- Assert.assertNotNull(TableVerifyContents.rootModel);
- Assert.assertEquals(subModel, table1.getContext());
- Assert.assertEquals(subModel, diagram2.getElement());
- Assert.assertEquals(rootModel, diagram1.getElement());
- DisplayUtils.safeReadAndDispatch();
-
- }
-
- /**
- *
- * @return
- * the page list used for this model
- */
- private static final PageList getPageList(final EObject object) {
- final Resource resource = object.eResource();
- final ModelSet modelSet = (ModelSet) resource.getResourceSet();
- final Resource diResource = modelSet.getAssociatedResource(resource, DiModel.DI_FILE_EXTENSION, false);
- final SashWindowsMngr windowMngr = DiUtils.lookupSashWindowsMngr(diResource);
- final PageList pageList = windowMngr.getPageList();
- assert pageList != null;
- return pageList;
- }
-
- @Test
- public void verifyContentsForTable1() throws ServiceException {
- IPageManager pageManager = papyrusEditor.getServicesRegistry().getService(IPageManager.class);
- Assert.assertEquals(3, pageManager.allPages().size());
- IEditorPart tableEditor = papyrusEditor.getActiveEditor();
- Assert.assertNull(tableEditor);
- TransactionalEditingDomain editingDomain = papyrusEditor.getServicesRegistry().getService(TransactionalEditingDomain.class);
- editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, table1)));
- DisplayUtils.safeReadAndDispatch();
- tableEditor = papyrusEditor.getActiveEditor();
- Assert.assertTrue(tableEditor instanceof NatTableEditor);
- INattableModelManager manager = (INattableModelManager) tableEditor.getAdapter(INattableModelManager.class);
- Assert.assertNotNull(manager);
- Assert.assertEquals(AllTests.VIEWS_TABLE_ID, manager.getTable().getTableConfiguration().getType());
-
- IAxisManager axisManager = manager.getRowAxisManager();
- final Collection<Object> managedAxis_subSubPackageTable1 = axisManager.getAllManagedAxis();
- Assert.assertEquals(2, managedAxis_subSubPackageTable1.size());
- Assert.assertTrue(managedAxis_subSubPackageTable1.contains(table1));
- Assert.assertTrue(managedAxis_subSubPackageTable1.contains(diagram2));
-
- Assert.assertEquals(managedAxis_subSubPackageTable1.size(), axisManager.getTableManager().getRowElementsList().size());
- Assert.assertTrue(axisManager.getTableManager().getRowElementsList().contains(table1));
- Assert.assertTrue(axisManager.getTableManager().getRowElementsList().contains(diagram2));
- }
-
- @AfterClass
- public static void endOfTest() {
- GenericUtils.closeAllEditors();
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 434993
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.nattable.views.tests.tests;
+
+import java.io.IOException;
+import java.util.Collection;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.commands.OpenDiagramCommand;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.sasheditor.DiModel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageList;
+import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
+import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.nattable.views.tests.Activator;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.GenericUtils;
+import org.eclipse.papyrus.junit.utils.ModelExplorerUtils;
+import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
+import org.eclipse.papyrus.junit.utils.ProjectUtils;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.uml2.uml.Model;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleException;
+
+public class TableVerifyContents extends AbstractPapyrusTest {
+
+ @ClassRule
+ public static final HouseKeeper.Static houseKeeper = new HouseKeeper.Static();
+
+ private static final String MODEL_PATH = "/resources/model2"; //$NON-NLS-1$
+
+ private static final String SOURCE_PATH = "/resources/"; //$NON-NLS-1$
+
+ private static final String FILE_ROOT_NAME = "model2"; //$NON-NLS-1$
+
+ private static final String PROJECT_NAME = "test"; //$NON-NLS-1$
+
+ private static IMultiDiagramEditor papyrusEditor;
+
+ private static final String BUNDLE_ID = Activator.getDefault().getBundle().getSymbolicName();
+
+ private static Model rootModel;
+
+ private static Model subModel;
+
+ private static Table table1;
+
+ private static Diagram diagram1;
+
+ private static Diagram diagram2;
+
+ private static ModelExplorerView view;
+
+ @BeforeClass
+ public static void init() {
+ try {
+ GenericUtils.closeAllEditors();
+ initTests(Activator.getDefault().getBundle(), PROJECT_NAME, MODEL_PATH);
+
+ } catch (CoreException e) {
+ Activator.log.error(e);
+ } catch (IOException e) {
+ Activator.log.error(e);
+ } catch (BundleException e) {
+ Activator.log.error(e);
+ }
+ }
+
+ public static void initTests(final Bundle bundle, final String projectName, final String papyrusModelPath) throws CoreException, IOException, BundleException {
+ ProjectUtils.removeAllProjectFromTheWorkspace();
+ IProject testProject = houseKeeper.createProject(projectName);
+ final IFile file = PapyrusProjectUtils.copyPapyrusModel(testProject, bundle, SOURCE_PATH, FILE_ROOT_NAME);
+ RunnableWithResult<?> runnableWithResult = new RunnableWithResult.Impl<Object>() {
+
+ @Override
+ public void run() {
+ try {
+ papyrusEditor = houseKeeper.openPapyrusEditor(file);
+ } catch (Exception ex) {
+ Activator.log.error(ex);
+ }
+
+ try {
+ TableVerifyContents.view = ModelExplorerUtils.openModelExplorerView();
+ } catch (PartInitException e) {
+ setStatus(new Status(IStatus.ERROR, bundle.getSymbolicName(), e.getMessage()));
+ }
+ EObject root = ModelExplorerUtils.getRootInModelExplorer(TableVerifyContents.view);
+ TableVerifyContents.rootModel = (Model) root;
+ subModel = (Model) TableVerifyContents.rootModel.getMember("SubModel1"); //$NON-NLS-1$
+
+ PageList pageList = getPageList(rootModel);
+ for (final PageRef pageRef : pageList.getAvailablePage()) {
+ Object identifier = pageRef.getPageIdentifier();
+ if (identifier instanceof Diagram) {
+ if ("ClassDiagram2".equals(((Diagram) identifier).getName())) {
+ diagram2 = (Diagram) identifier;
+ } else if ("ClassDiagram1".equals(((Diagram) identifier).getName())) {
+ diagram1 = (Diagram) identifier;
+ }
+
+ } else if (identifier instanceof Table) {
+ if ("TableOfViews0".equals(((Table) identifier).getName())) {
+ table1 = (Table) identifier;
+ }
+ }
+
+ }
+ setStatus(Status.OK_STATUS);
+ }
+
+ };
+ Display.getDefault().syncExec(runnableWithResult);
+ Assert.assertEquals(runnableWithResult.getStatus().getMessage(), IStatus.OK, runnableWithResult.getStatus().getSeverity());
+ Assert.assertNotNull(subModel);
+ Assert.assertNotNull(diagram1);
+ Assert.assertNotNull(diagram2);
+ Assert.assertNotNull(table1);
+ Assert.assertNotNull(TableVerifyContents.rootModel);
+ Assert.assertEquals(subModel, table1.getContext());
+ Assert.assertEquals(subModel, diagram2.getElement());
+ Assert.assertEquals(rootModel, diagram1.getElement());
+ DisplayUtils.safeReadAndDispatch();
+
+ }
+
+ /**
+ *
+ * @return
+ * the page list used for this model
+ */
+ private static final PageList getPageList(final EObject object) {
+ final Resource resource = object.eResource();
+ final ModelSet modelSet = (ModelSet) resource.getResourceSet();
+ final Resource diResource = modelSet.getAssociatedResource(resource, DiModel.DI_FILE_EXTENSION, false);
+ final SashWindowsMngr windowMngr = DiUtils.lookupSashWindowsMngr(diResource);
+ final PageList pageList = windowMngr.getPageList();
+ assert pageList != null;
+ return pageList;
+ }
+
+ @Test
+ public void verifyContentsForTable1() throws ServiceException {
+ IPageManager pageManager = papyrusEditor.getServicesRegistry().getService(IPageManager.class);
+ Assert.assertEquals(3, pageManager.allPages().size());
+ IEditorPart tableEditor = papyrusEditor.getActiveEditor();
+ Assert.assertNull(tableEditor);
+ TransactionalEditingDomain editingDomain = papyrusEditor.getServicesRegistry().getService(TransactionalEditingDomain.class);
+ editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, table1)));
+ DisplayUtils.safeReadAndDispatch();
+ tableEditor = papyrusEditor.getActiveEditor();
+ Assert.assertTrue(tableEditor instanceof NatTableEditor);
+ INattableModelManager manager = (INattableModelManager) tableEditor.getAdapter(INattableModelManager.class);
+ Assert.assertNotNull(manager);
+ Assert.assertEquals(AllTests.VIEWS_TABLE_ID, manager.getTable().getTableConfiguration().getType());
+
+ IAxisManager axisManager = manager.getRowAxisManager();
+ final Collection<Object> managedAxis_subSubPackageTable1 = axisManager.getAllManagedAxis();
+ Assert.assertEquals(2, managedAxis_subSubPackageTable1.size());
+ Assert.assertTrue(managedAxis_subSubPackageTable1.contains(table1));
+ Assert.assertTrue(managedAxis_subSubPackageTable1.contains(diagram2));
+
+ Assert.assertEquals(managedAxis_subSubPackageTable1.size(), axisManager.getTableManager().getRowElementsList().size());
+ Assert.assertTrue(axisManager.getTableManager().getRowElementsList().contains(table1));
+ Assert.assertTrue(axisManager.getTableManager().getRowElementsList().contains(diagram2));
+ }
+
+ @AfterClass
+ public static void endOfTest() {
+ GenericUtils.closeAllEditors();
+ }
+
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
index e3a8879a574..be5e009ef29 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
@@ -1,29 +1,29 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui;bundle-version="3.106.0",
- org.junit;bundle-version="4.11.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.0.0",
- org.eclipse.emf.transaction,
- org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.ui.navigator;bundle-version="3.5.500",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.services.controlmode.tests,
- org.eclipse.papyrus.infra.services.controlmode.tests.control,
- org.eclipse.papyrus.infra.services.controlmode.tests.uncontrol
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.tests.control.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui;bundle-version="3.106.0",
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",
+ org.eclipse.uml2.uml;bundle-version="5.0.0",
+ org.eclipse.emf.transaction,
+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
+ org.eclipse.ui.navigator;bundle-version="3.5.500",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.infra.services.controlmode.tests,
+ org.eclipse.papyrus.infra.services.controlmode.tests.control,
+ org.eclipse.papyrus.infra.services.controlmode.tests.uncontrol
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.services.controlmode.tests.control.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.tests
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/StrategyChooserFixture.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/StrategyChooserFixture.java
index 695a90ec885..344b19d9810 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/StrategyChooserFixture.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/StrategyChooserFixture.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2016 CEA, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -8,29 +8,43 @@
*
* Contributors:
* Christian W. Damus (CEA) - Initial API and implementation
+ * Christian W. Damus - bug 485220
*
*/
package org.eclipse.papyrus.infra.services.controlmode.tests;
-import org.eclipse.papyrus.infra.services.resourceloading.preferences.StrategyChooser;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser;
/**
- * A {@link StrategyChooser} fixture for the control-mode tests that ensures a normal control-mode strategy
+ * An {@link IStrategyChooser} fixture for the control-mode tests that ensures a normal control-mode strategy
* is restored after completion for predictable/correct resource loading behaviour in the execution of
* subsequent (and unrelated) tests.
*/
public class StrategyChooserFixture {
private final int strategyToRestore;
+ private IStrategyChooser chooser;
- public StrategyChooserFixture(int choose) {
- strategyToRestore = new StrategyChooser().getCurrentStrategy();
- StrategyChooser.setCurrentStrategy(choose);
+ public StrategyChooserFixture(ServicesRegistry serviceRegistry, int choose) {
+ super();
+
+ try {
+ chooser = serviceRegistry.getService(IStrategyChooser.class);
+ strategyToRestore = chooser.getCurrentStrategy();
+ chooser.setStrategy(choose);
+ } catch (ServiceException e) {
+ throw new IllegalStateException("IStrategyChooser service is not available", e);
+ }
}
public void dispose() {
- StrategyChooser.setCurrentStrategy(strategyToRestore);
+ if (chooser != null) {
+ chooser.setStrategy(strategyToRestore);
+ chooser = null;
+ }
}
}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/control/AbstractControlModeTest.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/control/AbstractControlModeTest.java
index 12ec1bc0871..1abaf08c33d 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/control/AbstractControlModeTest.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/control/AbstractControlModeTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014 CEA LIST and others.
+ * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
* Contributors:
* Juan Cadavid <juan.cadavid@cea.fr> implementation
* Christian W. Damus (CEA) - bug 437217 - control-mode strategy changes interfere with later tests
+ * Christian W. Damus - bug 485220
*
******************************************************************************/
package org.eclipse.papyrus.infra.services.controlmode.tests.control;
@@ -79,7 +80,7 @@ public abstract class AbstractControlModeTest extends AbstractPapyrusTest {
public void setUp() throws Exception {
// Set the current resource loading strategy to the default
- houseKeeper.cleanUpLater(new StrategyChooserFixture(0));
+ houseKeeper.cleanUpLater(new StrategyChooserFixture(editorFixture.getServiceRegistry(), 0));
openEditor();
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/uncontrol/AbstractUncontrolModelTest.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/uncontrol/AbstractUncontrolModelTest.java
index 1a505ce2816..76bb8f29368 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/uncontrol/AbstractUncontrolModelTest.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/src/org/eclipse/papyrus/infra/services/controlmode/tests/uncontrol/AbstractUncontrolModelTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,7 +9,7 @@
* Juan Cadavid <juan.cadavid@cea.fr> implementation
* Christian W. Damus (CEA) - bug 437217 - control-mode strategy changes interfere with later tests
* Gabriel Pascual (ALL4TEC) gabriel.pascual@all4tec.net - Bug 459427
- * Christian W. Damus - bug 480209
+ * Christian W. Damus - bugs 480209, 485220
******************************************************************************/
package org.eclipse.papyrus.infra.services.controlmode.tests.uncontrol;
@@ -72,7 +72,7 @@ public abstract class AbstractUncontrolModelTest extends AbstractPapyrusTest {
@Before
public void setUp() {
// Set the current resource loading strategy to the default
- houseKeeper.cleanUpLater(new StrategyChooserFixture(0));
+ houseKeeper.cleanUpLater(new StrategyChooserFixture(editorFixture.getServiceRegistry(), 0));
openEditor();
}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/edit/advice/MarkerDeletionAdviceTest.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/edit/advice/MarkerDeletionAdviceTest.java
index 5d9a3d5f7d8..f6326aec03e 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/edit/advice/MarkerDeletionAdviceTest.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/edit/advice/MarkerDeletionAdviceTest.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.infra.services.edit.internal.advice.MarkerDeletionAdvice;
import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF
index 6d199f486dd..0da19b0558a 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.resourceloading.profile;bundle-version="1.2.0",
- org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.services.resourceloading.tests,
- org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1,
- org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2
-Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0"
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %fragmentName
-Bundle-Localization: fragment
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading.tests
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.uml2.uml;bundle-version="3.1.0",
+ org.eclipse.papyrus.uml.resourceloading.profile;bundle-version="1.2.0",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.8.0"
+Export-Package: org.eclipse.papyrus.infra.services.resourceloading.tests,
+ org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1,
+ org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.2.0"
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %fragmentName
+Bundle-Localization: fragment
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading.tests
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/StrategyChooserFixture.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/StrategyChooserFixture.java
index 06141cd1ab3..bb5f22bee93 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/StrategyChooserFixture.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/test/org/eclipse/papyrus/infra/services/resourceloading/tests/StrategyChooserFixture.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2016 CEA, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -8,11 +8,13 @@
*
* Contributors:
* Christian W. Damus (CEA) - Initial API and implementation
+ * Christian W. Damus - bug 485220
*
*/
package org.eclipse.papyrus.infra.services.resourceloading.tests;
-import org.eclipse.papyrus.infra.services.resourceloading.preferences.StrategyChooser;
+import org.eclipse.papyrus.infra.services.resourceloading.IStrategyChooser;
+import org.eclipse.papyrus.infra.services.resourceloading.impl.ProxyManager;
/**
@@ -23,14 +25,21 @@ import org.eclipse.papyrus.infra.services.resourceloading.preferences.StrategyCh
public class StrategyChooserFixture {
private final int strategyToRestore;
+ private IStrategyChooser chooser;
public StrategyChooserFixture(int choose) {
- strategyToRestore = new StrategyChooser().getCurrentStrategy();
- StrategyChooser.setCurrentStrategy(choose);
+ super();
+
+ chooser = ProxyManager.getStrategyChooser();
+ strategyToRestore = chooser.getCurrentStrategy();
+ chooser.setStrategy(choose);
}
public void dispose() {
- StrategyChooser.setCurrentStrategy(strategyToRestore);
+ if (chooser != null) {
+ chooser.setStrategy(strategyToRestore);
+ chooser = null;
+ }
}
}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/runner/ITestSuiteClass.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/runner/ITestSuiteClass.java
index 493ca82c9f2..b575a9e9c45 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/runner/ITestSuiteClass.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/src/org/eclipse/papyrus/junit/framework/runner/ITestSuiteClass.java
@@ -1,38 +1,48 @@
-/*****************************************************************************
- * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- * Christian W. Damus - bugs 451230, 485220
- *
- *****************************************************************************/
-package org.eclipse.papyrus.junit.framework.runner;
-
-
-/**
- * Interface for all suite classes.
- */
-public interface ITestSuiteClass {
-
- /**
- * Returns the main test suite class for this entry
- *
- * @return the main test suite class for this entry
- */
- public Class<?> getMainTestSuiteClass();
-
- /**
- * Queries whether the test suite runs in "headless mode" (without the Eclipse Workbench).
- *
- * @return whether I am a headless test suite
- */
- default boolean isHeadless() {
- Class<?> main = getMainTestSuiteClass();
- return (main != null) && main.isAnnotationPresent(Headless.class);
- }
-}
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ * Christian W. Damus - bugs 451230, 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.junit.framework.runner;
+
+
+/**
+ * Interface for all suite classes.
+ */
+public interface ITestSuiteClass {
+
+ /**
+ * Returns the main test suite class for this entry
+ *
+ * @return the main test suite class for this entry
+ */
+ public Class<?> getMainTestSuiteClass();
+
+ /**
+ * Queries whether the test suite runs in "headless mode" (without the Eclipse Workbench).
+ *
+ * @return whether I am an headless test suite
+ */
+ default boolean isHeadless() {
+ Class<?> main = getMainTestSuiteClass();
+ return (main != null) && main.isAnnotationPresent(Headless.class);
+ }
+
+ /**
+ * Queries whether the test suite runs in "UI mode" (in an Eclipse Workbench).
+ *
+ * @return whether I am an UI test suite
+ */
+ default boolean isUI() {
+ Class<?> main = getMainTestSuiteClass();
+ return (main != null) && !main.isAnnotationPresent(Headless.class);
+ }
+}
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/resources/EcoreModel.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/resources/EcoreModel.java
index 49461a32162..bf36fb787a5 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/resources/EcoreModel.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/resources/EcoreModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2016 CEA, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,7 @@
*
* Contributors:
* Christian W. Damus (CEA) - Initial API and implementation
+ * Christian W. Damus - bug 485220
*
*/
package org.eclipse.papyrus.junit.utils.resources;
@@ -15,6 +16,7 @@ package org.eclipse.papyrus.junit.utils.resources;
import static org.junit.Assert.fail;
import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EcoreFactory;
import org.eclipse.emf.ecore.EcorePackage;
@@ -46,7 +48,7 @@ public class EcoreModel extends EMFLogicalModel {
}
public EPackage getRoot() {
- return (EPackage)EcoreUtil.getObjectByType(getResource().getContents(), EcorePackage.Literals.EPACKAGE);
+ return (EPackage) EcoreUtil.getObjectByType(getResource().getContents(), EcorePackage.Literals.EPACKAGE);
}
@Override
@@ -62,6 +64,7 @@ public class EcoreModel extends EMFLogicalModel {
try {
TransactionHelper.run(getModelManager().getTransactionalEditingDomain(), new Runnable() {
+ @Override
public void run() {
resource.getContents().add(ePackage);
}
@@ -71,4 +74,9 @@ public class EcoreModel extends EMFLogicalModel {
fail("Creation of Ecore model failed: " + e.getLocalizedMessage());
}
}
+
+ @Override
+ protected boolean isSupportedRoot(EObject object) {
+ return EcorePackage.Literals.EPACKAGE.isInstance(object);
+ }
}
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF
index 7a6cb71737d..088c5d67351 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF
@@ -1,51 +1,50 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.xtext.junit4,
- org.eclipse.ui.workbench;resolution:=optional,
- org.eclipse.m2m.qvt.oml;bundle-version="3.3.0",
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.m2m.qvt.oml.common;bundle-version="3.3.0",
- org.eclipse.m2m.qvt.oml.emf.util;bundle-version="3.3.0",
- org.eclipse.m2m.qvt.oml.ocl;bundle-version="3.3.0",
- org.eclipse.m2m.qvt.oml.runtime;bundle-version="3.3.0",
- org.eclipse.xtend.lib,
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtend;bundle-version="1.4.0",
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.junit;visibility:=reexport,
- org.eclipse.uml2;bundle-version="5.0.0",
- org.eclipse.uml2.uml,
- org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional,
- org.eclipse.ocl.uml;bundle-version="5.0.0",
- org.eclipse.uml2.uml.resources;bundle-version="5.0.0",
- org.eclipse.papyrus.uml.alf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.alf.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.alf.to.fuml;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
- org.eclipse.xtext,
- org.eclipse.ocl.pivot,
- org.eclipse.ocl,
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.alf,
- org.eclipse.papyrus.uml.alf.tests
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: bin/,
- .,
- Alf/,
- UML/
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: ALF Tests
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.tests;singleton:=true
-Import-Package: org.apache.log4j,
- org.hamcrest.core,
- org.junit;version="4.5.0",
- org.junit.runner;version="4.5.0",
- org.junit.runner.manipulation;version="4.5.0",
- org.junit.runner.notification;version="4.5.0",
- org.junit.runners;version="4.5.0",
- org.junit.runners.model;version="4.5.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.xtext.junit4,
+ org.eclipse.ui.workbench;resolution:=optional,
+ org.eclipse.m2m.qvt.oml;bundle-version="3.3.0",
+ org.eclipse.emf.common,
+ org.eclipse.emf.ecore,
+ org.eclipse.m2m.qvt.oml.common;bundle-version="3.3.0",
+ org.eclipse.m2m.qvt.oml.emf.util;bundle-version="3.3.0",
+ org.eclipse.m2m.qvt.oml.ocl;bundle-version="3.3.0",
+ org.eclipse.m2m.qvt.oml.runtime;bundle-version="3.3.0",
+ org.eclipse.xtend.lib,
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtend;bundle-version="1.4.0",
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.junit;visibility:=reexport,
+ org.eclipse.uml2;bundle-version="5.0.0",
+ org.eclipse.uml2.uml,
+ org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional,
+ org.eclipse.ocl.uml;bundle-version="5.0.0",
+ org.eclipse.uml2.uml.resources;bundle-version="5.0.0",
+ org.eclipse.papyrus.uml.alf;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.alf.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.alf.to.fuml;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
+ org.eclipse.xtext,
+ org.eclipse.ocl.pivot,
+ org.eclipse.ocl,
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.uml.alf,
+ org.eclipse.papyrus.uml.alf.tests
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .,
+ Alf/,
+ UML/
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: ALF Tests
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.alf.tests;singleton:=true
+Import-Package: org.apache.log4j,
+ org.hamcrest.core,
+ org.junit;version="4.5.0",
+ org.junit.runner;version="4.5.0",
+ org.junit.runner.manipulation;version="4.5.0",
+ org.junit.runner.notification;version="4.5.0",
+ org.junit.runners;version="4.5.0",
+ org.junit.runners.model;version="4.5.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
index d9f3b22d1aa..39dd8048097 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
@@ -1,31 +1,31 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.junit;bundle-version="4.11.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- org.eclipse.emf.ecore;bundle-version="2.11.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.1.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="1.2.0",
- com.google.inject;bundle-version="3.0.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",
- org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0"
-Export-Package: org.eclipse.papyrus.uml.profile.assistants.generator.tests
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.assistants.generator.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
+ org.eclipse.emf.ecore;bundle-version="2.11.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0",
+ org.eclipse.uml2.uml;bundle-version="5.1.0",
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="1.2.0",
+ com.google.inject;bundle-version="3.0.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",
+ org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0"
+Export-Package: org.eclipse.papyrus.uml.profile.assistants.generator.tests
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.assistants.generator.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF
index eb16a354356..566c84b227d 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.junit;bundle-version="4.11.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- org.eclipse.emf.ecore;bundle-version="2.11.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.1.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;bundle-version="1.2.0",
- com.google.inject;bundle-version="3.0.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.8.0"
-Export-Package: org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
+ org.eclipse.emf.ecore;bundle-version="2.11.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0",
+ org.eclipse.uml2.uml;bundle-version="5.1.0",
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;bundle-version="1.2.0",
+ com.google.inject;bundle-version="3.0.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.8.0"
+Export-Package: org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF
index 39a57ebea84..5e0f6e251e3 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF
@@ -1,36 +1,36 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.editor;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.uml2.uml.editor,
- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.tests.framework;bundle-version="1.2.0",
- org.eclipse.xtend.lib;bundle-version="2.8.1",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.diagram.activity.tests,
- org.eclipse.papyrus.uml.diagram.activity.tests.canonical;x-friends:="org.eclipse.papyrus.uml.diagram.interactionoverview.tests",
- org.eclipse.papyrus.uml.diagram.activity.tests.generation
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.activity.tests.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.activity.tests;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.editor;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.2.0",
+ org.eclipse.uml2.uml;bundle-version="4.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
+ org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
+ org.eclipse.uml2.uml.editor,
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
+ org.eclipse.papyrus.tests.framework;bundle-version="1.2.0",
+ org.eclipse.xtend.lib;bundle-version="2.8.1",
+ org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.uml.diagram.activity.tests,
+ org.eclipse.papyrus.uml.diagram.activity.tests.canonical;x-friends:="org.eclipse.papyrus.uml.diagram.interactionoverview.tests",
+ org.eclipse.papyrus.uml.diagram.activity.tests.generation
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.activity.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.activity.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/org.eclipse.papyrus.uml.diagram.dnd.tests.launch b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/org.eclipse.papyrus.uml.diagram.dnd.tests.launch
index ec10ec6800f..c46cdb99948 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/org.eclipse.papyrus.uml.diagram.dnd.tests.launch
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd.tests/org.eclipse.papyrus.uml.diagram.dnd.tests.launch
@@ -35,7 +35,7 @@
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.cea.papyrus.fuml.gen@default:default,com.google.gerrit.common@default:default,com.google.gerrit.prettify@default:default,com.google.gerrit.reviewdb@default:default,com.google.gson@default:default,com.google.guava@default:default,com.google.gwt.servlet@default:default,com.google.gwtjsonrpc@default:default,com.google.gwtorm@default:default,com.google.inject.assistedinject@default:false,com.google.inject.multibindings@default:false,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.mountainminds.eclemma.core@default:default,com.mountainminds.eclemma.doc@default:default,com.mountainminds.eclemma.ui@default:default,com.ning.async-http-client@default:default,com.sun.el@default:default,com.sun.syndication@default:default,com.sun.xml.bind@default:default,javax.activation@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml.bind@default:default,javax.xml.stream@default:default,javax.xml@default:default,lpg.runtime.java@default:default,net.sf.jautodoc.velocity@default:default,net.sf.jautodoc@default:default,net.sourceforge.nattable.core@default:default,org.antlr.runtime*3.0.0.v200803061811@default:default,org.antlr.runtime*3.2.0.v201101311130@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.math@default:default,org.apache.commons.pool@default:default,org.apache.commons.primitives@default:default,org.apache.derby@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene*2.9.1.v201101211721@default:default,org.apache.lucene*3.5.0.v20120319-2345@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core*2.9.1.v201101211721@default:default,org.apache.lucene.core*3.5.0.v20120319-2345@default:default,org.apache.lucene.highlighter@default:default,org.apache.lucene.memory@default:default,org.apache.lucene.misc*2.9.1.v20100421-0704@default:default,org.apache.lucene.misc*3.5.0.v20120319-2345@default:default,org.apache.lucene.queries*2.9.1.v20100421-0704@default:default,org.apache.lucene.queries*3.5.0.v20120319-2345@default:default,org.apache.lucene.snowball@default:default,org.apache.lucene.spellchecker@default:default,org.apache.ws.commons.util@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlrpc@default:default,org.eclipse.acceleo.common.ui@default:default,org.eclipse.acceleo.common@default:default,org.eclipse.acceleo.compatibility.ui@default:default,org.eclipse.acceleo.compatibility@default:default,org.eclipse.acceleo.doc@default:default,org.eclipse.acceleo.engine@default:default,org.eclipse.acceleo.examples@default:default,org.eclipse.acceleo.ide.ui@default:default,org.eclipse.acceleo.model.edit@default:default,org.eclipse.acceleo.model@default:default,org.eclipse.acceleo.parser@default:default,org.eclipse.acceleo.profiler.edit@default:default,org.eclipse.acceleo.profiler.editor@default:default,org.eclipse.acceleo.profiler@default:default,org.eclipse.acceleo.traceability.model@default:default,org.eclipse.acceleo.traceability@default:default,org.eclipse.acceleo.ui.capabilities@default:default,org.eclipse.acceleo.ui.interpreter@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.b3.aggregator.edit@default:default,org.eclipse.b3.aggregator.editor@default:default,org.eclipse.b3.aggregator.engine.maven@default:default,org.eclipse.b3.aggregator.engine@default:default,org.eclipse.b3.aggregator.legacy.ui@default:default,org.eclipse.b3.aggregator.legacy@default:default,org.eclipse.b3.aggregator@default:default,org.eclipse.b3.cli@default:default,org.eclipse.b3.p2.edit@default:default,org.eclipse.b3.p2.maven@default:default,org.eclipse.b3.p2@default:default,org.eclipse.b3.util@default:default,org.eclipse.buckminster.osgi.filter@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare.win32@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.dltk.console.ui@default:default,org.eclipse.dltk.console@default:default,org.eclipse.dltk.core.index.sql.h2@default:default,org.eclipse.dltk.core.index.sql@default:default,org.eclipse.dltk.core.index@default:default,org.eclipse.dltk.core.manipulation@default:default,org.eclipse.dltk.core@default:default,org.eclipse.dltk.debug.ui@default:default,org.eclipse.dltk.debug@default:default,org.eclipse.dltk.formatter@default:default,org.eclipse.dltk.launching@default:default,org.eclipse.dltk.logconsole.ui@default:default,org.eclipse.dltk.logconsole@default:default,org.eclipse.dltk.testing@default:default,org.eclipse.dltk.ui@default:default,org.eclipse.dltk.validators.core@default:default,org.eclipse.dltk.validators.externalchecker@default:default,org.eclipse.dltk.validators.ui@default:default,org.eclipse.dltk@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.doc@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diff.edit@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.facet.aggregate.doc@default:default,org.eclipse.emf.facet.aggregate.metamodel.notgenerated@default:default,org.eclipse.emf.facet.aggregate.metamodel@default:default,org.eclipse.emf.facet.capabilities@default:default,org.eclipse.emf.facet.common.core@default:default,org.eclipse.emf.facet.common.sdk.core@default:default,org.eclipse.emf.facet.common.sdk.ui@default:default,org.eclipse.emf.facet.common.ui@default:default,org.eclipse.emf.facet.custom.core@default:default,org.eclipse.emf.facet.custom.doc@default:default,org.eclipse.emf.facet.custom.metamodel.edit@default:default,org.eclipse.emf.facet.custom.metamodel@default:default,org.eclipse.emf.facet.custom.sdk.core@default:default,org.eclipse.emf.facet.custom.ui@default:default,org.eclipse.emf.facet.dev.core@default:default,org.eclipse.emf.facet.dev.ui@default:default,org.eclipse.emf.facet.doc@default:default,org.eclipse.emf.facet.ecore@default:default,org.eclipse.emf.facet.efacet.catalog@default:default,org.eclipse.emf.facet.efacet.core@default:default,org.eclipse.emf.facet.efacet.doc@default:default,org.eclipse.emf.facet.efacet.edit@default:default,org.eclipse.emf.facet.efacet.editor@default:default,org.eclipse.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.emf.facet.efacet.metamodel@default:default,org.eclipse.emf.facet.efacet.ui@default:default,org.eclipse.emf.facet.efacet@default:default,org.eclipse.emf.facet.infra.browser.custom.core@default:default,org.eclipse.emf.facet.infra.browser.custom.edit@default:default,org.eclipse.emf.facet.infra.browser.custom.editor@default:default,org.eclipse.emf.facet.infra.browser.custom.examples.uml@default:default,org.eclipse.emf.facet.infra.browser.custom.ui@default:default,org.eclipse.emf.facet.infra.browser.custom@default:default,org.eclipse.emf.facet.infra.browser.doc@default:default,org.eclipse.emf.facet.infra.browser.uicore.examples.cnf@default:default,org.eclipse.emf.facet.infra.browser.uicore@default:default,org.eclipse.emf.facet.infra.browser@default:default,org.eclipse.emf.facet.infra.common.core@default:default,org.eclipse.emf.facet.infra.common.ui@default:default,org.eclipse.emf.facet.infra.facet.core@default:default,org.eclipse.emf.facet.infra.facet.edit@default:default,org.eclipse.emf.facet.infra.facet.editor@default:default,org.eclipse.emf.facet.infra.facet.ui@default:default,org.eclipse.emf.facet.infra.facet@default:default,org.eclipse.emf.facet.infra.query.core@default:default,org.eclipse.emf.facet.infra.query.edit@default:default,org.eclipse.emf.facet.infra.query.editor@default:default,org.eclipse.emf.facet.infra.query.ui@default:default,org.eclipse.emf.facet.infra.query@default:default,org.eclipse.emf.facet.query.java.core@default:default,org.eclipse.emf.facet.query.java.metamodel@default:default,org.eclipse.emf.facet.query.java.ui@default:default,org.eclipse.emf.facet.query.java@default:default,org.eclipse.emf.facet.releng.tools@default:default,org.eclipse.emf.facet.util.core@default:default,org.eclipse.emf.facet.util.emf.catalog@default:default,org.eclipse.emf.facet.util.emf.core@default:default,org.eclipse.emf.facet.util.emf.doc@default:default,org.eclipse.emf.facet.util.emf.ui@default:default,org.eclipse.emf.facet.util.ui@default:default,org.eclipse.emf.facet.widgets.celleditors.ecore.tests.samplemm@default:default,org.eclipse.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.emf.facet.widgets.celleditors.edit@default:default,org.eclipse.emf.facet.widgets.celleditors.editor@default:default,org.eclipse.emf.facet.widgets.celleditors@default:default,org.eclipse.emf.facet.widgets.nattable.doc@default:default,org.eclipse.emf.facet.widgets.nattable.examples.ecore@default:default,org.eclipse.emf.facet.widgets.nattable.instance.edit@default:default,org.eclipse.emf.facet.widgets.nattable.instance@default:default,org.eclipse.emf.facet.widgets.nattable.tableconfiguration.edit@default:default,org.eclipse.emf.facet.widgets.nattable.tableconfiguration.editor@default:default,org.eclipse.emf.facet.widgets.nattable.tableconfiguration@default:default,org.eclipse.emf.facet.widgets.nattable.workbench@default:default,org.eclipse.emf.facet.widgets.nattable@default:default,org.eclipse.emf.facet.widgets.table.doc@default:default,org.eclipse.emf.facet.widgets.table.metamodel.edit@default:default,org.eclipse.emf.facet.widgets.table.metamodel@default:default,org.eclipse.emf.facet.widgets.table.ui.nattable@default:default,org.eclipse.emf.facet.widgets.table.ui.workbench@default:default,org.eclipse.emf.facet.widgets.table.ui@default:default,org.eclipse.emf.facet.widgets@default:default,org.eclipse.emf.generic.editor@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.ui@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.transaction.doc@default:default,org.eclipse.emf.transaction.examples@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation.doc@default:default,org.eclipse.emf.validation.examples@default:default,org.eclipse.emf.validation.ocl@default:default,org.eclipse.emf.validation.ui.ide@default:default,org.eclipse.emf.validation.ui@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.doc@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.epp.mpc.core@default:default,org.eclipse.epp.mpc.help.ui@default:default,org.eclipse.epp.mpc.ui@default:default,org.eclipse.epp.package.rcp@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.gef@default:default,org.eclipse.gmf.bridge.trace@default:default,org.eclipse.gmf.bridge.ui.dashboard@default:default,org.eclipse.gmf.bridge.ui@default:default,org.eclipse.gmf.bridge@default:default,org.eclipse.gmf.codegen.edit@default:default,org.eclipse.gmf.codegen.ui@default:default,org.eclipse.gmf.codegen@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.ecore.editor@default:default,org.eclipse.gmf.examples.runtime.ui.pde@default:default,org.eclipse.gmf.graphdef.codegen.ui@default:default,org.eclipse.gmf.graphdef.codegen@default:default,org.eclipse.gmf.graphdef.edit@default:default,org.eclipse.gmf.graphdef@default:default,org.eclipse.gmf.map.edit@default:default,org.eclipse.gmf.map@default:default,org.eclipse.gmf.runtime.common.core@default:default,org.eclipse.gmf.runtime.common.ui.action.ide@default:default,org.eclipse.gmf.runtime.common.ui.action@default:default,org.eclipse.gmf.runtime.common.ui.printing.win32@default:false,org.eclipse.gmf.runtime.common.ui.printing@default:default,org.eclipse.gmf.runtime.common.ui.services.action@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd.ide@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd@default:default,org.eclipse.gmf.runtime.common.ui.services.properties@default:default,org.eclipse.gmf.runtime.common.ui.services@default:default,org.eclipse.gmf.runtime.common.ui@default:default,org.eclipse.gmf.runtime.diagram.core@default:default,org.eclipse.gmf.runtime.diagram.ui.actions@default:default,org.eclipse.gmf.runtime.diagram.ui.dnd@default:default,org.eclipse.gmf.runtime.diagram.ui.geoshapes@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default,org.eclipse.gmf.runtime.diagram.ui.printing@default:default,org.eclipse.gmf.runtime.diagram.ui.properties@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.providers@default:default,org.eclipse.gmf.runtime.diagram.ui.render@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default,org.eclipse.gmf.runtime.diagram.ui@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default,org.eclipse.gmf.runtime.draw2d.ui.render@default:default,org.eclipse.gmf.runtime.draw2d.ui@default:default,org.eclipse.gmf.runtime.emf.clipboard.core@default:default,org.eclipse.gmf.runtime.emf.commands.core@default:default,org.eclipse.gmf.runtime.emf.core@default:default,org.eclipse.gmf.runtime.emf.type.core@default:default,org.eclipse.gmf.runtime.emf.type.ui@default:default,org.eclipse.gmf.runtime.emf.ui.properties@default:default,org.eclipse.gmf.runtime.emf.ui@default:default,org.eclipse.gmf.runtime.gef.ui@default:default,org.eclipse.gmf.runtime.notation.edit@default:default,org.eclipse.gmf.runtime.notation.providers@default:default,org.eclipse.gmf.runtime.notation.sdk@default:default,org.eclipse.gmf.runtime.notation@default:default,org.eclipse.gmf.runtime.sdk@default:default,org.eclipse.gmf.tooldef.edit@default:default,org.eclipse.gmf.tooldef@default:default,org.eclipse.gmf.tooling@default:default,org.eclipse.gmf.validate@default:default,org.eclipse.gmf.xpand.editor@default:default,org.eclipse.gmf.xpand.qvtlibrary@default:default,org.eclipse.gmf.xpand@default:default,org.eclipse.gmf@default:default,org.eclipse.gmt.modisco.examples@default:default,org.eclipse.gmt.modisco.infra.browser.custom.core@default:default,org.eclipse.gmt.modisco.infra.browser.custom.editor@default:default,org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk@default:default,org.eclipse.gmt.modisco.infra.browser.custom.examples.uml@default:default,org.eclipse.gmt.modisco.infra.browser.custom.ui@default:default,org.eclipse.gmt.modisco.infra.browser.custom@default:default,org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf@default:default,org.eclipse.gmt.modisco.infra.browser.uicore@default:default,org.eclipse.gmt.modisco.infra.browser@default:default,org.eclipse.gmt.modisco.infra.capabilities@default:default,org.eclipse.gmt.modisco.infra.common.cdo@default:default,org.eclipse.gmt.modisco.infra.common.core@default:default,org.eclipse.gmt.modisco.infra.common.ui@default:default,org.eclipse.gmt.modisco.infra.discoverymanager@default:default,org.eclipse.gmt.modisco.infra.facet.core@default:default,org.eclipse.gmt.modisco.infra.facet.edit@default:default,org.eclipse.gmt.modisco.infra.facet.editor@default:default,org.eclipse.gmt.modisco.infra.facet.ui@default:default,org.eclipse.gmt.modisco.infra.facet@default:default,org.eclipse.gmt.modisco.infra.query.core@default:default,org.eclipse.gmt.modisco.infra.query.edit@default:default,org.eclipse.gmt.modisco.infra.query.editor@default:default,org.eclipse.gmt.modisco.infra.query.jxpath@default:default,org.eclipse.gmt.modisco.infra.query.ui@default:default,org.eclipse.gmt.modisco.infra.query@default:default,org.eclipse.gmt.modisco.java.browser.customization@default:default,org.eclipse.gmt.modisco.java.cdo@default:default,org.eclipse.gmt.modisco.java.discoverer.cdo@default:default,org.eclipse.gmt.modisco.java.discoverer@default:default,org.eclipse.gmt.modisco.java.generation@default:default,org.eclipse.gmt.modisco.java.queries@default:default,org.eclipse.gmt.modisco.java@default:default,org.eclipse.gmt.modisco.kdm.browser.extension@default:default,org.eclipse.gmt.modisco.kdm.source.discoverer@default:default,org.eclipse.gmt.modisco.kdm.uml2converter@default:default,org.eclipse.gmt.modisco.omg.kdm@default:default,org.eclipse.gmt.modisco.omg.smm@default:default,org.eclipse.gmt.modisco.tool.metricsvisualizationbuilder@default:default,org.eclipse.gmt.modisco.workflow.mwe@default:default,org.eclipse.gmt.modisco.workflow@default:default,org.eclipse.gmt.modisco.xml.browser.customization@default:default,org.eclipse.gmt.modisco.xml.discoverer@default:default,org.eclipse.gmt.modisco.xml@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.discovery@default:default,org.eclipse.m2e.editor.xml@default:default,org.eclipse.m2e.editor@default:default,org.eclipse.m2e.jdt@default:default,org.eclipse.m2e.launching@default:default,org.eclipse.m2e.lifecyclemapping.defaults@default:default,org.eclipse.m2e.logback.appender@default:false,org.eclipse.m2e.logback.configuration@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.m2e.refactoring@default:default,org.eclipse.m2e.scm@default:default,org.eclipse.m2m.atl.adt.debug@default:default,org.eclipse.m2m.atl.adt.editor@default:default,org.eclipse.m2m.atl.adt.ui@default:default,org.eclipse.m2m.atl.adt@default:default,org.eclipse.m2m.atl.cheatsheets@default:default,org.eclipse.m2m.atl.common@default:default,org.eclipse.m2m.atl.core.ant@default:default,org.eclipse.m2m.atl.core.emf@default:default,org.eclipse.m2m.atl.core.ui.vm@default:default,org.eclipse.m2m.atl.core.ui@default:default,org.eclipse.m2m.atl.core@default:default,org.eclipse.m2m.atl.debug.core@default:default,org.eclipse.m2m.atl.doc@default:default,org.eclipse.m2m.atl.drivers.emf4atl@default:default,org.eclipse.m2m.atl.drivers.uml24atl@default:default,org.eclipse.m2m.atl.dsls@default:default,org.eclipse.m2m.atl.engine.emfvm.launch@default:default,org.eclipse.m2m.atl.engine.emfvm@default:default,org.eclipse.m2m.atl.engine.vm@default:default,org.eclipse.m2m.atl.engine@default:default,org.eclipse.m2m.atl.examples@default:default,org.eclipse.m2m.atl.profiler.core@default:default,org.eclipse.m2m.atl.profiler.emfvm@default:default,org.eclipse.m2m.atl.profiler.exportmodel.editor@default:default,org.eclipse.m2m.atl.profiler.exportmodel@default:default,org.eclipse.m2m.atl.profiler.model@default:default,org.eclipse.m2m.atl.profiler.ui@default:default,org.eclipse.m2m.atl.profiler.vm@default:default,org.eclipse.m2m.atl@default:default,org.eclipse.m2m.qvt.oml.common.ui@default:default,org.eclipse.m2m.qvt.oml.common@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.debug.core@default:default,org.eclipse.m2m.qvt.oml.debug.ui@default:default,org.eclipse.m2m.qvt.oml.doc@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.editor.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util@default:default,org.eclipse.m2m.qvt.oml.ocl@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime.ui@default:default,org.eclipse.m2m.qvt.oml.runtime@default:default,org.eclipse.m2m.qvt.oml.samples@default:default,org.eclipse.m2m.qvt.oml.trace.edit@default:default,org.eclipse.m2m.qvt.oml.ui@default:default,org.eclipse.m2m.qvt.oml@default:default,org.eclipse.modisco.doc@default:default,org.eclipse.modisco.infra.discovery.core@default:default,org.eclipse.modisco.infra.discovery.ui@default:default,org.eclipse.modisco.infra.discovery@default:default,org.eclipse.modisco.infra.omg.doc@default:default,org.eclipse.modisco.infrastructure.doc@default:default,org.eclipse.modisco.java.composition.browser.customization@default:default,org.eclipse.modisco.java.composition.discoverer.ui@default:default,org.eclipse.modisco.java.composition.discoverer@default:default,org.eclipse.modisco.java.composition.ui@default:default,org.eclipse.modisco.java.composition@default:default,org.eclipse.modisco.java.discoverer.cdo@default:default,org.eclipse.modisco.java.discoverer.ui@default:default,org.eclipse.modisco.java.discoverer@default:default,org.eclipse.modisco.java.doc@default:default,org.eclipse.modisco.jee.doc@default:default,org.eclipse.modisco.jee.ejbjar.discoverer.ui@default:default,org.eclipse.modisco.jee.ejbjar.discoverer@default:default,org.eclipse.modisco.jee.ejbjar@default:default,org.eclipse.modisco.jee.facet@default:default,org.eclipse.modisco.jee.jsp.browser.customization@default:default,org.eclipse.modisco.jee.jsp.discoverer.ui@default:default,org.eclipse.modisco.jee.jsp.discoverer@default:default,org.eclipse.modisco.jee.jsp.generation@default:default,org.eclipse.modisco.jee.jsp@default:default,org.eclipse.modisco.jee.queries@default:default,org.eclipse.modisco.jee.webapp.discoverer.ui@default:default,org.eclipse.modisco.jee.webapp.discoverer@default:default,org.eclipse.modisco.jee.webapp@default:default,org.eclipse.modisco.jee@default:default,org.eclipse.modisco.kdm.source.discoverer.ui@default:default,org.eclipse.modisco.kdm.source.discoverer@default:default,org.eclipse.modisco.kdm.source.extension.ui.browser@default:default,org.eclipse.modisco.kdm.source.extension.ui@default:default,org.eclipse.modisco.kdm.source.extension@default:default,org.eclipse.modisco.kdm.uml2converter.ui@default:default,org.eclipse.modisco.kdm.uml2converter@default:default,org.eclipse.modisco.omg.gastm@default:default,org.eclipse.modisco.omg.smm@default:default,org.eclipse.modisco.util.atl.core@default:default,org.eclipse.modisco.workflow.core@default:default,org.eclipse.modisco.workflow.ui@default:default,org.eclipse.modisco.workflow@default:default,org.eclipse.modisco.xml.discoverer.ui@default:default,org.eclipse.modisco.xml.discoverer@default:default,org.eclipse.modisco.xml.doc@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default,org.eclipse.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.doc@default:default,org.eclipse.ocl.ecore.edit@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.edit@default:default,org.eclipse.ocl.ui@default:default,org.eclipse.ocl.uml.edit@default:default,org.eclipse.ocl.uml.ui@default:default,org.eclipse.ocl.uml@default:default,org.eclipse.ocl@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.papyrus.compare.report.ui@default:default,org.eclipse.papyrus.compare.report@default:default,org.eclipse.papyrus.infra.emf.compare.common@default:default,org.eclipse.papyrus.infra.emf.compare.instance@default:default,org.eclipse.papyrus.infra.emf.compare.ui@default:default,org.eclipse.papyrus.java.generator.jdtsynchronizer@default:default,org.eclipse.papyrus.java.generator.metamodel.jdt.edit@default:default,org.eclipse.papyrus.java.generator.metamodel.jdt.editor@default:default,org.eclipse.papyrus.java.generator.metamodel.jdt@default:default,org.eclipse.papyrus.java.generator.transfo.umltojdt@default:default,org.eclipse.papyrus.java.generator.ui@default:default,org.eclipse.papyrus.java.profile.edit@default:default,org.eclipse.papyrus.java.profile.editor@default:default,org.eclipse.papyrus.java.profile@default:default,org.eclipse.papyrus.java.reverse.ui@default:default,org.eclipse.papyrus.java.reverse@default:default,org.eclipse.papyrus.java.template@default:default,org.eclipse.papyrus.layout.algorithms.gridAlgorithm@default:default,org.eclipse.papyrus.layout.algorithms.horizontalAlgorithm@default:default,org.eclipse.papyrus.layout.algorithms.horizontalSymmetryAlgorithm@default:default,org.eclipse.papyrus.layout.algorithms.horizontalTreeAlgorithm@default:default,org.eclipse.papyrus.layout.algorithms.radialAlgorithm@default:default,org.eclipse.papyrus.layout.algorithms.springAlgorithm@default:default,org.eclipse.papyrus.layout.algorithms.treeAlgorithm@default:default,org.eclipse.papyrus.layout.algorithms.verticalAlgorithm@default:default,org.eclipse.papyrus.layout.algorithms.verticalSymmetryAlgorithm@default:default,org.eclipse.papyrus.layout.subeditor.gmf@default:default,org.eclipse.papyrus.layout@default:default,org.eclipse.papyrus.marte.static.profile@default:default,org.eclipse.papyrus.marte.vsl@default:default,org.eclipse.papyrus.uml.compare.file@default:default,org.eclipse.papyrus.uml.compare.merger@default:default,org.eclipse.papyrus.uml.compare@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.php.core.parser@default:default,org.eclipse.php.core@default:default,org.eclipse.php.debug.core@default:default,org.eclipse.php.debug.daemon@default:default,org.eclipse.php.debug.ui@default:default,org.eclipse.php.help@default:default,org.eclipse.php.server.core@default:default,org.eclipse.php.server.ui@default:default,org.eclipse.php.ui@default:default,org.eclipse.php@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rap.help@default:default,org.eclipse.rap.ui.intro@default:default,org.eclipse.rap.ui.launch.rwt@default:default,org.eclipse.rap.ui.launch@default:default,org.eclipse.rap.ui.templates@default:default,org.eclipse.rcp@default:default,org.eclipse.recommenders.aether@default:default,org.eclipse.recommenders.completion.rcp.calls@default:default,org.eclipse.recommenders.completion.rcp.chain@default:default,org.eclipse.recommenders.completion.rcp.e38@default:false,org.eclipse.recommenders.completion.rcp.overrides@default:default,org.eclipse.recommenders.completion.rcp.subwords@default:default,org.eclipse.recommenders.completion.rcp.templates@default:default,org.eclipse.recommenders.completion.rcp@default:default,org.eclipse.recommenders.doc@default:default,org.eclipse.recommenders.extdoc.rcp@default:default,org.eclipse.recommenders.extdoc@default:default,org.eclipse.recommenders.injection@default:default,org.eclipse.recommenders.jayes.serialization@default:default,org.eclipse.recommenders.jayes@default:default,org.eclipse.recommenders.rcp@default:default,org.eclipse.recommenders.utils.rcp@default:default,org.eclipse.recommenders.utils@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.team.svn@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.doc@default:default,org.eclipse.uml2.examples.uml.ui@default:default,org.eclipse.uml2.examples@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.ecore.exporter@default:default,org.eclipse.uml2.uml.ecore.importer@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.l2@default:default,org.eclipse.uml2.uml.profile.l3@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.uml2@default:default,org.eclipse.update.configurator@3:true,org.eclipse.viatra2.core2@default:default,org.eclipse.viatra2.editor.text@default:default,org.eclipse.viatra2.editor@default:default,org.eclipse.viatra2.emf.importer.generic.exporter@default:default,org.eclipse.viatra2.emf.importer.generic@default:default,org.eclipse.viatra2.emf.incquery.codegen.gtasm@default:default,org.eclipse.viatra2.emf.incquery.codegen.patternmatcher@default:default,org.eclipse.viatra2.emf.incquery.codegen.term@default:default,org.eclipse.viatra2.emf.incquery.core@default:default,org.eclipse.viatra2.emf.incquery.gui@default:default,org.eclipse.viatra2.emf.incquery.model.edit@default:default,org.eclipse.viatra2.emf.incquery.model.editor@default:default,org.eclipse.viatra2.emf.incquery.model@default:default,org.eclipse.viatra2.emf.incquery.runtime@default:default,org.eclipse.viatra2.gtasm.interpreter.impl@default:default,org.eclipse.viatra2.gtasm.interpreter.term@default:default,org.eclipse.viatra2.gtasm.interpreter@default:default,org.eclipse.viatra2.gtasm.model.edit@default:default,org.eclipse.viatra2.gtasm.model@default:default,org.eclipse.viatra2.gtasm.patternmatcher.impl@default:default,org.eclipse.viatra2.gtasm.patternmatcher.incremental.rete@default:default,org.eclipse.viatra2.gtasm.patternmatcher.incremental@default:default,org.eclipse.viatra2.gtasm.patternmatcher@default:default,org.eclipse.viatra2.gtasm.support@default:default,org.eclipse.viatra2.gtasm.trigger@default:default,org.eclipse.viatra2.gtasm.typing.model@default:default,org.eclipse.viatra2.gui@default:default,org.eclipse.viatra2.help.wiki@default:default,org.eclipse.viatra2.help@default:default,org.eclipse.viatra2.imports.uml2.galileo@default:default,org.eclipse.viatra2.imports.vtml@default:default,org.eclipse.viatra2.loaders.vtcl_lpgparser@default:default,org.eclipse.viatra2.natives.strings@default:default,org.eclipse.wb.core.databinding@default:default,org.eclipse.wb.core.lib@default:default,org.eclipse.wb.core.ui@default:default,org.eclipse.wb.core@default:default,org.eclipse.wb.discovery.core@default:default,org.eclipse.wb.discovery.ui@default:default,org.eclipse.wb.layout.group@default:default,org.eclipse.wb.os.win32@default:default,org.eclipse.wb.os@default:default,org.eclipse.wb.rcp.databinding.emf@default:default,org.eclipse.wb.rcp.databinding@default:default,org.eclipse.wb.rcp.nebula@default:default,org.eclipse.wb.rcp.swing2swt@default:default,org.eclipse.wb.rcp@default:default,org.eclipse.wb.runtime.lib@default:default,org.eclipse.wb.runtime@default:default,org.eclipse.wb.swt.widgets.baseline@default:default,org.eclipse.wb.swt@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.infopop@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.snippets@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.wst.dtd.core@default:default,org.eclipse.wst.dtd.ui.infopop@default:default,org.eclipse.wst.dtd.ui@default:default,org.eclipse.wst.dtdeditor.doc.user@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.wst.internet.cache@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.jsdt.web.core@default:default,org.eclipse.wst.jsdt.web.ui@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.doc.user@default:default,org.eclipse.wst.sse.ui.infopop@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.standard.schemas@default:default,org.eclipse.wst.validation.infopop@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.web@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xml.ui.infopop@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xmleditor.doc.user@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.wst.xsd.ui@default:default,org.eclipse.wst.xsdeditor.doc.user@default:default,org.eclipse.xpand.activities@default:default,org.eclipse.xpand.doc@default:default,org.eclipse.xpand.examples@default:default,org.eclipse.xpand.incremental@default:default,org.eclipse.xpand.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd.edit@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.check.ui@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.doc@default:default,org.eclipse.xtend.examples@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.profiler@default:default,org.eclipse.xtend.shared.ui@default:default,org.eclipse.xtend.typesystem.emf.ui@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend.typesystem.uml2.ui@default:default,org.eclipse.xtend.typesystem.uml2@default:default,org.eclipse.xtend.typesystem.xsd.ui@default:default,org.eclipse.xtend.typesystem.xsd@default:default,org.eclipse.xtend.ui@default:default,org.eclipse.xtend.util.stdlib@default:default,org.eclipse.xtend2.lib@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.activities@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.doc@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.junit@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.purexbase.ui@default:default,org.eclipse.xtext.purexbase@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.junit@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.junit@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.xtext.xtext.ui.examples@default:default,org.eclipse.xtext.xtext.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.layouts@default:default,org.h2@default:default,org.hamcrest.core@default:default,org.jacoco.agent@default:default,org.jacoco.core@default:default,org.jacoco.report@default:default,org.jboss.netty@default:default,org.jdom@default:default,org.jsoup@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default,org.junit4@default:default,org.kohsuke.args4j@default:default,org.mortbay.jetty.util@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.tigris.subversion.clientadapter.javahl.win64@default:false,org.tigris.subversion.clientadapter.javahl@default:default,org.tigris.subversion.clientadapter@default:default,org.tigris.subversion.subclipse.core@default:default,org.tigris.subversion.subclipse.doc@default:default,org.tigris.subversion.subclipse.tools.usage@default:default,org.tigris.subversion.subclipse.ui@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil*1.0.0.v200806040011@default:default,org.w3c.dom.smil*1.0.1.v200903091627@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.ocl.examples.codegen@default:default,org.eclipse.ocl.examples.common@default:default,org.eclipse.ocl.examples.domain@default:default,org.eclipse.ocl.examples.eventmanager@default:default,org.eclipse.ocl.examples.impactanalyzer.ui@default:default,org.eclipse.ocl.examples.impactanalyzer.util@default:default,org.eclipse.ocl.examples.impactanalyzer@default:default,org.eclipse.ocl.examples.interpreter@default:default,org.eclipse.ocl.examples.library@default:default,org.eclipse.ocl.examples.modelregistry.edit@default:default,org.eclipse.ocl.examples.modelregistry.editor@default:default,org.eclipse.ocl.examples.modelregistry.ui@default:default,org.eclipse.ocl.examples.modelregistry@default:default,org.eclipse.ocl.examples.pivot@default:default,org.eclipse.ocl.examples.ui@default:default,org.eclipse.ocl.examples.xtext.base@default:default,org.eclipse.ocl.examples.xtext.completeocl.ui@default:default,org.eclipse.ocl.examples.xtext.completeocl@default:default,org.eclipse.ocl.examples.xtext.console@default:default,org.eclipse.ocl.examples.xtext.essentialocl.ui@default:default,org.eclipse.ocl.examples.xtext.essentialocl@default:default,org.eclipse.ocl.examples.xtext.markup.ui@default:default,org.eclipse.ocl.examples.xtext.markup@default:default,org.eclipse.ocl.examples.xtext.oclinecore.ui@default:default,org.eclipse.ocl.examples.xtext.oclinecore@default:default,org.eclipse.ocl.examples.xtext.oclstdlib.ui@default:default,org.eclipse.ocl.examples.xtext.oclstdlib@default:default,org.eclipse.ocl.examples@default:default,org.eclipse.papyrus.bundles.tests@default:default,org.eclipse.papyrus.customization.palette@default:default,org.eclipse.papyrus.customization.paletteconfiguration@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.model.xwt@default:default,org.eclipse.papyrus.customization.properties@default:default,org.eclipse.papyrus.diagramtemplate.edit@default:default,org.eclipse.papyrus.diagramtemplate.editor@default:default,org.eclipse.papyrus.diagramtemplate@default:default,org.eclipse.papyrus.documentation.plugin@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.export@default:default,org.eclipse.papyrus.infra.extendedtypes.emf@default:default,org.eclipse.papyrus.infra.extendedtypes@default:default,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.css.xtext@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.queries.core.configuration.edit@default:default,org.eclipse.papyrus.infra.queries.core.configuration@default:default,org.eclipse.papyrus.infra.queries.core@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.resourceloading.preferences@default:default,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.table.common@default:default,org.eclipse.papyrus.infra.table.instance@default:default,org.eclipse.papyrus.infra.table.menu@default:default,org.eclipse.papyrus.infra.table.modelexplorer@default:default,org.eclipse.papyrus.infra.table.properties@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.migration.properties.model@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition.tests@default:false,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.internalblock.tests@default:false,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.facets@default:default,org.eclipse.papyrus.sysml.modelexplorer.tests@default:false,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types.tests@default:false,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml.table.allocation@default:default,org.eclipse.papyrus.sysml.table.requirement@default:default,org.eclipse.papyrus.sysml.tests@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.team.svn@default:default,org.eclipse.papyrus.tests@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd.tests@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.emftree@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.package@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.usecase.tests@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.modelexplorer.tests@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.pastemanager@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.table.default@default:default,org.eclipse.papyrus.uml.table.widgets.celleditors@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.tools.extendedtypes@default:default,org.eclipse.papyrus.uml.tools.tests@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.tests@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.xwt@default:default,org.eclipse.xtext.gmf.glue@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.ocl.examples.codegen@default:default,org.eclipse.ocl.examples.common@default:default,org.eclipse.ocl.examples.domain@default:default,org.eclipse.ocl.examples.eventmanager@default:default,org.eclipse.ocl.examples.impactanalyzer.ui@default:default,org.eclipse.ocl.examples.impactanalyzer.util@default:default,org.eclipse.ocl.examples.impactanalyzer@default:default,org.eclipse.ocl.examples.interpreter@default:default,org.eclipse.ocl.examples.library@default:default,org.eclipse.ocl.examples.modelregistry.edit@default:default,org.eclipse.ocl.examples.modelregistry.editor@default:default,org.eclipse.ocl.examples.modelregistry.ui@default:default,org.eclipse.ocl.examples.modelregistry@default:default,org.eclipse.ocl.examples.pivot@default:default,org.eclipse.ocl.examples.ui@default:default,org.eclipse.ocl.examples.xtext.base@default:default,org.eclipse.ocl.examples.xtext.completeocl.ui@default:default,org.eclipse.ocl.examples.xtext.completeocl@default:default,org.eclipse.ocl.examples.xtext.console@default:default,org.eclipse.ocl.examples.xtext.essentialocl.ui@default:default,org.eclipse.ocl.examples.xtext.essentialocl@default:default,org.eclipse.ocl.examples.xtext.markup.ui@default:default,org.eclipse.ocl.examples.xtext.markup@default:default,org.eclipse.ocl.examples.xtext.oclinecore.ui@default:default,org.eclipse.ocl.examples.xtext.oclinecore@default:default,org.eclipse.ocl.examples.xtext.oclstdlib.ui@default:default,org.eclipse.ocl.examples.xtext.oclstdlib@default:default,org.eclipse.ocl.examples@default:default,org.eclipse.papyrus.bundles.tests@default:default,org.eclipse.papyrus.customization.palette@default:default,org.eclipse.papyrus.customization.paletteconfiguration@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.model.xwt@default:default,org.eclipse.papyrus.customization.properties@default:default,org.eclipse.papyrus.diagramtemplate.edit@default:default,org.eclipse.papyrus.diagramtemplate.editor@default:default,org.eclipse.papyrus.diagramtemplate@default:default,org.eclipse.papyrus.documentation.plugin@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.export@default:default,org.eclipse.papyrus.infra.extendedtypes.emf@default:default,org.eclipse.papyrus.infra.extendedtypes@default:default,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.css.xtext@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.queries.core.configuration.edit@default:default,org.eclipse.papyrus.infra.queries.core.configuration@default:default,org.eclipse.papyrus.infra.queries.core@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.resourceloading.preferences@default:default,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.table.common@default:default,org.eclipse.papyrus.infra.table.instance@default:default,org.eclipse.papyrus.infra.table.menu@default:default,org.eclipse.papyrus.infra.table.modelexplorer@default:default,org.eclipse.papyrus.infra.table.properties@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.migration.properties.model@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition.tests@default:false,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.internalblock.tests@default:false,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.facets@default:default,org.eclipse.papyrus.sysml.modelexplorer.tests@default:false,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types.tests@default:false,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml.table.allocation@default:default,org.eclipse.papyrus.sysml.table.requirement@default:default,org.eclipse.papyrus.sysml.tests@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.team.svn@default:default,org.eclipse.papyrus.tests@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd.tests@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.emftree@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.package@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.usecase.tests@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.modelexplorer.tests@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.pastemanager@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.table.default@default:default,org.eclipse.papyrus.uml.table.widgets.celleditors@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.tools.extendedtypes@default:default,org.eclipse.papyrus.uml.tools.tests@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.tests@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.infra.properties.ui@default:default,org.eclipse.papyrus.xwt@default:default,org.eclipse.xtext.gmf.glue@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<booleanAttribute key="tracing" value="false"/>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations
index 70ad583db68..f51cea9cf8c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="Element types configuration for test palette configuration plugin" identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.FakeProfile" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="FakeProfile" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" xmi:version="2.0">
- <elementTypeConfigurations identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.fake.tests" name="FakeClass" xmi:id="_ubJcsaeUEeSUR5jX0TaAcA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ubJcsqeUEeSUR5jX0TaAcA"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
- <matcherConfiguration xmi:id="_ubJcs6eUEeSUR5jX0TaAcA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>FakeProfile::FakeSto</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.uml.paletteconfiguration.tests.fakeadvice" target="_ubJcsaeUEeSUR5jX0TaAcA" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="FakeProfile::FakeSto" xmi:id="_ubJcyqeUEeSUR5jX0TaAcA">
- <requiredProfiles>FakeProfile</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="Element types configuration for test palette configuration plugin" identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.FakeProfile" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="FakeProfile" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" xmi:version="2.0">
+ <elementTypeConfigurations identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.fake.tests" name="FakeClass" xmi:id="_ubJcsaeUEeSUR5jX0TaAcA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ubJcsqeUEeSUR5jX0TaAcA"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+ <matcherConfiguration xmi:id="_ubJcs6eUEeSUR5jX0TaAcA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>FakeProfile::FakeSto</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.uml.paletteconfiguration.tests.fakeadvice" target="_ubJcsaeUEeSUR5jX0TaAcA" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="FakeProfile::FakeSto" xmi:id="_ubJcyqeUEeSUR5jX0TaAcA">
+ <requiredProfiles>FakeProfile</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations
index 70aeb3406d9..5f37a4b7b52 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="Element types configuration for test palette configuration plugin" identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.TestPaletteConfiguration" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="TestPaletteConfiguration" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" xmi:version="2.0">
- <elementTypeConfigurations identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests" name="ClassWithStoOnClass" xmi:id="_ubJcsaeUEeSUR5jX0TaAcA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
- <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ubJcsqeUEeSUR5jX0TaAcA"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
- <matcherConfiguration xmi:id="_ubJcs6eUEeSUR5jX0TaAcA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
- <stereotypesQualifiedNames>TestPaletteConfiguration::TPC_StoOnClass</stereotypesQualifiedNames>
- </matcherConfiguration>
- </elementTypeConfigurations>
- <adviceBindingsConfigurations identifier="org.eclipse.papyrus.uml.paletteconfiguration.tests.advice" target="_ubJcsaeUEeSUR5jX0TaAcA" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
- <stereotypesToApply stereotypeQualifiedName="TestPaletteConfiguration::TPC_StoOnClass" xmi:id="_ubJcyqeUEeSUR5jX0TaAcA">
- <requiredProfiles>TestPaletteConfiguration</requiredProfiles>
- </stereotypesToApply>
- </adviceBindingsConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="Element types configuration for test palette configuration plugin" identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.TestPaletteConfiguration" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="TestPaletteConfiguration" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" xmi:version="2.0">
+ <elementTypeConfigurations identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests" name="ClassWithStoOnClass" xmi:id="_ubJcsaeUEeSUR5jX0TaAcA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+ <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ubJcsqeUEeSUR5jX0TaAcA"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
+ <matcherConfiguration xmi:id="_ubJcs6eUEeSUR5jX0TaAcA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
+ <stereotypesQualifiedNames>TestPaletteConfiguration::TPC_StoOnClass</stereotypesQualifiedNames>
+ </matcherConfiguration>
+ </elementTypeConfigurations>
+ <adviceBindingsConfigurations identifier="org.eclipse.papyrus.uml.paletteconfiguration.tests.advice" target="_ubJcsaeUEeSUR5jX0TaAcA" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
+ <stereotypesToApply stereotypeQualifiedName="TestPaletteConfiguration::TPC_StoOnClass" xmi:id="_ubJcyqeUEeSUR5jX0TaAcA">
+ <requiredProfiles>TestPaletteConfiguration</requiredProfiles>
+ </stereotypesToApply>
+ </adviceBindingsConfigurations>
</elementtypesconfigurations:ElementTypeSetConfiguration> \ No newline at end of file
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF
index ccc5a590cf1..2ddd148692a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF
@@ -1,32 +1,32 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.junit;bundle-version="4.11.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.7.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.sequence;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.tests.framework;bundle-version="1.2.0",
- org.eclipse.xtend.lib;bundle-version="2.8.1",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.diagram.sequence.tests,
- org.eclipse.papyrus.uml.diagram.sequence.tests.generation
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.tests.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.7.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.sequence;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
+ org.eclipse.gmf.tooling.runtime;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.papyrus.tests.framework;bundle-version="1.2.0",
+ org.eclipse.xtend.lib;bundle-version="2.8.1",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.uml.diagram.sequence.tests,
+ org.eclipse.papyrus.uml.diagram.sequence.tests.generation
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence.tests
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF
index 176a90a1faf..8e86dd25f2d 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF
@@ -36,7 +36,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.expressions;bundle-version="3.5.0",
org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0",
org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0"
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0"
Export-Package: org.eclipse.papyrus.uml.diagram.tests.appearance,
org.eclipse.papyrus.uml.diagram.tests.canonical,
org.eclipse.papyrus.uml.diagram.tests.createFromPalette,
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestInstanceSpecification.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestInstanceSpecification.java
index eb1821c8fcb..db02d153fce 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestInstanceSpecification.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/TestInstanceSpecification.java
@@ -1,129 +1,129 @@
-package org.eclipse.papyrus.uml.diagram.tests.canonical;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.Set;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.commands.wrappers.GMFtoGEFCommandWrapper;
-import org.eclipse.papyrus.uml.service.types.helper.advice.InstanceSpecificationEditHelperAdvice;
-import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.UMLPackage;
-
-public abstract class TestInstanceSpecification extends TestLink {
-
- private GraphicalEditPart class1;
-
- private GraphicalEditPart class2;
-
- private GraphicalEditPart instanceSpec1;
-
- private GraphicalEditPart instanceSpec2;
-
- private org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart association12;
-
- /**
- * Test to manage InstanceSpecification.
- */
- protected void testInstanceSpecification(IElementType classType, IElementType associationType, IElementType instanceSpecification, IElementType instanceSpecificationLink) {
- installEnvironment(classType, associationType, instanceSpecification);
- testInstanceSpecificationLinkCreation(instanceSpecificationLink, instanceSpec1, instanceSpec2, null, 2);
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
- setupEditPartClassifier(instanceSpec1.resolveSemanticElement(), class1.resolveSemanticElement());
- setupEditPartClassifier(instanceSpec2.resolveSemanticElement(), class1.resolveSemanticElement());
- testUnexecutableInstanceSpecificationLinkCreation(instanceSpecificationLink, instanceSpec1, instanceSpec2, (Association) association12.resolveSemanticElement(), 2);
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
- setupEditPartClassifier(instanceSpec1.resolveSemanticElement(), class1.resolveSemanticElement());
- setupEditPartClassifier(instanceSpec2.resolveSemanticElement(), class2.resolveSemanticElement());
- testInstanceSpecificationLinkCreation(instanceSpecificationLink, instanceSpec1, instanceSpec2, (Association) association12.resolveSemanticElement(), 2);
- }
-
- private void setupEditPartClassifier(EObject source, EObject classifier) {
- SetRequest setRequest = new SetRequest(source, UMLPackage.eINSTANCE.getInstanceSpecification_Classifier(), Arrays.asList(classifier));
- ICommand command = createSetupEditPartClassifierCommand(source, setRequest);
- assertNotNull(CREATION + COMMAND_NULL, command);
- assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(GMFtoGEFCommandWrapper.wrap(command));
- }
-
- protected ICommand createSetupEditPartClassifierCommand(EObject source, SetRequest setRequest) {
- return new SetValueCommand(setRequest);
- }
-
- private void testInstanceSpecificationLinkCreation(IElementType instanceSpecType, GraphicalEditPart source, GraphicalEditPart target, Association association, int expectedEdges) {
- testToCreateInstanceSpecificationLink(instanceSpecType, source, target, association, true, expectedEdges);
- }
-
- private void testUnexecutableInstanceSpecificationLinkCreation(IElementType instanceSpecType, GraphicalEditPart source, GraphicalEditPart target, Association association, int expectedEdges) {
- testToCreateInstanceSpecificationLink(instanceSpecType, source, target, association, false, expectedEdges);
- }
-
- private void testToCreateInstanceSpecificationLink(IElementType instanceSpecType, GraphicalEditPart source, GraphicalEditPart target, Association association, boolean executable, int expectedEdges) {
- if (association != null) {
- Set<Association> associations = InstanceSpecificationEditHelperAdvice.getModelAssociations((InstanceSpecification) source.resolveSemanticElement(), (InstanceSpecification) target.resolveSemanticElement());
- assertEquals(CREATION + "Associations list", executable, associations.contains(association));
- }
- if (!executable) {
- return;
- }
- CreateConnectionViewRequest request = createConnectionViewRequest(instanceSpecType, source, target);
- InstanceSpecificationEditHelperAdvice.setupSuppressDialogRequest(request, association);
- testToCreateLink(request, source, target, expectedEdges);
- }
-
- private void testToCreateAssociation(IElementType associationType, GraphicalEditPart source, GraphicalEditPart target, int expectedEdges) {
- CreateConnectionViewRequest request = createConnectionViewRequest(associationType, source, target);
- testToCreateLink(request, source, target, expectedEdges);
- }
-
- private void testToCreateLink(CreateConnectionViewRequest request, GraphicalEditPart source, GraphicalEditPart target, int expectedEdges) {
- Command command = target.getCommand(request);
- assertNotNull(CREATION + COMMAND_NULL, command);
- assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
- assertEquals(CREATION + TEST_THE_EXECUTION, expectedEdges, ((Diagram) getRootView()).getEdges().size());
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
- assertEquals(CREATION + TEST_THE_REDO, expectedEdges, ((Diagram) getRootView()).getEdges().size());
- }
-
- private void installEnvironment(IElementType classType, IElementType associationType, IElementType instanceSpecification) {
- createNode(classType, new Point(100, 100));
- createNode(classType, new Point(400, 100));
- createNode(instanceSpecification, new Point(100, 300));
- createNode(instanceSpecification, new Point(400, 300));
- createNode(instanceSpecification, new Point(100, 600));
- class1 = (GraphicalEditPart) getDiagramEditPart().getChildren().get(0);
- class2 = (GraphicalEditPart) getDiagramEditPart().getChildren().get(1);
- instanceSpec1 = (GraphicalEditPart) getDiagramEditPart().getChildren().get(2);
- instanceSpec2 = (GraphicalEditPart) getDiagramEditPart().getChildren().get(3);
- testToCreateAssociation(associationType, class1, class2, 1);
- association12 = (org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart) class1.getSourceConnections().get(0);
- }
-
- private void createNode(IElementType sourceType, Point location) {
- CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
- requestcreation.setLocation(location);
- Command command = getDiagramEditPart().getCommand(requestcreation);
- assertNotNull(CREATION + COMMAND_NULL, command);
- assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
- assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute()); //$NON-NLS-1$
- diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
- }
+package org.eclipse.papyrus.uml.diagram.tests.canonical;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.Set;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.UnexecutableCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.commands.wrappers.GMFtoGEFCommandWrapper;
+import org.eclipse.papyrus.uml.service.types.internal.ui.advice.InstanceSpecificationLinkEditHelperAdvice;
+import org.eclipse.uml2.uml.Association;
+import org.eclipse.uml2.uml.InstanceSpecification;
+import org.eclipse.uml2.uml.UMLPackage;
+
+public abstract class TestInstanceSpecification extends TestLink {
+
+ private GraphicalEditPart class1;
+
+ private GraphicalEditPart class2;
+
+ private GraphicalEditPart instanceSpec1;
+
+ private GraphicalEditPart instanceSpec2;
+
+ private org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart association12;
+
+ /**
+ * Test to manage InstanceSpecification.
+ */
+ protected void testInstanceSpecification(IElementType classType, IElementType associationType, IElementType instanceSpecification, IElementType instanceSpecificationLink) {
+ installEnvironment(classType, associationType, instanceSpecification);
+ testInstanceSpecificationLinkCreation(instanceSpecificationLink, instanceSpec1, instanceSpec2, null, 2);
+ diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+ setupEditPartClassifier(instanceSpec1.resolveSemanticElement(), class1.resolveSemanticElement());
+ setupEditPartClassifier(instanceSpec2.resolveSemanticElement(), class1.resolveSemanticElement());
+ testUnexecutableInstanceSpecificationLinkCreation(instanceSpecificationLink, instanceSpec1, instanceSpec2, (Association) association12.resolveSemanticElement(), 2);
+ diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+ setupEditPartClassifier(instanceSpec1.resolveSemanticElement(), class1.resolveSemanticElement());
+ setupEditPartClassifier(instanceSpec2.resolveSemanticElement(), class2.resolveSemanticElement());
+ testInstanceSpecificationLinkCreation(instanceSpecificationLink, instanceSpec1, instanceSpec2, (Association) association12.resolveSemanticElement(), 2);
+ }
+
+ private void setupEditPartClassifier(EObject source, EObject classifier) {
+ SetRequest setRequest = new SetRequest(source, UMLPackage.eINSTANCE.getInstanceSpecification_Classifier(), Arrays.asList(classifier));
+ ICommand command = createSetupEditPartClassifierCommand(source, setRequest);
+ assertNotNull(CREATION + COMMAND_NULL, command);
+ assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+ diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(GMFtoGEFCommandWrapper.wrap(command));
+ }
+
+ protected ICommand createSetupEditPartClassifierCommand(EObject source, SetRequest setRequest) {
+ return new SetValueCommand(setRequest);
+ }
+
+ private void testInstanceSpecificationLinkCreation(IElementType instanceSpecType, GraphicalEditPart source, GraphicalEditPart target, Association association, int expectedEdges) {
+ testToCreateInstanceSpecificationLink(instanceSpecType, source, target, association, true, expectedEdges);
+ }
+
+ private void testUnexecutableInstanceSpecificationLinkCreation(IElementType instanceSpecType, GraphicalEditPart source, GraphicalEditPart target, Association association, int expectedEdges) {
+ testToCreateInstanceSpecificationLink(instanceSpecType, source, target, association, false, expectedEdges);
+ }
+
+ private void testToCreateInstanceSpecificationLink(IElementType instanceSpecType, GraphicalEditPart source, GraphicalEditPart target, Association association, boolean executable, int expectedEdges) {
+ if (association != null) {
+ Set<Association> associations = InstanceSpecificationLinkEditHelperAdvice.getModelAssociations((InstanceSpecification) source.resolveSemanticElement(), (InstanceSpecification) target.resolveSemanticElement());
+ assertEquals(CREATION + "Associations list", executable, associations.contains(association));
+ }
+ if (!executable) {
+ return;
+ }
+ CreateConnectionViewRequest request = createConnectionViewRequest(instanceSpecType, source, target);
+ InstanceSpecificationLinkEditHelperAdvice.setupSuppressDialogRequest(request, association);
+ testToCreateLink(request, source, target, expectedEdges);
+ }
+
+ private void testToCreateAssociation(IElementType associationType, GraphicalEditPart source, GraphicalEditPart target, int expectedEdges) {
+ CreateConnectionViewRequest request = createConnectionViewRequest(associationType, source, target);
+ testToCreateLink(request, source, target, expectedEdges);
+ }
+
+ private void testToCreateLink(CreateConnectionViewRequest request, GraphicalEditPart source, GraphicalEditPart target, int expectedEdges) {
+ Command command = target.getCommand(request);
+ assertNotNull(CREATION + COMMAND_NULL, command);
+ assertTrue(CONTAINER_CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute());
+ diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+ assertEquals(CREATION + TEST_THE_EXECUTION, expectedEdges, ((Diagram) getRootView()).getEdges().size());
+ diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();
+ diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();
+ assertEquals(CREATION + TEST_THE_REDO, expectedEdges, ((Diagram) getRootView()).getEdges().size());
+ }
+
+ private void installEnvironment(IElementType classType, IElementType associationType, IElementType instanceSpecification) {
+ createNode(classType, new Point(100, 100));
+ createNode(classType, new Point(400, 100));
+ createNode(instanceSpecification, new Point(100, 300));
+ createNode(instanceSpecification, new Point(400, 300));
+ createNode(instanceSpecification, new Point(100, 600));
+ class1 = (GraphicalEditPart) getDiagramEditPart().getChildren().get(0);
+ class2 = (GraphicalEditPart) getDiagramEditPart().getChildren().get(1);
+ instanceSpec1 = (GraphicalEditPart) getDiagramEditPart().getChildren().get(2);
+ instanceSpec2 = (GraphicalEditPart) getDiagramEditPart().getChildren().get(3);
+ testToCreateAssociation(associationType, class1, class2, 1);
+ association12 = (org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart) class1.getSourceConnections().get(0);
+ }
+
+ private void createNode(IElementType sourceType, Point location) {
+ CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());
+ requestcreation.setLocation(location);
+ Command command = getDiagramEditPart().getCommand(requestcreation);
+ assertNotNull(CREATION + COMMAND_NULL, command);
+ assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
+ assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute()); //$NON-NLS-1$
+ diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);
+ }
} \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/bugs/OpenAndDeleteTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/bugs/OpenAndDeleteTest.java
index 39923cfc2d6..1843c8dadfc 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/bugs/OpenAndDeleteTest.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/bugs/OpenAndDeleteTest.java
@@ -1,155 +1,155 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.nattable.clazz.config.tests.bugs;
-
-import java.util.List;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;
-import org.eclipse.papyrus.infra.core.resource.IModel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
-import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
-import org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager;
-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.junit.utils.TableUtils;
-import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
-import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.junit.utils.rules.ShowView;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.uml2.uml.Model;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-
-/**
- * This allow to test the opening and the deletion of a table
- */
-@PluginResource("resources/bugs/bug470811/OpenAndDeleteTest.di")
-@ShowView(value = "org.eclipse.papyrus.views.modelexplorer.modelexplorer")
-public class OpenAndDeleteTest extends AbstractPapyrusTest {
-
- /**
- * The table name.
- */
- private static final String TABLE_NAME = "ClassTreeTable0"; //$NON-NLS-1$
-
-
- /**
- * The papyrus fixture.
- */
- @Rule
- public final PapyrusEditorFixture fixture = new PapyrusEditorFixture();
-
- /**
- * Constructor.
- */
- public OpenAndDeleteTest() {
- super();
- }
-
- /**
- * This allows to test the deletion of the table.
- *
- * @throws Exception
- * The exception
- */
- @Test
- public void testTableDeletion() throws Exception {
- final Model model = (Model) fixture.getModel();
- Assert.assertNotNull("RootModel is null", model); //$NON-NLS-1$
-
- // Get the table and open it
- Table mainTable = TableUtils.getNotationFirstTable(fixture.getModelSet(), TABLE_NAME);
- fixture.getPageManager().openPage(mainTable);
- fixture.flushDisplayEvents();
-
- // Get the editing domain
- TransactionalEditingDomain editingDomain = fixture.getEditingDomain();
- Assert.assertNotNull("The editing domain cannot be null", editingDomain); //$NON-NLS-1$
-
- // Get the provider for the table
- IElementEditService provider = ElementEditServiceUtils.getCommandProvider(mainTable);
- Assert.assertNotNull("The provider cannot be null", provider); //$NON-NLS-1$
-
- // Retrieve delete command from the Element Edit service
- DestroyElementRequest request = new DestroyElementRequest(mainTable, false);
- Assert.assertNotNull("The request cannot be null", request); //$NON-NLS-1$
-
- ICommand deleteCommand = provider.getEditCommand(request);
- Assert.assertNotNull("The delete command cannot be null", deleteCommand); //$NON-NLS-1$
-
- // Add current EObject destroy command to the global command
- ICommand gmfCommand = null;
- gmfCommand = CompositeCommand.compose(gmfCommand, deleteCommand);
- Assert.assertNotNull("The GMF command cannot be null", gmfCommand); //$NON-NLS-1$
-
- // Execute the command
- editingDomain.getCommandStack().execute(GMFtoEMFCommandWrapper.wrap(gmfCommand.reduce()));
- fixture.flushDisplayEvents();
-
- // Check the deletion
- checkNoNotation();
-
- // Undo the command
- editingDomain.getCommandStack().undo();
- mainTable = TableUtils.getNotationFirstTable(fixture.getModelSet(), TABLE_NAME);
- Assert.assertNotNull("The table was not re-created", mainTable); //$NON-NLS-1$
- fixture.getPageManager().openPage(mainTable);
- fixture.flushDisplayEvents();
-
- // Try to execute a resize command to check the re-creation
- IPageManager pageManager = fixture.getPageManager();
- List<Object> pages = pageManager.allPages();
- pageManager.openPage(pages.get(0));
- IEditorPart part = fixture.getEditor().getActiveEditor();
- Assert.assertTrue(part instanceof NatTableEditor);
- NatTableEditor editor = (NatTableEditor) part;
- INattableModelManager currentManager = (INattableModelManager) editor.getAdapter(INattableModelManager.class);
- Assert.assertTrue(currentManager instanceof ITreeNattableModelManager);
- ITreeNattableModelManager manager = (ITreeNattableModelManager) currentManager;
- ((NattableModelManager) manager).resizeHeader();
-
- // Redo the command
- editingDomain.getCommandStack().redo();
- checkNoNotation();
- }
-
- /**
- * Check that no notation exist in the notation file (after deleted the table).
- *
- * @throws Exception
- * The exception.
- */
- private void checkNoNotation() throws Exception {
- IModel notationModel = fixture.getModelSet().getModel(NotationModel.MODEL_ID);
- AbstractBaseModel notationBaseModel = null;
- if (notationModel instanceof AbstractBaseModel) {
- notationBaseModel = (AbstractBaseModel) notationModel;
- } else {
- Assert.fail("notation model is not an abstract base model"); //$NON-NLS-1$
- }
- Assert.assertEquals("The table was not deleted", 0, notationBaseModel.getResource().getContents().size()); //$NON-NLS-1$
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.bugs;
+
+import java.util.List;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.TableUtils;
+import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.papyrus.junit.utils.rules.ShowView;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.uml2.uml.Model;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * This allow to test the opening and the deletion of a table
+ */
+@PluginResource("resources/bugs/bug470811/OpenAndDeleteTest.di")
+@ShowView(value = "org.eclipse.papyrus.views.modelexplorer.modelexplorer")
+public class OpenAndDeleteTest extends AbstractPapyrusTest {
+
+ /**
+ * The table name.
+ */
+ private static final String TABLE_NAME = "ClassTreeTable0"; //$NON-NLS-1$
+
+
+ /**
+ * The papyrus fixture.
+ */
+ @Rule
+ public final PapyrusEditorFixture fixture = new PapyrusEditorFixture();
+
+ /**
+ * Constructor.
+ */
+ public OpenAndDeleteTest() {
+ super();
+ }
+
+ /**
+ * This allows to test the deletion of the table.
+ *
+ * @throws Exception
+ * The exception
+ */
+ @Test
+ public void testTableDeletion() throws Exception {
+ final Model model = (Model) fixture.getModel();
+ Assert.assertNotNull("RootModel is null", model); //$NON-NLS-1$
+
+ // Get the table and open it
+ Table mainTable = TableUtils.getNotationFirstTable(fixture.getModelSet(), TABLE_NAME);
+ fixture.getPageManager().openPage(mainTable);
+ fixture.flushDisplayEvents();
+
+ // Get the editing domain
+ TransactionalEditingDomain editingDomain = fixture.getEditingDomain();
+ Assert.assertNotNull("The editing domain cannot be null", editingDomain); //$NON-NLS-1$
+
+ // Get the provider for the table
+ IElementEditService provider = ElementEditServiceUtils.getCommandProvider(mainTable);
+ Assert.assertNotNull("The provider cannot be null", provider); //$NON-NLS-1$
+
+ // Retrieve delete command from the Element Edit service
+ DestroyElementRequest request = new DestroyElementRequest(mainTable, false);
+ Assert.assertNotNull("The request cannot be null", request); //$NON-NLS-1$
+
+ ICommand deleteCommand = provider.getEditCommand(request);
+ Assert.assertNotNull("The delete command cannot be null", deleteCommand); //$NON-NLS-1$
+
+ // Add current EObject destroy command to the global command
+ ICommand gmfCommand = null;
+ gmfCommand = CompositeCommand.compose(gmfCommand, deleteCommand);
+ Assert.assertNotNull("The GMF command cannot be null", gmfCommand); //$NON-NLS-1$
+
+ // Execute the command
+ editingDomain.getCommandStack().execute(GMFtoEMFCommandWrapper.wrap(gmfCommand.reduce()));
+ fixture.flushDisplayEvents();
+
+ // Check the deletion
+ checkNoNotation();
+
+ // Undo the command
+ editingDomain.getCommandStack().undo();
+ mainTable = TableUtils.getNotationFirstTable(fixture.getModelSet(), TABLE_NAME);
+ Assert.assertNotNull("The table was not re-created", mainTable); //$NON-NLS-1$
+ fixture.getPageManager().openPage(mainTable);
+ fixture.flushDisplayEvents();
+
+ // Try to execute a resize command to check the re-creation
+ IPageManager pageManager = fixture.getPageManager();
+ List<Object> pages = pageManager.allPages();
+ pageManager.openPage(pages.get(0));
+ IEditorPart part = fixture.getEditor().getActiveEditor();
+ Assert.assertTrue(part instanceof NatTableEditor);
+ NatTableEditor editor = (NatTableEditor) part;
+ INattableModelManager currentManager = (INattableModelManager) editor.getAdapter(INattableModelManager.class);
+ Assert.assertTrue(currentManager instanceof ITreeNattableModelManager);
+ ITreeNattableModelManager manager = (ITreeNattableModelManager) currentManager;
+ ((NattableModelManager) manager).resizeHeader();
+
+ // Redo the command
+ editingDomain.getCommandStack().redo();
+ checkNoNotation();
+ }
+
+ /**
+ * Check that no notation exist in the notation file (after deleted the table).
+ *
+ * @throws Exception
+ * The exception.
+ */
+ private void checkNoNotation() throws Exception {
+ IModel notationModel = fixture.getModelSet().getModel(NotationModel.MODEL_ID);
+ AbstractBaseModel notationBaseModel = null;
+ if (notationModel instanceof AbstractBaseModel) {
+ notationBaseModel = (AbstractBaseModel) notationModel;
+ } else {
+ Assert.fail("notation model is not an abstract base model"); //$NON-NLS-1$
+ }
+ Assert.assertEquals("The table was not deleted", 0, notationBaseModel.getResource().getContents().size()); //$NON-NLS-1$
+ }
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/creation/outside/AbstractCreateElementTableTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/creation/outside/AbstractCreateElementTableTest.java
index 49ca10d2584..9ea3baa6c7a 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/creation/outside/AbstractCreateElementTableTest.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/creation/outside/AbstractCreateElementTableTest.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;
import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/markers/ValidationMarkerInTableHeaderTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/markers/ValidationMarkerInTableHeaderTest.java
index 40c126199d5..6ae8574b204 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/markers/ValidationMarkerInTableHeaderTest.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/markers/ValidationMarkerInTableHeaderTest.java
@@ -21,7 +21,7 @@ import org.eclipse.nebula.widgets.nattable.NatTable;
import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
import org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager;
import org.eclipse.papyrus.infra.nattable.provider.NattableTopLabelProvider;
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/overwrite/AbstractPasteInsertTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/overwrite/AbstractPasteInsertTest.java
index 9eb66c88835..cc4062a8b51 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/overwrite/AbstractPasteInsertTest.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/overwrite/AbstractPasteInsertTest.java
@@ -30,9 +30,9 @@ import org.eclipse.nebula.widgets.nattable.NatTable;
import org.eclipse.nebula.widgets.nattable.selection.command.ClearAllSelectionsCommand;
import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.commands.OpenDiagramCommand;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
import org.eclipse.papyrus.infra.nattable.handler.PasteInTableHandler;
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesTests.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesTests.java
index 4714924b664..f8ea26fcf73 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesTests.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/paste/tests/AbstractPasteWithCategoriesTests.java
@@ -31,12 +31,12 @@ import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.emf.commands.core.command.EditingDomainUndoContext;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.commands.CheckedOperationHistory;
import org.eclipse.papyrus.commands.OpenDiagramCommand;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.gmf.command.CheckedOperationHistory;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
import org.eclipse.papyrus.infra.nattable.handler.PasteInTableHandler;
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AbstractOpenTableTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AbstractOpenTableTest.java
index cb28d3bb70d..c8c916b97ba 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AbstractOpenTableTest.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AbstractOpenTableTest.java
@@ -1,87 +1,87 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.nattable.clazz.config.tests.tests;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.papyrus.commands.OpenDiagramCommand;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.editor.integration.tests.tests.AbstractEditorIntegrationTest;
-import org.eclipse.papyrus.infra.core.resource.ModelSet;
-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
-import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.junit.utils.GenericUtils;
-import org.eclipse.papyrus.uml.nattable.clazz.config.tests.Activator;
-import org.eclipse.ui.IEditorPart;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.osgi.framework.Bundle;
-
-/**
- * @author VL222926
- *
- */
-public abstract class AbstractOpenTableTest extends AbstractEditorIntegrationTest {
-
- /**
- * This test allows to be sure that we doesn't break existing table model
- *
- * @throws Exception
- */
-
- public void testOpenExistingTable(String projectName, String modelName) throws Exception {
- // initModel(projectName, modelName, getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
- IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
- Assert.assertEquals(1, pageManager.allPages().size());
- IEditorPart tableEditor = editor.getActiveEditor();
- Assert.assertNull(tableEditor);
- Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();
- Table table = (Table) notationResource.getContents().get(0);
- TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
- editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, table)));
- // to refresh the table content
- // while(!Display.getDefault().isDisposed() && Display.getDefault().readAndDispatch());
- tableEditor = editor.getActiveEditor();
- Assert.assertTrue(tableEditor instanceof NatTableEditor);
- INattableModelManager manager = (INattableModelManager) tableEditor.getAdapter(INattableModelManager.class);
- Assert.assertNotNull(manager);
- Assert.assertEquals(org.eclipse.papyrus.uml.nattable.clazz.config.Activator.TABLE_TYPE, manager.getTable().getTableConfiguration().getType());
- }
-
- protected Table getTable() throws ServiceException {
- Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();
- Table table = (Table) notationResource.getContents().get(0);
- return table;
- }
-
- @Override
- protected String getSourcePath() {
- return "/resources/"; //$NON-NLS-1$
- }
-
- @Override
- protected Bundle getBundle() {
- return Activator.getDefault().getBundle();
- }
-
- @AfterClass
- public static void endOfTest() {
- GenericUtils.closeAllEditors();
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.tests;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.commands.OpenDiagramCommand;
+import org.eclipse.papyrus.editor.integration.tests.tests.AbstractEditorIntegrationTest;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.junit.utils.GenericUtils;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.Activator;
+import org.eclipse.ui.IEditorPart;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.osgi.framework.Bundle;
+
+/**
+ * @author VL222926
+ *
+ */
+public abstract class AbstractOpenTableTest extends AbstractEditorIntegrationTest {
+
+ /**
+ * This test allows to be sure that we doesn't break existing table model
+ *
+ * @throws Exception
+ */
+
+ public void testOpenExistingTable(String projectName, String modelName) throws Exception {
+ // initModel(projectName, modelName, getBundle()); //$NON-NLS-1$ //$NON-NLS-2$
+ IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);
+ Assert.assertEquals(1, pageManager.allPages().size());
+ IEditorPart tableEditor = editor.getActiveEditor();
+ Assert.assertNull(tableEditor);
+ Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();
+ Table table = (Table) notationResource.getContents().get(0);
+ TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);
+ editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, table)));
+ // to refresh the table content
+ // while(!Display.getDefault().isDisposed() && Display.getDefault().readAndDispatch());
+ tableEditor = editor.getActiveEditor();
+ Assert.assertTrue(tableEditor instanceof NatTableEditor);
+ INattableModelManager manager = (INattableModelManager) tableEditor.getAdapter(INattableModelManager.class);
+ Assert.assertNotNull(manager);
+ Assert.assertEquals(org.eclipse.papyrus.uml.nattable.clazz.config.Activator.TABLE_TYPE, manager.getTable().getTableConfiguration().getType());
+ }
+
+ protected Table getTable() throws ServiceException {
+ Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();
+ Table table = (Table) notationResource.getContents().get(0);
+ return table;
+ }
+
+ @Override
+ protected String getSourcePath() {
+ return "/resources/"; //$NON-NLS-1$
+ }
+
+ @Override
+ protected Bundle getBundle() {
+ return Activator.getDefault().getBundle();
+ }
+
+ @AfterClass
+ public static void endOfTest() {
+ GenericUtils.closeAllEditors();
+ }
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/bugs/OpenAndDeleteTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/bugs/OpenAndDeleteTest.java
index c517934ab63..90a8e112357 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/bugs/OpenAndDeleteTest.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/bugs/OpenAndDeleteTest.java
@@ -1,152 +1,152 @@
-/*****************************************************************************
- * Copyright (c) 2015 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.nattable.generic.tests.bugs;
-
-import java.util.List;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;
-import org.eclipse.papyrus.infra.core.resource.IModel;
-import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
-import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.junit.utils.TableUtils;
-import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
-import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.junit.utils.rules.ShowView;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.uml2.uml.Model;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-
-/**
- * This allow to test the opening and the deletion of a table
- */
-@PluginResource("resources/bugs/bug470811/OpenAndDeleteTest.di")
-@ShowView(value = "org.eclipse.papyrus.views.modelexplorer.modelexplorer")
-public class OpenAndDeleteTest extends AbstractPapyrusTest {
-
- /**
- * The table name.
- */
- private static final String TABLE_NAME = "GenericTable0"; //$NON-NLS-1$
-
-
- /**
- * The papyrus fixture.
- */
- @Rule
- public final PapyrusEditorFixture fixture = new PapyrusEditorFixture();
-
- /**
- * Constructor.
- */
- public OpenAndDeleteTest() {
- super();
- }
-
- /**
- * This allows to test the deletion of the table.
- *
- * @throws Exception
- * The exception
- */
- @Test
- public void testTableDeletion() throws Exception {
- final Model model = (Model) fixture.getModel();
- Assert.assertNotNull("RootModel is null", model); //$NON-NLS-1$
-
- // Get the table and open it
- Table mainTable = TableUtils.getNotationFirstTable(fixture.getModelSet(), TABLE_NAME);
- fixture.getPageManager().openPage(mainTable);
- fixture.flushDisplayEvents();
-
- // Get the editing domain
- TransactionalEditingDomain editingDomain = fixture.getEditingDomain();
- Assert.assertNotNull("The editing domain cannot be null", editingDomain); //$NON-NLS-1$
-
- // Get the provider for the table
- IElementEditService provider = ElementEditServiceUtils.getCommandProvider(mainTable);
- Assert.assertNotNull("The provider cannot be null", provider); //$NON-NLS-1$
-
- // Retrieve delete command from the Element Edit service
- DestroyElementRequest request = new DestroyElementRequest(mainTable, false);
- Assert.assertNotNull("The request cannot be null", request); //$NON-NLS-1$
-
- ICommand deleteCommand = provider.getEditCommand(request);
- Assert.assertNotNull("The delete command cannot be null", deleteCommand); //$NON-NLS-1$
-
- // Add current EObject destroy command to the global command
- ICommand gmfCommand = null;
- gmfCommand = CompositeCommand.compose(gmfCommand, deleteCommand);
- Assert.assertNotNull("The GMF command cannot be null", gmfCommand); //$NON-NLS-1$
-
- // Execute the command
- editingDomain.getCommandStack().execute(GMFtoEMFCommandWrapper.wrap(gmfCommand.reduce()));
- fixture.flushDisplayEvents();
-
- // Check the deletion
- checkNoNotation();
-
- // Undo the command
- editingDomain.getCommandStack().undo();
- mainTable = TableUtils.getNotationFirstTable(fixture.getModelSet(), TABLE_NAME);
- Assert.assertNotNull("The table was not re-created", mainTable); //$NON-NLS-1$
- fixture.getPageManager().openPage(mainTable);
- fixture.flushDisplayEvents();
-
- // Try to execute a resize command to check the re-creation
- IPageManager pageManager = fixture.getPageManager();
- List<Object> pages = pageManager.allPages();
- pageManager.openPage(pages.get(0));
- IEditorPart part = fixture.getEditor().getActiveEditor();
- Assert.assertTrue(part instanceof NatTableEditor);
- NatTableEditor editor = (NatTableEditor) part;
- INattableModelManager currentManager = (INattableModelManager) editor.getAdapter(INattableModelManager.class);
- ((NattableModelManager) currentManager).resizeHeader();
-
- // Redo the command
- editingDomain.getCommandStack().redo();
- checkNoNotation();
- }
-
- /**
- * Check that no notation exist in the notation file (after deleted the table).
- *
- * @throws Exception
- * The exception.
- */
- private void checkNoNotation() throws Exception {
- IModel notationModel = fixture.getModelSet().getModel(NotationModel.MODEL_ID);
- AbstractBaseModel notationBaseModel = null;
- if (notationModel instanceof AbstractBaseModel) {
- notationBaseModel = (AbstractBaseModel) notationModel;
- } else {
- Assert.fail("notation model is not an abstract base model"); //$NON-NLS-1$
- }
- Assert.assertEquals("The table was not deleted", 0, notationBaseModel.getResource().getContents().size()); //$NON-NLS-1$
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.nattable.generic.tests.bugs;
+
+import java.util.List;
+
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;
+import org.eclipse.papyrus.infra.core.resource.IModel;
+import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
+import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.TableUtils;
+import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.papyrus.junit.utils.rules.ShowView;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.uml2.uml.Model;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * This allow to test the opening and the deletion of a table
+ */
+@PluginResource("resources/bugs/bug470811/OpenAndDeleteTest.di")
+@ShowView(value = "org.eclipse.papyrus.views.modelexplorer.modelexplorer")
+public class OpenAndDeleteTest extends AbstractPapyrusTest {
+
+ /**
+ * The table name.
+ */
+ private static final String TABLE_NAME = "GenericTable0"; //$NON-NLS-1$
+
+
+ /**
+ * The papyrus fixture.
+ */
+ @Rule
+ public final PapyrusEditorFixture fixture = new PapyrusEditorFixture();
+
+ /**
+ * Constructor.
+ */
+ public OpenAndDeleteTest() {
+ super();
+ }
+
+ /**
+ * This allows to test the deletion of the table.
+ *
+ * @throws Exception
+ * The exception
+ */
+ @Test
+ public void testTableDeletion() throws Exception {
+ final Model model = (Model) fixture.getModel();
+ Assert.assertNotNull("RootModel is null", model); //$NON-NLS-1$
+
+ // Get the table and open it
+ Table mainTable = TableUtils.getNotationFirstTable(fixture.getModelSet(), TABLE_NAME);
+ fixture.getPageManager().openPage(mainTable);
+ fixture.flushDisplayEvents();
+
+ // Get the editing domain
+ TransactionalEditingDomain editingDomain = fixture.getEditingDomain();
+ Assert.assertNotNull("The editing domain cannot be null", editingDomain); //$NON-NLS-1$
+
+ // Get the provider for the table
+ IElementEditService provider = ElementEditServiceUtils.getCommandProvider(mainTable);
+ Assert.assertNotNull("The provider cannot be null", provider); //$NON-NLS-1$
+
+ // Retrieve delete command from the Element Edit service
+ DestroyElementRequest request = new DestroyElementRequest(mainTable, false);
+ Assert.assertNotNull("The request cannot be null", request); //$NON-NLS-1$
+
+ ICommand deleteCommand = provider.getEditCommand(request);
+ Assert.assertNotNull("The delete command cannot be null", deleteCommand); //$NON-NLS-1$
+
+ // Add current EObject destroy command to the global command
+ ICommand gmfCommand = null;
+ gmfCommand = CompositeCommand.compose(gmfCommand, deleteCommand);
+ Assert.assertNotNull("The GMF command cannot be null", gmfCommand); //$NON-NLS-1$
+
+ // Execute the command
+ editingDomain.getCommandStack().execute(GMFtoEMFCommandWrapper.wrap(gmfCommand.reduce()));
+ fixture.flushDisplayEvents();
+
+ // Check the deletion
+ checkNoNotation();
+
+ // Undo the command
+ editingDomain.getCommandStack().undo();
+ mainTable = TableUtils.getNotationFirstTable(fixture.getModelSet(), TABLE_NAME);
+ Assert.assertNotNull("The table was not re-created", mainTable); //$NON-NLS-1$
+ fixture.getPageManager().openPage(mainTable);
+ fixture.flushDisplayEvents();
+
+ // Try to execute a resize command to check the re-creation
+ IPageManager pageManager = fixture.getPageManager();
+ List<Object> pages = pageManager.allPages();
+ pageManager.openPage(pages.get(0));
+ IEditorPart part = fixture.getEditor().getActiveEditor();
+ Assert.assertTrue(part instanceof NatTableEditor);
+ NatTableEditor editor = (NatTableEditor) part;
+ INattableModelManager currentManager = (INattableModelManager) editor.getAdapter(INattableModelManager.class);
+ ((NattableModelManager) currentManager).resizeHeader();
+
+ // Redo the command
+ editingDomain.getCommandStack().redo();
+ checkNoNotation();
+ }
+
+ /**
+ * Check that no notation exist in the notation file (after deleted the table).
+ *
+ * @throws Exception
+ * The exception.
+ */
+ private void checkNoNotation() throws Exception {
+ IModel notationModel = fixture.getModelSet().getModel(NotationModel.MODEL_ID);
+ AbstractBaseModel notationBaseModel = null;
+ if (notationModel instanceof AbstractBaseModel) {
+ notationBaseModel = (AbstractBaseModel) notationModel;
+ } else {
+ Assert.fail("notation model is not an abstract base model"); //$NON-NLS-1$
+ }
+ Assert.assertEquals("The table was not deleted", 0, notationBaseModel.getResource().getContents().size()); //$NON-NLS-1$
+ }
+
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AbstractGenericTableTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AbstractGenericTableTest.java
index a52510c2972..e38d1461e61 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AbstractGenericTableTest.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/AbstractGenericTableTest.java
@@ -19,10 +19,10 @@ import org.eclipse.core.resources.IFile;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.papyrus.commands.OpenDiagramCommand;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.editor.integration.tests.tests.AbstractEditorIntegrationTest;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
import org.eclipse.papyrus.infra.nattable.common.editor.NatTableEditor;
import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/org.eclipse.papyrus.uml.service.types.tests.launch b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/org.eclipse.papyrus.uml.service.types.tests.launch
index e958d319753..2d1b8cf901f 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/org.eclipse.papyrus.uml.service.types.tests.launch
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/org.eclipse.papyrus.uml.service.types.tests.launch
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
<booleanAttribute key="askclear" value="false"/>
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
@@ -39,5 +40,5 @@
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
+<booleanAttribute key="useProduct" value="false"/>
</launchConfiguration>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreatePureUMLElementTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreatePureUMLElementTest.java
index 1ff4d5157c5..805dc6d747c 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreatePureUMLElementTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreatePureUMLElementTest.java
@@ -215,7 +215,7 @@ public class CreatePureUMLElementTest extends AbstractPapyrusTest {
if (canCreate) {
Assert.assertNotNull("Command should be executable, so not null", command);
Assert.assertTrue("Command should be executable", command.canExecute());
- return new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(command);
+ return new org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper(command);
} else {
if (command != null) {
// command was not null. It should be unexecutable in this case
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeletePureUMLElementTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeletePureUMLElementTest.java
index 12448a2dd60..e9f44667518 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeletePureUMLElementTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeletePureUMLElementTest.java
@@ -1,202 +1,202 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2014 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) - Initial API and implementation
- * Christian W. Damus (CEA) - bug 422257
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.service.types.tests.deletion;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.util.Collections;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
-import org.eclipse.uml2.uml.Activity;
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.Model;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-/**
- * Class that provides tests only for UML based models, no DI/Notation
- * <P>
- * Goal of this class is to test the uml implementation, ex. SubsetAddComand
- * </P>
- */
-public class DeletePureUMLElementTest extends AbstractPapyrusTest {
-
- private static final int deleteActivityChildrenSize = 4;
-
- @ClassRule
- public static final HouseKeeper.Static houseKeeper = new HouseKeeper.Static();
-
- private static IProject createProject;
-
- private static IFile copyPapyrusModel;
-
- private static Model rootModel;
-
- private static Resource resource;
-
- private static TransactionalEditingDomain domain;
-
- private static Activity testActivityDelete;
-
- private static ActivityNode centralBufferNode1;
-
- private static ActivityNode centralBufferNode2;
-
- private static ActivityNode addVariableValueAction1;
-
- private static ActivityNode addVariableValueAction2;
-
- @BeforeClass
- public static void initTest() {
- // create Project
- createProject = houseKeeper.createProject("UMLOnlyTest");
-
- // create UML resource
- // import test model
- copyPapyrusModel = houseKeeper.createFile(createProject, "TestPureUMLModel.uml", "/resource/TestPureUMLModel.uml");
-
- // open model as UML resource
- domain = TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain();
- resource = domain.getResourceSet().createResource(URI.createPlatformResourceURI(copyPapyrusModel.getFullPath().toString(), true));
- try {
- resource.load(Collections.emptyMap());
- } catch (IOException e) {
- fail(e.getMessage());
- }
-
- rootModel = (Model)resource.getContents().get(0);
- assertNotNull("Model should not be null", rootModel);
- try {
- initExistingElements();
- } catch (Exception e) {
- fail(e.getMessage());
- }
-
- }
-
- /**
- * Init fields corresponding to element in the test model
- */
- private static void initExistingElements() throws Exception {
- // existing test delete activity
- testActivityDelete = (Activity)rootModel.getOwnedMember("TestActivityDelete");
- assertNotNull("Impossible to find test activity for deletion ", testActivityDelete);
-
- centralBufferNode1 = testActivityDelete.getNode("CentralBufferNode1");
- assertNotNull("Impossible to find element for deletion ", centralBufferNode1);
-
- centralBufferNode2 = testActivityDelete.getNode("CentralBufferNode2");
- assertNotNull("Impossible to find element for deletion ", centralBufferNode2);
-
- addVariableValueAction1 = testActivityDelete.getNode("AddVariableValueAction1");
- assertNotNull("Impossible to find element for deletion ", addVariableValueAction1);
- addVariableValueAction2 = testActivityDelete.getNode("AddVariableValueAction2");
- assertNotNull("Impossible to find element for deletion ", addVariableValueAction2);
- }
-
- @Test
- public void testDeleteOneAddVariableValueAction() throws Exception {
- int initialNumberOfNodes = testActivityDelete.getOwnedNodes().size();
- assertEquals("Test delete: Initialisation", deleteActivityChildrenSize, initialNumberOfNodes);
-
- Command command = getDeleteChildCommand(addVariableValueAction1, true);
- domain.getCommandStack().execute(command);
- Assert.assertEquals("Wrong number of owned nodes after deletion", initialNumberOfNodes - 1, testActivityDelete.getOwnedNodes().size());
- Assert.assertEquals("Wrong number of nodes after deletion", initialNumberOfNodes - 1, testActivityDelete.getNodes().size());
-
- domain.getCommandStack().undo();
- Assert.assertEquals("Wrong number of owned nodes after undo", initialNumberOfNodes, testActivityDelete.getOwnedNodes().size());
- Assert.assertEquals("Wrong number of nodes after undo", initialNumberOfNodes, testActivityDelete.getNodes().size());
-
- domain.getCommandStack().redo();
- Assert.assertEquals("Wrong number of owned nodes after redo", initialNumberOfNodes - 1, testActivityDelete.getOwnedNodes().size());
- Assert.assertEquals("Wrong number of nodes after redo", initialNumberOfNodes - 1, testActivityDelete.getNodes().size());
-
- domain.getCommandStack().undo();
- Assert.assertEquals("Wrong number of nodes after 2nd undo", initialNumberOfNodes, testActivityDelete.getNodes().size());
- }
-
- @Test
- public void testDeleteOneCentralBufferNode() throws Exception {
- int initialNumberOfNodes = testActivityDelete.getOwnedNodes().size();
- assertEquals("Test delete: Initialisation", deleteActivityChildrenSize, initialNumberOfNodes);
-
- Command command = getDeleteChildCommand(centralBufferNode1, true);
- domain.getCommandStack().execute(command);
- Assert.assertEquals("Wrong number of owned nodes after deletion", initialNumberOfNodes - 1, testActivityDelete.getOwnedNodes().size());
- Assert.assertEquals("Wrong number of nodes after deletion", initialNumberOfNodes - 1, testActivityDelete.getNodes().size());
-
- domain.getCommandStack().undo();
- Assert.assertEquals("Wrong number of owned nodes after undo", initialNumberOfNodes, testActivityDelete.getOwnedNodes().size());
- Assert.assertEquals("Wrong number of nodes after undo", initialNumberOfNodes, testActivityDelete.getNodes().size());
-
- domain.getCommandStack().redo();
- Assert.assertEquals("Wrong number of owned nodes after redo", initialNumberOfNodes - 1, testActivityDelete.getOwnedNodes().size());
- Assert.assertEquals("Wrong number of nodes after redo", initialNumberOfNodes - 1, testActivityDelete.getNodes().size());
-
- domain.getCommandStack().undo();
- Assert.assertEquals("Wrong number of nodes after 2nd undo", initialNumberOfNodes, testActivityDelete.getNodes().size());
- }
-
- /**
- * Creates the element in the given owner element, undo and redo the action
- *
- * @param owner
- * owner of the new element
- * @param hintedType
- * type of the new element
- * @param canCreate
- * <code>true</code> if new element can be created in the specified owner
- */
- protected Command getDeleteChildCommand(EObject objectToDelete, boolean canDelete) throws Exception {
- IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(objectToDelete);
- ICommand command = elementEditService.getEditCommand(new DestroyElementRequest(objectToDelete, false));
- assertNotNull("Delete command should not be null", command);
- // test if the command is enable and compare with the canCreate parameter
- boolean canExecute = command.canExecute();
- if(canExecute) {
- // executable but was expected as not executable
- if(!canDelete) {
- fail("Delete command is executable but it was expected as not executable");
- } else {
- // command is executable, and it was expected to => run the creation
- Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(command);
- return emfCommand;
- }
- } else {
- if(canDelete) {
- fail("Delete command is not executable but it was expected to be executable");
- }
- }
- return null;
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2013, 2014 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Remi Schnekenburger (CEA LIST) - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 422257
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.service.types.tests.deletion;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.util.Collections;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.uml2.uml.Activity;
+import org.eclipse.uml2.uml.ActivityNode;
+import org.eclipse.uml2.uml.Model;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+
+/**
+ * Class that provides tests only for UML based models, no DI/Notation
+ * <P>
+ * Goal of this class is to test the uml implementation, ex. SubsetAddComand
+ * </P>
+ */
+public class DeletePureUMLElementTest extends AbstractPapyrusTest {
+
+ private static final int deleteActivityChildrenSize = 4;
+
+ @ClassRule
+ public static final HouseKeeper.Static houseKeeper = new HouseKeeper.Static();
+
+ private static IProject createProject;
+
+ private static IFile copyPapyrusModel;
+
+ private static Model rootModel;
+
+ private static Resource resource;
+
+ private static TransactionalEditingDomain domain;
+
+ private static Activity testActivityDelete;
+
+ private static ActivityNode centralBufferNode1;
+
+ private static ActivityNode centralBufferNode2;
+
+ private static ActivityNode addVariableValueAction1;
+
+ private static ActivityNode addVariableValueAction2;
+
+ @BeforeClass
+ public static void initTest() {
+ // create Project
+ createProject = houseKeeper.createProject("UMLOnlyTest");
+
+ // create UML resource
+ // import test model
+ copyPapyrusModel = houseKeeper.createFile(createProject, "TestPureUMLModel.uml", "/resource/TestPureUMLModel.uml");
+
+ // open model as UML resource
+ domain = TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain();
+ resource = domain.getResourceSet().createResource(URI.createPlatformResourceURI(copyPapyrusModel.getFullPath().toString(), true));
+ try {
+ resource.load(Collections.emptyMap());
+ } catch (IOException e) {
+ fail(e.getMessage());
+ }
+
+ rootModel = (Model)resource.getContents().get(0);
+ assertNotNull("Model should not be null", rootModel);
+ try {
+ initExistingElements();
+ } catch (Exception e) {
+ fail(e.getMessage());
+ }
+
+ }
+
+ /**
+ * Init fields corresponding to element in the test model
+ */
+ private static void initExistingElements() throws Exception {
+ // existing test delete activity
+ testActivityDelete = (Activity)rootModel.getOwnedMember("TestActivityDelete");
+ assertNotNull("Impossible to find test activity for deletion ", testActivityDelete);
+
+ centralBufferNode1 = testActivityDelete.getNode("CentralBufferNode1");
+ assertNotNull("Impossible to find element for deletion ", centralBufferNode1);
+
+ centralBufferNode2 = testActivityDelete.getNode("CentralBufferNode2");
+ assertNotNull("Impossible to find element for deletion ", centralBufferNode2);
+
+ addVariableValueAction1 = testActivityDelete.getNode("AddVariableValueAction1");
+ assertNotNull("Impossible to find element for deletion ", addVariableValueAction1);
+ addVariableValueAction2 = testActivityDelete.getNode("AddVariableValueAction2");
+ assertNotNull("Impossible to find element for deletion ", addVariableValueAction2);
+ }
+
+ @Test
+ public void testDeleteOneAddVariableValueAction() throws Exception {
+ int initialNumberOfNodes = testActivityDelete.getOwnedNodes().size();
+ assertEquals("Test delete: Initialisation", deleteActivityChildrenSize, initialNumberOfNodes);
+
+ Command command = getDeleteChildCommand(addVariableValueAction1, true);
+ domain.getCommandStack().execute(command);
+ Assert.assertEquals("Wrong number of owned nodes after deletion", initialNumberOfNodes - 1, testActivityDelete.getOwnedNodes().size());
+ Assert.assertEquals("Wrong number of nodes after deletion", initialNumberOfNodes - 1, testActivityDelete.getNodes().size());
+
+ domain.getCommandStack().undo();
+ Assert.assertEquals("Wrong number of owned nodes after undo", initialNumberOfNodes, testActivityDelete.getOwnedNodes().size());
+ Assert.assertEquals("Wrong number of nodes after undo", initialNumberOfNodes, testActivityDelete.getNodes().size());
+
+ domain.getCommandStack().redo();
+ Assert.assertEquals("Wrong number of owned nodes after redo", initialNumberOfNodes - 1, testActivityDelete.getOwnedNodes().size());
+ Assert.assertEquals("Wrong number of nodes after redo", initialNumberOfNodes - 1, testActivityDelete.getNodes().size());
+
+ domain.getCommandStack().undo();
+ Assert.assertEquals("Wrong number of nodes after 2nd undo", initialNumberOfNodes, testActivityDelete.getNodes().size());
+ }
+
+ @Test
+ public void testDeleteOneCentralBufferNode() throws Exception {
+ int initialNumberOfNodes = testActivityDelete.getOwnedNodes().size();
+ assertEquals("Test delete: Initialisation", deleteActivityChildrenSize, initialNumberOfNodes);
+
+ Command command = getDeleteChildCommand(centralBufferNode1, true);
+ domain.getCommandStack().execute(command);
+ Assert.assertEquals("Wrong number of owned nodes after deletion", initialNumberOfNodes - 1, testActivityDelete.getOwnedNodes().size());
+ Assert.assertEquals("Wrong number of nodes after deletion", initialNumberOfNodes - 1, testActivityDelete.getNodes().size());
+
+ domain.getCommandStack().undo();
+ Assert.assertEquals("Wrong number of owned nodes after undo", initialNumberOfNodes, testActivityDelete.getOwnedNodes().size());
+ Assert.assertEquals("Wrong number of nodes after undo", initialNumberOfNodes, testActivityDelete.getNodes().size());
+
+ domain.getCommandStack().redo();
+ Assert.assertEquals("Wrong number of owned nodes after redo", initialNumberOfNodes - 1, testActivityDelete.getOwnedNodes().size());
+ Assert.assertEquals("Wrong number of nodes after redo", initialNumberOfNodes - 1, testActivityDelete.getNodes().size());
+
+ domain.getCommandStack().undo();
+ Assert.assertEquals("Wrong number of nodes after 2nd undo", initialNumberOfNodes, testActivityDelete.getNodes().size());
+ }
+
+ /**
+ * Creates the element in the given owner element, undo and redo the action
+ *
+ * @param owner
+ * owner of the new element
+ * @param hintedType
+ * type of the new element
+ * @param canCreate
+ * <code>true</code> if new element can be created in the specified owner
+ */
+ protected Command getDeleteChildCommand(EObject objectToDelete, boolean canDelete) throws Exception {
+ IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(objectToDelete);
+ ICommand command = elementEditService.getEditCommand(new DestroyElementRequest(objectToDelete, false));
+ assertNotNull("Delete command should not be null", command);
+ // test if the command is enable and compare with the canCreate parameter
+ boolean canExecute = command.canExecute();
+ if(canExecute) {
+ // executable but was expected as not executable
+ if(!canDelete) {
+ fail("Delete command is executable but it was expected as not executable");
+ } else {
+ // command is executable, and it was expected to => run the creation
+ Command emfCommand = new org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper(command);
+ return emfCommand;
+ }
+ } else {
+ if(canDelete) {
+ fail("Delete command is not executable but it was expected to be executable");
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/suites/AllTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/suites/AllTests.java
index 6a31970bf93..e8984b5be5e 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/suites/AllTests.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/suites/AllTests.java
@@ -1,55 +1,42 @@
-/*****************************************************************************
- * Copyright (c) 2012, 2015 CEA LIST, Christian W. Damus, and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- * Christian W. Damus - bug 458685
- * Christian W. Damus - bug 468071
- * Christian W. Damus - bug 465899
- * Christian W. Damus - bug 478314
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.uml.service.types.tests.suites;
-
-import org.eclipse.papyrus.uml.service.types.tests.creation.ConnectorReadOnlyTestBug465899;
-import org.eclipse.papyrus.uml.service.types.tests.creation.CreateElementTest;
-import org.eclipse.papyrus.uml.service.types.tests.creation.CreateProfileRelationshipTest;
-import org.eclipse.papyrus.uml.service.types.tests.creation.CreatePureUMLElementTest;
-import org.eclipse.papyrus.uml.service.types.tests.creation.CreateRelationshipTest;
-import org.eclipse.papyrus.uml.service.types.tests.creation.MoveElementTest;
-import org.eclipse.papyrus.uml.service.types.tests.creation.SetFeatureTest;
-import org.eclipse.papyrus.uml.service.types.tests.deletion.DeleteAssociationTest;
-import org.eclipse.papyrus.uml.service.types.tests.deletion.DeleteContainmentSubsetTest;
-import org.eclipse.papyrus.uml.service.types.tests.deletion.DeleteDependentWithStereotypeApplications458685;
-import org.eclipse.papyrus.uml.service.types.tests.deletion.DeletePureUMLElementTest;
-import org.junit.runner.RunWith;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
-import org.junit.runners.Suite.SuiteClasses;
-
-/**
- * Main Test suite.
- */
-@RunWith(ClassificationSuite.class)
-@SuiteClasses({
- // TestElementTypeRegistryContent.class,
- CreatePureUMLElementTest.class, // pure uml tests, only element edit service
- CreateElementTest.class,
- CreateRelationshipTest.class,
- CreateProfileRelationshipTest.class,
- MoveElementTest.class,
- SetFeatureTest.class,
- DeletePureUMLElementTest.class,
- DeleteAssociationTest.class,
- DeleteDependentWithStereotypeApplications458685.class,
- DeleteContainmentSubsetTest.class,
- ConnectorReadOnlyTestBug465899.class,
-})
-public class AllTests {
- // JUnit 4 Test Suite
-}
+/*****************************************************************************
+ * Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ * Christian W. Damus - bugs 458685, 468071, 465899, 478314, 485220
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.service.types.tests.suites;
+
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.eclipse.papyrus.junit.framework.runner.Headless;
+import org.eclipse.papyrus.uml.service.types.tests.creation.ConnectorReadOnlyTestBug465899;
+import org.eclipse.papyrus.uml.service.types.tests.creation.CreatePureUMLElementTest;
+import org.eclipse.papyrus.uml.service.types.tests.deletion.DeleteContainmentSubsetTest;
+import org.eclipse.papyrus.uml.service.types.tests.deletion.DeleteDependentWithStereotypeApplications458685;
+import org.eclipse.papyrus.uml.service.types.tests.deletion.DeletePureUMLElementTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * Main Test suite.
+ */
+@Headless
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+ // TestElementTypeRegistryContent.class,
+ CreatePureUMLElementTest.class, // pure uml tests, only element edit service
+ DeletePureUMLElementTest.class,
+ DeleteDependentWithStereotypeApplications458685.class,
+ DeleteContainmentSubsetTest.class,
+ ConnectorReadOnlyTestBug465899.class,
+})
+public class AllTests {
+ // JUnit 4 Test Suite
+}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.classpath b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.classpath
new file mode 100644
index 00000000000..ad32c83a788
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.project b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.project
new file mode 100644
index 00000000000..f6c0fae0e9a
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.uml.service.types.ui.tests</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..94d61f00da6
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,291 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..954281dbc31
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,68 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n * CEA LIST - Initial API and implementation\n * \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..a724c0513b5
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Require-Bundle: org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
+ org.hamcrest.core,
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.uml.service.types.ui.tests.creation,
+ org.eclipse.papyrus.uml.service.types.ui.tests.deletion,
+ org.eclipse.papyrus.uml.service.types.ui.tests.suites
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0"
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.service.types.ui.tests;singleton:=true
+Import-Package: org.eclipse.papyrus.infra.newchild
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/about.html b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/about.html
new file mode 100644
index 00000000000..d35d5aed64c
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/build.properties b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/build.properties
new file mode 100644
index 00000000000..86c1e730aec
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/build.properties
@@ -0,0 +1,9 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ about.html,\
+ plugin.properties,\
+ resource/,\
+ icons/
+src.includes = about.html
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/icons/sample.gif b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/icons/sample.gif
new file mode 100644
index 00000000000..34fb3c9d8cb
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/icons/sample.gif
Binary files differ
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/org.eclipse.papyrus.uml.service.types.ui.tests.launch b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/org.eclipse.papyrus.uml.service.types.ui.tests.launch
new file mode 100644
index 00000000000..12580ea1287
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/org.eclipse.papyrus.uml.service.types.ui.tests.launch
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/suites/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.service.types.ui.tests.suites.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.service.types.ui.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Dhelp.lucene.tokenizer=standard -Xms768m -Xmx1200m -XX:PermSize=256M -XX:MaxPermSize=512M"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/plugin.properties b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/plugin.properties
new file mode 100644
index 00000000000..192cd428814
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/plugin.properties
@@ -0,0 +1,15 @@
+#
+# Copyright (c) 2011 CEA, 2016 LIST, Christian W. Damus, and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#
+# CEA LIST - Initial API and Implementation.
+# Christian W. Damus - bug 485220
+#
+pluginName=Papyrus UML Service Types UI Tests
+providerName=Eclipse Modeling Project
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/pom.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/pom.xml
new file mode 100644
index 00000000000..1603b5d5052
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.tests.releng</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <relativePath>../../../../../releng/main-tests</relativePath>
+ </parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.uml.service.types.ui.tests</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/testprofile.profile.di b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/AssociationTestModel.di
index bf9abab340f..bf9abab340f 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/testprofile.profile.di
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/AssociationTestModel.di
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/AssociationTestModel.notation b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/AssociationTestModel.notation
index 9e8e03d9c8b..565bc5806fa 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/AssociationTestModel.notation
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/AssociationTestModel.notation
@@ -1,80 +1,80 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Ed8PIIEtEeSLxJ9CeEdfMg" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_FuR1oIEtEeSLxJ9CeEdfMg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_FukwkIEtEeSLxJ9CeEdfMg" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_FvKmcIEtEeSLxJ9CeEdfMg" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_FvKmcYEtEeSLxJ9CeEdfMg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_FvKmcoEtEeSLxJ9CeEdfMg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_FvKmc4EtEeSLxJ9CeEdfMg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FvKmdIEtEeSLxJ9CeEdfMg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_FvKmdYEtEeSLxJ9CeEdfMg" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_FvKmdoEtEeSLxJ9CeEdfMg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_FvKmd4EtEeSLxJ9CeEdfMg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_FvKmeIEtEeSLxJ9CeEdfMg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FvKmeYEtEeSLxJ9CeEdfMg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_FvKmeoEtEeSLxJ9CeEdfMg" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_FvKme4EtEeSLxJ9CeEdfMg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_FvKmfIEtEeSLxJ9CeEdfMg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_FvKmfYEtEeSLxJ9CeEdfMg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FvKmfoEtEeSLxJ9CeEdfMg"/>
- </children>
- <element xmi:type="uml:Class" href="AssociationTestModel.uml#_FtFi0IEtEeSLxJ9CeEdfMg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FuR1oYEtEeSLxJ9CeEdfMg" x="252" y="300"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_F1R1gYEtEeSLxJ9CeEdfMg" type="2008">
- <children xmi:type="notation:DecorationNode" xmi:id="_F1R1g4EtEeSLxJ9CeEdfMg" type="5029"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_F1R1hIEtEeSLxJ9CeEdfMg" type="7017">
- <styles xmi:type="notation:TitleStyle" xmi:id="_F1R1hYEtEeSLxJ9CeEdfMg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_F1R1hoEtEeSLxJ9CeEdfMg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_F1R1h4EtEeSLxJ9CeEdfMg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F1R1iIEtEeSLxJ9CeEdfMg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_F1R1iYEtEeSLxJ9CeEdfMg" type="7018">
- <styles xmi:type="notation:TitleStyle" xmi:id="_F1R1ioEtEeSLxJ9CeEdfMg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_F1R1i4EtEeSLxJ9CeEdfMg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_F1R1jIEtEeSLxJ9CeEdfMg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F1R1jYEtEeSLxJ9CeEdfMg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_F1R1joEtEeSLxJ9CeEdfMg" type="7019">
- <styles xmi:type="notation:TitleStyle" xmi:id="_F1R1j4EtEeSLxJ9CeEdfMg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_F1R1kIEtEeSLxJ9CeEdfMg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_F1R1kYEtEeSLxJ9CeEdfMg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F1R1koEtEeSLxJ9CeEdfMg"/>
- </children>
- <element xmi:type="uml:Class" href="AssociationTestModel.uml#_F1R1gIEtEeSLxJ9CeEdfMg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F1R1goEtEeSLxJ9CeEdfMg" x="598" y="300"/>
- </children>
- <styles xmi:type="notation:StringValueStyle" xmi:id="_Ed8PIYEtEeSLxJ9CeEdfMg" name="diagram_compatibility_version" stringValue="1.0.0"/>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_Ed8PIoEtEeSLxJ9CeEdfMg"/>
- <styles xmi:type="style:PapyrusViewStyle" xmi:id="_Ed8PI4EtEeSLxJ9CeEdfMg">
- <owner xmi:type="uml:Model" href="AssociationTestModel.uml#_EZLq8IEtEeSLxJ9CeEdfMg"/>
- </styles>
- <element xmi:type="uml:Model" href="AssociationTestModel.uml#_EZLq8IEtEeSLxJ9CeEdfMg"/>
- <edges xmi:type="notation:Connector" xmi:id="_GT_KwIEtEeSLxJ9CeEdfMg" type="4001" source="_FuR1oIEtEeSLxJ9CeEdfMg" target="_F1R1gYEtEeSLxJ9CeEdfMg">
- <children xmi:type="notation:DecorationNode" xmi:id="_GT_Kw4EtEeSLxJ9CeEdfMg" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_GT_KxIEtEeSLxJ9CeEdfMg" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_GT_KxYEtEeSLxJ9CeEdfMg" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_GT_KxoEtEeSLxJ9CeEdfMg" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_GT_Kx4EtEeSLxJ9CeEdfMg" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_GT_KyIEtEeSLxJ9CeEdfMg" y="-20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_GT_KyYEtEeSLxJ9CeEdfMg" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_GT_KyoEtEeSLxJ9CeEdfMg" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_GT_Ky4EtEeSLxJ9CeEdfMg" type="6033">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_GT_KzIEtEeSLxJ9CeEdfMg" y="20"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_GUI7wIEtEeSLxJ9CeEdfMg" type="6034">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_GUI7wYEtEeSLxJ9CeEdfMg" y="-20"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_GT_KwYEtEeSLxJ9CeEdfMg"/>
- <element xmi:type="uml:Association" href="AssociationTestModel.uml#_GT1Zw4EtEeSLxJ9CeEdfMg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GT_KwoEtEeSLxJ9CeEdfMg"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GWN_YIEtEeSLxJ9CeEdfMg" id="(1.0,0.44)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HCG1AIEtEeSLxJ9CeEdfMg" id="(0.0,0.44)"/>
- </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Ed8PIIEtEeSLxJ9CeEdfMg" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_FuR1oIEtEeSLxJ9CeEdfMg" type="2008">
+ <children xmi:type="notation:DecorationNode" xmi:id="_FukwkIEtEeSLxJ9CeEdfMg" type="5029"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_FvKmcIEtEeSLxJ9CeEdfMg" type="7017">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_FvKmcYEtEeSLxJ9CeEdfMg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_FvKmcoEtEeSLxJ9CeEdfMg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_FvKmc4EtEeSLxJ9CeEdfMg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FvKmdIEtEeSLxJ9CeEdfMg"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_FvKmdYEtEeSLxJ9CeEdfMg" type="7018">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_FvKmdoEtEeSLxJ9CeEdfMg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_FvKmd4EtEeSLxJ9CeEdfMg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_FvKmeIEtEeSLxJ9CeEdfMg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FvKmeYEtEeSLxJ9CeEdfMg"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_FvKmeoEtEeSLxJ9CeEdfMg" type="7019">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_FvKme4EtEeSLxJ9CeEdfMg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_FvKmfIEtEeSLxJ9CeEdfMg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_FvKmfYEtEeSLxJ9CeEdfMg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FvKmfoEtEeSLxJ9CeEdfMg"/>
+ </children>
+ <element xmi:type="uml:Class" href="AssociationTestModel.uml#_FtFi0IEtEeSLxJ9CeEdfMg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FuR1oYEtEeSLxJ9CeEdfMg" x="252" y="300"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_F1R1gYEtEeSLxJ9CeEdfMg" type="2008">
+ <children xmi:type="notation:DecorationNode" xmi:id="_F1R1g4EtEeSLxJ9CeEdfMg" type="5029"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_F1R1hIEtEeSLxJ9CeEdfMg" type="7017">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_F1R1hYEtEeSLxJ9CeEdfMg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_F1R1hoEtEeSLxJ9CeEdfMg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_F1R1h4EtEeSLxJ9CeEdfMg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F1R1iIEtEeSLxJ9CeEdfMg"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_F1R1iYEtEeSLxJ9CeEdfMg" type="7018">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_F1R1ioEtEeSLxJ9CeEdfMg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_F1R1i4EtEeSLxJ9CeEdfMg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_F1R1jIEtEeSLxJ9CeEdfMg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F1R1jYEtEeSLxJ9CeEdfMg"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_F1R1joEtEeSLxJ9CeEdfMg" type="7019">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_F1R1j4EtEeSLxJ9CeEdfMg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_F1R1kIEtEeSLxJ9CeEdfMg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_F1R1kYEtEeSLxJ9CeEdfMg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F1R1koEtEeSLxJ9CeEdfMg"/>
+ </children>
+ <element xmi:type="uml:Class" href="AssociationTestModel.uml#_F1R1gIEtEeSLxJ9CeEdfMg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F1R1goEtEeSLxJ9CeEdfMg" x="598" y="300"/>
+ </children>
+ <styles xmi:type="notation:StringValueStyle" xmi:id="_Ed8PIYEtEeSLxJ9CeEdfMg" name="diagram_compatibility_version" stringValue="1.0.0"/>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_Ed8PIoEtEeSLxJ9CeEdfMg"/>
+ <styles xmi:type="style:PapyrusViewStyle" xmi:id="_Ed8PI4EtEeSLxJ9CeEdfMg">
+ <owner xmi:type="uml:Model" href="AssociationTestModel.uml#_EZLq8IEtEeSLxJ9CeEdfMg"/>
+ </styles>
+ <element xmi:type="uml:Model" href="AssociationTestModel.uml#_EZLq8IEtEeSLxJ9CeEdfMg"/>
+ <edges xmi:type="notation:Connector" xmi:id="_GT_KwIEtEeSLxJ9CeEdfMg" type="4001" source="_FuR1oIEtEeSLxJ9CeEdfMg" target="_F1R1gYEtEeSLxJ9CeEdfMg">
+ <children xmi:type="notation:DecorationNode" xmi:id="_GT_Kw4EtEeSLxJ9CeEdfMg" type="6001">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_GT_KxIEtEeSLxJ9CeEdfMg" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_GT_KxYEtEeSLxJ9CeEdfMg" type="6002">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_GT_KxoEtEeSLxJ9CeEdfMg" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_GT_Kx4EtEeSLxJ9CeEdfMg" type="6003">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_GT_KyIEtEeSLxJ9CeEdfMg" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_GT_KyYEtEeSLxJ9CeEdfMg" type="6005">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_GT_KyoEtEeSLxJ9CeEdfMg" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_GT_Ky4EtEeSLxJ9CeEdfMg" type="6033">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_GT_KzIEtEeSLxJ9CeEdfMg" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_GUI7wIEtEeSLxJ9CeEdfMg" type="6034">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_GUI7wYEtEeSLxJ9CeEdfMg" y="-20"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_GT_KwYEtEeSLxJ9CeEdfMg"/>
+ <element xmi:type="uml:Association" href="AssociationTestModel.uml#_GT1Zw4EtEeSLxJ9CeEdfMg"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GT_KwoEtEeSLxJ9CeEdfMg"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GWN_YIEtEeSLxJ9CeEdfMg" id="(1.0,0.44)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HCG1AIEtEeSLxJ9CeEdfMg" id="(0.0,0.44)"/>
+ </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/AssociationTestModel.uml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/AssociationTestModel.uml
index 0af6641cf7b..62354a1407c 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/AssociationTestModel.uml
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/AssociationTestModel.uml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_EZLq8IEtEeSLxJ9CeEdfMg" name="model">
- <packagedElement xmi:type="uml:Class" xmi:id="_FtFi0IEtEeSLxJ9CeEdfMg" name="Class1">
- <ownedAttribute xmi:type="uml:Property" xmi:id="_GT1ZwIEtEeSLxJ9CeEdfMg" name="class2" type="_F1R1gIEtEeSLxJ9CeEdfMg" association="_GT1Zw4EtEeSLxJ9CeEdfMg">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GT1ZwYEtEeSLxJ9CeEdfMg" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GT1ZwoEtEeSLxJ9CeEdfMg" value="1"/>
- </ownedAttribute>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_F1R1gIEtEeSLxJ9CeEdfMg" name="Class2"/>
- <packagedElement xmi:type="uml:Association" xmi:id="_GT1Zw4EtEeSLxJ9CeEdfMg" name="TestAssociation" memberEnd="_GT1ZxIEtEeSLxJ9CeEdfMg _GT1ZwIEtEeSLxJ9CeEdfMg">
- <ownedEnd xmi:type="uml:Property" xmi:id="_GT1ZxIEtEeSLxJ9CeEdfMg" name="class1" type="_FtFi0IEtEeSLxJ9CeEdfMg" association="_GT1Zw4EtEeSLxJ9CeEdfMg">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GT1ZxYEtEeSLxJ9CeEdfMg" value="1"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GT1ZxoEtEeSLxJ9CeEdfMg" value="1"/>
- </ownedEnd>
- </packagedElement>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_EZLq8IEtEeSLxJ9CeEdfMg" name="model">
+ <packagedElement xmi:type="uml:Class" xmi:id="_FtFi0IEtEeSLxJ9CeEdfMg" name="Class1">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_GT1ZwIEtEeSLxJ9CeEdfMg" name="class2" type="_F1R1gIEtEeSLxJ9CeEdfMg" association="_GT1Zw4EtEeSLxJ9CeEdfMg">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GT1ZwYEtEeSLxJ9CeEdfMg" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GT1ZwoEtEeSLxJ9CeEdfMg" value="1"/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_F1R1gIEtEeSLxJ9CeEdfMg" name="Class2"/>
+ <packagedElement xmi:type="uml:Association" xmi:id="_GT1Zw4EtEeSLxJ9CeEdfMg" name="TestAssociation" memberEnd="_GT1ZxIEtEeSLxJ9CeEdfMg _GT1ZwIEtEeSLxJ9CeEdfMg">
+ <ownedEnd xmi:type="uml:Property" xmi:id="_GT1ZxIEtEeSLxJ9CeEdfMg" name="class1" type="_FtFi0IEtEeSLxJ9CeEdfMg" association="_GT1Zw4EtEeSLxJ9CeEdfMg">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GT1ZxYEtEeSLxJ9CeEdfMg" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GT1ZxoEtEeSLxJ9CeEdfMg" value="1"/>
+ </ownedEnd>
+ </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestModel.di b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/TestModel.di
index 279b08e24e1..ae313072c4f 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestModel.di
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/TestModel.di
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
- <pageList/>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
- <windows>
- <children xsi:type="di:TabFolder"/>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="UTF-8"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+ <pageList/>
+ <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+ <windows>
+ <children xsi:type="di:TabFolder"/>
+ </windows>
+ </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestModel.notation b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/TestModel.notation
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestModel.notation
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/TestModel.notation
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestModel.uml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/TestModel.uml
index 96d0276faf6..96d0276faf6 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/TestModel.uml
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/TestModel.uml
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/AssociationTestModel.di b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/testprofile.profile.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/AssociationTestModel.di
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/testprofile.profile.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/testprofile.profile.notation b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/testprofile.profile.notation
index a1cc52d8d7d..a1cc52d8d7d 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/testprofile.profile.notation
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/testprofile.profile.notation
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/testprofile.profile.uml b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/testprofile.profile.uml
index 59028ac1f03..59028ac1f03 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/resource/testprofile.profile.uml
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/resource/testprofile.profile.uml
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/AbstractCreateRelationshipTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/AbstractCreateRelationshipTest.java
index 9cba68e67ac..01014cd5e2e 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/AbstractCreateRelationshipTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/AbstractCreateRelationshipTest.java
@@ -11,7 +11,7 @@
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.service.types.tests.creation;
+package org.eclipse.papyrus.uml.service.types.ui.tests.creation;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -37,7 +37,7 @@ import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
import org.eclipse.papyrus.infra.widgets.editors.ITreeSelectorDialog;
import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.uml.service.types.tests.creation.auxtests.IAuxTest;
+import org.eclipse.papyrus.uml.service.types.ui.tests.creation.auxtests.IAuxTest;
import org.junit.Assert;
/**
@@ -187,7 +187,7 @@ public abstract class AbstractCreateRelationshipTest extends AbstractPapyrusTest
protected ICommand buildWrappedRelationshipCommand(TransactionalEditingDomain ted, IElementType elementType, EObject container, EObject target, EReference reference) {
IElementEditService serviceProvider = ElementEditServiceUtils.getCommandProvider(elementType);
ITreeSelectorDialog dialog = new TestTargetSelectionDialog(target);
- SetTargetAndRelationshipCommand createGMFCommand = new SetTargetAndRelationshipCommand(ted, "Create "+elementType.getDisplayName(),serviceProvider,reference, container, elementType,dialog);
+ SetTargetAndRelationshipCommand createGMFCommand = new SetTargetAndRelationshipCommand(ted, "Create " + elementType.getDisplayName(), serviceProvider, reference, container, elementType, dialog);
return createGMFCommand;
}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreateElementTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/CreateElementTest.java
index 4eb88c1a001..2756a92791f 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreateElementTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/CreateElementTest.java
@@ -12,7 +12,7 @@
* Christian W. Damus - bug 468071
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.service.types.tests.creation;
+package org.eclipse.papyrus.uml.service.types.ui.tests.creation;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -100,7 +100,7 @@ public class CreateElementTest extends AbstractPapyrusTest {
// import test model
try {
- copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(createProject, Platform.getBundle("org.eclipse.papyrus.uml.service.types"), "/resource/", "TestModel");
+ copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(createProject, Platform.getBundle("org.eclipse.papyrus.uml.service.types.ui"), "/resource/", "TestModel");
} catch (CoreException e) {
fail(e.getMessage());
} catch (IOException e) {
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreateProfileRelationshipTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/CreateProfileRelationshipTest.java
index 59ee78dca97..b7b74659db8 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreateProfileRelationshipTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/CreateProfileRelationshipTest.java
@@ -11,7 +11,7 @@
* Christian W. Damus (CEA) - bug 434993
* Patrik Nandorf (Ericsson AB) - Bug 425565
*****************************************************************************/
-package org.eclipse.papyrus.uml.service.types.tests.creation;
+package org.eclipse.papyrus.uml.service.types.ui.tests.creation;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -77,7 +77,7 @@ public class CreateProfileRelationshipTest extends AbstractCreateRelationshipTes
// import test model
try {
- copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(createProject, Platform.getBundle("org.eclipse.papyrus.uml.service.types"), "/resource/", "testprofile.profile");
+ copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(createProject, Platform.getBundle("org.eclipse.papyrus.uml.service.types.ui"), "/resource/", "testprofile.profile");
} catch (CoreException e) {
fail(e.getMessage());
} catch (IOException e) {
@@ -91,7 +91,7 @@ public class CreateProfileRelationshipTest extends AbstractCreateRelationshipTes
fail(e1.getMessage());
}
- transactionalEditingDomain = (TransactionalEditingDomain) openPapyrusEditor.getAdapter(TransactionalEditingDomain.class);
+ transactionalEditingDomain = openPapyrusEditor.getAdapter(TransactionalEditingDomain.class);
assertTrue("Impossible to init editing domain", transactionalEditingDomain instanceof TransactionalEditingDomain);
// retrieve UML model from this editor
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreateRelationshipTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/CreateRelationshipTest.java
index c09195e5ccf..5849f04ad79 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreateRelationshipTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/CreateRelationshipTest.java
@@ -11,7 +11,7 @@
* Christian W. Damus (CEA) - bug 434993
* Patrik Nandorf (Ericsson AB) - Bug 425565
*****************************************************************************/
-package org.eclipse.papyrus.uml.service.types.tests.creation;
+package org.eclipse.papyrus.uml.service.types.ui.tests.creation;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -46,8 +46,8 @@ import org.eclipse.papyrus.infra.widgets.editors.ITreeSelectorDialog;
import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.eclipse.papyrus.uml.service.types.tests.creation.auxtests.AuxTransitionTests;
-import org.eclipse.papyrus.uml.service.types.tests.creation.auxtests.IAuxTest;
+import org.eclipse.papyrus.uml.service.types.ui.tests.creation.auxtests.AuxTransitionTests;
+import org.eclipse.papyrus.uml.service.types.ui.tests.creation.auxtests.IAuxTest;
import org.eclipse.papyrus.uml.tools.model.UmlModel;
import org.eclipse.papyrus.uml.tools.model.UmlUtils;
import org.eclipse.uml2.uml.Actor;
@@ -126,7 +126,7 @@ public class CreateRelationshipTest extends AbstractCreateRelationshipTest {
// import test model
try {
- copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(createProject, Platform.getBundle("org.eclipse.papyrus.uml.service.types"), "/resource/", "TestModel");
+ copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(createProject, Platform.getBundle("org.eclipse.papyrus.uml.service.types.ui"), "/resource/", "TestModel");
} catch (CoreException e) {
fail(e.getMessage());
} catch (IOException e) {
@@ -140,14 +140,14 @@ public class CreateRelationshipTest extends AbstractCreateRelationshipTest {
fail(e1.getMessage());
}
- transactionalEditingDomain = (TransactionalEditingDomain)openPapyrusEditor.getAdapter(TransactionalEditingDomain.class);
+ transactionalEditingDomain = openPapyrusEditor.getAdapter(TransactionalEditingDomain.class);
assertTrue("Impossible to init editing domain", transactionalEditingDomain instanceof TransactionalEditingDomain);
// retrieve UML model from this editor
try {
modelset = ModelUtils.getModelSetChecked(openPapyrusEditor.getServicesRegistry());
umlIModel = UmlUtils.getUmlModel(modelset);
- rootModel = (Model)umlIModel.lookupRoot();
+ rootModel = (Model) umlIModel.lookupRoot();
} catch (ServiceException e) {
fail(e.getMessage());
} catch (NotFoundException e) {
@@ -168,58 +168,58 @@ public class CreateRelationshipTest extends AbstractCreateRelationshipTest {
*/
private static void initExistingElements() throws Exception {
// existing test activity
- testClass1 = (Class)rootModel.getOwnedMember("TestClass");
+ testClass1 = (Class) rootModel.getOwnedMember("TestClass");
Assert.assertNotNull("Impossible to find testClass", testClass1);
- testClass2 = (Class)rootModel.getOwnedMember("TestClass2");
+ testClass2 = (Class) rootModel.getOwnedMember("TestClass2");
Assert.assertNotNull("Impossible to find testClass2", testClass2);
- testPackage1 = (Package)rootModel.getOwnedMember("TestPackage1");
- testPackage2 = (Package)rootModel.getOwnedMember("TestPackage2");
+ testPackage1 = (Package) rootModel.getOwnedMember("TestPackage1");
+ testPackage2 = (Package) rootModel.getOwnedMember("TestPackage2");
- testArtifact1 = (Artifact)rootModel.getOwnedMember("TestArtifact");
+ testArtifact1 = (Artifact) rootModel.getOwnedMember("TestArtifact");
Assert.assertNotNull("Impossible to find TestArtifact", testArtifact1);
- testNode1 = (Node)rootModel.getOwnedMember("TestNode");
+ testNode1 = (Node) rootModel.getOwnedMember("TestNode");
Assert.assertNotNull("Impossible to find TestNode", testNode1);
- testComponent1 = (Component)rootModel.getOwnedMember("TestComponent");
+ testComponent1 = (Component) rootModel.getOwnedMember("TestComponent");
Assert.assertNotNull("Impossible to find TestComponent", testComponent1);
- testUseCase1 = (UseCase)rootModel.getOwnedMember("TestUseCase1");
+ testUseCase1 = (UseCase) rootModel.getOwnedMember("TestUseCase1");
Assert.assertNotNull("Impossible to find TestUseCase1", testUseCase1);
- testUseCase2 = (UseCase)rootModel.getOwnedMember("TestUseCase2");
+ testUseCase2 = (UseCase) rootModel.getOwnedMember("TestUseCase2");
Assert.assertNotNull("Impossible to find TestUseCase2", testUseCase2);
- testActor1 = (Actor)rootModel.getOwnedMember("TestActor1");
+ testActor1 = (Actor) rootModel.getOwnedMember("TestActor1");
Assert.assertNotNull("Impossible to find TestActor1", testActor1);
- protocolStateMachine1 = (ProtocolStateMachine)rootModel.getOwnedMember("ProtocolStateMachine1");
+ protocolStateMachine1 = (ProtocolStateMachine) rootModel.getOwnedMember("ProtocolStateMachine1");
Assert.assertNotNull("Impossible to find ProtocolStateMachine1", protocolStateMachine1);
- protocolStateMachine2 = (ProtocolStateMachine)rootModel.getOwnedMember("ProtocolStateMachine2");
+ protocolStateMachine2 = (ProtocolStateMachine) rootModel.getOwnedMember("ProtocolStateMachine2");
Assert.assertNotNull("Impossible to find ProtocolStateMachine2", protocolStateMachine2);
- testInterface1 = (Interface)rootModel.getOwnedMember("TestInterface1");
+ testInterface1 = (Interface) rootModel.getOwnedMember("TestInterface1");
Assert.assertNotNull("Impossible to find TestInterface1", testInterface1);
- stateMachine = (StateMachine)rootModel.getOwnedMember("StateMachine");
+ stateMachine = (StateMachine) rootModel.getOwnedMember("StateMachine");
Assert.assertNotNull("Impossible to find StateMachine", stateMachine);
- region = (Region)stateMachine.getOwnedMember("Region");
+ region = (Region) stateMachine.getOwnedMember("Region");
Assert.assertNotNull("Impossible to find Region", region);
- initialState = (Pseudostate)region.getOwnedMember("InitialState");
+ initialState = (Pseudostate) region.getOwnedMember("InitialState");
Assert.assertNotNull("Impossible to find InitialState", initialState);
- state1 = (State)region.getOwnedMember("State1");
+ state1 = (State) region.getOwnedMember("State1");
Assert.assertNotNull("Impossible to find State1", state1);
- state2 = (State)region.getOwnedMember("State2");
+ state2 = (State) region.getOwnedMember("State2");
Assert.assertNotNull("Impossible to find State2", state2);
- finalState = (FinalState)region.getOwnedMember("FinalState");
+ finalState = (FinalState) region.getOwnedMember("FinalState");
Assert.assertNotNull("Impossible to find FinalState", finalState);
}
@@ -227,51 +227,51 @@ public class CreateRelationshipTest extends AbstractCreateRelationshipTest {
/* ABSTRACTION test cases */
@Test
public void testCreateAbstractionBetweenClassesInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.ABSTRACTION, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.ABSTRACTION, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateAbstractionBetweenClassAndNullInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, null , UMLElementTypes.ABSTRACTION, CAN_CREATE, RESULT_NOT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, null, UMLElementTypes.ABSTRACTION, CAN_CREATE, RESULT_NOT_EXPECTED, null);
}
@Test
public void testCreateAbstractionBetweenPackageAndClassesInModel() throws Exception {
- runCreationRelationshipTest(rootModel, testPackage1, testClass2, UMLElementTypes.ABSTRACTION, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(rootModel, testPackage1, testClass2, UMLElementTypes.ABSTRACTION, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateAbstractionBetweenClassAndPackageInModel() throws Exception {
- runCreationRelationshipTest(rootModel, testClass1, testPackage1 , UMLElementTypes.ABSTRACTION, CAN_CREATE, RESULT_EXPECTED,null);
+ runCreationRelationshipTest(rootModel, testClass1, testPackage1, UMLElementTypes.ABSTRACTION, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateAbstractionBetweenClassAndClassInClass() throws Exception {
- runCreationRelationshipTest(testClass1, testClass1, testClass2 , UMLElementTypes.ABSTRACTION, CAN_CREATE, RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testClass1, testClass1, testClass2, UMLElementTypes.ABSTRACTION, CAN_CREATE, RESULT_EXPECTED, null);
}
/* COMPONENT_REALIZATION test cases */
@Test
public void testCreateComponentRealizationBetweenClassAndComponentInComponent() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, testComponent1, UMLElementTypes.COMPONENT_REALIZATION, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, testComponent1, UMLElementTypes.COMPONENT_REALIZATION, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateComponentRealizationBetweenClassAndComponentInClass() throws Exception {
- runCreationRelationshipTest(testClass1, testClass1, testComponent1, UMLElementTypes.COMPONENT_REALIZATION, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testClass1, testClass1, testComponent1, UMLElementTypes.COMPONENT_REALIZATION, CAN_CREATE, RESULT_EXPECTED, null);
}
- @Test
+ @Test
public void testCreateComponentRealizationBetweenComponentAndClass() throws Exception {
- runCreationRelationshipTest(testPackage1, testComponent1,testClass1, UMLElementTypes.COMPONENT_REALIZATION, CAN_CREATE, RESULT_NOT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testComponent1, testClass1, UMLElementTypes.COMPONENT_REALIZATION, CAN_CREATE, RESULT_NOT_EXPECTED, null);
}
@Test
public void testCreateComponentRealizationBetweenComponentAndClassInComponent() throws Exception {
- runCreationRelationshipTest(testComponent1, testComponent1,testClass1, UMLElementTypes.COMPONENT_REALIZATION, CAN_CREATE, RESULT_NOT_EXPECTED,null);
+ runCreationRelationshipTest(testComponent1, testComponent1, testClass1, UMLElementTypes.COMPONENT_REALIZATION, CAN_CREATE, RESULT_NOT_EXPECTED, null);
}
@@ -279,86 +279,86 @@ public class CreateRelationshipTest extends AbstractCreateRelationshipTest {
/* DEPENDENCY test cases */
@Test
public void testCreateDependencyBetweenClassesInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.DEPENDENCY, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.DEPENDENCY, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateDependencyBetweenClassAndNullInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, null , UMLElementTypes.DEPENDENCY, CAN_CREATE, RESULT_NOT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, null, UMLElementTypes.DEPENDENCY, CAN_CREATE, RESULT_NOT_EXPECTED, null);
}
/* DEPLOYMENT test cases */
@Test
public void testCreateDeploymentBetweenNodeAndArtifactInNode() throws Exception {
- runCreationRelationshipTest(testNode1, testNode1, testArtifact1, UMLElementTypes.DEPLOYMENT, CAN_NOT_CREATE, RESULT_NOT_EXPECTED,null);
+ runCreationRelationshipTest(testNode1, testNode1, testArtifact1, UMLElementTypes.DEPLOYMENT, CAN_NOT_CREATE, RESULT_NOT_EXPECTED, null);
}
-
+
@Test
public void testCreateDeploymentBetweenArtifactAndNodeInNode() throws Exception {
- runCreationRelationshipTest(testNode1, testArtifact1, testNode1, UMLElementTypes.DEPLOYMENT, CAN_CREATE, RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testNode1, testArtifact1, testNode1, UMLElementTypes.DEPLOYMENT, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateDeploymentBetweenNodeAndArtifactInArtifact() throws Exception {
- runCreationRelationshipTest(testArtifact1, testNode1, testArtifact1, UMLElementTypes.DEPLOYMENT, CAN_NOT_CREATE, RESULT_NOT_EXPECTED,null);
+ runCreationRelationshipTest(testArtifact1, testNode1, testArtifact1, UMLElementTypes.DEPLOYMENT, CAN_NOT_CREATE, RESULT_NOT_EXPECTED, null);
}
@Test
public void testCreateDeploymentBetweenArtifactAndNodeInArtifact() throws Exception {
- runCreationRelationshipTest(testArtifact1, testArtifact1, testNode1, UMLElementTypes.DEPLOYMENT, CAN_CREATE, RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testArtifact1, testArtifact1, testNode1, UMLElementTypes.DEPLOYMENT, CAN_CREATE, RESULT_EXPECTED, null);
}
/* ELEMENT_IMPORT test cases */
@Test
public void testCreateElementImportBetweenPackageAndPackageInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testPackage1, testPackage2, UMLElementTypes.ELEMENT_IMPORT, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testPackage1, testPackage2, UMLElementTypes.ELEMENT_IMPORT, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateElementImportBetweenPackageAndPackageInPackage2() throws Exception {
- runCreationRelationshipTest(testClass1, testPackage1, testPackage2, UMLElementTypes.ELEMENT_IMPORT, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testClass1, testPackage1, testPackage2, UMLElementTypes.ELEMENT_IMPORT, CAN_CREATE, RESULT_EXPECTED, null);
}
/* EXTEND test cases */
@Test
public void testCreateExtendBetweenUseCases2InUseCase() throws Exception {
- runCreationRelationshipTest(testUseCase1, testUseCase1, testUseCase2, UMLElementTypes.EXTEND, CAN_CREATE, RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testUseCase1, testUseCase1, testUseCase2, UMLElementTypes.EXTEND, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateExtendBetweenClasses2InPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.EXTEND, CAN_NOT_CREATE, RESULT_NOT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.EXTEND, CAN_NOT_CREATE, RESULT_NOT_EXPECTED, null);
}
/* GENERALIZATION test cases */
@Test
public void testCreateGeneralizationBetweenClassesInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.GENERALIZATION, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.GENERALIZATION, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateGeneralizationBetweenClassesInClass() throws Exception {
- runCreationRelationshipTest(testClass1, testClass1, testClass2, UMLElementTypes.GENERALIZATION, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testClass1, testClass1, testClass2, UMLElementTypes.GENERALIZATION, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateGeneralizationBetweenClassAndNullInClass() throws Exception {
- runCreationRelationshipTest(testClass1, testClass1, null , UMLElementTypes.GENERALIZATION, CAN_CREATE, RESULT_NOT_EXPECTED,null);
+ runCreationRelationshipTest(testClass1, testClass1, null, UMLElementTypes.GENERALIZATION, CAN_CREATE, RESULT_NOT_EXPECTED, null);
}
/* INCLUDE test cases */
@Test
public void testCreateIncludeBetweenUseCases2InUseCase() throws Exception {
- runCreationRelationshipTest(testUseCase1, testUseCase1, testUseCase2, UMLElementTypes.INCLUDE, CAN_CREATE, RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testUseCase1, testUseCase1, testUseCase2, UMLElementTypes.INCLUDE, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateIncludeBetweenClasses2InPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.INCLUDE, CAN_NOT_CREATE, RESULT_NOT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.INCLUDE, CAN_NOT_CREATE, RESULT_NOT_EXPECTED, null);
}
@@ -366,24 +366,24 @@ public class CreateRelationshipTest extends AbstractCreateRelationshipTest {
/* INFORMATION_FLOW test cases */
@Test
public void testCreateInformationfloweBetweenUseCases2InUseCase() throws Exception {
- runCreationRelationshipTest(testUseCase1, testUseCase1, testUseCase2, UMLElementTypes.INFORMATION_FLOW, CAN_CREATE, RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testUseCase1, testUseCase1, testUseCase2, UMLElementTypes.INFORMATION_FLOW, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateInformationfloweBetweenClasses2InPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.INFORMATION_FLOW, CAN_CREATE, RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.INFORMATION_FLOW, CAN_CREATE, RESULT_EXPECTED, null);
}
/* INTERFACE_REALIZATION test cases */
@Test
public void testCreateInterfaceRealizationBetweenUseCases2InUseCase() throws Exception {
- runCreationRelationshipTest(testUseCase1, testUseCase1, testUseCase2, UMLElementTypes.INTERFACE_REALIZATION, CAN_CREATE, RESULT_NOT_EXPECTED,null);
+ runCreationRelationshipTest(testUseCase1, testUseCase1, testUseCase2, UMLElementTypes.INTERFACE_REALIZATION, CAN_CREATE, RESULT_NOT_EXPECTED, null);
}
@Test
public void testCreateInterfaceRealizationBetweenClassAndInterfaceInClass() throws Exception {
- runCreationRelationshipTest(testClass1, testClass1, testInterface1, UMLElementTypes.INTERFACE_REALIZATION, CAN_CREATE, RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testClass1, testClass1, testInterface1, UMLElementTypes.INTERFACE_REALIZATION, CAN_CREATE, RESULT_EXPECTED, null);
}
@@ -391,61 +391,61 @@ public class CreateRelationshipTest extends AbstractCreateRelationshipTest {
/* MANIFESTATION test cases */
@Test // OK
public void testCreateManifestationBetweenArtifactAndPackage2InArtifact() throws Exception {
- runCreationRelationshipTest(testArtifact1, testArtifact1, testPackage1, UMLElementTypes.MANIFESTATION, CAN_CREATE, RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testArtifact1, testArtifact1, testPackage1, UMLElementTypes.MANIFESTATION, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test // OK
public void testCreateManifestationBetweenClassAndPackage2InArtifact() throws Exception {
- runCreationRelationshipTest(testArtifact1, testClass1, testPackage1, UMLElementTypes.MANIFESTATION, CAN_CREATE, RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testArtifact1, testClass1, testPackage1, UMLElementTypes.MANIFESTATION, CAN_CREATE, RESULT_EXPECTED, null);
}
- /* PACKAGE_IMPORT test cases */
+ /* PACKAGE_IMPORT test cases */
@Test
public void testCreatePackageImportBetweenPackageAndPackageInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testPackage1, testPackage2, UMLElementTypes.PACKAGE_IMPORT, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testPackage1, testPackage2, UMLElementTypes.PACKAGE_IMPORT, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreatePackageImportBetweenPackageAndPackageInPackage2() throws Exception {
- runCreationRelationshipTest(testClass1, testPackage1, testPackage2, UMLElementTypes.PACKAGE_IMPORT, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testClass1, testPackage1, testPackage2, UMLElementTypes.PACKAGE_IMPORT, CAN_CREATE, RESULT_EXPECTED, null);
}
- /* PACKAGE_MERGE test cases */
+ /* PACKAGE_MERGE test cases */
@Test
public void testCreatePackageMergeBetweenPackageAndPackageInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testPackage1, testPackage2, UMLElementTypes.PACKAGE_MERGE, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testPackage1, testPackage2, UMLElementTypes.PACKAGE_MERGE, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreatePackageMergeBetweenPackageAndPackageInPackage2() throws Exception {
- runCreationRelationshipTest(testClass1, testPackage1, testPackage2, UMLElementTypes.PACKAGE_MERGE, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testClass1, testPackage1, testPackage2, UMLElementTypes.PACKAGE_MERGE, CAN_CREATE, RESULT_EXPECTED, null);
}
- /* PROTOCOL_CONFORMANCE test cases */
+ /* PROTOCOL_CONFORMANCE test cases */
@Test
public void testCreateProtocolConformanceBetweenPackageAndPackageInPackage() throws Exception {
- runCreationRelationshipTest(protocolStateMachine1, protocolStateMachine1, protocolStateMachine2, UMLElementTypes.PROTOCOL_CONFORMANCE, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(protocolStateMachine1, protocolStateMachine1, protocolStateMachine2, UMLElementTypes.PROTOCOL_CONFORMANCE, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateProtocolConformanceBetweenPackageAndPackageInPackage2() throws Exception {
- runCreationRelationshipTest(testClass1, testPackage1, testPackage2, UMLElementTypes.PROTOCOL_CONFORMANCE, CAN_NOT_CREATE,RESULT_NOT_EXPECTED,null);
+ runCreationRelationshipTest(testClass1, testPackage1, testPackage2, UMLElementTypes.PROTOCOL_CONFORMANCE, CAN_NOT_CREATE, RESULT_NOT_EXPECTED, null);
}
/* REALIZATION test cases */
@Test
public void testCreateRealizationBetweenClassesInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.REALIZATION, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.REALIZATION, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateRealizationBetweenClassAndNullInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, null , UMLElementTypes.REALIZATION, CAN_CREATE, RESULT_NOT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, null, UMLElementTypes.REALIZATION, CAN_CREATE, RESULT_NOT_EXPECTED, null);
}
@@ -453,47 +453,47 @@ public class CreateRelationshipTest extends AbstractCreateRelationshipTest {
/* REFINE test cases */
@Test
public void testCreateRefineBetweenClassesInClass() throws Exception {
- runCreationRelationshipTest(testClass1, testClass1, testClass2, UMLElementTypes.REFINE, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testClass1, testClass1, testClass2, UMLElementTypes.REFINE, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateRefineBetweenClassesInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.REFINE, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.REFINE, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateRefineBetweenClassAndNullInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, null , UMLElementTypes.REFINE, CAN_CREATE, RESULT_NOT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, null, UMLElementTypes.REFINE, CAN_CREATE, RESULT_NOT_EXPECTED, null);
}
/* TRACE test cases */
@Test
public void testCreateTraceBetweenClassesInClass() throws Exception {
- runCreationRelationshipTest(testClass1, testClass1, testClass2, UMLElementTypes.TRACE, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testClass1, testClass1, testClass2, UMLElementTypes.TRACE, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateTraceBetweenClassesInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.TRACE, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.TRACE, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateTraceBetweenClassAndNullInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, null , UMLElementTypes.TRACE, CAN_CREATE, RESULT_NOT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, null, UMLElementTypes.TRACE, CAN_CREATE, RESULT_NOT_EXPECTED, null);
}
/* SUBSTITUTION test cases */
@Test
public void testCreateSubstitutionBetweenClassesInPackage() throws Exception {
- runCreationRelationshipTest(testClass1, testClass1, testClass2, UMLElementTypes.SUBSTITUTION, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testClass1, testClass1, testClass2, UMLElementTypes.SUBSTITUTION, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateSubstitutionBetweenClassAndNullInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, null , UMLElementTypes.SUBSTITUTION, CAN_CREATE, RESULT_NOT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, null, UMLElementTypes.SUBSTITUTION, CAN_CREATE, RESULT_NOT_EXPECTED, null);
}
@@ -501,12 +501,12 @@ public class CreateRelationshipTest extends AbstractCreateRelationshipTest {
/* USAGE test cases */
@Test
public void testCreateUsageBetweenClassesInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.USAGE, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, testClass2, UMLElementTypes.USAGE, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateUsageBetweenClassAndNullInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, null , UMLElementTypes.USAGE, CAN_CREATE, RESULT_NOT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, null, UMLElementTypes.USAGE, CAN_CREATE, RESULT_NOT_EXPECTED, null);
}
@@ -515,12 +515,12 @@ public class CreateRelationshipTest extends AbstractCreateRelationshipTest {
/* ASSOCIATION test cases */
@Test
public void testCreateAssociationBetweenClassesInPackage() throws Exception {
- runCreationRelationshipTest(testClass1, testClass1, testClass2, UMLElementTypes.ASSOCIATION, CAN_CREATE,RESULT_EXPECTED,null);
+ runCreationRelationshipTest(testClass1, testClass1, testClass2, UMLElementTypes.ASSOCIATION, CAN_CREATE, RESULT_EXPECTED, null);
}
@Test
public void testCreateAssociationBetweenClassAndNullInPackage() throws Exception {
- runCreationRelationshipTest(testPackage1, testClass1, null , UMLElementTypes.ASSOCIATION, CAN_CREATE, RESULT_NOT_EXPECTED,null);
+ runCreationRelationshipTest(testPackage1, testClass1, null, UMLElementTypes.ASSOCIATION, CAN_CREATE, RESULT_NOT_EXPECTED, null);
}
@@ -540,24 +540,28 @@ public class CreateRelationshipTest extends AbstractCreateRelationshipTest {
/* TRANSITION test cases */
- @Test @Ignore //TODO - enable when the issue is fixed
+ @Test
+ @Ignore // TODO - enable when the issue is fixed
public void testCreateTransitionBetweenInitialAndState() throws Exception {
- runCreationRelationshipTest(null, initialState, state1 , UMLElementTypes.TRANSITION, CAN_CREATE, RESULT_EXPECTED,new AuxTransitionTests());
+ runCreationRelationshipTest(null, initialState, state1, UMLElementTypes.TRANSITION, CAN_CREATE, RESULT_EXPECTED, new AuxTransitionTests());
}
- @Test @Ignore //TODO - enable when the issue is fixed
+ @Test
+ @Ignore // TODO - enable when the issue is fixed
public void testCreateTransitionBetweenStateAndInitial() throws Exception {
- runCreationRelationshipTest(null, state1, initialState , UMLElementTypes.TRANSITION, CAN_CREATE, RESULT_NOT_EXPECTED,new AuxTransitionTests());
+ runCreationRelationshipTest(null, state1, initialState, UMLElementTypes.TRANSITION, CAN_CREATE, RESULT_NOT_EXPECTED, new AuxTransitionTests());
}
- @Test @Ignore //TODO - enable when the issue is fixed
+ @Test
+ @Ignore // TODO - enable when the issue is fixed
public void testCreateTransitionBetweenStateAndFinal() throws Exception {
- runCreationRelationshipTest(null, state1, finalState , UMLElementTypes.TRANSITION, CAN_CREATE, RESULT_EXPECTED,new AuxTransitionTests());
+ runCreationRelationshipTest(null, state1, finalState, UMLElementTypes.TRANSITION, CAN_CREATE, RESULT_EXPECTED, new AuxTransitionTests());
}
- @Test @Ignore //TODO - enable when the issue is fixed
+ @Test
+ @Ignore // TODO - enable when the issue is fixed
public void testCreateTransitionBetweenFinalAndState() throws Exception {
- runCreationRelationshipTest(null, finalState, state1 , UMLElementTypes.TRANSITION, CAN_CREATE, RESULT_NOT_EXPECTED,new AuxTransitionTests());
+ runCreationRelationshipTest(null, finalState, state1, UMLElementTypes.TRANSITION, CAN_CREATE, RESULT_NOT_EXPECTED, new AuxTransitionTests());
}
@@ -593,25 +597,26 @@ public class CreateRelationshipTest extends AbstractCreateRelationshipTest {
* @throws Exception
* exception thrown if anything goes wrong
*/
- protected void runCreationRelationshipTest(EObject container, EObject source, EObject target, IHintedType hintedType, boolean canCreate, boolean resultExpected,IAuxTest aux) throws Exception {
+ @Override
+ protected void runCreationRelationshipTest(EObject container, EObject source, EObject target, IHintedType hintedType, boolean canCreate, boolean resultExpected, IAuxTest aux) throws Exception {
Assert.assertTrue("Editor should not be dirty before test", !openPapyrusEditor.isDirty());
Command command = getCreateRelationshipCommand(container, source, target, hintedType, canCreate);
// command has been tested when created. Runs the test if it is possible
- if(canCreate) {
- transactionalEditingDomain.getCommandStack().execute(command);
+ if (canCreate) {
+ transactionalEditingDomain.getCommandStack().execute(command);
Collection<?> commandResult = command.getResult();
if (commandResult.isEmpty() && resultExpected) {
Assert.fail("Command should have a non-empty result");
- }
+ }
if (!commandResult.isEmpty() && !resultExpected) {
Assert.fail("Command should have a empty result");
- }
+ }
if (aux != null && !commandResult.isEmpty()) {
- aux.test(container,source,target,hintedType,commandResult);
+ aux.test(container, source, target, hintedType, commandResult);
}
if (resultExpected) {
@@ -626,52 +631,53 @@ public class CreateRelationshipTest extends AbstractCreateRelationshipTest {
if (openPapyrusEditor.isDirty()) {
transactionalEditingDomain.getCommandStack().undo();
- }
+ }
Assert.assertTrue("Editor should not be dirty after test", !openPapyrusEditor.isDirty());
- }
+ }
}
/**
* Creates the relationship in the given owner element, between the source and target elements, undo and redo the action
*
* @param container
- * container of the new element
+ * container of the new element
* @param source
- * the source of the relationship
+ * the source of the relationship
* @param target
- * the target of the relationship
+ * the target of the relationship
* @param hintedType
- * type of the new element
+ * type of the new element
* @param canCreate
- * <code>true</code> if new element can be created in the specified owner
- *
+ * <code>true</code> if new element can be created in the specified owner
+ *
* @return the command
*/
+ @Override
protected Command getCreateRelationshipCommand(EObject container, EObject source, EObject target, IHintedType hintedType, boolean canCreate) throws ServiceException {
- // getCommandprovider from any of the non null EObject
+ // getCommandprovider from any of the non null EObject
TransactionalEditingDomain transactionalEditingDomain = null;
- if(source!=null) {
+ if (source != null) {
transactionalEditingDomain = ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(source);
- } else if(target!=null) {
+ } else if (target != null) {
transactionalEditingDomain = ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(target);
- } else if(container!=null) {
+ } else if (container != null) {
transactionalEditingDomain = ServiceUtilsForEObject.getInstance().getTransactionalEditingDomain(container);
} else {
fail("impossible to run the test with null parameters");
}
- ICommand command = buildWrappedRelationshipCommand(transactionalEditingDomain,hintedType,source,target,null);
+ ICommand command = buildWrappedRelationshipCommand(transactionalEditingDomain, hintedType, source, target, null);
// test if the command is enable and compare with the canCreate parameter
boolean canExecute = command.canExecute();
- if(canExecute) {
+ if (canExecute) {
if (!(command instanceof SetTargetAndRelationshipCommand)) {
assertTrue("Command should be a SetTargetAndRelationshipCommand", command instanceof SetTargetAndRelationshipCommand);
}
// executable but was expected as not executable
- if(!canCreate) {
+ if (!canCreate) {
fail("Creation command is executable but it was expected as not executable");
} else {
// command is executable, and it was expected to => run the creation
@@ -679,7 +685,7 @@ public class CreateRelationshipTest extends AbstractCreateRelationshipTest {
return emfCommand;
}
} else {
- if(canCreate) {
+ if (canCreate) {
fail("Creation command is not executable but it was expected to be executable");
}
}
@@ -696,10 +702,11 @@ public class CreateRelationshipTest extends AbstractCreateRelationshipTest {
* @param reference
* @return
*/
- protected ICommand buildWrappedRelationshipCommand(TransactionalEditingDomain ted, IElementType elementType, EObject source,EObject target, EReference reference) {
+ @Override
+ protected ICommand buildWrappedRelationshipCommand(TransactionalEditingDomain ted, IElementType elementType, EObject source, EObject target, EReference reference) {
IElementEditService serviceProvider = ElementEditServiceUtils.getCommandProvider(elementType);
ITreeSelectorDialog dialog = new TestTargetSelectionDialog(target);
- SetTargetAndRelationshipCommand createGMFCommand = new SetTargetAndRelationshipCommand(ted, "Create "+elementType.getDisplayName(),serviceProvider,reference, source, elementType,dialog);
+ SetTargetAndRelationshipCommand createGMFCommand = new SetTargetAndRelationshipCommand(ted, "Create " + elementType.getDisplayName(), serviceProvider, reference, source, elementType, dialog);
return createGMFCommand;
}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/MoveElementTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/MoveElementTest.java
index ee8435ca035..524c455e1a4 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/MoveElementTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/MoveElementTest.java
@@ -12,7 +12,7 @@
* Christian W. Damus - bug 468071
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.service.types.tests.creation;
+package org.eclipse.papyrus.uml.service.types.ui.tests.creation;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -98,7 +98,7 @@ public class MoveElementTest extends AbstractPapyrusTest {
// import test model
try {
- copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(createProject, Platform.getBundle("org.eclipse.papyrus.uml.service.types"), "/resource/", "TestModel");
+ copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(createProject, Platform.getBundle("org.eclipse.papyrus.uml.service.types.ui"), "/resource/", "TestModel");
} catch (CoreException e) {
fail(e.getMessage());
} catch (IOException e) {
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/SetFeatureTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/SetFeatureTest.java
index 6b5274e0b05..b74284b3f31 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/SetFeatureTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/SetFeatureTest.java
@@ -12,7 +12,7 @@
* Christian W. Damus - bug 468071
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.service.types.tests.creation;
+package org.eclipse.papyrus.uml.service.types.ui.tests.creation;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -99,7 +99,7 @@ public class SetFeatureTest extends AbstractPapyrusTest {
// import test model
try {
- copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(createProject, Platform.getBundle("org.eclipse.papyrus.uml.service.types"), "/resource/", "TestModel");
+ copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(createProject, Platform.getBundle("org.eclipse.papyrus.uml.service.types.ui"), "/resource/", "TestModel");
} catch (CoreException e) {
fail(e.getMessage());
} catch (IOException e) {
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/auxtests/AuxTransitionTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/auxtests/AuxTransitionTests.java
index 5e8fc99d851..de5f4de066c 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/auxtests/AuxTransitionTests.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/auxtests/AuxTransitionTests.java
@@ -11,7 +11,7 @@
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.service.types.tests.creation.auxtests;
+package org.eclipse.papyrus.uml.service.types.ui.tests.creation.auxtests;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/auxtests/IAuxTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/auxtests/IAuxTest.java
index 126587999db..744281d7733 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/auxtests/IAuxTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/auxtests/IAuxTest.java
@@ -11,7 +11,7 @@
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.service.types.tests.creation.auxtests;
+package org.eclipse.papyrus.uml.service.types.ui.tests.creation.auxtests;
import java.util.Collection;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeleteAssociationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/deletion/DeleteAssociationTest.java
index b3ea061e300..5a85f4e4ebc 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeleteAssociationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/deletion/DeleteAssociationTest.java
@@ -11,7 +11,7 @@
*
*****************************************************************************/
-package org.eclipse.papyrus.uml.service.types.tests.deletion;
+package org.eclipse.papyrus.uml.service.types.ui.tests.deletion;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/suites/AllTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/suites/AllTests.java
new file mode 100644
index 00000000000..076c555ed22
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/suites/AllTests.java
@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ * Christian W. Damus - bugs 458685, 468071, 465899, 478314, 485220
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.service.types.ui.tests.suites;
+
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.eclipse.papyrus.uml.service.types.ui.tests.creation.CreateElementTest;
+import org.eclipse.papyrus.uml.service.types.ui.tests.creation.CreateProfileRelationshipTest;
+import org.eclipse.papyrus.uml.service.types.ui.tests.creation.CreateRelationshipTest;
+import org.eclipse.papyrus.uml.service.types.ui.tests.creation.MoveElementTest;
+import org.eclipse.papyrus.uml.service.types.ui.tests.creation.SetFeatureTest;
+import org.eclipse.papyrus.uml.service.types.ui.tests.deletion.DeleteAssociationTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * Main Test suite.
+ */
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+ // TestElementTypeRegistryContent.class,
+ CreateElementTest.class,
+ CreateRelationshipTest.class,
+ CreateProfileRelationshipTest.class,
+ MoveElementTest.class,
+ SetFeatureTest.class,
+ DeleteAssociationTest.class,
+})
+public class AllTests {
+ // JUnit 4 Test Suite
+}
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/PropertyGrammarTests.launch b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/PropertyGrammarTests.launch
index c9b79fa7bb6..49279316ab9 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/PropertyGrammarTests.launch
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/PropertyGrammarTests.launch
@@ -33,7 +33,7 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="ca.odell.glazedlists@default:default,ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.gerrit.common@default:default,com.google.gerrit.prettify@default:default,com.google.gerrit.reviewdb@default:default,com.google.gson@default:default,com.google.guava@default:default,com.google.gwt.servlet@default:default,com.google.gwtjsonrpc@default:default,com.google.gwtorm@default:default,com.google.inject.multibindings@default:false,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.mountainminds.eclemma.asm@default:default,com.mountainminds.eclemma.core@default:default,com.mountainminds.eclemma.debug.ui.compatibility@default:default,com.mountainminds.eclemma.doc@default:default,com.mountainminds.eclemma.ui@default:default,com.sun.el@default:default,edu.umd.cs.findbugs.plugin.eclipse@default:default,javaewah@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.servlet*3.1.0.v201410161800@default:default,javax.servlet.jsp@default:default,javax.xml@default:default,lpg.runtime.java@default:default,net.sf.eclipsecs.branding@default:default,net.sf.eclipsecs.checkstyle@default:default,net.sf.eclipsecs.core@default:default,net.sf.eclipsecs.doc@default:default,net.sf.eclipsecs.ui@default:default,org.antlr.runtime@default:default,org.apache.ant*1.9.4.v201410062020@default:default,org.apache.ant*1.9.4.v201504302020@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.compress@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.math@default:default,org.apache.commons.pool@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.solr.client.solrj@default:default,org.apache.ws.commons.util@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlrpc@default:default,org.eclipse.aether.api@default:default,org.eclipse.aether.connector.basic@default:default,org.eclipse.aether.impl@default:default,org.eclipse.aether.maven@default:default,org.eclipse.aether.spi@default:default,org.eclipse.aether.transport.file@default:default,org.eclipse.aether.transport.http@default:default,org.eclipse.aether.util@default:default,org.eclipse.ant.core*3.4.0.v20150304-0921@default:default,org.eclipse.ant.core*3.4.0.v20150428-1928@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.buckminster.ant@default:default,org.eclipse.buckminster.cmdline@default:default,org.eclipse.buckminster.core@default:default,org.eclipse.buckminster.download@default:default,org.eclipse.buckminster.executor@default:default,org.eclipse.buckminster.fetcher@default:default,org.eclipse.buckminster.generic.ui@default:default,org.eclipse.buckminster.generic@default:default,org.eclipse.buckminster.git@default:default,org.eclipse.buckminster.installer@default:default,org.eclipse.buckminster.jarprocessor@default:default,org.eclipse.buckminster.jdt@default:default,org.eclipse.buckminster.junit@default:default,org.eclipse.buckminster.model.common.edit@default:default,org.eclipse.buckminster.model.common@default:default,org.eclipse.buckminster.mspec.edit@default:default,org.eclipse.buckminster.mspec.editor@default:default,org.eclipse.buckminster.mspec@default:default,org.eclipse.buckminster.osgi.filter@default:default,org.eclipse.buckminster.pde.ui@default:default,org.eclipse.buckminster.pde@default:default,org.eclipse.buckminster.rmap.edit@default:default,org.eclipse.buckminster.rmap.editor@default:default,org.eclipse.buckminster.rmap.pde.edit@default:default,org.eclipse.buckminster.rmap.pde@default:default,org.eclipse.buckminster.rmap@default:default,org.eclipse.buckminster.runtime@default:default,org.eclipse.buckminster.sax@default:default,org.eclipse.buckminster.ui.dependency.visualizer@default:default,org.eclipse.buckminster.ui@default:default,org.eclipse.compare*3.5.600.v20141216-1556@default:default,org.eclipse.compare*3.5.600.v20150420-1449@default:default,org.eclipse.compare.core*3.5.500.v20141202-1337@default:default,org.eclipse.compare.core*3.5.500.v20150505-1058@default:default,org.eclipse.compare.win32@default:default,org.eclipse.core.commands*3.6.100.v20150311-0214@default:default,org.eclipse.core.commands*3.7.0.v20150422-0725@default:default,org.eclipse.core.contenttype*3.4.200.v20150316-1243@default:default,org.eclipse.core.contenttype*3.5.0.v20150421-2214@default:default,org.eclipse.core.databinding*1.4.100.v20150311-0216@default:default,org.eclipse.core.databinding*1.5.0.v20150422-0725@default:default,org.eclipse.core.databinding.beans*1.2.200.v20150311-0217@default:default,org.eclipse.core.databinding.beans*1.3.0.v20150422-0725@default:default,org.eclipse.core.databinding.observable*1.4.1.v20150311-0218@default:default,org.eclipse.core.databinding.observable*1.5.0.v20150422-0725@default:default,org.eclipse.core.databinding.property*1.4.200.v20150311-0218@default:default,org.eclipse.core.databinding.property*1.5.0.v20150422-0725@default:default,org.eclipse.core.expressions*3.4.600.v20150316-1244@default:default,org.eclipse.core.expressions*3.5.0.v20150421-2214@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem*1.5.0.v20150313-1707@default:default,org.eclipse.core.filesystem*1.5.0.v20150421-0713@default:default,org.eclipse.core.filesystem.java7*1.0.0.v20150304-0027@default:false,org.eclipse.core.filesystem.java7*1.0.100.v20150423-0754@default:false,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.jobs*3.7.0.v20150316-1238@default:default,org.eclipse.core.jobs*3.7.0.v20150330-2103@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources*3.10.0.v20150423-0755@default:default,org.eclipse.core.resources*3.9.100.v20150313-1707@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.runtime*3.11.0.v20150316-1241@default:true,org.eclipse.core.runtime*3.11.0.v20150405-1723@default:true,org.eclipse.core.runtime.compatibility*3.2.200.v20150218-1001@default:default,org.eclipse.core.runtime.compatibility*3.2.300.v20150423-0821@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.variables@default:default,org.eclipse.cvs*1.4.200.v20150430-1445@default:default,org.eclipse.cvs*1.4.200.v20150514-1000@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui*3.11.0.v20150303-1130@default:default,org.eclipse.debug.ui*3.11.0.v20150514-0917@default:default,org.eclipse.draw2d*3.10.0.201505040206@default:default,org.eclipse.draw2d*3.10.0.201505170205@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.e4.core.commands*0.10.2.v20150313-1340@default:default,org.eclipse.e4.core.commands*0.11.0.v20150422-0725@default:default,org.eclipse.e4.core.contexts*1.3.100.v20150316-1240@default:default,org.eclipse.e4.core.contexts*1.4.0.v20150421-2214@default:default,org.eclipse.e4.core.di*1.4.0.v20150316-1236@default:default,org.eclipse.e4.core.di*1.5.0.v20150421-2214@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions*0.12.0.v20150316-124