Bug 580638: [Sirius][ClassDiagram][Tests] Check that tested Sirius ClassDiagram are unsynchronized.
-remove some broken Papyrus model
-set all Sirius diagram as Unsynchronized
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
Change-Id: I78124c71d90d091d389b6164dd78b2fa9c320fc6
diff --git a/plugins/doc/org.eclipse.papyrus.sirius.doc/src/site/mediawiki/papyrus-sirius-devDoc.mediawiki b/plugins/doc/org.eclipse.papyrus.sirius.doc/src/site/mediawiki/papyrus-sirius-devDoc.mediawiki
index f54097e..d5b8826 100755
--- a/plugins/doc/org.eclipse.papyrus.sirius.doc/src/site/mediawiki/papyrus-sirius-devDoc.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.sirius.doc/src/site/mediawiki/papyrus-sirius-devDoc.mediawiki
@@ -320,8 +320,11 @@
Code in org.eclipse.papyrus.sirius.uml.diagram.textedit override classic editpart to add an xtext parser on each label edition.
-= Test coverage =
+= Tests =
+==How to ensure new plugins/features are well configured?==
+Each new feature must be added as extra requirements in the pom.xml of the plugin '''org.eclipse.papyrus.sirius.bundles.tests''' to ensure that all plugins provided by the new feature is well configured (about.xml, min/max for dependencies ...)
+== Test coverage ==
The common method to create new tests for sirius diagram is located in org.eclipse.papyrus.sirius.junit.utils. In this plugin, the SiriusDiagramEditorFixture provide all the method to load model, ope session, tests tools that will be used in the several test case.
Each specific diagram is tested in a specific plugin. Those tests include:
@@ -331,6 +334,8 @@
* Drag and Drop tools tests
* Deletion
+Each test should check the state of the tested diagram (synchronized/unsynchronized), to ensure that the test is executed on the expected diagram configuration.
+
= ClassDiagram =
==AssociationClass==
This element is quite difficult to represent. Its representation is composed with two edges and one node:
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/TopNode_Class_CreationTest.di b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/TopNode_Class_CreationTest.di
deleted file mode 100755
index 8c549ee..0000000
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/TopNode_Class_CreationTest.di
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/TopNode_Class_CreationTest.notation b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/TopNode_Class_CreationTest.notation
deleted file mode 100755
index bf9abab..0000000
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/TopNode_Class_CreationTest.notation
+++ /dev/null
@@ -1,2 +0,0 @@
-<?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.sirius.uml.diagram.clazz.tests/resources/creation/edges/common/Edge_CreationTest.aird b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/edges/common/Edge_CreationTest.aird
index afd07af..f233914 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/edges/common/Edge_CreationTest.aird
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/edges/common/Edge_CreationTest.aird
@@ -22,7 +22,7 @@
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.papyrus.sirius.uml.diagram.sequence/description/papyrus_sequence.odesign#//@ownedViewpoints[name='SequenceDiagram']"/>
</ownedViews>
</viewpoint:DAnalysis>
- <diagram:DSemanticDiagram uid="_m7ijgInOEey4m6SbQ_ztBA" synchronized="false">>
+ <diagram:DSemanticDiagram uid="_m7ijgInOEey4m6SbQ_ztBA" synchronized="false">
<eAnnotations xmi:type="description:DAnnotation" uid="_nADQEInOEey4m6SbQ_ztBA" source="Papyrus-SiriusDiagram">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nADQEYnOEey4m6SbQ_ztBA" key="Papyrus-SiriusDiagram-ImplementationId" value="org.eclipse.papyrus.sirius.uml.diagram.class"/>
</eAnnotations>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/subNodes/instancespecificationSubNodes/instancespecificationSubNodes.aird b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/subNodes/instancespecificationSubNodes/instancespecificationSubNodes.aird
index 901685f..1c0b068 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/subNodes/instancespecificationSubNodes/instancespecificationSubNodes.aird
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/subNodes/instancespecificationSubNodes/instancespecificationSubNodes.aird
@@ -22,7 +22,7 @@
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.papyrus.sirius.uml.diagram.statemachine/description/papyrus_statemachine.odesign#//@ownedViewpoints[name='StateMachineDiagram']"/>
</ownedViews>
</viewpoint:DAnalysis>
- <diagram:DSemanticDiagram uid="_SAlm8J4vEey_eICVHohATA">
+ <diagram:DSemanticDiagram uid="_SAlm8J4vEey_eICVHohATA" synchronized="false">
<eAnnotations xmi:type="description:DAnnotation" uid="_SC7JQJ4vEey_eICVHohATA" source="Papyrus-SiriusDiagram">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SC7JQZ4vEey_eICVHohATA" key="Papyrus-SiriusDiagram-ImplementationId" value="org.eclipse.papyrus.sirius.uml.diagram.class"/>
</eAnnotations>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/subNodes/signalSubNodes/signalSubNodes.aird b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/subNodes/signalSubNodes/signalSubNodes.aird
index 1b7295b..2fda2b7 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/subNodes/signalSubNodes/signalSubNodes.aird
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/subNodes/signalSubNodes/signalSubNodes.aird
@@ -22,7 +22,7 @@
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.papyrus.sirius.uml.diagram.sequence/description/papyrus_sequence.odesign#//@ownedViewpoints[name='SequenceDiagram']"/>
</ownedViews>
</viewpoint:DAnalysis>
- <diagram:DSemanticDiagram uid="_y00HsJPLEeyIXLbp7yFc_w">
+ <diagram:DSemanticDiagram uid="_y00HsJPLEeyIXLbp7yFc_w" synchronized="false">
<eAnnotations xmi:type="description:DAnnotation" uid="_y2gw0pPLEeyIXLbp7yFc_w" source="Papyrus-SiriusDiagram">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_y2gw05PLEeyIXLbp7yFc_w" key="Papyrus-SiriusDiagram-ImplementationId" value="org.eclipse.papyrus.sirius.uml.diagram.class"/>
</eAnnotations>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/topNodes/TopNode_CreationTest.aird b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/topNodes/TopNode_CreationTest.aird
index de88b3d..93b6960 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/topNodes/TopNode_CreationTest.aird
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/creation/topNodes/TopNode_CreationTest.aird
@@ -22,7 +22,7 @@
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.papyrus.sirius.uml.diagram.statemachine/description/papyrus_statemachine.odesign#//@ownedViewpoints[name='StateMachineDiagram']"/>
</ownedViews>
</viewpoint:DAnalysis>
- <diagram:DSemanticDiagram uid="_xjCPkDctEeySVJ5jrKIH0A">
+ <diagram:DSemanticDiagram uid="_xjCPkDctEeySVJ5jrKIH0A" synchronized="false">
<eAnnotations xmi:type="description:DAnnotation" uid="_xl4vQjctEeySVJ5jrKIH0A" source="Papyrus-SiriusDiagram">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xl4vQzctEeySVJ5jrKIH0A" key="Papyrus-SiriusDiagram-ImplementationId" value="org.eclipse.papyrus.sirius.uml.diagram.class"/>
</eAnnotations>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/edges/abstraction/Edge_Abstraction_DeleteSemanticTest.aird b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/edges/abstraction/Edge_Abstraction_DeleteSemanticTest.aird
index 6a7b0e0..99deb08 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/edges/abstraction/Edge_Abstraction_DeleteSemanticTest.aird
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/edges/abstraction/Edge_Abstraction_DeleteSemanticTest.aird
@@ -22,7 +22,7 @@
</ownedRepresentationDescriptors>
</ownedViews>
</viewpoint:DAnalysis>
- <diagram:DSemanticDiagram uid="_lCErgEkXEeyHOvMI38kLoA">
+ <diagram:DSemanticDiagram uid="_lCErgEkXEeyHOvMI38kLoA" synchronized="false">
<eAnnotations xmi:type="description:DAnnotation" uid="_lDQ-UkkXEeyHOvMI38kLoA" source="Papyrus-SiriusDiagram">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_lDQ-U0kXEeyHOvMI38kLoA" key="Papyrus-SiriusDiagram-ImplementationId" value="org.eclipse.papyrus.sirius.uml.diagram.class"/>
</eAnnotations>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/edges/dependency/Edge_Dependency_DeleteSemanticTest.aird b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/edges/dependency/Edge_Dependency_DeleteSemanticTest.aird
index 618a8ef..b28a392 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/edges/dependency/Edge_Dependency_DeleteSemanticTest.aird
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/edges/dependency/Edge_Dependency_DeleteSemanticTest.aird
@@ -22,7 +22,7 @@
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.papyrus.sirius.uml.diagram.sequence/description/papyrus_sequence.odesign#//@ownedViewpoints[name='SequenceDiagram']"/>
</ownedViews>
</viewpoint:DAnalysis>
- <diagram:DSemanticDiagram uid="_tIwg0DcmEey1v5ZgfkSlPg">
+ <diagram:DSemanticDiagram uid="_tIwg0DcmEey1v5ZgfkSlPg" synchronized="false">
<eAnnotations xmi:type="description:DAnnotation" uid="_tJ-BwjcmEey1v5ZgfkSlPg" source="Papyrus-SiriusDiagram">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tJ-BwzcmEey1v5ZgfkSlPg" key="Papyrus-SiriusDiagram-ImplementationId" value="org.eclipse.papyrus.sirius.uml.diagram.class"/>
</eAnnotations>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/edges/generalization/Edge_Generalization_DeleteSemanticTest.aird b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/edges/generalization/Edge_Generalization_DeleteSemanticTest.aird
index b3ded85..1328cfb 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/edges/generalization/Edge_Generalization_DeleteSemanticTest.aird
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/edges/generalization/Edge_Generalization_DeleteSemanticTest.aird
@@ -22,7 +22,7 @@
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.papyrus.sirius.uml.diagram.sequence/description/papyrus_sequence.odesign#//@ownedViewpoints[name='SequenceDiagram']"/>
</ownedViews>
</viewpoint:DAnalysis>
- <diagram:DSemanticDiagram uid="_d5PNMDcnEey1v5ZgfkSlPg">
+ <diagram:DSemanticDiagram uid="_d5PNMDcnEey1v5ZgfkSlPg" synchronized="false">
<eAnnotations xmi:type="description:DAnnotation" uid="_d6cuIDcnEey1v5ZgfkSlPg" source="Papyrus-SiriusDiagram">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_d6cuITcnEey1v5ZgfkSlPg" key="Papyrus-SiriusDiagram-ImplementationId" value="org.eclipse.papyrus.sirius.uml.diagram.class"/>
</eAnnotations>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/edges/informationFlow/Edge_InformationFlow_DeleteSemanticTest.aird b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/edges/informationFlow/Edge_InformationFlow_DeleteSemanticTest.aird
index d95c48f..40a1915 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/edges/informationFlow/Edge_InformationFlow_DeleteSemanticTest.aird
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/edges/informationFlow/Edge_InformationFlow_DeleteSemanticTest.aird
@@ -22,7 +22,7 @@
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.papyrus.sirius.uml.diagram.sequence/description/papyrus_sequence.odesign#//@ownedViewpoints[name='SequenceDiagram']"/>
</ownedViews>
</viewpoint:DAnalysis>
- <diagram:DSemanticDiagram uid="_pKh7QDcnEey1v5ZgfkSlPg">
+ <diagram:DSemanticDiagram uid="_pKh7QDcnEey1v5ZgfkSlPg" synchronized="false">
<eAnnotations xmi:type="description:DAnnotation" uid="_pLrx0jcnEey1v5ZgfkSlPg" source="Papyrus-SiriusDiagram">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pLrx0zcnEey1v5ZgfkSlPg" key="Papyrus-SiriusDiagram-ImplementationId" value="org.eclipse.papyrus.sirius.uml.diagram.class"/>
</eAnnotations>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/class/TopNode_Class_DeleteSemanticTest.aird b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/class/TopNode_Class_DeleteSemanticTest.aird
index 3ce159e..36546f2 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/class/TopNode_Class_DeleteSemanticTest.aird
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/class/TopNode_Class_DeleteSemanticTest.aird
@@ -22,7 +22,7 @@
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.papyrus.sirius.uml.diagram.sequence/description/papyrus_sequence.odesign#//@ownedViewpoints[name='SequenceDiagram']"/>
</ownedViews>
</viewpoint:DAnalysis>
- <diagram:DSemanticDiagram uid="_Bn3M0DcoEey1v5ZgfkSlPg">
+ <diagram:DSemanticDiagram uid="_Bn3M0DcoEey1v5ZgfkSlPg" synchronized="false">
<eAnnotations xmi:type="description:DAnnotation" uid="_BqfqEjcoEey1v5ZgfkSlPg" source="Papyrus-SiriusDiagram">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BqfqEzcoEey1v5ZgfkSlPg" key="Papyrus-SiriusDiagram-ImplementationId" value="org.eclipse.papyrus.sirius.uml.diagram.class"/>
</eAnnotations>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/comment/TopNode_Comment_DeleteSemanticTest.aird b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/comment/TopNode_Comment_DeleteSemanticTest.aird
index 78e2b7f..6fe61c8 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/comment/TopNode_Comment_DeleteSemanticTest.aird
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/comment/TopNode_Comment_DeleteSemanticTest.aird
@@ -22,7 +22,7 @@
</ownedRepresentationDescriptors>
</ownedViews>
</viewpoint:DAnalysis>
- <diagram:DSemanticDiagram uid="_u920oEkWEeyHOvMI38kLoA">
+ <diagram:DSemanticDiagram uid="_u920oEkWEeyHOvMI38kLoA" synchronized="false">
<eAnnotations xmi:type="description:DAnnotation" uid="_vAwXokkWEeyHOvMI38kLoA" source="Papyrus-SiriusDiagram">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vAwXo0kWEeyHOvMI38kLoA" key="Papyrus-SiriusDiagram-ImplementationId" value="org.eclipse.papyrus.sirius.uml.diagram.class"/>
</eAnnotations>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/dataType/TopNode_DataType_DeleteSemanticTest.aird b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/dataType/TopNode_DataType_DeleteSemanticTest.aird
index d0e32db..7e1652e 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/dataType/TopNode_DataType_DeleteSemanticTest.aird
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/dataType/TopNode_DataType_DeleteSemanticTest.aird
@@ -22,7 +22,7 @@
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.papyrus.sirius.uml.diagram.sequence/description/papyrus_sequence.odesign#//@ownedViewpoints[name='SequenceDiagram']"/>
</ownedViews>
</viewpoint:DAnalysis>
- <diagram:DSemanticDiagram uid="_2601QInPEey4m6SbQ_ztBA">
+ <diagram:DSemanticDiagram uid="_2601QInPEey4m6SbQ_ztBA" synchronized="false">
<eAnnotations xmi:type="description:DAnnotation" uid="_2-QjwInPEey4m6SbQ_ztBA" source="Papyrus-SiriusDiagram">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2-QjwYnPEey4m6SbQ_ztBA" key="Papyrus-SiriusDiagram-ImplementationId" value="org.eclipse.papyrus.sirius.uml.diagram.class"/>
</eAnnotations>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/durationObservation/TopNode_DurationObservation_DeleteSemanticTest.di b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/durationObservation/TopNode_DurationObservation_DeleteSemanticTest.di
deleted file mode 100755
index bf9abab..0000000
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/durationObservation/TopNode_DurationObservation_DeleteSemanticTest.di
+++ /dev/null
@@ -1,2 +0,0 @@
-<?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.sirius.uml.diagram.clazz.tests/resources/delete/nodes/package/TopNode_PackageWithSubNodes_DeleteSemanticTest.aird b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/package/TopNode_PackageWithSubNodes_DeleteSemanticTest.aird
index 32b2d6e..c4ce57e 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/package/TopNode_PackageWithSubNodes_DeleteSemanticTest.aird
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/resources/delete/nodes/package/TopNode_PackageWithSubNodes_DeleteSemanticTest.aird
@@ -22,7 +22,7 @@
</ownedRepresentationDescriptors>
</ownedViews>
</viewpoint:DAnalysis>
- <diagram:DSemanticDiagram uid="_X-uJ8EkXEeyHOvMI38kLoA">
+ <diagram:DSemanticDiagram uid="_X-uJ8EkXEeyHOvMI38kLoA" synchronized="false">
<eAnnotations xmi:type="description:DAnnotation" uid="_X_8R8UkXEeyHOvMI38kLoA" source="Papyrus-SiriusDiagram">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_X_8R8kkXEeyHOvMI38kLoA" key="Papyrus-SiriusDiagram-ImplementationId" value="org.eclipse.papyrus.sirius.uml.diagram.class"/>
</eAnnotations>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/AbstractSiriusDiagramTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/AbstractSiriusDiagramTests.java
new file mode 100755
index 0000000..1d8ac97
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/AbstractSiriusDiagramTests.java
@@ -0,0 +1,43 @@
+/*****************************************************************************
+ * Copyright (c) 2022 CEA LIST
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.sirius.uml.diagram.clazz.tests;
+
+import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.junit.Assert;
+import org.junit.Rule;
+
+/**
+ * Abstract tests to use for Sirius Diagram Tests
+ */
+public abstract class AbstractSiriusDiagramTests {//extends AbstractPapyrusTest {
+
+ /**
+ * The editor fixture
+ */
+ @Rule
+ public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture();
+
+ /**
+ * This method is used to check if the current diagram has the expected synchronization status
+ *
+ * @param isSynchronized
+ * <code>true</code> if the diagram must be synchronized
+ */
+ protected void checkSiriusDiagramSynchronization(final boolean isSynchronized) {
+ final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
+ Assert.assertNotNull("We don't found a Sirius active diagram", siriusDiagram); //$NON-NLS-1$
+ Assert.assertEquals("The synchronization status of the diagram is not the expected one", Boolean.valueOf(isSynchronized), Boolean.valueOf(siriusDiagram.isSynchronized())); //$NON-NLS-1$
+ }
+}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Abstraction_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Abstraction_CreationTest.java
index c9e7ab8..07f2f84 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Abstraction_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Abstraction_CreationTest.java
@@ -18,17 +18,14 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -36,24 +33,17 @@
*/
@PluginResource("resources/creation/edges/common/Edge_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_Abstraction_CreationTest extends AbstractPapyrusTest {
+public class Edge_Abstraction_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createAbstractionEdgeTest() {
- final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
- Assert.assertNotNull(siriusDiagram);
- Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
-
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
Assert.assertNotNull("The diagram edit part has not been found", diagramEditpart);
Diagram diagram = diagramEditpart.getDiagramView();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_AssociationClass_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_AssociationClass_CreationTest.java
index 1fa7212..40ea7d5 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_AssociationClass_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_AssociationClass_CreationTest.java
@@ -18,18 +18,16 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
import org.eclipse.sirius.diagram.DNodeContainer;
import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -37,20 +35,17 @@
*/
@PluginResource("resources/creation/edges/common/Edge_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_AssociationClass_CreationTest extends AbstractPapyrusTest {
+public class Edge_AssociationClass_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createAssociationClassEdgeTest() {
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
Assert.assertNotNull(siriusDiagram);
Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Association_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Association_CreationTest.java
index 4100935..d682762 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Association_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Association_CreationTest.java
@@ -18,17 +18,14 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -36,24 +33,17 @@
*/
@PluginResource("resources/creation/edges/common/Edge_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_Association_CreationTest extends AbstractPapyrusTest {
+public class Edge_Association_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createAssociationEdgeTest() {
- final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
- Assert.assertNotNull(siriusDiagram);
- Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
-
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
Assert.assertNotNull("The diagram edit part has not been found", diagramEditpart);
Diagram diagram = diagramEditpart.getDiagramView();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_CompositeAssociation_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_CompositeAssociation_CreationTest.java
index f8c186e..05465cc 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_CompositeAssociation_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_CompositeAssociation_CreationTest.java
@@ -17,11 +17,10 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
@@ -29,7 +28,6 @@
import org.eclipse.uml2.uml.AggregationKind;
import org.eclipse.uml2.uml.Association;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -37,20 +35,17 @@
*/
@PluginResource("resources/creation/edges/common/Edge_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_CompositeAssociation_CreationTest extends AbstractPapyrusTest {
+public class Edge_CompositeAssociation_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createCompositeAssociationEdgeTest() {
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
Assert.assertNotNull(siriusDiagram);
Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Containment_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Containment_CreationTest.java
index 06a216f..982eef9 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Containment_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Containment_CreationTest.java
@@ -17,11 +17,10 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
import org.eclipse.sirius.diagram.DNodeContainer;
import org.eclipse.sirius.diagram.EdgeTarget;
@@ -30,7 +29,6 @@
import org.eclipse.uml2.uml.Classifier;
import org.junit.Assert;
import org.junit.Ignore;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -38,22 +36,18 @@
*/
@PluginResource("resources/creation/edges/common/Edge_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_Containment_CreationTest extends AbstractPapyrusTest {
+public class Edge_Containment_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
@Ignore //TODO : this test is ignored because it is failing. The requirement about syncrhonization of diagrams changed and are not yet well defined
public void createContainmentEdgeTest() {
-
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
Assert.assertNotNull("The diagram edit part has not been found", diagramEditpart);
Diagram diagram = diagramEditpart.getDiagramView();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Dependency_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Dependency_CreationTest.java
index 07408c4..fde0f8a 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Dependency_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Dependency_CreationTest.java
@@ -17,17 +17,14 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -35,23 +32,17 @@
*/
@PluginResource("resources/creation/edges/common/Edge_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_Dependency_CreationTest extends AbstractPapyrusTest {
+public class Edge_Dependency_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createDependencyEdgeTest() {
- final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
- Assert.assertNotNull(siriusDiagram);
- Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
Assert.assertNotNull("The diagram edit part has not been found", diagramEditpart);
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_ElementImport_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_ElementImport_CreationTest.java
index 73025f6..6390162 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_ElementImport_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_ElementImport_CreationTest.java
@@ -17,21 +17,18 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
import org.eclipse.sirius.diagram.DNodeContainer;
-import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Classifier;
import org.eclipse.uml2.uml.ElementImport;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -39,23 +36,17 @@
*/
@PluginResource("resources/creation/edges/common/Edge_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_ElementImport_CreationTest extends AbstractPapyrusTest {
+public class Edge_ElementImport_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createElementImportEdgeTest() {
- final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
- Assert.assertNotNull(siriusDiagram);
- Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
Assert.assertNotNull("The diagram edit part has not been found", diagramEditpart);
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_GeneralizationSet_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_GeneralizationSet_CreationTest.java
index abcd446..30459d3 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_GeneralizationSet_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_GeneralizationSet_CreationTest.java
@@ -17,17 +17,14 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -35,24 +32,17 @@
*/
@PluginResource("resources/creation/edges/generalizationSet/Edge_GeneralizationSet_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_GeneralizationSet_CreationTest extends AbstractPapyrusTest {
+public class Edge_GeneralizationSet_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_GeneralizationSet_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createGeneralizationSetEdgeTest() {
- final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
- Assert.assertNotNull(siriusDiagram);
- Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
-
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
Assert.assertNotNull("The diagram edit part has not been found", diagramEditpart);
Diagram diagram = diagramEditpart.getDiagramView();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Generalization_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Generalization_CreationTest.java
index 893a7e1..42b8727 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Generalization_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Generalization_CreationTest.java
@@ -17,17 +17,14 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -35,24 +32,17 @@
*/
@PluginResource("resources/creation/edges/common/Edge_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_Generalization_CreationTest extends AbstractPapyrusTest {
+public class Edge_Generalization_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createGeneralizationEdgeTest() {
- final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
- Assert.assertNotNull(siriusDiagram);
- Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
-
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
Assert.assertNotNull("The diagram edit part has not been found", diagramEditpart);
Diagram diagram = diagramEditpart.getDiagramView();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_InformationFlow_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_InformationFlow_CreationTest.java
index c1408a4..a9f21c7 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_InformationFlow_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_InformationFlow_CreationTest.java
@@ -17,17 +17,14 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -35,24 +32,17 @@
*/
@PluginResource("resources/creation/edges/common/Edge_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_InformationFlow_CreationTest extends AbstractPapyrusTest {
+public class Edge_InformationFlow_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createInformationFlowEdgeTest() {
- final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
- Assert.assertNotNull(siriusDiagram);
- Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
-
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
Assert.assertNotNull("The diagram edit part has not been found", diagramEditpart);
Diagram diagram = diagramEditpart.getDiagramView();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_InstanceSpecification_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_InstanceSpecification_CreationTest.java
index 88dfabb..9437313 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_InstanceSpecification_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_InstanceSpecification_CreationTest.java
@@ -16,15 +16,12 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -32,24 +29,17 @@
*/
@PluginResource("resources/creation/edges/instanceSpecification/Edge_InstanceSpecification_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_InstanceSpecification_CreationTest extends AbstractPapyrusTest {
+public class Edge_InstanceSpecification_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_InstanceSpecification_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createInstanceSpecificationEdgeTest() {
- final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
- Assert.assertNotNull(siriusDiagram);
- Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
-
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
Assert.assertNotNull("The diagram edit part has not been found", diagramEditpart);
Diagram diagram = diagramEditpart.getDiagramView();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_InterfaceRealization_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_InterfaceRealization_CreationTest.java
index 77bb675..013c5be 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_InterfaceRealization_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_InterfaceRealization_CreationTest.java
@@ -17,17 +17,14 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -35,24 +32,17 @@
*/
@PluginResource("resources/creation/edges/interfaceRealization/Edge_InterfaceRealization_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_InterfaceRealization_CreationTest extends AbstractPapyrusTest {
+public class Edge_InterfaceRealization_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_InterfaceRealization_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createInterfaceRealizationEdgeTest() {
- final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
- Assert.assertNotNull(siriusDiagram);
- Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
-
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
Assert.assertNotNull("The diagram edit part has not been found", diagramEditpart);
Diagram diagram = diagramEditpart.getDiagramView();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Link_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Link_CreationTest.java
index a4bb1f5..ca62f10 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Link_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Link_CreationTest.java
@@ -17,20 +17,17 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.eclipse.sirius.diagram.model.business.internal.spec.DNodeSpec;
import org.eclipse.uml2.uml.Constraint;
import org.eclipse.uml2.uml.Element;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -38,24 +35,17 @@
*/
@PluginResource("resources/creation/edges/link/Edge_Link_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_Link_CreationTest extends AbstractPapyrusTest {
+public class Edge_Link_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_Link_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createCommentLink() {
- final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
- Assert.assertNotNull(siriusDiagram);
- Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
-
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
Assert.assertNotNull("The diagram edit part has not been found", diagramEditpart);
Diagram diagram = diagramEditpart.getDiagramView();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_PackageImport_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_PackageImport_CreationTest.java
index fcd27df..b000c4d 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_PackageImport_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_PackageImport_CreationTest.java
@@ -17,17 +17,14 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -35,24 +32,17 @@
*/
@PluginResource("resources/creation/edges/packageImportMerge/Edge_PackageImportMerge_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_PackageImport_CreationTest extends AbstractPapyrusTest {
+public class Edge_PackageImport_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_PackageImportMerge_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createPackageImportEdgeTest() {
- final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
- Assert.assertNotNull(siriusDiagram);
- Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
-
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
Assert.assertNotNull("The diagram edit part has not been found", diagramEditpart);
Diagram diagram = diagramEditpart.getDiagramView();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_PackageMerge_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_PackageMerge_CreationTest.java
index 1ee597b..1476d0c 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_PackageMerge_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_PackageMerge_CreationTest.java
@@ -17,17 +17,14 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -35,24 +32,17 @@
*/
@PluginResource("resources/creation/edges/packageImportMerge/Edge_PackageImportMerge_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_PackageMerge_CreationTest extends AbstractPapyrusTest {
+public class Edge_PackageMerge_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_PackageImportMerge_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createPackageMergeEdgeTest() {
- final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
- Assert.assertNotNull(siriusDiagram);
- Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
-
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
Assert.assertNotNull("The diagram edit part has not been found", diagramEditpart);
Diagram diagram = diagramEditpart.getDiagramView();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Realization_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Realization_CreationTest.java
index e115bc2..c7bcc3f 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Realization_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Realization_CreationTest.java
@@ -17,17 +17,14 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -35,24 +32,17 @@
*/
@PluginResource("resources/creation/edges/common/Edge_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_Realization_CreationTest extends AbstractPapyrusTest {
+public class Edge_Realization_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createRealizationEdgeTest() {
- final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
- Assert.assertNotNull(siriusDiagram);
- Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
-
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
Assert.assertNotNull("The diagram edit part has not been found", diagramEditpart);
Diagram diagram = diagramEditpart.getDiagramView();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_SharedAssociation_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_SharedAssociation_CreationTest.java
index 8382317..9cf3b3f 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_SharedAssociation_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_SharedAssociation_CreationTest.java
@@ -17,19 +17,16 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.eclipse.uml2.uml.AggregationKind;
import org.eclipse.uml2.uml.Association;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -37,24 +34,17 @@
*/
@PluginResource("resources/creation/edges/common/Edge_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_SharedAssociation_CreationTest extends AbstractPapyrusTest {
+public class Edge_SharedAssociation_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createSharedAssociationEdgeTest() {
- final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
- Assert.assertNotNull(siriusDiagram);
- Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
-
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
Assert.assertNotNull("The diagram edit part has not been found", diagramEditpart);
Diagram diagram = diagramEditpart.getDiagramView();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Substitution_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Substitution_CreationTest.java
index ff8f462..e554894 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Substitution_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Substitution_CreationTest.java
@@ -17,17 +17,14 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -35,24 +32,17 @@
*/
@PluginResource("resources/creation/edges/common/Edge_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_Substitution_CreationTest extends AbstractPapyrusTest {
+public class Edge_Substitution_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createSubstitutionEdgeTest() {
- final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
- Assert.assertNotNull(siriusDiagram);
- Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
-
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
Assert.assertNotNull("The diagram edit part has not been found", diagramEditpart);
Diagram diagram = diagramEditpart.getDiagramView();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Usage_CreationTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Usage_CreationTest.java
index 31905d8..5be7d7b 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Usage_CreationTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/edges/Edge_Usage_CreationTest.java
@@ -17,17 +17,14 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.CreationToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
-import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -35,24 +32,17 @@
*/
@PluginResource("resources/creation/edges/common/Edge_CreationTest.di") // the resource to import for the test in the workspace
@SuppressWarnings("nls")
-public class Edge_Usage_CreationTest extends AbstractPapyrusTest {
+public class Edge_Usage_CreationTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "Edge_ClassDiagram";
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createUsageEdgeTest() {
- final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
- Assert.assertNotNull(siriusDiagram);
- Assert.assertFalse("The diagram must be unsynchronized for this test", siriusDiagram.isSynchronized()); //$NON-NLS-1$
-
+ // check the diagram synchronization status
+ checkSiriusDiagramSynchronization(false);
+
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
Assert.assertNotNull("The diagram edit part has not been found", diagramEditpart);
Diagram diagram = diagramEditpart.getDiagramView();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/topNodes/AbstractCreateNodeTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/topNodes/AbstractCreateNodeTests.java
index 26176ad..e44f596 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/topNodes/AbstractCreateNodeTests.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/creation/topNodes/AbstractCreateNodeTests.java
@@ -15,7 +15,7 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.checkers.internal.api.GraphicalOwnerUtils;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.checkers.internal.api.SemanticAndGraphicalCreationChecker;
import org.eclipse.sirius.diagram.DDiagram;
@@ -27,18 +27,11 @@
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.Rule;
/**
* Abstract Test for Node Creation
*/
-public abstract class AbstractCreateNodeTests {
-
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture();
+public abstract class AbstractCreateNodeTests extends AbstractSiriusDiagramTests{
/**
* the root of the model
@@ -90,6 +83,7 @@
}
/**
+ * This method creates the node and checks that the diagram is unsynchronized
*
* @param creationToolId
* the ID of the creation tool to used
@@ -99,6 +93,24 @@
* the graphical container to use to create the node
*/
protected void createNode(final String creationToolId, final SemanticAndGraphicalCreationChecker checker, final EObject graphicalContainer) {
+ createNode(creationToolId, checker, graphicalContainer, false);
+ }
+
+ /**
+ * This method create the node and checks the status of the current diagram (synchronized or not synchronized)
+ *
+ * @param creationToolId
+ * the ID of the creation tool to used
+ * @param checker
+ * the checker used to validate the creation of the node
+ * @param graphicalContainer
+ * the graphical container to use to create the node
+ * @param isSynchronized
+ * <code>true</code> if the diagram must be synchronized
+ */
+ protected void createNode(final String creationToolId, final SemanticAndGraphicalCreationChecker checker, final EObject graphicalContainer, final boolean isSynchronized) {
+ checkSiriusDiagramSynchronization(isSynchronized);
+
Assert.assertEquals("The graphical container must be empty before the creation of the node.", 0, GraphicalOwnerUtils.getGraphicalOwnerChildrenSize(graphicalContainer)); //$NON-NLS-1$
boolean result = fixture.applyContainerCreationTool(creationToolId, getDDiagram(), graphicalContainer);
Assert.assertTrue("The creation of element failed", result); //$NON-NLS-1$
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/edges/Edge_Abstraction_DeleteSemanticTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/edges/Edge_Abstraction_DeleteSemanticTest.java
index 6125d80..8b24e08 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/edges/Edge_Abstraction_DeleteSemanticTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/edges/Edge_Abstraction_DeleteSemanticTest.java
@@ -17,37 +17,32 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.NamedElement;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
/**
* Delete Dependency edge from model test
*/
@PluginResource("resources/delete/edges/abstraction/Edge_Abstraction_DeleteSemanticTest.di")
@SuppressWarnings("nls")
-public class Edge_Abstraction_DeleteSemanticTest extends AbstractPapyrusTest {
+public class Edge_Abstraction_DeleteSemanticTest extends AbstractSiriusDiagramTests {
private static final String ELEMENT_TO_DESTROY_NAME = "EdgeToDelete";
private static final String CLASS_DIAGRAM_NAME = "Edge_GeneralizationSet_ClassDiagram";
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void Delete_AbstractionEdge_Semantic() {
+ checkSiriusDiagramSynchronization(false);
+
// setup
Assert.assertTrue(fixture.getModel() instanceof Model);
Model rootModel = (Model) fixture.getModel();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/edges/Edge_Dependency_DeleteSemanticTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/edges/Edge_Dependency_DeleteSemanticTest.java
index 8bc13b5..b731014 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/edges/Edge_Dependency_DeleteSemanticTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/edges/Edge_Dependency_DeleteSemanticTest.java
@@ -17,37 +17,32 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.NamedElement;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
/**
* Delete Dependency edge from model test
*/
@PluginResource("resources/delete/edges/dependency/Edge_Dependency_DeleteSemanticTest.di")
@SuppressWarnings("nls")
-public class Edge_Dependency_DeleteSemanticTest extends AbstractPapyrusTest {
+public class Edge_Dependency_DeleteSemanticTest extends AbstractSiriusDiagramTests {
private static final String ELEMENT_TO_DESTROY_NAME = "EdgeToDelete";
private static final String CLASS_DIAGRAM_NAME = "Edge_Dependency_Delete_ClassDiagram";
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void Delete_DependencyEdge_Semantic() {
+ checkSiriusDiagramSynchronization(false);
+
// setup
Assert.assertTrue(fixture.getModel() instanceof Model);
Model rootModel = (Model) fixture.getModel();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/edges/Edge_Generalization_DeleteSemanticTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/edges/Edge_Generalization_DeleteSemanticTest.java
index fee087b..24f680a 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/edges/Edge_Generalization_DeleteSemanticTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/edges/Edge_Generalization_DeleteSemanticTest.java
@@ -17,38 +17,33 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
+import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Generalization;
import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Class;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
/**
* Delete Dependency edge from model test
*/
@PluginResource("resources/delete/edges/generalization/Edge_Generalization_DeleteSemanticTest.di")
@SuppressWarnings("nls")
-public class Edge_Generalization_DeleteSemanticTest extends AbstractPapyrusTest {
+public class Edge_Generalization_DeleteSemanticTest extends AbstractSiriusDiagramTests {
private static final String EDGE_SOURCE_NAME = "EdgeSource";
private static final String CLASS_DIAGRAM_NAME = "Edge_Generalization_Delete_ClassDiagram";
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void Delete_GeneralizationEdge_Semantic() {
+ checkSiriusDiagramSynchronization(false);
+
// setup
Assert.assertTrue(fixture.getModel() instanceof Model);
Model rootModel = (Model) fixture.getModel();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/edges/Edge_InformationFlow_DeleteSemanticTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/edges/Edge_InformationFlow_DeleteSemanticTest.java
index 86c68fb..c83641a 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/edges/Edge_InformationFlow_DeleteSemanticTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/edges/Edge_InformationFlow_DeleteSemanticTest.java
@@ -17,38 +17,33 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.PackageableElement;
import org.eclipse.uml2.uml.internal.impl.PackageImpl;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
/**
* Delete Dependency edge from model test
*/
@PluginResource("resources/delete/edges/informationFlow/Edge_InformationFlow_DeleteSemanticTest.di")
@SuppressWarnings("nls")
-public class Edge_InformationFlow_DeleteSemanticTest extends AbstractPapyrusTest {
+public class Edge_InformationFlow_DeleteSemanticTest extends AbstractSiriusDiagramTests {
private static final String EDGE_SOURCE_NAME = "EdgeSource";
private static final String CLASS_DIAGRAM_NAME = "Edge_InformationFlow_Delete_ClassDiagram";
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void Delete_InformationFlowEdge_Semantic() {
+ checkSiriusDiagramSynchronization(false);
+
// setup
Assert.assertTrue(fixture.getModel() instanceof Model);
Model rootModel = (Model) fixture.getModel();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/nodes/TopNode_Class_DeleteSemanticTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/nodes/TopNode_Class_DeleteSemanticTest.java
index ee97135..76c830c 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/nodes/TopNode_Class_DeleteSemanticTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/nodes/TopNode_Class_DeleteSemanticTest.java
@@ -17,36 +17,31 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DNodeContainer;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.NamedElement;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
/**
* Delete Class from model test
*/
@PluginResource("resources/delete/nodes/class/TopNode_Class_DeleteSemanticTest.di")
@SuppressWarnings("nls")
-public class TopNode_Class_DeleteSemanticTest extends AbstractPapyrusTest {
+public class TopNode_Class_DeleteSemanticTest extends AbstractSiriusDiagramTests {
private static final String ELEMENT_TO_DESTROY_NAME = "ClassToDelete";
private static final String CLASS_DIAGRAM_NAME = "TopNode_Class_Delete_ClassDiagram";
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void Delete_Class_Semantic() {
+ checkSiriusDiagramSynchronization(false);
+
// setup
Assert.assertTrue(fixture.getModel() instanceof Model);
Model rootModel = (Model) fixture.getModel();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/nodes/TopNode_Comment_DeleteSemanticTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/nodes/TopNode_Comment_DeleteSemanticTest.java
index 5b8cd1c..32ad6c4 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/nodes/TopNode_Comment_DeleteSemanticTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/nodes/TopNode_Comment_DeleteSemanticTest.java
@@ -17,35 +17,30 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.model.business.internal.spec.DNodeSpec;
import org.eclipse.uml2.uml.Comment;
import org.eclipse.uml2.uml.Model;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
/**
* Delete Class from model test
*/
@PluginResource("resources/delete/nodes/comment/TopNode_Comment_DeleteSemanticTest.di")
@SuppressWarnings("nls")
-public class TopNode_Comment_DeleteSemanticTest extends AbstractPapyrusTest {
+public class TopNode_Comment_DeleteSemanticTest extends AbstractSiriusDiagramTests {
private static final String CLASS_DIAGRAM_NAME = "TopNode_Comment_DeleteSemanticTest";
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void Delete_Comment_Semantic() {
+ checkSiriusDiagramSynchronization(false);
+
// setup
Assert.assertTrue(fixture.getModel() instanceof Model);
Model rootModel = (Model) fixture.getModel();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/nodes/TopNode_DataType_DeleteSemanticTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/nodes/TopNode_DataType_DeleteSemanticTest.java
index 2f3d591..ac87b9f 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/nodes/TopNode_DataType_DeleteSemanticTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/nodes/TopNode_DataType_DeleteSemanticTest.java
@@ -17,16 +17,14 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagramElement;
import org.eclipse.sirius.diagram.DNodeContainer;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.NamedElement;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -34,18 +32,17 @@
*/
@PluginResource("resources/delete/nodes/dataType/TopNode_DataType_DeleteSemanticTest.di")
@SuppressWarnings("nls")
-public class TopNode_DataType_DeleteSemanticTest extends AbstractPapyrusTest {
+public class TopNode_DataType_DeleteSemanticTest extends AbstractSiriusDiagramTests {
private static final String ELEMENT_TO_DESTROY_NAME = "DataTypeToDelete";
private static final String CLASS_DIAGRAM_NAME = "TopNode_DataType_Delete_ClassDiagram";
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void Delete_DataType_Semantic() {
+ checkSiriusDiagramSynchronization(false);
+
// setup
Assert.assertTrue(fixture.getModel() instanceof Model);
Model rootModel = (Model) fixture.getModel();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/nodes/TopNode_PackageWithSubNodes_DeleteSemanticTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/nodes/TopNode_PackageWithSubNodes_DeleteSemanticTest.java
index b0f0446..2822463 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/nodes/TopNode_PackageWithSubNodes_DeleteSemanticTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/semantic/nodes/TopNode_PackageWithSubNodes_DeleteSemanticTest.java
@@ -17,25 +17,21 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DNodeContainer;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.internal.impl.PackageImpl;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
/**
* Delete Package element and it's sub nodes from model test
*/
@PluginResource("resources/delete/nodes/package/TopNode_PackageWithSubNodes_DeleteSemanticTest.di")
@SuppressWarnings("nls")
-public class TopNode_PackageWithSubNodes_DeleteSemanticTest extends AbstractPapyrusTest {
+public class TopNode_PackageWithSubNodes_DeleteSemanticTest extends AbstractSiriusDiagramTests {
private static final String ELEMENT_TO_DESTROY_NAME = "PackageToDelete";
@@ -43,13 +39,12 @@
private static final String CLASS_DIAGRAM_NAME = "TopNode_Package_Delete_ClassDiagram";
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings({ "restriction", "unused" })
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void Delete_Package_Semantic() {
+ checkSiriusDiagramSynchronization(false);
+
// setup
Assert.assertTrue(fixture.getModel() instanceof Model);
Model rootModel = (Model) fixture.getModel();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/edges/Edge_Abstraction_DeleteViewTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/edges/Edge_Abstraction_DeleteViewTest.java
index e5f8104..9b8cd17 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/edges/Edge_Abstraction_DeleteViewTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/edges/Edge_Abstraction_DeleteViewTest.java
@@ -22,38 +22,32 @@
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.eclipse.sirius.diagram.ui.internal.edit.parts.DEdgeEditPart;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.NamedElement;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
/**
* Delete Dependency edge from diagram test
*/
@PluginResource("resources/delete/edges/abstraction/Edge_Abstraction_DeleteSemanticTest.di")
@SuppressWarnings("nls")
-public class Edge_Abstraction_DeleteViewTest extends AbstractPapyrusTest {
+public class Edge_Abstraction_DeleteViewTest extends AbstractSiriusDiagramTests {
private static final String VIEW_TO_DELETE_ELEMENT_NAME = "EdgeToDelete";
private static final String CLASS_DIAGRAM_NAME = "Edge_GeneralizationSet_ClassDiagram";
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void Delete_Abstraction_Edge_View() {
+ checkSiriusDiagramSynchronization(false);
// setup
Assert.assertTrue(fixture.getModel() instanceof Model);
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/edges/Edge_Dependency_DeleteViewTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/edges/Edge_Dependency_DeleteViewTest.java
index 6f8c0aa..8e31425 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/edges/Edge_Dependency_DeleteViewTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/edges/Edge_Dependency_DeleteViewTest.java
@@ -22,38 +22,32 @@
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.eclipse.sirius.diagram.ui.internal.edit.parts.DEdgeEditPart;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.NamedElement;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
/**
* Delete Dependency edge from diagram test
*/
@PluginResource("resources/delete/edges/dependency/Edge_Dependency_DeleteSemanticTest.di")
@SuppressWarnings("nls")
-public class Edge_Dependency_DeleteViewTest extends AbstractPapyrusTest {
+public class Edge_Dependency_DeleteViewTest extends AbstractSiriusDiagramTests {
private static final String VIEW_TO_DELETE_ELEMENT_NAME = "EdgeToDelete";
private static final String CLASS_DIAGRAM_NAME = "Edge_Dependency_Delete_ClassDiagram";
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void Delete_DependencyEdge_View() {
+ checkSiriusDiagramSynchronization(false);
// setup
Assert.assertTrue(fixture.getModel() instanceof Model);
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/edges/Edge_Generalization_DeleteViewTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/edges/Edge_Generalization_DeleteViewTest.java
index 3d53a62..975f4cb 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/edges/Edge_Generalization_DeleteViewTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/edges/Edge_Generalization_DeleteViewTest.java
@@ -22,39 +22,33 @@
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.eclipse.sirius.diagram.ui.internal.edit.parts.DEdgeEditPart;
+import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Generalization;
import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Class;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
/**
* Delete Dependency edge from diagram test
*/
@PluginResource("resources/delete/edges/generalization/Edge_Generalization_DeleteSemanticTest.di")
@SuppressWarnings("nls")
-public class Edge_Generalization_DeleteViewTest extends AbstractPapyrusTest {
+public class Edge_Generalization_DeleteViewTest extends AbstractSiriusDiagramTests {
private static final String EDGE_SOURCE_NAME = "EdgeSource";
private static final String CLASS_DIAGRAM_NAME = "Edge_Generalization_Delete_ClassDiagram";
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void Delete_GeneralizationEdge_View() {
+ checkSiriusDiagramSynchronization(false);
// setup
Assert.assertTrue(fixture.getModel() instanceof Model);
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/edges/Edge_InformationFlow_DeleteViewTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/edges/Edge_InformationFlow_DeleteViewTest.java
index 8ff0385..de7adf2 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/edges/Edge_InformationFlow_DeleteViewTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/edges/Edge_InformationFlow_DeleteViewTest.java
@@ -22,17 +22,15 @@
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec;
import org.eclipse.sirius.diagram.ui.internal.edit.parts.DEdgeEditPart;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.PackageableElement;
import org.eclipse.uml2.uml.internal.impl.PackageImpl;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -40,19 +38,17 @@
*/
@PluginResource("resources/delete/edges/informationFlow/Edge_InformationFlow_DeleteSemanticTest.di")
@SuppressWarnings("nls")
-public class Edge_InformationFlow_DeleteViewTest extends AbstractPapyrusTest {
+public class Edge_InformationFlow_DeleteViewTest extends AbstractSiriusDiagramTests {
private static final String EDGE_SOURCE_NAME = "EdgeSource";
private static final String CLASS_DIAGRAM_NAME = "Edge_InformationFlow_Delete_ClassDiagram";
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void Delete_InformationFlowEdge_View() {
+ checkSiriusDiagramSynchronization(false);
// setup
Assert.assertTrue(fixture.getModel() instanceof Model);
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/nodes/TopNode_Class_DeleteViewTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/nodes/TopNode_Class_DeleteViewTest.java
index c440b6a..eb86df3 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/nodes/TopNode_Class_DeleteViewTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/nodes/TopNode_Class_DeleteViewTest.java
@@ -22,39 +22,33 @@
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DNodeContainer;
import org.eclipse.sirius.diagram.model.business.internal.spec.DNodeContainerSpec;
import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeContainerEditPart;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.NamedElement;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
/**
* Delete Class from diagram test
*/
@PluginResource("resources/delete/nodes/class/TopNode_Class_DeleteSemanticTest.di")
@SuppressWarnings("nls")
-public class TopNode_Class_DeleteViewTest extends AbstractPapyrusTest {
+public class TopNode_Class_DeleteViewTest extends AbstractSiriusDiagramTests {
private static final String VIEW_TO_DELETE_ELEMENT_NAME = "ClassToDelete";
private static final String CLASS_DIAGRAM_NAME = "TopNode_Class_Delete_ClassDiagram";
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void Delete_Class_View() {
+ checkSiriusDiagramSynchronization(false);
// setup
Assert.assertTrue(fixture.getModel() instanceof Model);
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/nodes/TopNode_Comment_DeleteViewTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/nodes/TopNode_Comment_DeleteViewTest.java
index c560415..aefbaeb 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/nodes/TopNode_Comment_DeleteViewTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/nodes/TopNode_Comment_DeleteViewTest.java
@@ -22,36 +22,30 @@
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.model.business.internal.spec.DNodeSpec;
import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeEditPart;
import org.eclipse.uml2.uml.Comment;
import org.eclipse.uml2.uml.Model;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
/**
* Delete Class from diagram test
*/
@PluginResource("resources/delete/nodes/comment/TopNode_Comment_DeleteSemanticTest.di")
@SuppressWarnings("nls")
-public class TopNode_Comment_DeleteViewTest extends AbstractPapyrusTest {
+public class TopNode_Comment_DeleteViewTest extends AbstractSiriusDiagramTests {
private static final String CLASS_DIAGRAM_NAME = "TopNode_Comment_DeleteSemanticTest";
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void Delete_Comment_View() {
+ checkSiriusDiagramSynchronization(false);
// setup
Assert.assertTrue(fixture.getModel() instanceof Model);
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/nodes/TopNode_DataType_DeleteViewTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/nodes/TopNode_DataType_DeleteViewTest.java
index ba65219..af8aa53 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/nodes/TopNode_DataType_DeleteViewTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/nodes/TopNode_DataType_DeleteViewTest.java
@@ -22,17 +22,14 @@
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DNodeContainer;
import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeContainerEditPart;
-import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeListEditPart;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.NamedElement;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
/**
@@ -40,19 +37,17 @@
*/
@PluginResource("resources/delete/nodes/dataType/TopNode_DataType_DeleteSemanticTest.di")
@SuppressWarnings("nls")
-public class TopNode_DataType_DeleteViewTest extends AbstractPapyrusTest {
+public class TopNode_DataType_DeleteViewTest extends AbstractSiriusDiagramTests {
private static final String VIEW_TO_DELETE_ELEMENT_NAME = "DataTypeToDelete";
private static final String CLASS_DIAGRAM_NAME = "TopNode_DataType_Delete_ClassDiagram";
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void delete_DataType_View() {
+ checkSiriusDiagramSynchronization(false);
// setup
Assert.assertTrue(fixture.getModel() instanceof Model);
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/nodes/TopNode_PackageWithSubNodes_DeleteViewTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/nodes/TopNode_PackageWithSubNodes_DeleteViewTest.java
index ce20883..429da23 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/nodes/TopNode_PackageWithSubNodes_DeleteViewTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/delete/view/nodes/TopNode_PackageWithSubNodes_DeleteViewTest.java
@@ -17,25 +17,21 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationRunner;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DNodeContainer;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.internal.impl.PackageImpl;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
/**
* Delete Package element and it's sub nodes from diagram test
*/
@PluginResource("resources/delete/nodes/package/TopNode_PackageWithSubNodes_DeleteSemanticTest.di")
@SuppressWarnings("nls")
-public class TopNode_PackageWithSubNodes_DeleteViewTest extends AbstractPapyrusTest {
+public class TopNode_PackageWithSubNodes_DeleteViewTest extends AbstractSiriusDiagramTests {
private static final String ELEMENT_TO_DESTROY_NAME = "PackageToDelete";
@@ -43,13 +39,12 @@
private static final String CLASS_DIAGRAM_NAME = "TopNode_Package_Delete_ClassDiagram";
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture(/* Collections.singletonList("aird") */);
-
@SuppressWarnings("restriction")
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void Delete_Package_View() {
+ checkSiriusDiagramSynchronization(false);
+
// setup
Assert.assertTrue(fixture.getModel() instanceof Model);
Model rootModel = (Model) fixture.getModel();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/diagram/AbstractDiagramCreationTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/diagram/AbstractDiagramCreationTests.java
index 7206c76..6d2ea78 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/diagram/AbstractDiagramCreationTests.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/diagram/AbstractDiagramCreationTests.java
@@ -25,11 +25,11 @@
import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramPrototype;
import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
import org.eclipse.papyrus.sirius.editor.internal.sessions.SiriusConstants;
import org.eclipse.papyrus.sirius.editor.representation.SiriusDiagramConstants;
import org.eclipse.papyrus.sirius.editor.representation.SiriusDiagramPrototype;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DSemanticDiagram;
import org.eclipse.sirius.viewpoint.DAnalysis;
import org.eclipse.sirius.viewpoint.description.DAnnotation;
@@ -42,7 +42,7 @@
/**
* Abstract class to test the Sirius Diagram creation in Papyrus
*/
-public abstract class AbstractDiagramCreationTests extends AbstractPapyrusTest {
+public abstract class AbstractDiagramCreationTests extends AbstractSiriusDiagramTests {
protected Package rootModel;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/AbstractSemanticDropSubNodeTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/AbstractSemanticDropSubNodeTests.java
index 473f938..ebc9cc8 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/AbstractSemanticDropSubNodeTests.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/AbstractSemanticDropSubNodeTests.java
@@ -21,7 +21,7 @@
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.sirius.editor.representation.SiriusDiagramConstants;
-import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
import org.eclipse.sirius.diagram.DDiagramElement;
import org.eclipse.sirius.diagram.DDiagramElementContainer;
@@ -34,19 +34,13 @@
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.Rule;
/**
*
* TODO //adapter from AbstractSubNodeListElementCreationTests maybe a common class could help us
*/
-public abstract class AbstractSemanticDropSubNodeTests<T extends Element> {
+public abstract class AbstractSemanticDropSubNodeTests<T extends Element> extends AbstractSiriusDiagramTests {
- /**
- * this fixture is used to access to Papyrus environment (editor/diagram/commandstack/editingdomain/...)
- */
- @Rule
- public final SiriusDiagramEditorFixture fixture = new SiriusDiagramEditorFixture();
protected Package root;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SemanticDropIntoModelTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SemanticDropIntoModelTest.java
index 4f8ba81..53ae54d 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SemanticDropIntoModelTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SemanticDropIntoModelTest.java
@@ -49,6 +49,7 @@
@Test
@ActiveDiagram(DIAGRAM_NAME)
public void dropPackageIntoModel() {
+ checkSiriusDiagramSynchronization(false);
final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
Assert.assertNotNull(siriusDiagram);
Assert.assertFalse("The diagram must be unsynchronized to test drop", siriusDiagram.isSynchronized()); //$NON-NLS-1$
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SemanticDropIntoModel_2_Test.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SemanticDropIntoModel_2_Test.java
index dc15907..ccb20fc 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SemanticDropIntoModel_2_Test.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SemanticDropIntoModel_2_Test.java
@@ -16,9 +16,9 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.sirius.editor.representation.SiriusDiagramConstants;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.papyrus.sirius.editor.representation.SiriusDiagramConstants;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.MappingTypes;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.SemanticDropToolsIds;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.checkers.creation.graphical.CD_ClassCreationChecker;
@@ -58,6 +58,7 @@
@Test
@ActiveDiagram(DIAGRAM_NAME)
public void dropPackageIntoModel() {
+ checkSiriusDiagramSynchronization(false);
final NamedElement toDrop = getSemanticOwner().getMember("PackageToDrop"); //$NON-NLS-1$
dropNode(SemanticDropToolsIds.DROP__PACKAGE__TOOL, new CD_PackageCreationChecker(diagram, getTopNodeGraphicalContainer()), new SemanticDropChecker(toDrop), toDrop);
}
@@ -65,6 +66,7 @@
@Test
@ActiveDiagram(DIAGRAM_NAME)
public void dropClassIntoModel() {
+ checkSiriusDiagramSynchronization(false);
final NamedElement toDrop = getSemanticOwner().getMember("ClassToDrop"); //$NON-NLS-1$
dropNode(SemanticDropToolsIds.DROP__CLASS__TOOL, new CD_ClassCreationChecker(diagram, getTopNodeGraphicalContainer()), new SemanticDropChecker(toDrop), toDrop);
}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SemanticDropIntoPackageTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SemanticDropIntoPackageTest.java
index f9a2f79..925c979 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SemanticDropIntoPackageTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SemanticDropIntoPackageTest.java
@@ -48,6 +48,7 @@
@Test
@ActiveDiagram(DIAGRAM_NAME)
public void dropClassIntoPackage() {
+ checkSiriusDiagramSynchronization(false);
final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
Assert.assertNotNull(siriusDiagram);
Assert.assertFalse("The diagram must be unsynchronized to test drop", siriusDiagram.isSynchronized()); //$NON-NLS-1$
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SubNode_OperationToClass_DropTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SubNode_OperationToClass_DropTest.java
index de3b85f..ec1d667 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SubNode_OperationToClass_DropTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SubNode_OperationToClass_DropTest.java
@@ -17,11 +17,11 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.SemanticDropToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
import org.eclipse.sirius.diagram.model.business.internal.spec.DNodeContainerSpec;
import org.eclipse.sirius.diagram.model.business.internal.spec.DNodeListElementSpec;
@@ -38,7 +38,7 @@
*/
@PluginResource("resources/drop/subNode/propertyOperationToClass/SubNode_PropertyOperationToClass_DropTest.di")
@SuppressWarnings({ "nls", "restriction" })
-public class SubNode_OperationToClass_DropTest extends AbstractPapyrusTest {
+public class SubNode_OperationToClass_DropTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "SubNode_PropertyOperationToClass_ClassDiagram";
@@ -51,6 +51,7 @@
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createOperationSubNodeTest() {
+ checkSiriusDiagramSynchronization(false);
Assert.assertTrue(fixture.getModel() instanceof Model);
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SubNode_PropertyToClass_DropTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SubNode_PropertyToClass_DropTest.java
index e7c5fad..db5182f 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SubNode_PropertyToClass_DropTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/subNodes/SubNode_PropertyToClass_DropTest.java
@@ -17,11 +17,11 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ActiveDiagram;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
import org.eclipse.papyrus.sirius.junit.utils.rules.SiriusDiagramEditorFixture;
import org.eclipse.papyrus.sirius.uml.diagram.clazz.internal.constants.SemanticDropToolsIds;
+import org.eclipse.papyrus.sirius.uml.diagram.clazz.tests.AbstractSiriusDiagramTests;
import org.eclipse.sirius.diagram.DDiagram;
import org.eclipse.sirius.diagram.model.business.internal.spec.DNodeContainerSpec;
import org.eclipse.sirius.diagram.model.business.internal.spec.DNodeListElementSpec;
@@ -38,7 +38,7 @@
*/
@PluginResource("resources/drop/subNode/propertyOperationToClass/SubNode_PropertyOperationToClass_DropTest.di")
@SuppressWarnings({ "nls", "restriction" })
-public class SubNode_PropertyToClass_DropTest extends AbstractPapyrusTest {
+public class SubNode_PropertyToClass_DropTest extends AbstractSiriusDiagramTests {
private static final String DIAGRAM_NAME = "SubNode_PropertyOperationToClass_ClassDiagram";
@@ -51,6 +51,7 @@
@Test
@ActiveDiagram(DIAGRAM_NAME) // open the diagram
public void createPropertySubNodeTest() {
+ checkSiriusDiagramSynchronization(false);
Assert.assertTrue(fixture.getModel() instanceof Model);
DiagramEditPart diagramEditpart = fixture.getActiveDiagram();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/topNodes/AbstractTopNodeDropTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/topNodes/AbstractTopNodeDropTests.java
index 13ff8eb..af2f61f 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/topNodes/AbstractTopNodeDropTests.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/topNodes/AbstractTopNodeDropTests.java
@@ -107,7 +107,19 @@
graphicalChecker.validateAfterRedo();
semanticChecker.validateAfterRedo();
}
-
+
+ /**
+ * This method is used to check if the current diagram has the expected synchronization status
+ *
+ * @param isSynchronized
+ * <code>true</code> if the diagram must be synchronized
+ */
+ protected void checkSiriusDiagramSynchronization(final boolean isSynchronized) {
+ final DSemanticDiagram siriusDiagram = this.fixture.getActiveSiriusDiagram();
+ Assert.assertNotNull("We don't found a Sirius active diagram", siriusDiagram); //$NON-NLS-1$
+ Assert.assertEquals("The synchronization status of the diagram is not the expected one", Boolean.valueOf(isSynchronized), Boolean.valueOf(siriusDiagram.isSynchronized())); //$NON-NLS-1$
+ }
+
protected abstract DragAndDropTarget getTopNodeGraphicalContainer();
/**
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/topNodes/DropTopNodeOnClassDiagram_ModelOwner_Test.java b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/topNodes/DropTopNodeOnClassDiagram_ModelOwner_Test.java
index 646c96e..fb64651 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/topNodes/DropTopNodeOnClassDiagram_ModelOwner_Test.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.sirius.uml.diagram.clazz.tests/src/org/eclipse/papyrus/sirius/uml/diagram/clazz/tests/drop/topNodes/DropTopNodeOnClassDiagram_ModelOwner_Test.java
@@ -59,6 +59,7 @@
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void dropComment() {
+ checkSiriusDiagramSynchronization(false);
final Comment elementToBeDropped = this.root.getOwnedComments().get(0);
Assert.assertTrue("The element to be dropped must be an instance of Class", elementToBeDropped instanceof org.eclipse.uml2.uml.Comment);//$NON-NLS-1$
dropNode(SemanticDropToolsIds.DROP__COMMENT__TOOL, new CD_CommentCreationChecker(this.diagram, this.diagramRepresentation), new SemanticDropChecker(elementToBeDropped), elementToBeDropped);
@@ -67,6 +68,7 @@
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void dropClass() {
+ checkSiriusDiagramSynchronization(false);
final NamedElement elementToBeDropped = this.root.getMember("ClassToDrop"); //$NON-NLS-1$
Assert.assertTrue("The element to be dropped must be an instance of Class", elementToBeDropped instanceof org.eclipse.uml2.uml.Class);//$NON-NLS-1$
dropNode(SemanticDropToolsIds.DROP__CLASS__TOOL, new CD_ClassCreationChecker(this.diagram, this.diagramRepresentation), new SemanticDropChecker(elementToBeDropped), elementToBeDropped);
@@ -75,6 +77,7 @@
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void dropComponent() {
+ checkSiriusDiagramSynchronization(false);
final NamedElement elementToBeDropped = this.root.getMember("ComponentToDrop"); //$NON-NLS-1$
Assert.assertTrue("The element to be dropped must be an instance of Component", elementToBeDropped instanceof Component);//$NON-NLS-1$
dropNode(SemanticDropToolsIds.DROP__COMPONENT__TOOL, new CD_ComponentCreationChecker(this.diagram, this.diagramRepresentation), new SemanticDropChecker(elementToBeDropped), elementToBeDropped);
@@ -83,6 +86,7 @@
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void dropConstraint() {
+ checkSiriusDiagramSynchronization(false);
final Constraint elementToBeDropped = this.root.getOwnedElements().stream().filter(Constraint.class::isInstance).map(Constraint.class::cast).findFirst().get();
Assert.assertTrue("The element to be dropped must be an instance of Constraint", elementToBeDropped instanceof org.eclipse.uml2.uml.Constraint);//$NON-NLS-1$
dropNode(SemanticDropToolsIds.DROP__CONSTRAINT__TOOL, new CD_ConstraintCreationChecker(this.diagram, this.diagramRepresentation), new SemanticDropChecker(elementToBeDropped), elementToBeDropped);
@@ -91,6 +95,7 @@
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void dropDatatype() {
+ checkSiriusDiagramSynchronization(false);
final NamedElement elementToBeDropped = this.root.getMember("DataTypeToDrop"); //$NON-NLS-1$
Assert.assertTrue("The element to be dropped must be an instance of DataType", elementToBeDropped instanceof DataType);//$NON-NLS-1$
dropNode(SemanticDropToolsIds.DROP__DATATYPE__TOOL, new CD_DataTypeCreationChecker(this.diagram, this.diagramRepresentation), new SemanticDropChecker(elementToBeDropped), elementToBeDropped);
@@ -99,6 +104,7 @@
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void dropEnumeration() {
+ checkSiriusDiagramSynchronization(false);
final NamedElement elementToBeDropped = this.root.getMember("EnumerationToDrop"); //$NON-NLS-1$
Assert.assertTrue("The element to be dropped must be an instance of Enumeration", elementToBeDropped instanceof Enumeration);//$NON-NLS-1$
dropNode(SemanticDropToolsIds.DROP__ENUMERATION__TOOL, new CD_EnumerationCreationChecker(this.diagram, this.diagramRepresentation), new SemanticDropChecker(elementToBeDropped), elementToBeDropped);
@@ -107,6 +113,7 @@
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void dropInformationItem() {
+ checkSiriusDiagramSynchronization(false);
final NamedElement elementToBeDropped = this.root.getMember("InformationItemToDrop"); //$NON-NLS-1$
Assert.assertTrue("The element to be dropped must be an instance of InformationItem", elementToBeDropped instanceof InformationItem);//$NON-NLS-1$
dropNode(SemanticDropToolsIds.DROP__INFORMATION_ITEM__TOOL, new CD_InformationItemCreationChecker(this.diagram, this.diagramRepresentation), new SemanticDropChecker(elementToBeDropped), elementToBeDropped);
@@ -115,6 +122,7 @@
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void dropInstanceSpecification() {
+ checkSiriusDiagramSynchronization(false);
final NamedElement elementToBeDropped = this.root.getMember("InstanceSpecificationToDrop"); //$NON-NLS-1$
Assert.assertTrue("The element to be dropped must be an instance of InstanceSpecification", elementToBeDropped instanceof InstanceSpecification);//$NON-NLS-1$
dropNode(SemanticDropToolsIds.DROP__INSTANCE_SPECIFICATION__TOOL, new CD_InstanceSpecificationCreationChecker(this.diagram, this.diagramRepresentation), new SemanticDropChecker(elementToBeDropped), elementToBeDropped);
@@ -123,6 +131,7 @@
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void dropInterface() {
+ checkSiriusDiagramSynchronization(false);
final NamedElement elementToBeDropped = this.root.getMember("InterfaceToDrop"); //$NON-NLS-1$
Assert.assertTrue("The element to be dropped must be an instance of Interface", elementToBeDropped instanceof Interface);//$NON-NLS-1$
dropNode(SemanticDropToolsIds.DROP__INTERFACE__TOOL, new CD_InterfaceCreationChecker(this.diagram, this.diagramRepresentation), new SemanticDropChecker(elementToBeDropped), elementToBeDropped);
@@ -131,6 +140,7 @@
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void dropModel() {
+ checkSiriusDiagramSynchronization(false);
final NamedElement elementToBeDropped = this.root.getMember("ModelToDrop"); //$NON-NLS-1$
Assert.assertTrue("The element to be dropped must be an instance of Model", elementToBeDropped instanceof Model);//$NON-NLS-1$
dropNode(SemanticDropToolsIds.DROP__MODEL__TOOL, new CD_ModelCreationChecker(this.diagram, this.diagramRepresentation), new SemanticDropChecker(elementToBeDropped), elementToBeDropped);
@@ -139,6 +149,7 @@
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void dropPackage() {
+ checkSiriusDiagramSynchronization(false);
final NamedElement elementToBeDropped = this.root.getMember("PackageToDrop"); //$NON-NLS-1$
Assert.assertTrue("The element to be dropped must be an instance of Package", elementToBeDropped instanceof Package);//$NON-NLS-1$
dropNode(SemanticDropToolsIds.DROP__PACKAGE__TOOL, new CD_PackageCreationChecker(this.diagram, this.diagramRepresentation), new SemanticDropChecker(elementToBeDropped), elementToBeDropped);
@@ -147,6 +158,7 @@
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void dropPrimitiveType() {
+ checkSiriusDiagramSynchronization(false);
final NamedElement elementToBeDropped = this.root.getMember("PrimitiveTypeToDrop"); //$NON-NLS-1$
Assert.assertTrue("The element to be dropped must be an instance of PrimitiveType", elementToBeDropped instanceof PrimitiveType);//$NON-NLS-1$
dropNode(SemanticDropToolsIds.DROP__PRIMITIVETYPE__TOOL, new CD_PrimitiveTypeCreationChecker(this.diagram, this.diagramRepresentation), new SemanticDropChecker(elementToBeDropped), elementToBeDropped);
@@ -155,6 +167,7 @@
@Test
@ActiveDiagram(CLASS_DIAGRAM_NAME)
public void dropSignal() {
+ checkSiriusDiagramSynchronization(false);
final NamedElement elementToBeDropped = this.root.getMember("SignalToDrop"); //$NON-NLS-1$
Assert.assertTrue("The element to be dropped must be an instance of Signal", elementToBeDropped instanceof Signal);//$NON-NLS-1$
dropNode(SemanticDropToolsIds.DROP__SIGNAL__TOOL, new CD_SignalCreationChecker(this.diagram, this.diagramRepresentation), new SemanticDropChecker(elementToBeDropped), elementToBeDropped);
