Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Maggi2016-02-17 14:07:02 +0000
committerGerrit Code Review @ Eclipse.org2016-02-17 15:31:34 +0000
commit362cccc9b5ccb3805a61de6e0cbaff30bc0f667e (patch)
tree4d5da4a16d8ade0453be165b9022824442eed1c8
parent17534f2d7b45d1611c2e6fcffc0aab9555fc5727 (diff)
downloadorg.eclipse.papyrus-362cccc9b5ccb3805a61de6e0cbaff30bc0f667e.tar.gz
org.eclipse.papyrus-362cccc9b5ccb3805a61de6e0cbaff30bc0f667e.tar.xz
org.eclipse.papyrus-362cccc9b5ccb3805a61de6e0cbaff30bc0f667e.zip
Bug 487934 - [SysML 1.1][Tests] Uml Wizard tests shouldn't reference
Sysml - remove old tests on Sysml model creation (tests present with rcptt in SysML 1.4) - patch deprecated in SysML tests - remove deprecated .di2 files Change-Id: I9241b58ac72e2bcfce155b55e5fdf01d9b8cd31e Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Allocate_TEST.di276
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Copy_TEST.di240
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_DeriveReqt_TEST.di276
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_FlowPort_TEST.di258
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Refine_TEST.di284
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Satisfy_TEST.di290
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Trace_TEST.di284
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Verify_TEST.di2100
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_View_TEST.di244
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocatedTest.java436
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewTest.java334
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java436
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java348
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementRelatedTest.java808
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementTest.java1182
-rw-r--r--tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/TestCaseTest.java388
-rw-r--r--[-rwxr-xr-x]tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF50
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/AllTests.java58
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateSysMLModelWizard.java79
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestInitModelWizard.java1
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewSysMLProjectWizard.java50
-rw-r--r--[-rwxr-xr-x]tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/plugin.properties6
-rw-r--r--[-rwxr-xr-x]tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/Bug458492_Edition_Enumeration.java1
-rw-r--r--tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/SysMLContentProviderTest.java17
24 files changed, 2023 insertions, 2823 deletions
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Allocate_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Allocate_TEST.di2
deleted file mode 100644
index bee187d70e1..00000000000
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Allocate_TEST.di2
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<di2:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di2="http://www.papyrusuml.org" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="DefaultDiagram">
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="201:75" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Allocations::Allocated"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Allocate_TEST.uml#_zIq0AA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="455:75" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Allocations::Allocated"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Allocate_TEST.uml#_zhGiIA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="555:125" graphEdge="//@contained.5"/>
- <anchorage position="555:132" graphEdge="//@contained.6"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="751:75" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Allocations::Allocated"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Allocate_TEST.uml#_zx8agA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="750:125" graphEdge="//@contained.5"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="751:246" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Allocations::Allocated"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Allocate_TEST.uml#_0BSeEA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="750:271" graphEdge="//@contained.6"/>
- <anchorage position="750:300" graphEdge="//@contained.7"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="455:246" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Allocations::Allocated"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Allocate_TEST.uml#_0V2Y0A_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="555:300" graphEdge="//@contained.7"/>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.1/@anchorage.0 //@contained.2/@anchorage.0">
- <property key="PropStereoDisplay" value="SysML::Allocations::Allocate"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-2:-18" size="75:30"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Abstraction" href="SysML_Allocate_TEST.uml#_6vCvgA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.1/@anchorage.1 //@contained.3/@anchorage.0">
- <property key="PropStereoDisplay" value="SysML::Allocations::Allocate"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-1" size="75:30"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Abstraction" href="SysML_Allocate_TEST.uml#_CwrqsA_yEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.4/@anchorage.0 //@contained.3/@anchorage.1">
- <property key="PropStereoDisplay" value="SysML::Allocations::Allocate"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-1:21" size="75:30"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Abstraction" href="SysML_Allocate_TEST.uml#_DUvaAA_yEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <owner xsi:type="di2:Uml1SemanticModelBridge">
- <element xsi:type="uml:Model" href="SysML_Allocate_TEST.uml#_wJfGRw_xEd2mbaTvSwUWQw"/>
- </owner>
-</di2:Diagram>
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Copy_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Copy_TEST.di2
deleted file mode 100644
index 88fd8a7f707..00000000000
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Copy_TEST.di2
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<di2:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di2="http://www.papyrusuml.org" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="DefaultDiagram">
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="260:70" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Copy_TEST.uml#_H7ms4A_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="360:101" graphEdge="//@contained.2"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="519:70" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Copy_TEST.uml#_IRqccA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="518:101" graphEdge="//@contained.2"/>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.0/@anchorage.0 //@contained.1/@anchorage.0">
- <property key="PropStereoDisplay" value="SysML::Requirements::Copy"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-3:-18" size="75:30"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Abstraction" href="SysML_Copy_TEST.uml#_JHml8A_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="708:70" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Copy_TEST.uml#_J4U4QA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <owner xsi:type="di2:Uml1SemanticModelBridge">
- <element xsi:type="uml:Model" href="SysML_Copy_TEST.uml#_FjBFMQ_xEd2mbaTvSwUWQw"/>
- </owner>
-</di2:Diagram>
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_DeriveReqt_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_DeriveReqt_TEST.di2
deleted file mode 100644
index 457b6be40f5..00000000000
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_DeriveReqt_TEST.di2
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<di2:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di2="http://www.papyrusuml.org" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="DefaultDiagram">
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="120:61" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_DeriveReqt_TEST.uml#_x5NzwA_wEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="256:61" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_DeriveReqt_TEST.uml#_yOhVYA_wEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="356:112" graphEdge="//@contained.5"/>
- <anchorage position="356:137" graphEdge="//@contained.6"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="462:61" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_DeriveReqt_TEST.uml#_yoJWUA_wEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="461:112" graphEdge="//@contained.5"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="256:208" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_DeriveReqt_TEST.uml#_y7-RQA_wEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="356:267" graphEdge="//@contained.7"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="462:208" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_DeriveReqt_TEST.uml#_zWMvIA_wEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="461:253" graphEdge="//@contained.6"/>
- <anchorage position="461:267" graphEdge="//@contained.7"/>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.1/@anchorage.0 //@contained.2/@anchorage.0">
- <property key="PropStereoDisplay" value="SysML::Requirements::DeriveReqt"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-18" size="75:30"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Abstraction" href="SysML_DeriveReqt_TEST.uml#_3KuJoA_wEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.1/@anchorage.1 //@contained.4/@anchorage.0">
- <property key="PropStereoDisplay" value="SysML::Requirements::DeriveReqt"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-4" size="75:30"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Abstraction" href="SysML_DeriveReqt_TEST.uml#_48Q_wA_wEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.3/@anchorage.0 //@contained.4/@anchorage.1">
- <property key="PropStereoDisplay" value="SysML::Requirements::DeriveReqt"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="1:22" size="75:30"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Abstraction" href="SysML_DeriveReqt_TEST.uml#_5hE9AA_wEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <owner xsi:type="di2:Uml1SemanticModelBridge">
- <element xsi:type="uml:Model" href="SysML_DeriveReqt_TEST.uml#_u2TcYA_wEd2mbaTvSwUWQw"/>
- </owner>
-</di2:Diagram>
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_FlowPort_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_FlowPort_TEST.di2
deleted file mode 100644
index 88d88e21f21..00000000000
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_FlowPort_TEST.di2
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di2="http://www.papyrusuml.org" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML">
- <di2:Diagram isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="DefaultDiagram">
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="428:82" size="100:100">
- <property key="PropStereoDisplay" value="SysML::PortAndFlows::FlowSpecification"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Interface" href="SysML_FlowPort_TEST.uml#_g-Er0A_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="618:84" size="120:100">
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:PrimitiveType" href="SysML_FlowPort_TEST.uml#_irJ4sA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <owner xsi:type="di2:Uml1SemanticModelBridge">
- <element xsi:type="uml:Model" href="SysML_FlowPort_TEST.uml#_XAwHEA_xEd2mbaTvSwUWQw"/>
- </owner>
- </di2:Diagram>
- <di2:Diagram isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="Composite diagram of SysML_FlowPort_TEST" type="CompositeStructureDiagram">
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/1/@contained.1 /1/@contained.3 /1/@contained.5" position="199:49" size="600:291">
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_FlowPort_TEST.uml#_dtUFsA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/1/@contained.0" semanticChild="/1/@contained.2" position="789:99" size="20:20">
- <property key="PropStereoDisplay" value="SysML::PortAndFlows::FlowPort"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Port" href="SysML_FlowPort_TEST.uml#_eK9rAA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/1/@contained.1" position="597:80" size="196:15">
- <property key="custom_disp" value="56"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/1/@contained.0" semanticChild="/1/@contained.4" position="789:212" size="20:20">
- <property key="PropStereoDisplay" value="SysML::PortAndFlows::FlowPort"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Port" href="SysML_FlowPort_TEST.uml#_jzbIUA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/1/@contained.3" position="605:191" size="186:15">
- <property key="custom_disp" value="56"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/1/@contained.0" semanticChild="/1/@contained.6" position="189:160" size="20:20">
- <property key="PropStereoDisplay" value="SysML::PortAndFlows::FlowPort"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Port" href="SysML_FlowPort_TEST.uml#_nu9JwA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/1/@contained.5" position="210:137" size="196:15">
- <property key="custom_disp" value="56"/>
- </contained>
- <owner xsi:type="di2:Uml1SemanticModelBridge">
- <element xsi:type="uml:Model" href="SysML_FlowPort_TEST.uml#_XAwHEA_xEd2mbaTvSwUWQw"/>
- </owner>
- </di2:Diagram>
-</xmi:XMI>
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Refine_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Refine_TEST.di2
deleted file mode 100644
index fa6ddef2603..00000000000
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Refine_TEST.di2
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<di2:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di2="http://www.papyrusuml.org" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="DefaultDiagram">
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="201:75" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Refine_TEST.uml#_zIq0AA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="455:75" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::RequirementRelated"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Refine_TEST.uml#_zhGiIA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="555:125" graphEdge="//@contained.5"/>
- <anchorage position="555:132" graphEdge="//@contained.6"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="751:75" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Refine_TEST.uml#_zx8agA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="750:125" graphEdge="//@contained.5"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="751:246" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Refine_TEST.uml#_0BSeEA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="750:271" graphEdge="//@contained.6"/>
- <anchorage position="750:300" graphEdge="//@contained.7"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="455:246" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::RequirementRelated"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Refine_TEST.uml#_0V2Y0A_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="555:300" graphEdge="//@contained.7"/>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.1/@anchorage.0 //@contained.2/@anchorage.0">
- <property key="PropStereoDisplay" value="Standard::Refine"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-2:-18" size="75:30"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Abstraction" href="SysML_Refine_TEST.uml#_6vCvgA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.1/@anchorage.1 //@contained.3/@anchorage.0">
- <property key="PropStereoDisplay" value="Standard::Refine"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-1" size="75:30"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Abstraction" href="SysML_Refine_TEST.uml#_CwrqsA_yEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.4/@anchorage.0 //@contained.3/@anchorage.1">
- <property key="PropStereoDisplay" value="Standard::Refine"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-1:21" size="75:30"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Abstraction" href="SysML_Refine_TEST.uml#_DUvaAA_yEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="201:246" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::RequirementRelated"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Refine_TEST.uml#_houV4A_yEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <owner xsi:type="di2:Uml1SemanticModelBridge">
- <element xsi:type="uml:Model" href="SysML_Refine_TEST.uml#_wJfGRw_xEd2mbaTvSwUWQw"/>
- </owner>
-</di2:Diagram>
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Satisfy_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Satisfy_TEST.di2
deleted file mode 100644
index b7ac779d710..00000000000
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Satisfy_TEST.di2
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<di2:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di2="http://www.papyrusuml.org" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="DefaultDiagram">
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="201:75" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Satisfy_TEST.uml#_zIq0AA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="455:75" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::RequirementRelated"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Satisfy_TEST.uml#_zhGiIA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="555:125"/>
- <anchorage position="555:132"/>
- <anchorage position="555:119" graphEdge="//@contained.6"/>
- <anchorage position="555:134" graphEdge="//@contained.7"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="751:75" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Satisfy_TEST.uml#_zx8agA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="750:125"/>
- <anchorage position="750:119" graphEdge="//@contained.6"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="751:246" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Satisfy_TEST.uml#_0BSeEA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="750:271"/>
- <anchorage position="750:300"/>
- <anchorage position="750:270" graphEdge="//@contained.7"/>
- <anchorage position="750:301" graphEdge="//@contained.8"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="455:246" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::RequirementRelated"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Satisfy_TEST.uml#_0V2Y0A_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="555:300"/>
- <anchorage position="555:301" graphEdge="//@contained.8"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="201:246" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::RequirementRelated"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Satisfy_TEST.uml#_houV4A_yEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.1/@anchorage.2 //@contained.2/@anchorage.1">
- <property key="PropStereoDisplay" value="SysML::Requirements::Satisfy"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-1:-14" size="49:15"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Realization" href="SysML_Satisfy_TEST.uml#_v7uPgA_0Ed2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.1/@anchorage.3 //@contained.3/@anchorage.2">
- <property key="PropStereoDisplay" value="SysML::Requirements::Satisfy"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-1:3" size="49:15"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Realization" href="SysML_Satisfy_TEST.uml#_waaWoA_0Ed2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.4/@anchorage.1 //@contained.3/@anchorage.3">
- <property key="PropStereoDisplay" value="SysML::Requirements::Satisfy"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-1:-15" size="49:15"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Realization" href="SysML_Satisfy_TEST.uml#_xFLx8A_0Ed2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <owner xsi:type="di2:Uml1SemanticModelBridge">
- <element xsi:type="uml:Model" href="SysML_Satisfy_TEST.uml#_wJfGRw_xEd2mbaTvSwUWQw"/>
- </owner>
-</di2:Diagram>
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Trace_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Trace_TEST.di2
deleted file mode 100644
index 65d5ce4facf..00000000000
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Trace_TEST.di2
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<di2:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di2="http://www.papyrusuml.org" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="DefaultDiagram">
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="201:75" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Trace_TEST.uml#_zIq0AA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="455:75" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Trace_TEST.uml#_zhGiIA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="555:125" graphEdge="//@contained.5"/>
- <anchorage position="555:132" graphEdge="//@contained.6"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="751:75" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::RequirementRelated"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Trace_TEST.uml#_zx8agA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="750:125" graphEdge="//@contained.5"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="751:246" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::RequirementRelated"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Trace_TEST.uml#_0BSeEA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="750:271" graphEdge="//@contained.6"/>
- <anchorage position="750:300" graphEdge="//@contained.7"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="455:246" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Trace_TEST.uml#_0V2Y0A_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="555:300" graphEdge="//@contained.7"/>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.1/@anchorage.0 //@contained.2/@anchorage.0">
- <property key="PropStereoDisplay" value="Standard::Trace"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-2:-18" size="75:30"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Abstraction" href="SysML_Trace_TEST.uml#_6vCvgA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.1/@anchorage.1 //@contained.3/@anchorage.0">
- <property key="PropStereoDisplay" value="Standard::Trace"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-1" size="75:30"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Abstraction" href="SysML_Trace_TEST.uml#_CwrqsA_yEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.4/@anchorage.0 //@contained.3/@anchorage.1">
- <property key="PropStereoDisplay" value="Standard::Trace"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-1:21" size="75:30"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Abstraction" href="SysML_Trace_TEST.uml#_DUvaAA_yEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="201:246" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::RequirementRelated"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Trace_TEST.uml#_houV4A_yEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <owner xsi:type="di2:Uml1SemanticModelBridge">
- <element xsi:type="uml:Model" href="SysML_Trace_TEST.uml#_wJfGRw_xEd2mbaTvSwUWQw"/>
- </owner>
-</di2:Diagram>
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Verify_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Verify_TEST.di2
deleted file mode 100644
index cc52f7dfcbb..00000000000
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Verify_TEST.di2
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<di2:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di2="http://www.papyrusuml.org" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="DefaultDiagram">
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="201:75" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Verify_TEST.uml#_zIq0AA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="350:75" size="205:102">
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::TestCase"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="SysML_Verify_TEST.uml#_312fYA_yEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="534:125" graphEdge="//@contained.5"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::TestCase"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="SysML_Verify_TEST.uml#_4AbXsA_yEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="513:154" graphEdge="//@contained.6"/>
- </contained>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Verify_TEST.uml#_zhGiIA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="751:75" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Verify_TEST.uml#_zx8agA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="750:125" graphEdge="//@contained.5"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="751:246" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::Requirement"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Verify_TEST.uml#_0BSeEA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="750:271" graphEdge="//@contained.6"/>
- <anchorage position="750:319" graphEdge="//@contained.7"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="350:245" size="206:102">
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::TestCase"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="SysML_Verify_TEST.uml#_7KL98A_yEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100">
- <property key="PropStereoDisplay" value="SysML::Requirements::TestCase"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Operation" href="SysML_Verify_TEST.uml#_7Vq1MA_yEd2mbaTvSwUWQw"/>
- </semanticModel>
- <anchorage position="554:319" graphEdge="//@contained.7"/>
- </contained>
- </contained>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_Verify_TEST.uml#_0V2Y0A_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.1/@contained.1/@contained.0/@anchorage.0 //@contained.2/@anchorage.0">
- <property key="PropStereoDisplay" value="SysML::Requirements::Verify"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="29:-23" size="75:30"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Abstraction" href="SysML_Verify_TEST.uml#_6vCvgA_xEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.1/@contained.1/@contained.1/@anchorage.0 //@contained.3/@anchorage.0">
- <property key="PropStereoDisplay" value="SysML::Requirements::Verify"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="43:9" size="75:30"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Abstraction" href="SysML_Verify_TEST.uml#_CwrqsA_yEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.4/@contained.1/@contained.1/@anchorage.0 //@contained.3/@anchorage.1">
- <property key="PropStereoDisplay" value="SysML::Requirements::Verify"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="15:23" size="75:30"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Abstraction" href="SysML_Verify_TEST.uml#_DUvaAA_yEd2mbaTvSwUWQw"/>
- </semanticModel>
- </contained>
- <owner xsi:type="di2:Uml1SemanticModelBridge">
- <element xsi:type="uml:Model" href="SysML_Verify_TEST.uml#_wJfGRw_xEd2mbaTvSwUWQw"/>
- </owner>
-</di2:Diagram>
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_View_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_View_TEST.di2
deleted file mode 100644
index 56046b79807..00000000000
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_View_TEST.di2
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<di2:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di2="http://www.papyrusuml.org" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="DefaultDiagram">
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="649:120" size="100:100">
- <property key="PropStereoDisplay" value="SysML::ModelElements::ViewPoint"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_View_TEST.uml#_v9DegA_vEd2uupC7rat70Q"/>
- </semanticModel>
- <anchorage position="648:179" graphEdge="//@contained.4"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="347:120" size="200:100">
- <property key="PropStereoDisplay" value="SysML::ModelElements::View"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Package" href="SysML_View_TEST.uml#_xOtToA_vEd2uupC7rat70Q"/>
- </semanticModel>
- <anchorage position="547:179" graphEdge="//@contained.4"/>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="649:270" size="100:100">
- <property key="PropStereoDisplay" value="SysML::ModelElements::ViewPoint"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Class" href="SysML_View_TEST.uml#_xknSMA_vEd2uupC7rat70Q"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="347:270" size="200:100">
- <property key="PropStereoDisplay" value="SysML::ModelElements::View"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Package" href="SysML_View_TEST.uml#_yAVk4A_vEd2uupC7rat70Q"/>
- </semanticModel>
- </contained>
- <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="//@contained.1/@anchorage.0 //@contained.0/@anchorage.0">
- <property key="PropStereoDisplay" value="SysML::ModelElements::Conform"/>
- <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
- <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-3:-19" size="75:30"/>
- <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
- <element xsi:type="uml:Abstraction" href="SysML_View_TEST.uml#_1ofXUA_vEd2uupC7rat70Q"/>
- </semanticModel>
- </contained>
- <owner xsi:type="di2:Uml1SemanticModelBridge">
- <element xsi:type="uml:Model" href="SysML_View_TEST.uml#_vKPhgA_vEd2uupC7rat70Q"/>
- </owner>
-</di2:Diagram>
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocatedTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocatedTest.java
index 4423c9c4be3..3fe67eaba21 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocatedTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocatedTest.java
@@ -1,218 +1,218 @@
-/*****************************************************************************
- * Copyright (c) 2009, 2014 CEA LIST and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 422257
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.allocations.tests;
-
-import static org.junit.Assert.fail;
-
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
-import org.eclipse.papyrus.sysml.allocations.Allocated;
-import org.eclipse.papyrus.sysml.allocations.AllocationsFactory;
-import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;
-import org.eclipse.papyrus.sysml.utils.SysMLTestResources;
-import org.eclipse.uml2.uml.Abstraction;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-/**
- * <!-- begin-user-doc --> A test case for the model object '<em><b>Allocated</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * The following features are tested:
- * <ul>
- * <li>{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedFrom() <em>Allocated From</em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedTo() <em>Allocated To</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AllocatedTest extends AbstractPapyrusTest {
-
- @Rule
- public final HouseKeeper houseKeeper = new HouseKeeper();
-
- protected Allocated fixture = null;
-
- protected Class c0 = null;
-
- protected Class c1 = null;
-
- protected Class c2 = null;
-
- protected Class c3 = null;
-
- protected Class c4 = null;
-
- protected Allocated ac0 = null;
-
- protected Allocated ac1 = null;
-
- protected Allocated ac2 = null;
-
- protected Allocated ac3 = null;
-
- protected Allocated ac4 = null;
-
- protected Model model = null;
-
- /**
- * Returns the fixture for this Allocated test case. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected Allocated getFixture() {
- return fixture;
- }
-
- /**
- * Sets the fixture for this Allocated test case.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void setFixture(Allocated fixture) {
- this.fixture = fixture;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see junit.framework.TestCase#setUp()
- * @generated NOT
- */
- @Before
- public void setUp() throws Exception {
- setFixture(AllocationsFactory.eINSTANCE.createAllocated());
-
- // Prepare test
- model = SysMLTestResources.createSysMLModel(houseKeeper.createResourceSet());
- if(model == null) {
- fail();
- }
-
- if(model.getAppliedProfiles().isEmpty()) {
- fail();
- }
-
- // Create classes
- c0 = model.createOwnedClass("C0", false);
- c1 = model.createOwnedClass("C1", false);
- c2 = model.createOwnedClass("C2", false);
- c3 = model.createOwnedClass("C3", false);
- c4 = model.createOwnedClass("C4", false);
-
- // Add Allocated stereotype
-
- ac0 = (Allocated)StereotypeApplicationHelper.INSTANCE.applyStereotype(c0, AllocationsPackage.eINSTANCE.getAllocated());
- ac1 = (Allocated)StereotypeApplicationHelper.INSTANCE.applyStereotype(c1, AllocationsPackage.eINSTANCE.getAllocated());
- ac2 = (Allocated)StereotypeApplicationHelper.INSTANCE.applyStereotype(c2, AllocationsPackage.eINSTANCE.getAllocated());
- ac3 = (Allocated)StereotypeApplicationHelper.INSTANCE.applyStereotype(c3, AllocationsPackage.eINSTANCE.getAllocated());
- ac4 = (Allocated)StereotypeApplicationHelper.INSTANCE.applyStereotype(c4, AllocationsPackage.eINSTANCE.getAllocated());
-
- // Add Abstractions with allocate stereotype
- // c1 -> c2, c3
- // c4 -> c3
- Abstraction c1_c2 = UMLFactory.eINSTANCE.createAbstraction();
- c1_c2.getClients().add(c1);
- c1_c2.getSuppliers().add(c2);
- model.getPackagedElements().add(c1_c2);
-
- StereotypeApplicationHelper.INSTANCE.applyStereotype(c1_c2, AllocationsPackage.eINSTANCE.getAllocate());
-
- Abstraction c1_c3 = UMLFactory.eINSTANCE.createAbstraction();
- model.getPackagedElements().add(c1_c3);
- c1_c3.getClients().add(c1);
- c1_c3.getSuppliers().add(c3);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(c1_c3, AllocationsPackage.eINSTANCE.getAllocate());
-
- Abstraction c4_c3 = UMLFactory.eINSTANCE.createAbstraction();
- model.getPackagedElements().add(c4_c3);
- c4_c3.getClients().add(c4);
- c4_c3.getSuppliers().add(c3);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(c4_c3, AllocationsPackage.eINSTANCE.getAllocate());
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- @After
- public void tearDown() throws Exception {
- setFixture(null);
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedFrom()
- * <em>Allocated From</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedFrom()
- * @generated NOT
- */
- @Test
- public void testGetAllocatedFrom() {
-
- // Verifies : ac0.getAllocatedFrom = []
- if(!ac0.getAllocatedFrom().isEmpty()) {
- fail();
- }
-
- // Verifies : ac2.getAllocatedFrom = [c1]
- if(!ac2.getAllocatedFrom().contains(c1)) {
- fail();
- }
-
- // Verifies : ac3.getAllocatedFrom = [c1, c4]
- if(!(ac3.getAllocatedFrom().contains(c1) && ac3.getAllocatedFrom().contains(c4))) {
- fail();
- }
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedTo()
- * <em>Allocated To</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedTo()
- * @generated NOT
- */
- @Test
- public void testGetAllocatedTo() {
-
- // Verifies : ac0.getAllocatedTo = []
- if(!ac0.getAllocatedTo().isEmpty()) {
- fail();
- }
-
- // Verifies : ac0.getAllocatedTo = [c2, c3]
- if(!(ac1.getAllocatedTo().contains(c2) && ac1.getAllocatedTo().contains(c3))) {
- fail();
- }
-
- // Verifies : ac4.getAllocatedTo = [c3]
- if(!ac4.getAllocatedTo().contains(c3)) {
- fail();
- }
- }
-
-} // AllocatedTest
+/*****************************************************************************
+ * Copyright (c) 2009, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 422257
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.allocations.tests;
+
+import static org.junit.Assert.fail;
+
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.sysml.allocations.Allocated;
+import org.eclipse.papyrus.sysml.allocations.AllocationsFactory;
+import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;
+import org.eclipse.papyrus.sysml.utils.SysMLTestResources;
+import org.eclipse.uml2.uml.Abstraction;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * <!-- begin-user-doc --> A test case for the model object '<em><b>Allocated</b></em>'. <!--
+ * end-user-doc -->
+ * <p>
+ * The following features are tested:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedFrom() <em>Allocated From</em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedTo() <em>Allocated To</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class AllocatedTest extends AbstractPapyrusTest {
+
+ @Rule
+ public final HouseKeeper houseKeeper = new HouseKeeper();
+
+ protected Allocated fixture = null;
+
+ protected Class c0 = null;
+
+ protected Class c1 = null;
+
+ protected Class c2 = null;
+
+ protected Class c3 = null;
+
+ protected Class c4 = null;
+
+ protected Allocated ac0 = null;
+
+ protected Allocated ac1 = null;
+
+ protected Allocated ac2 = null;
+
+ protected Allocated ac3 = null;
+
+ protected Allocated ac4 = null;
+
+ protected Model model = null;
+
+ /**
+ * Returns the fixture for this Allocated test case. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ */
+ protected Allocated getFixture() {
+ return fixture;
+ }
+
+ /**
+ * Sets the fixture for this Allocated test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void setFixture(Allocated fixture) {
+ this.fixture = fixture;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see junit.framework.TestCase#setUp()
+ * @generated NOT
+ */
+ @Before
+ public void setUp() throws Exception {
+ setFixture(AllocationsFactory.eINSTANCE.createAllocated());
+
+ // Prepare test
+ model = SysMLTestResources.createSysMLModel(houseKeeper.createResourceSet());
+ if(model == null) {
+ fail();
+ }
+
+ if(model.getAppliedProfiles().isEmpty()) {
+ fail();
+ }
+
+ // Create classes
+ c0 = model.createOwnedClass("C0", false);
+ c1 = model.createOwnedClass("C1", false);
+ c2 = model.createOwnedClass("C2", false);
+ c3 = model.createOwnedClass("C3", false);
+ c4 = model.createOwnedClass("C4", false);
+
+ // Add Allocated stereotype
+
+ ac0 = (Allocated)StereotypeApplicationHelper.getInstance(null).applyStereotype(c0, AllocationsPackage.eINSTANCE.getAllocated());
+ ac1 = (Allocated)StereotypeApplicationHelper.getInstance(null).applyStereotype(c1, AllocationsPackage.eINSTANCE.getAllocated());
+ ac2 = (Allocated)StereotypeApplicationHelper.getInstance(null).applyStereotype(c2, AllocationsPackage.eINSTANCE.getAllocated());
+ ac3 = (Allocated)StereotypeApplicationHelper.getInstance(null).applyStereotype(c3, AllocationsPackage.eINSTANCE.getAllocated());
+ ac4 = (Allocated)StereotypeApplicationHelper.getInstance(null).applyStereotype(c4, AllocationsPackage.eINSTANCE.getAllocated());
+
+ // Add Abstractions with allocate stereotype
+ // c1 -> c2, c3
+ // c4 -> c3
+ Abstraction c1_c2 = UMLFactory.eINSTANCE.createAbstraction();
+ c1_c2.getClients().add(c1);
+ c1_c2.getSuppliers().add(c2);
+ model.getPackagedElements().add(c1_c2);
+
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(c1_c2, AllocationsPackage.eINSTANCE.getAllocate());
+
+ Abstraction c1_c3 = UMLFactory.eINSTANCE.createAbstraction();
+ model.getPackagedElements().add(c1_c3);
+ c1_c3.getClients().add(c1);
+ c1_c3.getSuppliers().add(c3);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(c1_c3, AllocationsPackage.eINSTANCE.getAllocate());
+
+ Abstraction c4_c3 = UMLFactory.eINSTANCE.createAbstraction();
+ model.getPackagedElements().add(c4_c3);
+ c4_c3.getClients().add(c4);
+ c4_c3.getSuppliers().add(c3);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(c4_c3, AllocationsPackage.eINSTANCE.getAllocate());
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see junit.framework.TestCase#tearDown()
+ * @generated
+ */
+ @After
+ public void tearDown() throws Exception {
+ setFixture(null);
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedFrom()
+ * <em>Allocated From</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedFrom()
+ * @generated NOT
+ */
+ @Test
+ public void testGetAllocatedFrom() {
+
+ // Verifies : ac0.getAllocatedFrom = []
+ if(!ac0.getAllocatedFrom().isEmpty()) {
+ fail();
+ }
+
+ // Verifies : ac2.getAllocatedFrom = [c1]
+ if(!ac2.getAllocatedFrom().contains(c1)) {
+ fail();
+ }
+
+ // Verifies : ac3.getAllocatedFrom = [c1, c4]
+ if(!(ac3.getAllocatedFrom().contains(c1) && ac3.getAllocatedFrom().contains(c4))) {
+ fail();
+ }
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedTo()
+ * <em>Allocated To</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.allocations.Allocated#getAllocatedTo()
+ * @generated NOT
+ */
+ @Test
+ public void testGetAllocatedTo() {
+
+ // Verifies : ac0.getAllocatedTo = []
+ if(!ac0.getAllocatedTo().isEmpty()) {
+ fail();
+ }
+
+ // Verifies : ac0.getAllocatedTo = [c2, c3]
+ if(!(ac1.getAllocatedTo().contains(c2) && ac1.getAllocatedTo().contains(c3))) {
+ fail();
+ }
+
+ // Verifies : ac4.getAllocatedTo = [c3]
+ if(!ac4.getAllocatedTo().contains(c3)) {
+ fail();
+ }
+ }
+
+} // AllocatedTest
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewTest.java
index c01eefb87d1..f1f664e2874 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewTest.java
@@ -1,167 +1,167 @@
-/*****************************************************************************
- * Copyright (c) 2009, 2014 CEA LIST and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 422257
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.modelelements.tests;
-
-import static org.junit.Assert.fail;
-
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
-import org.eclipse.papyrus.sysml.modelelements.ModelelementsFactory;
-import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;
-import org.eclipse.papyrus.sysml.modelelements.View;
-import org.eclipse.papyrus.sysml.modelelements.ViewPoint;
-import org.eclipse.papyrus.sysml.utils.SysMLTestResources;
-import org.eclipse.uml2.uml.Abstraction;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-/**
- * <!-- begin-user-doc --> A test case for the model object '<em><b>View</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * The following features are tested:
- * <ul>
- * <li>{@link org.eclipse.papyrus.sysml.modelelements.View#getViewPoint() <em>View Point</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ViewTest extends AbstractPapyrusTest {
-
- @Rule
- public final HouseKeeper houseKeeper = new HouseKeeper();
-
- protected View fixture = null;
-
- protected Package p0 = null;
-
- protected Package p1 = null;
-
- protected Class c1 = null;
-
- protected ViewPoint vp1 = null;
-
- protected View v0 = null;
-
- protected View v1 = null;
-
- protected Model model = null;
-
- /**
- * Returns the fixture for this View test case.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected View getFixture() {
- return fixture;
- }
-
- /**
- * Sets the fixture for this View test case.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void setFixture(View fixture) {
- this.fixture = fixture;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see junit.framework.TestCase#setUp()
- * @generated NOT
- */
- @Before
- public void setUp() throws Exception {
- setFixture(ModelelementsFactory.eINSTANCE.createView());
-
- // Prepare test
- model = SysMLTestResources.createSysMLModel(houseKeeper.createResourceSet());
- if(model == null) {
- fail();
- }
-
- if(model.getAppliedProfiles().isEmpty()) {
- fail();
- }
-
- // Create packages
- p0 = model.createNestedPackage("p0");
- p1 = model.createNestedPackage("p1");
-
- // Create classes
- c1 = model.createOwnedClass("c1", false);
-
- // Add View stereotype
-
- v0 = (View)StereotypeApplicationHelper.INSTANCE.applyStereotype(p0, ModelelementsPackage.eINSTANCE.getView());
- v1 = (View)StereotypeApplicationHelper.INSTANCE.applyStereotype(p1, ModelelementsPackage.eINSTANCE.getView());
-
- // Add ViewPoint stereotype
- vp1 = (ViewPoint)StereotypeApplicationHelper.INSTANCE.applyStereotype(c1, ModelelementsPackage.eINSTANCE.getViewPoint());
-
- // Add Abstractions with allocate stereotype
- // v1 (p1) -> vp1 (c1)
- Abstraction v1_vp1 = UMLFactory.eINSTANCE.createAbstraction();
- v1_vp1.getClients().add(p1);
- v1_vp1.getSuppliers().add(c1);
- model.getPackagedElements().add(v1_vp1);
-
- StereotypeApplicationHelper.INSTANCE.applyStereotype(v1_vp1, ModelelementsPackage.eINSTANCE.getConform());
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- @After
- public void tearDown() throws Exception {
- setFixture(null);
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.modelelements.View#getViewPoint()
- * <em>View Point</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.modelelements.View#getViewPoint()
- * @generated NOT
- */
- @Test
- public void testGetViewPoint() {
-
- // Verifies : v0.getViewPoint = []
- if(v0.getViewPoint() != null) {
- fail();
- }
-
- // Verifies : v1.getViewPoint = vp1
- if(!v1.getViewPoint().equals(vp1)) {
- fail();
- }
- }
-
-} // ViewTest
+/*****************************************************************************
+ * Copyright (c) 2009, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 422257
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.modelelements.tests;
+
+import static org.junit.Assert.fail;
+
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.sysml.modelelements.ModelelementsFactory;
+import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;
+import org.eclipse.papyrus.sysml.modelelements.View;
+import org.eclipse.papyrus.sysml.modelelements.ViewPoint;
+import org.eclipse.papyrus.sysml.utils.SysMLTestResources;
+import org.eclipse.uml2.uml.Abstraction;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * <!-- begin-user-doc --> A test case for the model object '<em><b>View</b></em>'. <!--
+ * end-user-doc -->
+ * <p>
+ * The following features are tested:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.sysml.modelelements.View#getViewPoint() <em>View Point</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ViewTest extends AbstractPapyrusTest {
+
+ @Rule
+ public final HouseKeeper houseKeeper = new HouseKeeper();
+
+ protected View fixture = null;
+
+ protected Package p0 = null;
+
+ protected Package p1 = null;
+
+ protected Class c1 = null;
+
+ protected ViewPoint vp1 = null;
+
+ protected View v0 = null;
+
+ protected View v1 = null;
+
+ protected Model model = null;
+
+ /**
+ * Returns the fixture for this View test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected View getFixture() {
+ return fixture;
+ }
+
+ /**
+ * Sets the fixture for this View test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void setFixture(View fixture) {
+ this.fixture = fixture;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see junit.framework.TestCase#setUp()
+ * @generated NOT
+ */
+ @Before
+ public void setUp() throws Exception {
+ setFixture(ModelelementsFactory.eINSTANCE.createView());
+
+ // Prepare test
+ model = SysMLTestResources.createSysMLModel(houseKeeper.createResourceSet());
+ if(model == null) {
+ fail();
+ }
+
+ if(model.getAppliedProfiles().isEmpty()) {
+ fail();
+ }
+
+ // Create packages
+ p0 = model.createNestedPackage("p0");
+ p1 = model.createNestedPackage("p1");
+
+ // Create classes
+ c1 = model.createOwnedClass("c1", false);
+
+ // Add View stereotype
+
+ v0 = (View)StereotypeApplicationHelper.getInstance(null).applyStereotype(p0, ModelelementsPackage.eINSTANCE.getView());
+ v1 = (View)StereotypeApplicationHelper.getInstance(null).applyStereotype(p1, ModelelementsPackage.eINSTANCE.getView());
+
+ // Add ViewPoint stereotype
+ vp1 = (ViewPoint)StereotypeApplicationHelper.getInstance(null).applyStereotype(c1, ModelelementsPackage.eINSTANCE.getViewPoint());
+
+ // Add Abstractions with allocate stereotype
+ // v1 (p1) -> vp1 (c1)
+ Abstraction v1_vp1 = UMLFactory.eINSTANCE.createAbstraction();
+ v1_vp1.getClients().add(p1);
+ v1_vp1.getSuppliers().add(c1);
+ model.getPackagedElements().add(v1_vp1);
+
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(v1_vp1, ModelelementsPackage.eINSTANCE.getConform());
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see junit.framework.TestCase#tearDown()
+ * @generated
+ */
+ @After
+ public void tearDown() throws Exception {
+ setFixture(null);
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.modelelements.View#getViewPoint()
+ * <em>View Point</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.modelelements.View#getViewPoint()
+ * @generated NOT
+ */
+ @Test
+ public void testGetViewPoint() {
+
+ // Verifies : v0.getViewPoint = []
+ if(v0.getViewPoint() != null) {
+ fail();
+ }
+
+ // Verifies : v1.getViewPoint = vp1
+ if(!v1.getViewPoint().equals(vp1)) {
+ fail();
+ }
+ }
+
+} // ViewTest
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java
index 152fa2ed914..0ecffb1ec41 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java
@@ -1,218 +1,218 @@
-/*****************************************************************************
- * Copyright (c) 2009, 2014 CEA LIST and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 422257
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.portandflows.tests;
-
-import static org.junit.Assert.fail;
-
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
-import org.eclipse.papyrus.sysml.portandflows.FlowDirection;
-import org.eclipse.papyrus.sysml.portandflows.FlowPort;
-import org.eclipse.papyrus.sysml.portandflows.FlowSpecification;
-import org.eclipse.papyrus.sysml.portandflows.PortandflowsFactory;
-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
-import org.eclipse.papyrus.sysml.utils.SysMLTestResources;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Image;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.PrimitiveType;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.util.UMLUtil;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-/**
- * <!-- begin-user-doc --> A test case for the model object '<em><b>Flow Port</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * The following features are tested:
- * <ul>
- * <li>{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#isAtomic() <em>Is Atomic</em>}</li>
- * </ul>
- * </p>
- * <p>
- * The following operations are tested:
- * <ul>
- * <li>{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#getIcon() <em>Get Icon</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FlowPortTest extends AbstractPapyrusTest {
-
- @Rule
- public final HouseKeeper houseKeeper = new HouseKeeper();
-
- protected FlowPort fixture = null;
-
- protected Class c0 = null;
-
- protected Interface i2 = null;
-
- protected Port p0 = null;
-
- protected Port p1 = null;
-
- protected Port p2 = null;
-
- protected FlowPort fp0 = null;
-
- protected FlowPort fp1 = null;
-
- protected FlowPort fp2 = null;
-
- protected FlowSpecification fsp2 = null;
-
- protected Model model = null;
-
- /**
- * Returns the fixture for this Flow Port test case. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected FlowPort getFixture() {
- return fixture;
- }
-
- /**
- * Sets the fixture for this Flow Port test case.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void setFixture(FlowPort fixture) {
- this.fixture = fixture;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see junit.framework.TestCase#setUp()
- * @generated NOT
- */
- @Before
- public void setUp() throws Exception {
- setFixture(PortandflowsFactory.eINSTANCE.createFlowPort());
-
- // Prepare test
- model = SysMLTestResources.createSysMLModel(houseKeeper.createResourceSet());
- if(model == null) {
- fail();
- }
-
- if(model.getAppliedProfiles().isEmpty()) {
- fail();
- }
-
- // Create classes & interface
- c0 = model.createOwnedClass("c0", false);
- i2 = model.createOwnedInterface("i2");
-
- // Create type
- PrimitiveType ptype = model.createOwnedPrimitiveType("type");
-
- // Create ports
- p0 = c0.createOwnedPort("p0", null);
- p1 = c0.createOwnedPort("p1", ptype);
- p2 = c0.createOwnedPort("p2", i2);
-
- // Add FlowPort stereotypes
- fp0 = (FlowPort)StereotypeApplicationHelper.INSTANCE.applyStereotype(p0, PortandflowsPackage.eINSTANCE.getFlowPort());
- fp1 = (FlowPort)StereotypeApplicationHelper.INSTANCE.applyStereotype(p1, PortandflowsPackage.eINSTANCE.getFlowPort());
- fp1.setDirection(FlowDirection.OUT);
- fp2 = (FlowPort)StereotypeApplicationHelper.INSTANCE.applyStereotype(p2, PortandflowsPackage.eINSTANCE.getFlowPort());
- fp2.setDirection(FlowDirection.IN);
- fp2.setIsConjugated(true);
-
- // Add FlowSpecification
- fsp2 = (FlowSpecification)StereotypeApplicationHelper.INSTANCE.applyStereotype(i2, PortandflowsPackage.eINSTANCE.getFlowSpecification());
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- @After
- public void tearDown() throws Exception {
- setFixture(null);
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#isAtomic() <em>Is Atomic</em>}' feature getter.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.portandflows.FlowPort#isAtomic()
- * @generated NOT
- */
- @Test
- public void testIsAtomic() {
- // FlowPort without type is Atomic
- if(!fp0.isAtomic()) {
- fail();
- }
-
- // FlowPort type is not a FlowSpecification
- if(!fp1.isAtomic()) {
- fail();
- }
-
- // FlowPort type is a FlowSpecification
- if(fp2.isAtomic()) {
- fail();
- }
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#getIcon()
- * <em>Get Icon</em>}' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.portandflows.FlowPort#getIcon()
- * @generated NOT
- */
- @Test
- public void testGetIcon() {
-
- // Retrieve Stereotype
- Stereotype s = UMLUtil.getStereotype(fp0);
-
- //Image i0 = s.getIcons().get(1); // IN
- Image i1 = s.getIcons().get(2); // OUT
- Image i2 = s.getIcons().get(3); // INOUT
- Image i3 = s.getIcons().get(4); // NA
-
- if(!fp0.getIcon().equals(i2)) { // fp0 is INOUT
- fail();
- }
-
- if(!fp1.getIcon().equals(i1)) { // fp1 is OUT
- fail();
- }
-
- if(!fp2.getIcon().equals(i3)) { // fp2 is atomic
- fail();
- }
- }
-
-} // FlowPortTest
+/*****************************************************************************
+ * Copyright (c) 2009, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 422257
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.portandflows.tests;
+
+import static org.junit.Assert.fail;
+
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.sysml.portandflows.FlowDirection;
+import org.eclipse.papyrus.sysml.portandflows.FlowPort;
+import org.eclipse.papyrus.sysml.portandflows.FlowSpecification;
+import org.eclipse.papyrus.sysml.portandflows.PortandflowsFactory;
+import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
+import org.eclipse.papyrus.sysml.utils.SysMLTestResources;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Image;
+import org.eclipse.uml2.uml.Interface;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Port;
+import org.eclipse.uml2.uml.PrimitiveType;
+import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.uml2.uml.util.UMLUtil;
+import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * <!-- begin-user-doc --> A test case for the model object '<em><b>Flow Port</b></em>'. <!--
+ * end-user-doc -->
+ * <p>
+ * The following features are tested:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#isAtomic() <em>Is Atomic</em>}</li>
+ * </ul>
+ * </p>
+ * <p>
+ * The following operations are tested:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#getIcon() <em>Get Icon</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class FlowPortTest extends AbstractPapyrusTest {
+
+ @Rule
+ public final HouseKeeper houseKeeper = new HouseKeeper();
+
+ protected FlowPort fixture = null;
+
+ protected Class c0 = null;
+
+ protected Interface i2 = null;
+
+ protected Port p0 = null;
+
+ protected Port p1 = null;
+
+ protected Port p2 = null;
+
+ protected FlowPort fp0 = null;
+
+ protected FlowPort fp1 = null;
+
+ protected FlowPort fp2 = null;
+
+ protected FlowSpecification fsp2 = null;
+
+ protected Model model = null;
+
+ /**
+ * Returns the fixture for this Flow Port test case. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ */
+ protected FlowPort getFixture() {
+ return fixture;
+ }
+
+ /**
+ * Sets the fixture for this Flow Port test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void setFixture(FlowPort fixture) {
+ this.fixture = fixture;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see junit.framework.TestCase#setUp()
+ * @generated NOT
+ */
+ @Before
+ public void setUp() throws Exception {
+ setFixture(PortandflowsFactory.eINSTANCE.createFlowPort());
+
+ // Prepare test
+ model = SysMLTestResources.createSysMLModel(houseKeeper.createResourceSet());
+ if(model == null) {
+ fail();
+ }
+
+ if(model.getAppliedProfiles().isEmpty()) {
+ fail();
+ }
+
+ // Create classes & interface
+ c0 = model.createOwnedClass("c0", false);
+ i2 = model.createOwnedInterface("i2");
+
+ // Create type
+ PrimitiveType ptype = model.createOwnedPrimitiveType("type");
+
+ // Create ports
+ p0 = c0.createOwnedPort("p0", null);
+ p1 = c0.createOwnedPort("p1", ptype);
+ p2 = c0.createOwnedPort("p2", i2);
+
+ // Add FlowPort stereotypes
+ fp0 = (FlowPort)StereotypeApplicationHelper.getInstance(null).applyStereotype(p0, PortandflowsPackage.eINSTANCE.getFlowPort());
+ fp1 = (FlowPort)StereotypeApplicationHelper.getInstance(null).applyStereotype(p1, PortandflowsPackage.eINSTANCE.getFlowPort());
+ fp1.setDirection(FlowDirection.OUT);
+ fp2 = (FlowPort)StereotypeApplicationHelper.getInstance(null).applyStereotype(p2, PortandflowsPackage.eINSTANCE.getFlowPort());
+ fp2.setDirection(FlowDirection.IN);
+ fp2.setIsConjugated(true);
+
+ // Add FlowSpecification
+ fsp2 = (FlowSpecification)StereotypeApplicationHelper.getInstance(null).applyStereotype(i2, PortandflowsPackage.eINSTANCE.getFlowSpecification());
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see junit.framework.TestCase#tearDown()
+ * @generated
+ */
+ @After
+ public void tearDown() throws Exception {
+ setFixture(null);
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#isAtomic() <em>Is Atomic</em>}' feature getter.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.portandflows.FlowPort#isAtomic()
+ * @generated NOT
+ */
+ @Test
+ public void testIsAtomic() {
+ // FlowPort without type is Atomic
+ if(!fp0.isAtomic()) {
+ fail();
+ }
+
+ // FlowPort type is not a FlowSpecification
+ if(!fp1.isAtomic()) {
+ fail();
+ }
+
+ // FlowPort type is a FlowSpecification
+ if(fp2.isAtomic()) {
+ fail();
+ }
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.portandflows.FlowPort#getIcon()
+ * <em>Get Icon</em>}' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.portandflows.FlowPort#getIcon()
+ * @generated NOT
+ */
+ @Test
+ public void testGetIcon() {
+
+ // Retrieve Stereotype
+ Stereotype s = UMLUtil.getStereotype(fp0);
+
+ //Image i0 = s.getIcons().get(1); // IN
+ Image i1 = s.getIcons().get(2); // OUT
+ Image i2 = s.getIcons().get(3); // INOUT
+ Image i3 = s.getIcons().get(4); // NA
+
+ if(!fp0.getIcon().equals(i2)) { // fp0 is INOUT
+ fail();
+ }
+
+ if(!fp1.getIcon().equals(i1)) { // fp1 is OUT
+ fail();
+ }
+
+ if(!fp2.getIcon().equals(i3)) { // fp2 is atomic
+ fail();
+ }
+ }
+
+} // FlowPortTest
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java
index e2b5f7c5ba9..b362a33cead 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java
@@ -1,174 +1,174 @@
-/*****************************************************************************
- * Copyright (c) 2009, 2014 CEA LIST and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 422257
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.portandflows.tests;
-
-import static org.junit.Assert.fail;
-
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
-import org.eclipse.papyrus.sysml.portandflows.FlowDirection;
-import org.eclipse.papyrus.sysml.portandflows.FlowProperty;
-import org.eclipse.papyrus.sysml.portandflows.PortandflowsFactory;
-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
-import org.eclipse.papyrus.sysml.utils.SysMLTestResources;
-import org.eclipse.uml2.uml.Image;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.util.UMLUtil;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-/**
- * <!-- begin-user-doc --> A test case for the model object '<em><b>Flow Property</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * The following operations are tested:
- * <ul>
- * <li>{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#getIcon() <em>Get Icon</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FlowPropertyTest extends AbstractPapyrusTest {
-
- @Rule
- public final HouseKeeper houseKeeper = new HouseKeeper();
-
- /**
- * The fixture for this Flow Property test case. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- protected FlowProperty fixture = null;
-
- protected Interface i = null;
-
- protected FlowProperty fp0 = null;
-
- protected FlowProperty fp1 = null;
-
- protected FlowProperty fp2 = null;
-
- protected Model model = null;
-
- /**
- * Returns the fixture for this Flow Property test case.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected FlowProperty getFixture() {
- return fixture;
- }
-
- /**
- * Sets the fixture for this Flow Property test case. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void setFixture(FlowProperty fixture) {
- this.fixture = fixture;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see junit.framework.TestCase#setUp()
- * @generated NOT
- */
- @Before
- public void setUp() throws Exception {
- setFixture(PortandflowsFactory.eINSTANCE.createFlowProperty());
-
- // Prepare test
- model = SysMLTestResources.createSysMLModel(houseKeeper.createResourceSet());
- if(model == null) {
- fail();
- }
-
- if(model.getAppliedProfiles().isEmpty()) {
- fail();
- }
-
- // Create interface
- i = model.createOwnedInterface("i");
-
- // Create properties
- Property p0 = i.createOwnedAttribute("p0", null);
- Property p1 = i.createOwnedAttribute("p1", null);
- Property p2 = i.createOwnedAttribute("p2", null);
-
- // Add FlowPort stereotypes
- fp0 = (FlowProperty)StereotypeApplicationHelper.INSTANCE.applyStereotype(p0, PortandflowsPackage.eINSTANCE.getFlowProperty());
- fp0.setDirection(FlowDirection.IN);
-
- fp1 = (FlowProperty)StereotypeApplicationHelper.INSTANCE.applyStereotype(p1, PortandflowsPackage.eINSTANCE.getFlowProperty());
- fp1.setDirection(FlowDirection.OUT);
-
- fp2 = (FlowProperty)StereotypeApplicationHelper.INSTANCE.applyStereotype(p2, PortandflowsPackage.eINSTANCE.getFlowProperty());
- fp2.setDirection(FlowDirection.INOUT);
-
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- @After
- public void tearDown() throws Exception {
- setFixture(null);
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#getIcon()
- * <em>Get Icon</em>}' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.portandflows.FlowProperty#getIcon()
- * @generated NOT
- */
- @Test
- public void testGetIcon() {
-
- // Retrieve Stereotype
- Stereotype s = UMLUtil.getStereotype(fp0);
-
- Image i0 = s.getIcons().get(1); // IN
- Image i1 = s.getIcons().get(2); // OUT
- Image i2 = s.getIcons().get(3); // INOUT
-
- if(!fp0.getIcon().equals(i0)) {
- fail();
- }
-
- if(!fp1.getIcon().equals(i1)) {
- fail();
- }
-
- if(!fp2.getIcon().equals(i2)) {
- fail();
- }
- }
-
-} // FlowPropertyTest
+/*****************************************************************************
+ * Copyright (c) 2009, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 422257
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.portandflows.tests;
+
+import static org.junit.Assert.fail;
+
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.sysml.portandflows.FlowDirection;
+import org.eclipse.papyrus.sysml.portandflows.FlowProperty;
+import org.eclipse.papyrus.sysml.portandflows.PortandflowsFactory;
+import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
+import org.eclipse.papyrus.sysml.utils.SysMLTestResources;
+import org.eclipse.uml2.uml.Image;
+import org.eclipse.uml2.uml.Interface;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.uml2.uml.util.UMLUtil;
+import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * <!-- begin-user-doc --> A test case for the model object '<em><b>Flow Property</b></em>'. <!--
+ * end-user-doc -->
+ * <p>
+ * The following operations are tested:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#getIcon() <em>Get Icon</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class FlowPropertyTest extends AbstractPapyrusTest {
+
+ @Rule
+ public final HouseKeeper houseKeeper = new HouseKeeper();
+
+ /**
+ * The fixture for this Flow Property test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated NOT
+ */
+ protected FlowProperty fixture = null;
+
+ protected Interface i = null;
+
+ protected FlowProperty fp0 = null;
+
+ protected FlowProperty fp1 = null;
+
+ protected FlowProperty fp2 = null;
+
+ protected Model model = null;
+
+ /**
+ * Returns the fixture for this Flow Property test case.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ protected FlowProperty getFixture() {
+ return fixture;
+ }
+
+ /**
+ * Sets the fixture for this Flow Property test case. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ */
+ protected void setFixture(FlowProperty fixture) {
+ this.fixture = fixture;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see junit.framework.TestCase#setUp()
+ * @generated NOT
+ */
+ @Before
+ public void setUp() throws Exception {
+ setFixture(PortandflowsFactory.eINSTANCE.createFlowProperty());
+
+ // Prepare test
+ model = SysMLTestResources.createSysMLModel(houseKeeper.createResourceSet());
+ if(model == null) {
+ fail();
+ }
+
+ if(model.getAppliedProfiles().isEmpty()) {
+ fail();
+ }
+
+ // Create interface
+ i = model.createOwnedInterface("i");
+
+ // Create properties
+ Property p0 = i.createOwnedAttribute("p0", null);
+ Property p1 = i.createOwnedAttribute("p1", null);
+ Property p2 = i.createOwnedAttribute("p2", null);
+
+ // Add FlowPort stereotypes
+ fp0 = (FlowProperty)StereotypeApplicationHelper.getInstance(null).applyStereotype(p0, PortandflowsPackage.eINSTANCE.getFlowProperty());
+ fp0.setDirection(FlowDirection.IN);
+
+ fp1 = (FlowProperty)StereotypeApplicationHelper.getInstance(null).applyStereotype(p1, PortandflowsPackage.eINSTANCE.getFlowProperty());
+ fp1.setDirection(FlowDirection.OUT);
+
+ fp2 = (FlowProperty)StereotypeApplicationHelper.getInstance(null).applyStereotype(p2, PortandflowsPackage.eINSTANCE.getFlowProperty());
+ fp2.setDirection(FlowDirection.INOUT);
+
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see junit.framework.TestCase#tearDown()
+ * @generated
+ */
+ @After
+ public void tearDown() throws Exception {
+ setFixture(null);
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.portandflows.FlowProperty#getIcon()
+ * <em>Get Icon</em>}' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.portandflows.FlowProperty#getIcon()
+ * @generated NOT
+ */
+ @Test
+ public void testGetIcon() {
+
+ // Retrieve Stereotype
+ Stereotype s = UMLUtil.getStereotype(fp0);
+
+ Image i0 = s.getIcons().get(1); // IN
+ Image i1 = s.getIcons().get(2); // OUT
+ Image i2 = s.getIcons().get(3); // INOUT
+
+ if(!fp0.getIcon().equals(i0)) {
+ fail();
+ }
+
+ if(!fp1.getIcon().equals(i1)) {
+ fail();
+ }
+
+ if(!fp2.getIcon().equals(i2)) {
+ fail();
+ }
+ }
+
+} // FlowPropertyTest
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementRelatedTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementRelatedTest.java
index 07633d3aa66..db86516ea56 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementRelatedTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementRelatedTest.java
@@ -1,404 +1,404 @@
-/*****************************************************************************
- * Copyright (c) 2009, 2014 CEA LIST and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 422257
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.requirements.tests;
-
-import static org.junit.Assert.fail;
-
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
-import org.eclipse.papyrus.sysml.requirements.Requirement;
-import org.eclipse.papyrus.sysml.requirements.RequirementRelated;
-import org.eclipse.papyrus.sysml.requirements.RequirementsFactory;
-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
-import org.eclipse.papyrus.sysml.utils.SysMLTestResources;
-import org.eclipse.uml2.uml.Abstraction;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Realization;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.profile.standard.StandardPackage;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-/**
- * <!-- begin-user-doc --> A test case for the model object '<em><b>Requirement Related</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are tested:
- * <ul>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getTracedFrom() <em>Traced From</em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getSatisfies() <em>Satisfies</em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getRefines() <em>Refines</em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getVerifies() <em>Verifies</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RequirementRelatedTest extends AbstractPapyrusTest {
-
- @Rule
- public final HouseKeeper houseKeeper = new HouseKeeper();
-
- protected RequirementRelated fixture = null;
-
- protected RequirementRelated default_reqR = null;
-
- protected Model model = null;
-
- // ////////////////////////////////////////////////////////////////////
-
- protected Class copy = null;
-
- protected Class master = null;
-
- protected Requirement copy_req = null;
-
- protected Requirement master_req = null;
-
- protected RequirementRelated copy_reqR = null;
-
- protected Requirement trace1_req = null;
-
- protected Requirement trace2_req = null;
-
- protected RequirementRelated traced_reqR = null;
-
- // ////////////////////////////////////////////////////////////////////
- // ////////////////////////////////////////////////////////////////////
- protected Requirement satisfied1_req = null;
-
- protected Requirement satisfied2_req = null;
-
- protected RequirementRelated satisfying_reqR = null;
-
- // ////////////////////////////////////////////////////////////////////
- // ////////////////////////////////////////////////////////////////////
- protected Requirement verified1_req = null;
-
- protected Requirement verified2_req = null;
-
- protected RequirementRelated verifying_reqR = null;
-
- // ////////////////////////////////////////////////////////////////////
- // ////////////////////////////////////////////////////////////////////
- protected Requirement refined1_req = null;
-
- protected Requirement refined2_req = null;
-
- protected RequirementRelated refining_reqR = null;
-
- // ////////////////////////////////////////////////////////////////////
-
- /**
- * Returns the fixture for this Requirement Related test case.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected RequirementRelated getFixture() {
- return fixture;
- }
-
- /**
- * Sets the fixture for this Requirement Related test case.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void setFixture(RequirementRelated fixture) {
- this.fixture = fixture;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see junit.framework.TestCase#setUp()
- * @generated NOT
- */
- @Before
- public void setUp() throws Exception {
- setFixture(RequirementsFactory.eINSTANCE.createRequirementRelated());
-
- // Prepare test
- model = SysMLTestResources.createSysMLModel(houseKeeper.createResourceSet());
- if(model == null) {
- fail();
- }
-
- if(model.getAppliedProfiles().isEmpty()) {
- fail();
- }
-
- // Create classes & interface
- Class defaultClass = model.createOwnedClass("defaultClass", false);
-
- // Add Requirement stereotypes
- default_reqR = (RequirementRelated)StereotypeApplicationHelper.INSTANCE.applyStereotype(defaultClass, RequirementsPackage.eINSTANCE.getRequirementRelated());
-
- // ////////////////////////////////////////////////////////////////////
- // Prepare getTracedFrom test elements
- // ////////////////////////////////////////////////////////////////////
-
- Class traced = model.createOwnedClass("traced", false);
- traced_reqR = (RequirementRelated)StereotypeApplicationHelper.INSTANCE.applyStereotype(traced, RequirementsPackage.eINSTANCE.getRequirementRelated());
-
- Class trace1 = model.createOwnedClass("trace1", false);
- trace1_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(trace1, RequirementsPackage.eINSTANCE.getRequirement());
-
- Class trace2 = model.createOwnedClass("trace2", false);
- trace2_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(trace2, RequirementsPackage.eINSTANCE.getRequirement());
-
- // Add "Trace" (Abstraction)
- // trace1, trace2 -> traced
- Abstraction t11 = UMLFactory.eINSTANCE.createAbstraction();
- t11.getClients().add(traced);
- t11.getSuppliers().add(trace1);
- model.getPackagedElements().add(t11);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(t11, StandardPackage.eINSTANCE.getTrace());
-
- Abstraction t12 = UMLFactory.eINSTANCE.createAbstraction();
- t12.getClients().add(traced);
- t12.getSuppliers().add(trace2);
- model.getPackagedElements().add(t12);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(t12, StandardPackage.eINSTANCE.getTrace());
-
- master = model.createOwnedClass("master", false);
- master_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(master, RequirementsPackage.eINSTANCE.getRequirement());
-
- copy = model.createOwnedClass("copy", false);
- copy_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(copy, RequirementsPackage.eINSTANCE.getRequirement());
- copy_reqR = (RequirementRelated)StereotypeApplicationHelper.INSTANCE.applyStereotype(copy, RequirementsPackage.eINSTANCE.getRequirementRelated());
-
- // Add "copy" (Abstraction) between master and copy
- // copy -> master
- Abstraction c_m = UMLFactory.eINSTANCE.createAbstraction();
- c_m.getClients().add(copy);
- c_m.getSuppliers().add(master);
- model.getPackagedElements().add(c_m);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(c_m, RequirementsPackage.eINSTANCE.getCopy());
-
-
- // ////////////////////////////////////////////////////////////////////
-
- // ////////////////////////////////////////////////////////////////////
- // Prepare getSatisfies() test elements
- // ////////////////////////////////////////////////////////////////////
-
- Class satisfying = model.createOwnedClass("satisfying", false);
- satisfying_reqR = (RequirementRelated)StereotypeApplicationHelper.INSTANCE.applyStereotype(satisfying, RequirementsPackage.eINSTANCE.getRequirementRelated());
-
- Class satisfied1 = model.createOwnedClass("satisfied1", false);
- satisfied1_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(satisfied1, RequirementsPackage.eINSTANCE.getRequirement());
-
- Class satisfied2 = model.createOwnedClass("satisfied2", false);
- satisfied2_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(satisfied2, RequirementsPackage.eINSTANCE.getRequirement());
-
- // Add "Satisfy" (Realization)
- // satisfying_reqR -> satisfied1_req, satisfied2_req
- Realization s1 = UMLFactory.eINSTANCE.createRealization();
- s1.getClients().add(satisfying);
- s1.getSuppliers().add(satisfied1);
- model.getPackagedElements().add(s1);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(s1, RequirementsPackage.eINSTANCE.getSatisfy());
-
-
- Realization s2 = UMLFactory.eINSTANCE.createRealization();
- s2.getClients().add(satisfying);
- s2.getSuppliers().add(satisfied2);
- model.getPackagedElements().add(s2);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(s2, RequirementsPackage.eINSTANCE.getSatisfy());
-
- // ////////////////////////////////////////////////////////////////////
-
- // ////////////////////////////////////////////////////////////////////
- // Prepare getVerifies() test elements
- // ////////////////////////////////////////////////////////////////////
-
- Class verifying = model.createOwnedClass("verifying", false);
- verifying_reqR = (RequirementRelated)StereotypeApplicationHelper.INSTANCE.applyStereotype(verifying, RequirementsPackage.eINSTANCE.getRequirementRelated());
-
- Class verified1 = model.createOwnedClass("verified1", false);
- verified1_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(verified1, RequirementsPackage.eINSTANCE.getRequirement());
- Class verified2 = model.createOwnedClass("verified2", false);
- verified2_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(verified2, RequirementsPackage.eINSTANCE.getRequirement());
-
- // Add "Verify" (Realization)
- // verifying_reqR -> verified1_req, verified2_req
- Realization v1 = UMLFactory.eINSTANCE.createRealization();
- v1.getClients().add(verifying);
- v1.getSuppliers().add(verified1);
- model.getPackagedElements().add(v1);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(v1, RequirementsPackage.eINSTANCE.getVerify());
-
- Realization v2 = UMLFactory.eINSTANCE.createRealization();
- v2.getClients().add(verifying);
- v2.getSuppliers().add(verified2);
- model.getPackagedElements().add(v2);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(v2, RequirementsPackage.eINSTANCE.getVerify());
-
-
- // ////////////////////////////////////////////////////////////////////
-
- // ////////////////////////////////////////////////////////////////////
- // Prepare getRefines() test elements
- // ////////////////////////////////////////////////////////////////////
-
- Class refining = model.createOwnedClass("refining", false);
- refining_reqR = (RequirementRelated)StereotypeApplicationHelper.INSTANCE.applyStereotype(refining, RequirementsPackage.eINSTANCE.getRequirementRelated());
-
- Class refined1 = model.createOwnedClass("refined1", false);
- refined1_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(refined1, RequirementsPackage.eINSTANCE.getRequirement());
- Class refined2 = model.createOwnedClass("refined2", false);
- refined2_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(refined2, RequirementsPackage.eINSTANCE.getRequirement());
-
- // Add "Refine" (Abstraction)
- // refining_reqR -> refined1_req, refined2_req
- Abstraction r1 = UMLFactory.eINSTANCE.createAbstraction();
- r1.getClients().add(refining);
- r1.getSuppliers().add(refined1);
- model.getPackagedElements().add(r1);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(r1, StandardPackage.eINSTANCE.getRefine());
-
- Abstraction r2 = UMLFactory.eINSTANCE.createAbstraction();
- r2.getClients().add(refining);
- r2.getSuppliers().add(refined2);
- model.getPackagedElements().add(r2);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(r2, StandardPackage.eINSTANCE.getRefine());
-
-
- // ////////////////////////////////////////////////////////////////////
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- @After
- public void tearDown() throws Exception {
- setFixture(null);
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getRefines()
- * <em>Refines</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getRefines()
- * @generated NOT
- */
- @Test
- public void testGetRefines() {
-
- // Isolated RequirementRelated
- if(!default_reqR.getRefines().isEmpty()) {
- fail();
- }
-
- // refining_reqR.getRefines() = [refined1_req, refined2_req]
- if(!refining_reqR.getRefines().contains(refined1_req)) {
- fail();
- }
- if(!refining_reqR.getRefines().contains(refined2_req)) {
- fail();
- }
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getSatisfies()
- * <em>Satisfies</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getSatisfies()
- * @generated NOT
- */
- @Test
- public void testGetSatisfies() {
-
- // Isolated RequirementRelated
- if(!default_reqR.getSatisfies().isEmpty()) {
- fail();
- }
-
- // satisfying_reqR.getSatisfies() = [satisfied1_req, satisfied2_req]
- if(!satisfying_reqR.getSatisfies().contains(satisfied1_req)) {
- fail();
- }
- if(!satisfying_reqR.getSatisfies().contains(satisfied2_req)) {
- fail();
- }
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getTracedFrom()
- * <em>Traced From</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getTracedFrom()
- * @generated NOT
- */
- @Test
- public void testGetTracedFrom() {
-
- // Isolated RequirementRelated
- if(!default_reqR.getTracedFrom().isEmpty()) {
- fail();
- }
-
- // traced_reqR.getTraceFrom() = [trace1_Req, trace2_req]
- if(!traced_reqR.getTracedFrom().contains(trace1_req)) {
- fail();
- }
- if(!traced_reqR.getTracedFrom().contains(trace2_req)) {
- fail();
- }
-
- // Should not include Trace subtypes clients
- // Test getter through Copy (should not be taken into account see bug #352563)
- if(copy_reqR.getTracedFrom().contains(master)) {
- fail();
- }
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getVerifies()
- * <em>Verifies</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getVerifies()
- * @generated NOT
- */
- @Test
- public void testGetVerifies() {
-
- // Isolated RequirementRelated
- if(!default_reqR.getVerifies().isEmpty()) {
- fail();
- }
-
- // verifying_reqR.getVerifies() = [verified1_req, verified2_req]
- if(!verifying_reqR.getVerifies().contains(verified1_req)) {
- fail();
- }
- if(!verifying_reqR.getVerifies().contains(verified2_req)) {
- fail();
- }
-
- }
-
-} // RequirementRelatedTest
+/*****************************************************************************
+ * Copyright (c) 2009, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 422257
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.requirements.tests;
+
+import static org.junit.Assert.fail;
+
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.sysml.requirements.Requirement;
+import org.eclipse.papyrus.sysml.requirements.RequirementRelated;
+import org.eclipse.papyrus.sysml.requirements.RequirementsFactory;
+import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
+import org.eclipse.papyrus.sysml.utils.SysMLTestResources;
+import org.eclipse.uml2.uml.Abstraction;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Realization;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.profile.standard.StandardPackage;
+import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * <!-- begin-user-doc --> A test case for the model object '<em><b>Requirement Related</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are tested:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getTracedFrom() <em>Traced From</em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getSatisfies() <em>Satisfies</em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getRefines() <em>Refines</em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getVerifies() <em>Verifies</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class RequirementRelatedTest extends AbstractPapyrusTest {
+
+ @Rule
+ public final HouseKeeper houseKeeper = new HouseKeeper();
+
+ protected RequirementRelated fixture = null;
+
+ protected RequirementRelated default_reqR = null;
+
+ protected Model model = null;
+
+ // ////////////////////////////////////////////////////////////////////
+
+ protected Class copy = null;
+
+ protected Class master = null;
+
+ protected Requirement copy_req = null;
+
+ protected Requirement master_req = null;
+
+ protected RequirementRelated copy_reqR = null;
+
+ protected Requirement trace1_req = null;
+
+ protected Requirement trace2_req = null;
+
+ protected RequirementRelated traced_reqR = null;
+
+ // ////////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////////
+ protected Requirement satisfied1_req = null;
+
+ protected Requirement satisfied2_req = null;
+
+ protected RequirementRelated satisfying_reqR = null;
+
+ // ////////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////////
+ protected Requirement verified1_req = null;
+
+ protected Requirement verified2_req = null;
+
+ protected RequirementRelated verifying_reqR = null;
+
+ // ////////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////////
+ protected Requirement refined1_req = null;
+
+ protected Requirement refined2_req = null;
+
+ protected RequirementRelated refining_reqR = null;
+
+ // ////////////////////////////////////////////////////////////////////
+
+ /**
+ * Returns the fixture for this Requirement Related test case.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ protected RequirementRelated getFixture() {
+ return fixture;
+ }
+
+ /**
+ * Sets the fixture for this Requirement Related test case.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ protected void setFixture(RequirementRelated fixture) {
+ this.fixture = fixture;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see junit.framework.TestCase#setUp()
+ * @generated NOT
+ */
+ @Before
+ public void setUp() throws Exception {
+ setFixture(RequirementsFactory.eINSTANCE.createRequirementRelated());
+
+ // Prepare test
+ model = SysMLTestResources.createSysMLModel(houseKeeper.createResourceSet());
+ if(model == null) {
+ fail();
+ }
+
+ if(model.getAppliedProfiles().isEmpty()) {
+ fail();
+ }
+
+ // Create classes & interface
+ Class defaultClass = model.createOwnedClass("defaultClass", false);
+
+ // Add Requirement stereotypes
+ default_reqR = (RequirementRelated)StereotypeApplicationHelper.getInstance(null).applyStereotype(defaultClass, RequirementsPackage.eINSTANCE.getRequirementRelated());
+
+ // ////////////////////////////////////////////////////////////////////
+ // Prepare getTracedFrom test elements
+ // ////////////////////////////////////////////////////////////////////
+
+ Class traced = model.createOwnedClass("traced", false);
+ traced_reqR = (RequirementRelated)StereotypeApplicationHelper.getInstance(null).applyStereotype(traced, RequirementsPackage.eINSTANCE.getRequirementRelated());
+
+ Class trace1 = model.createOwnedClass("trace1", false);
+ trace1_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(trace1, RequirementsPackage.eINSTANCE.getRequirement());
+
+ Class trace2 = model.createOwnedClass("trace2", false);
+ trace2_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(trace2, RequirementsPackage.eINSTANCE.getRequirement());
+
+ // Add "Trace" (Abstraction)
+ // trace1, trace2 -> traced
+ Abstraction t11 = UMLFactory.eINSTANCE.createAbstraction();
+ t11.getClients().add(traced);
+ t11.getSuppliers().add(trace1);
+ model.getPackagedElements().add(t11);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(t11, StandardPackage.eINSTANCE.getTrace());
+
+ Abstraction t12 = UMLFactory.eINSTANCE.createAbstraction();
+ t12.getClients().add(traced);
+ t12.getSuppliers().add(trace2);
+ model.getPackagedElements().add(t12);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(t12, StandardPackage.eINSTANCE.getTrace());
+
+ master = model.createOwnedClass("master", false);
+ master_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(master, RequirementsPackage.eINSTANCE.getRequirement());
+
+ copy = model.createOwnedClass("copy", false);
+ copy_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(copy, RequirementsPackage.eINSTANCE.getRequirement());
+ copy_reqR = (RequirementRelated)StereotypeApplicationHelper.getInstance(null).applyStereotype(copy, RequirementsPackage.eINSTANCE.getRequirementRelated());
+
+ // Add "copy" (Abstraction) between master and copy
+ // copy -> master
+ Abstraction c_m = UMLFactory.eINSTANCE.createAbstraction();
+ c_m.getClients().add(copy);
+ c_m.getSuppliers().add(master);
+ model.getPackagedElements().add(c_m);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(c_m, RequirementsPackage.eINSTANCE.getCopy());
+
+
+ // ////////////////////////////////////////////////////////////////////
+
+ // ////////////////////////////////////////////////////////////////////
+ // Prepare getSatisfies() test elements
+ // ////////////////////////////////////////////////////////////////////
+
+ Class satisfying = model.createOwnedClass("satisfying", false);
+ satisfying_reqR = (RequirementRelated)StereotypeApplicationHelper.getInstance(null).applyStereotype(satisfying, RequirementsPackage.eINSTANCE.getRequirementRelated());
+
+ Class satisfied1 = model.createOwnedClass("satisfied1", false);
+ satisfied1_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(satisfied1, RequirementsPackage.eINSTANCE.getRequirement());
+
+ Class satisfied2 = model.createOwnedClass("satisfied2", false);
+ satisfied2_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(satisfied2, RequirementsPackage.eINSTANCE.getRequirement());
+
+ // Add "Satisfy" (Realization)
+ // satisfying_reqR -> satisfied1_req, satisfied2_req
+ Realization s1 = UMLFactory.eINSTANCE.createRealization();
+ s1.getClients().add(satisfying);
+ s1.getSuppliers().add(satisfied1);
+ model.getPackagedElements().add(s1);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(s1, RequirementsPackage.eINSTANCE.getSatisfy());
+
+
+ Realization s2 = UMLFactory.eINSTANCE.createRealization();
+ s2.getClients().add(satisfying);
+ s2.getSuppliers().add(satisfied2);
+ model.getPackagedElements().add(s2);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(s2, RequirementsPackage.eINSTANCE.getSatisfy());
+
+ // ////////////////////////////////////////////////////////////////////
+
+ // ////////////////////////////////////////////////////////////////////
+ // Prepare getVerifies() test elements
+ // ////////////////////////////////////////////////////////////////////
+
+ Class verifying = model.createOwnedClass("verifying", false);
+ verifying_reqR = (RequirementRelated)StereotypeApplicationHelper.getInstance(null).applyStereotype(verifying, RequirementsPackage.eINSTANCE.getRequirementRelated());
+
+ Class verified1 = model.createOwnedClass("verified1", false);
+ verified1_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(verified1, RequirementsPackage.eINSTANCE.getRequirement());
+ Class verified2 = model.createOwnedClass("verified2", false);
+ verified2_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(verified2, RequirementsPackage.eINSTANCE.getRequirement());
+
+ // Add "Verify" (Realization)
+ // verifying_reqR -> verified1_req, verified2_req
+ Realization v1 = UMLFactory.eINSTANCE.createRealization();
+ v1.getClients().add(verifying);
+ v1.getSuppliers().add(verified1);
+ model.getPackagedElements().add(v1);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(v1, RequirementsPackage.eINSTANCE.getVerify());
+
+ Realization v2 = UMLFactory.eINSTANCE.createRealization();
+ v2.getClients().add(verifying);
+ v2.getSuppliers().add(verified2);
+ model.getPackagedElements().add(v2);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(v2, RequirementsPackage.eINSTANCE.getVerify());
+
+
+ // ////////////////////////////////////////////////////////////////////
+
+ // ////////////////////////////////////////////////////////////////////
+ // Prepare getRefines() test elements
+ // ////////////////////////////////////////////////////////////////////
+
+ Class refining = model.createOwnedClass("refining", false);
+ refining_reqR = (RequirementRelated)StereotypeApplicationHelper.getInstance(null).applyStereotype(refining, RequirementsPackage.eINSTANCE.getRequirementRelated());
+
+ Class refined1 = model.createOwnedClass("refined1", false);
+ refined1_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(refined1, RequirementsPackage.eINSTANCE.getRequirement());
+ Class refined2 = model.createOwnedClass("refined2", false);
+ refined2_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(refined2, RequirementsPackage.eINSTANCE.getRequirement());
+
+ // Add "Refine" (Abstraction)
+ // refining_reqR -> refined1_req, refined2_req
+ Abstraction r1 = UMLFactory.eINSTANCE.createAbstraction();
+ r1.getClients().add(refining);
+ r1.getSuppliers().add(refined1);
+ model.getPackagedElements().add(r1);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(r1, StandardPackage.eINSTANCE.getRefine());
+
+ Abstraction r2 = UMLFactory.eINSTANCE.createAbstraction();
+ r2.getClients().add(refining);
+ r2.getSuppliers().add(refined2);
+ model.getPackagedElements().add(r2);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(r2, StandardPackage.eINSTANCE.getRefine());
+
+
+ // ////////////////////////////////////////////////////////////////////
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see junit.framework.TestCase#tearDown()
+ * @generated
+ */
+ @After
+ public void tearDown() throws Exception {
+ setFixture(null);
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getRefines()
+ * <em>Refines</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getRefines()
+ * @generated NOT
+ */
+ @Test
+ public void testGetRefines() {
+
+ // Isolated RequirementRelated
+ if(!default_reqR.getRefines().isEmpty()) {
+ fail();
+ }
+
+ // refining_reqR.getRefines() = [refined1_req, refined2_req]
+ if(!refining_reqR.getRefines().contains(refined1_req)) {
+ fail();
+ }
+ if(!refining_reqR.getRefines().contains(refined2_req)) {
+ fail();
+ }
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getSatisfies()
+ * <em>Satisfies</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getSatisfies()
+ * @generated NOT
+ */
+ @Test
+ public void testGetSatisfies() {
+
+ // Isolated RequirementRelated
+ if(!default_reqR.getSatisfies().isEmpty()) {
+ fail();
+ }
+
+ // satisfying_reqR.getSatisfies() = [satisfied1_req, satisfied2_req]
+ if(!satisfying_reqR.getSatisfies().contains(satisfied1_req)) {
+ fail();
+ }
+ if(!satisfying_reqR.getSatisfies().contains(satisfied2_req)) {
+ fail();
+ }
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getTracedFrom()
+ * <em>Traced From</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getTracedFrom()
+ * @generated NOT
+ */
+ @Test
+ public void testGetTracedFrom() {
+
+ // Isolated RequirementRelated
+ if(!default_reqR.getTracedFrom().isEmpty()) {
+ fail();
+ }
+
+ // traced_reqR.getTraceFrom() = [trace1_Req, trace2_req]
+ if(!traced_reqR.getTracedFrom().contains(trace1_req)) {
+ fail();
+ }
+ if(!traced_reqR.getTracedFrom().contains(trace2_req)) {
+ fail();
+ }
+
+ // Should not include Trace subtypes clients
+ // Test getter through Copy (should not be taken into account see bug #352563)
+ if(copy_reqR.getTracedFrom().contains(master)) {
+ fail();
+ }
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.requirements.RequirementRelated#getVerifies()
+ * <em>Verifies</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.requirements.RequirementRelated#getVerifies()
+ * @generated NOT
+ */
+ @Test
+ public void testGetVerifies() {
+
+ // Isolated RequirementRelated
+ if(!default_reqR.getVerifies().isEmpty()) {
+ fail();
+ }
+
+ // verifying_reqR.getVerifies() = [verified1_req, verified2_req]
+ if(!verifying_reqR.getVerifies().contains(verified1_req)) {
+ fail();
+ }
+ if(!verifying_reqR.getVerifies().contains(verified2_req)) {
+ fail();
+ }
+
+ }
+
+} // RequirementRelatedTest
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementTest.java
index 212661e44ba..cc7fe4ab7e3 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementTest.java
@@ -1,591 +1,591 @@
-/*****************************************************************************
- * Copyright (c) 2009, 2014 CEA LIST and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 422257
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.requirements.tests;
-
-import static org.junit.Assert.fail;
-
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
-import org.eclipse.papyrus.sysml.requirements.Requirement;
-import org.eclipse.papyrus.sysml.requirements.RequirementsFactory;
-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
-import org.eclipse.papyrus.sysml.utils.SysMLTestResources;
-import org.eclipse.uml2.uml.Abstraction;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.Realization;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.profile.standard.StandardPackage;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-/**
- * <!-- begin-user-doc --> A test case for the model object '<em><b>Requirement</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * The following features are tested:
- * <ul>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerived() <em>Derived</em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerivedFrom() <em>Derived From</em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getSatisfiedBy() <em>Satisfied By</em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getRefinedBy() <em>Refined By</em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getTracedTo() <em>Traced To</em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getVerifiedBy() <em>Verified By</em>}</li>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getMaster() <em>Master</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RequirementTest extends AbstractPapyrusTest {
-
- @Rule
- public final HouseKeeper houseKeeper = new HouseKeeper();
-
- /**
- * The fixture for this Requirement test case. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- protected Requirement fixture = null;
-
- protected Class defaultClass = null;
-
- protected Requirement default_req = null;
-
- // ////////////////////////////////////////////////////////////////////
- protected Class copy = null;
-
- protected Class master = null;
-
- protected Requirement copy_req = null;
-
- protected Requirement master_req = null;
-
- // ////////////////////////////////////////////////////////////////////
- // ////////////////////////////////////////////////////////////////////
- protected Class derive1 = null;
-
- protected Class derive2 = null;
-
- protected Class derived1 = null;
-
- protected Class derived2 = null;
-
- protected Requirement derive1_req = null;
-
- protected Requirement derive2_req = null;
-
- protected Requirement derived1_req = null;
-
- protected Requirement derived2_req = null;
-
- // ////////////////////////////////////////////////////////////////////
- // ////////////////////////////////////////////////////////////////////
- protected Class satisfied = null;
-
- protected Class satisfyingNE1 = null;
-
- protected Class satisfyingNE2 = null;
-
- protected Requirement satisfied_req = null;
-
- // ////////////////////////////////////////////////////////////////////
- // ////////////////////////////////////////////////////////////////////
- protected Class refined = null;
-
- protected Class refiningNE1 = null;
-
- protected Class refiningNE2 = null;
-
- protected Requirement refined_req = null;
-
- // ////////////////////////////////////////////////////////////////////
- // ////////////////////////////////////////////////////////////////////
- protected Class traced1 = null;
-
- protected Class traced2 = null;
-
- protected Class trace = null;
-
- protected Requirement traced1_req = null;
-
- protected Requirement traced2_req = null;
-
- protected Requirement trace_req = null;
-
- // ////////////////////////////////////////////////////////////////////
-
- // ////////////////////////////////////////////////////////////////////
- protected Requirement verified_req = null;
-
- protected org.eclipse.papyrus.sysml.requirements.TestCase testCase1 = null;
-
- protected NamedElement verifierNamedElement = null;
-
- // ////////////////////////////////////////////////////////////////////
-
- protected org.eclipse.papyrus.sysml.requirements.TestCase testCase2 = null;
-
- protected Model model = null;
-
- /**
- * Returns the fixture for this Requirement test case. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected Requirement getFixture() {
- return fixture;
- }
-
- /**
- * Sets the fixture for this Requirement test case. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void setFixture(Requirement fixture) {
- this.fixture = fixture;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see junit.framework.TestCase#setUp()
- * @generated NOT
- */
- @Before
- public void setUp() throws Exception {
- setFixture(RequirementsFactory.eINSTANCE.createRequirement());
-
- // Prepare test
- model = SysMLTestResources.createSysMLModel(houseKeeper.createResourceSet());
- if(model == null) {
- fail();
- }
-
- if(model.getAppliedProfiles().isEmpty()) {
- fail();
- }
-
- // Create classes & interface
- defaultClass = model.createOwnedClass("defaultClass", false);
-
- // Add Requirement stereotypes
- default_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(defaultClass, RequirementsPackage.eINSTANCE.getRequirement());
-
- // ////////////////////////////////////////////////////////////////////
- // Prepare getMaster test elements
- // ////////////////////////////////////////////////////////////////////
-
- master = model.createOwnedClass("master", false);
- master_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(master, RequirementsPackage.eINSTANCE.getRequirement());
- copy = model.createOwnedClass("copy", false);
- copy_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(copy, RequirementsPackage.eINSTANCE.getRequirement());
-
- // Add "copy" (Abstraction) between master and copy
- // copy -> master
- Abstraction c_m = UMLFactory.eINSTANCE.createAbstraction();
- c_m.getClients().add(copy);
- c_m.getSuppliers().add(master);
- model.getPackagedElements().add(c_m);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(c_m, RequirementsPackage.eINSTANCE.getCopy());
-
- // ////////////////////////////////////////////////////////////////////
-
- // ////////////////////////////////////////////////////////////////////
- // Prepare getDerived / getDerivedFrom test elements
- // ////////////////////////////////////////////////////////////////////
-
- derive1 = model.createOwnedClass("d1", false);
- derive1_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(derive1, RequirementsPackage.eINSTANCE.getRequirement());
-
- derive2 = model.createOwnedClass("d2", false);
- derive2_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(derive2, RequirementsPackage.eINSTANCE.getRequirement());
-
- derived1 = model.createOwnedClass("dd1", false);
- derived1_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(derived1, RequirementsPackage.eINSTANCE.getRequirement());
-
- derived2 = model.createOwnedClass("dd2", false);
- derived2_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(derived2, RequirementsPackage.eINSTANCE.getRequirement());
-
- // Add "DeriveReqt" (Abstraction) between derive and derived
- // derived1 -> derive1, derive2
- // derived2 -> derive2
- Abstraction d11 = UMLFactory.eINSTANCE.createAbstraction();
- d11.getClients().add(derived1);
- d11.getSuppliers().add(derive1);
- model.getPackagedElements().add(d11);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(d11, RequirementsPackage.eINSTANCE.getDeriveReqt());
-
- Abstraction d12 = UMLFactory.eINSTANCE.createAbstraction();
- d12.getClients().add(derived1);
- d12.getSuppliers().add(derive2);
- model.getPackagedElements().add(d12);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(d12, RequirementsPackage.eINSTANCE.getDeriveReqt());
-
- Abstraction d22 = UMLFactory.eINSTANCE.createAbstraction();
- d22.getClients().add(derived2);
- d22.getSuppliers().add(derive2);
- model.getPackagedElements().add(d22);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(d22, RequirementsPackage.eINSTANCE.getDeriveReqt());
-
- // ////////////////////////////////////////////////////////////////////
-
- // ////////////////////////////////////////////////////////////////////
- // Prepare getSatisfiedBy test elements
- // ////////////////////////////////////////////////////////////////////
-
- satisfied = model.createOwnedClass("satisfied", false);
- satisfied_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(satisfied, RequirementsPackage.eINSTANCE.getRequirement());
-
- satisfyingNE1 = model.createOwnedClass("sNE1", false);
- satisfyingNE2 = model.createOwnedClass("sNE2", false);
-
- // Add "Satisfy" (Realization) between satisfyingNE(s) and satisfied
- // requirement
- // satisfyingNE1, satisfyingNE2 -> satisfied
- Realization ne1_s1 = UMLFactory.eINSTANCE.createRealization();
- ne1_s1.getClients().add(satisfyingNE1);
- ne1_s1.getSuppliers().add(satisfied);
- model.getPackagedElements().add(ne1_s1);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(ne1_s1, RequirementsPackage.eINSTANCE.getSatisfy());
-
- Realization ne2_s1 = UMLFactory.eINSTANCE.createRealization();
- ne2_s1.getClients().add(satisfyingNE2);
- ne2_s1.getSuppliers().add(satisfied);
- model.getPackagedElements().add(ne2_s1);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(ne2_s1, RequirementsPackage.eINSTANCE.getSatisfy());
-
- // ////////////////////////////////////////////////////////////////////
-
- // ////////////////////////////////////////////////////////////////////
- // Prepare getRefinedBy test elements
- // ////////////////////////////////////////////////////////////////////
-
- refined = model.createOwnedClass("refined", false);
- refined_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(refined, RequirementsPackage.eINSTANCE.getRequirement());
-
- refiningNE1 = model.createOwnedClass("rNE1", false);
- refiningNE2 = model.createOwnedClass("rNE2", false);
-
- // Add "Refine" (Abstraction) between refiningNE(s) and refined
- // requirement
- // refiningNE1, refiningNE2 -> refined
- Abstraction rne1_s1 = UMLFactory.eINSTANCE.createAbstraction();
- rne1_s1.getClients().add(refiningNE1);
- rne1_s1.getSuppliers().add(refined);
- model.getPackagedElements().add(rne1_s1);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(rne1_s1, StandardPackage.eINSTANCE.getRefine());
-
- Abstraction rne2_s1 = UMLFactory.eINSTANCE.createAbstraction();
- rne2_s1.getClients().add(refiningNE2);
- rne2_s1.getSuppliers().add(refined);
- model.getPackagedElements().add(rne2_s1);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(rne2_s1, StandardPackage.eINSTANCE.getRefine());
-
- // ////////////////////////////////////////////////////////////////////
-
- // ////////////////////////////////////////////////////////////////////
- // Prepare getTracedTo test elements
- // ////////////////////////////////////////////////////////////////////
-
- traced1 = model.createOwnedClass("traced1", false);
- traced1_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(traced1, RequirementsPackage.eINSTANCE.getRequirement());
-
- traced2 = model.createOwnedClass("traced2", false);
- traced2_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(traced2, RequirementsPackage.eINSTANCE.getRequirement());
-
- trace = model.createOwnedClass("trace", false);
- trace_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(trace, RequirementsPackage.eINSTANCE.getRequirement());
-
- // Add "Trace" (Abstraction)
- // [traced1, traced2] -> trace
- Abstraction t11 = UMLFactory.eINSTANCE.createAbstraction();
- t11.getClients().add(traced1);
- t11.getSuppliers().add(trace);
- model.getPackagedElements().add(t11);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(t11, StandardPackage.eINSTANCE.getTrace());
-
- Abstraction t12 = UMLFactory.eINSTANCE.createAbstraction();
- t12.getClients().add(traced2);
- t12.getSuppliers().add(trace);
- model.getPackagedElements().add(t12);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(t12, StandardPackage.eINSTANCE.getTrace());
-
- // ////////////////////////////////////////////////////////////////////
-
- // ////////////////////////////////////////////////////////////////////
- // Prepare getVerifiedBy test elements
- // ////////////////////////////////////////////////////////////////////
-
- verifierNamedElement = model.createOwnedClass("verifierNamedElement", false);
-
- Class verified = model.createOwnedClass("verified", false);
- verified_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(verified, RequirementsPackage.eINSTANCE.getRequirement());
-
- Class testClass = model.createOwnedClass("testClass", false);
- Operation op1 = testClass.createOwnedOperation("op1", null, null, null);
- Operation op2 = testClass.createOwnedOperation("op2", null, null, null);
-
- testCase1 = (org.eclipse.papyrus.sysml.requirements.TestCase)StereotypeApplicationHelper.INSTANCE.applyStereotype(op1, RequirementsPackage.eINSTANCE.getTestCase());
- testCase2 = (org.eclipse.papyrus.sysml.requirements.TestCase)StereotypeApplicationHelper.INSTANCE.applyStereotype(op2, RequirementsPackage.eINSTANCE.getTestCase());
-
- // Add "Verify" (Abstraction)
- // testCase1, testCase2 -> verified
- Abstraction t1_v = UMLFactory.eINSTANCE.createAbstraction();
- t1_v.getClients().add(op1);
- t1_v.getSuppliers().add(verified);
- model.getPackagedElements().add(t1_v);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(t1_v, RequirementsPackage.eINSTANCE.getVerify());
-
- Abstraction t2_v = UMLFactory.eINSTANCE.createAbstraction();
- t2_v.getClients().add(op2);
- t2_v.getSuppliers().add(verified);
- model.getPackagedElements().add(t2_v);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(t2_v, RequirementsPackage.eINSTANCE.getVerify());
-
- // Add "Verify" (Abstraction)
- // verifierNamedElement -> verified
- Abstraction t3_v = UMLFactory.eINSTANCE.createAbstraction();
- t3_v.getClients().add(verifierNamedElement);
- t3_v.getSuppliers().add(verified);
- model.getPackagedElements().add(t3_v);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(t3_v, RequirementsPackage.eINSTANCE.getVerify());
-
- // ////////////////////////////////////////////////////////////////////
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- @After
- public void tearDown() throws Exception {
- setFixture(null);
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerived()
- * <em>Derived</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.requirements.Requirement#getDerived()
- * @generated NOT
- */
- @Test
- public void testGetDerived() {
-
- // Isolated requirement : default_req.getDerived() = []
- if(!default_req.getDerived().isEmpty()) {
- fail();
- }
-
- // Verifies : derive1_req.getDerived() = [derived1_req]
- if(!derive1_req.getDerived().contains(derived1_req)) {
- fail();
- }
-
- // Verifies : derive2_req.getDerived() = [derived1_req, derived2_req]
- if(!derive2_req.getDerived().contains(derived1_req)) {
- fail();
- }
-
- if(!derive2_req.getDerived().contains(derived2_req)) {
- fail();
- }
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerivedFrom()
- * <em>Derived From</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.requirements.Requirement#getDerivedFrom()
- * @generated NOT
- */
- @Test
- public void testGetDerivedFrom() {
-
- // Isolated requirement : default_req.getDerivedFrom() = []
- if(!default_req.getDerivedFrom().isEmpty()) {
- fail();
- }
-
- // Verifies : derived2_req.getDerivedFrom() = [derive2_req]
- if(!derived2_req.getDerivedFrom().contains(derive2_req)) {
- fail();
- }
-
- // Verifies : derived1_req.getDerivedFrom() = [derive1_req, derive2_req]
- if(!derived1_req.getDerivedFrom().contains(derive1_req)) {
- fail();
- }
- if(!derived1_req.getDerivedFrom().contains(derive2_req)) {
- fail();
- }
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getMaster()
- * <em>Master</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.requirements.Requirement#getMaster()
- * @generated NOT
- */
- @Test
- public void testGetMaster() {
-
- // Isolated requirement : default_req.getMaster() = null
- if(default_req.getMaster() != null) {
- fail();
- }
-
- // Try retrieving Master from Copy requirement
- if(!master_req.equals(copy_req.getMaster())) {
- fail();
- }
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getRefinedBy()
- * <em>Refined By</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.requirements.Requirement#getRefinedBy()
- * @generated NOT
- */
- @Test
- public void testGetRefinedBy() {
-
- // Isolated requirement : default_req.getRefinedBy() = []
- if(!default_req.getRefinedBy().isEmpty()) {
- fail();
- }
-
- // Verifies : refined_req.getRefinedBy() = [refiningNE1, refiningNE2]
- if(!refined_req.getRefinedBy().contains(refiningNE1)) {
- fail();
- }
- if(!refined_req.getRefinedBy().contains(refiningNE2)) {
- fail();
- }
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getSatisfiedBy()
- * <em>Satisfied By</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.requirements.Requirement#getSatisfiedBy()
- * @generated NOT
- */
- @Test
- public void testGetSatisfiedBy() {
-
- // Isolated requirement : default_req.getSatisfiedBy() = []
- if(!default_req.getSatisfiedBy().isEmpty()) {
- fail();
- }
-
- // Verifies : satisfied_req.getSatisfiedBy() = [satisfyingNE1, satisfyingNE2]
- if(!satisfied_req.getSatisfiedBy().contains(satisfyingNE1)) {
- fail();
- }
- if(!satisfied_req.getSatisfiedBy().contains(satisfyingNE2)) {
- fail();
- }
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getTracedTo()
- * <em>Traced To</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.requirements.Requirement#getTracedTo()
- * @generated NOT
- */
- @Test
- public void testGetTracedTo() {
-
- // Isolated requirement : default_req.getTracedTo = []
- if(!default_req.getTracedTo().isEmpty()) {
- fail();
- }
-
- // DeriveReqt / Verify / Copy inherits from Trace
- // Test getter through Copy (should not be taken into account see bug #352563)
- if(master_req.getTracedTo().contains(copy)) {
- fail();
- }
-
- // Test getter through DeriveReqt (tracedTo = Clients)
- // derived1 -> [derive1_req, derive2_req] (should not be taken into account see bug #352563)
- // derived2 -> [derive2_req] (should not be taken into account see bug #352563)
- if(derive1_req.getTracedTo().contains(derived1)) {
- fail();
- }
- if(derive2_req.getTracedTo().contains(derived1)) {
- fail();
- }
- if(derive2_req.getTracedTo().contains(derived2)) {
- fail();
- }
-
- // Test getter through Verify (should not be taken into account see bug #352563)
- // Should not happen...
-
- // Direct test
- if(!trace_req.getTracedTo().contains(traced1)) {
- fail();
- }
- if(!trace_req.getTracedTo().contains(traced2)) {
- fail();
- }
-
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getVerifiedBy()
- * <em>Verified By</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.requirements.Requirement#getVerifiedBy()
- * @generated NOT
- */
- @Test
- public void testGetVerifiedBy() {
-
- // Isolated requirement : default_req.getVerifiedBy() = []
- if(!default_req.getVerifiedBy().isEmpty()) {
- fail();
- }
-
- // Test getVerifiedBy getter for
- // [testCase1, testCase2, verifierNamedElement] -> verified_req
- if(!verified_req.getVerifiedBy().contains(testCase1.getBase_Operation())) {
- fail();
- }
- if(!verified_req.getVerifiedBy().contains(testCase2.getBase_Operation())) {
- fail();
- }
- if(!verified_req.getVerifiedBy().contains(verifierNamedElement)) {
- fail();
- }
- }
-
-} // RequirementTest
+/*****************************************************************************
+ * Copyright (c) 2009, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 422257
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.requirements.tests;
+
+import static org.junit.Assert.fail;
+
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.sysml.requirements.Requirement;
+import org.eclipse.papyrus.sysml.requirements.RequirementsFactory;
+import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
+import org.eclipse.papyrus.sysml.utils.SysMLTestResources;
+import org.eclipse.uml2.uml.Abstraction;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Realization;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.profile.standard.StandardPackage;
+import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * <!-- begin-user-doc --> A test case for the model object '<em><b>Requirement</b></em>'. <!--
+ * end-user-doc -->
+ * <p>
+ * The following features are tested:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerived() <em>Derived</em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerivedFrom() <em>Derived From</em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getSatisfiedBy() <em>Satisfied By</em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getRefinedBy() <em>Refined By</em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getTracedTo() <em>Traced To</em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getVerifiedBy() <em>Verified By</em>}</li>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.Requirement#getMaster() <em>Master</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class RequirementTest extends AbstractPapyrusTest {
+
+ @Rule
+ public final HouseKeeper houseKeeper = new HouseKeeper();
+
+ /**
+ * The fixture for this Requirement test case. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated NOT
+ */
+ protected Requirement fixture = null;
+
+ protected Class defaultClass = null;
+
+ protected Requirement default_req = null;
+
+ // ////////////////////////////////////////////////////////////////////
+ protected Class copy = null;
+
+ protected Class master = null;
+
+ protected Requirement copy_req = null;
+
+ protected Requirement master_req = null;
+
+ // ////////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////////
+ protected Class derive1 = null;
+
+ protected Class derive2 = null;
+
+ protected Class derived1 = null;
+
+ protected Class derived2 = null;
+
+ protected Requirement derive1_req = null;
+
+ protected Requirement derive2_req = null;
+
+ protected Requirement derived1_req = null;
+
+ protected Requirement derived2_req = null;
+
+ // ////////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////////
+ protected Class satisfied = null;
+
+ protected Class satisfyingNE1 = null;
+
+ protected Class satisfyingNE2 = null;
+
+ protected Requirement satisfied_req = null;
+
+ // ////////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////////
+ protected Class refined = null;
+
+ protected Class refiningNE1 = null;
+
+ protected Class refiningNE2 = null;
+
+ protected Requirement refined_req = null;
+
+ // ////////////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////////////
+ protected Class traced1 = null;
+
+ protected Class traced2 = null;
+
+ protected Class trace = null;
+
+ protected Requirement traced1_req = null;
+
+ protected Requirement traced2_req = null;
+
+ protected Requirement trace_req = null;
+
+ // ////////////////////////////////////////////////////////////////////
+
+ // ////////////////////////////////////////////////////////////////////
+ protected Requirement verified_req = null;
+
+ protected org.eclipse.papyrus.sysml.requirements.TestCase testCase1 = null;
+
+ protected NamedElement verifierNamedElement = null;
+
+ // ////////////////////////////////////////////////////////////////////
+
+ protected org.eclipse.papyrus.sysml.requirements.TestCase testCase2 = null;
+
+ protected Model model = null;
+
+ /**
+ * Returns the fixture for this Requirement test case. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ */
+ protected Requirement getFixture() {
+ return fixture;
+ }
+
+ /**
+ * Sets the fixture for this Requirement test case. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ */
+ protected void setFixture(Requirement fixture) {
+ this.fixture = fixture;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see junit.framework.TestCase#setUp()
+ * @generated NOT
+ */
+ @Before
+ public void setUp() throws Exception {
+ setFixture(RequirementsFactory.eINSTANCE.createRequirement());
+
+ // Prepare test
+ model = SysMLTestResources.createSysMLModel(houseKeeper.createResourceSet());
+ if(model == null) {
+ fail();
+ }
+
+ if(model.getAppliedProfiles().isEmpty()) {
+ fail();
+ }
+
+ // Create classes & interface
+ defaultClass = model.createOwnedClass("defaultClass", false);
+
+ // Add Requirement stereotypes
+ default_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(defaultClass, RequirementsPackage.eINSTANCE.getRequirement());
+
+ // ////////////////////////////////////////////////////////////////////
+ // Prepare getMaster test elements
+ // ////////////////////////////////////////////////////////////////////
+
+ master = model.createOwnedClass("master", false);
+ master_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(master, RequirementsPackage.eINSTANCE.getRequirement());
+ copy = model.createOwnedClass("copy", false);
+ copy_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(copy, RequirementsPackage.eINSTANCE.getRequirement());
+
+ // Add "copy" (Abstraction) between master and copy
+ // copy -> master
+ Abstraction c_m = UMLFactory.eINSTANCE.createAbstraction();
+ c_m.getClients().add(copy);
+ c_m.getSuppliers().add(master);
+ model.getPackagedElements().add(c_m);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(c_m, RequirementsPackage.eINSTANCE.getCopy());
+
+ // ////////////////////////////////////////////////////////////////////
+
+ // ////////////////////////////////////////////////////////////////////
+ // Prepare getDerived / getDerivedFrom test elements
+ // ////////////////////////////////////////////////////////////////////
+
+ derive1 = model.createOwnedClass("d1", false);
+ derive1_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(derive1, RequirementsPackage.eINSTANCE.getRequirement());
+
+ derive2 = model.createOwnedClass("d2", false);
+ derive2_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(derive2, RequirementsPackage.eINSTANCE.getRequirement());
+
+ derived1 = model.createOwnedClass("dd1", false);
+ derived1_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(derived1, RequirementsPackage.eINSTANCE.getRequirement());
+
+ derived2 = model.createOwnedClass("dd2", false);
+ derived2_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(derived2, RequirementsPackage.eINSTANCE.getRequirement());
+
+ // Add "DeriveReqt" (Abstraction) between derive and derived
+ // derived1 -> derive1, derive2
+ // derived2 -> derive2
+ Abstraction d11 = UMLFactory.eINSTANCE.createAbstraction();
+ d11.getClients().add(derived1);
+ d11.getSuppliers().add(derive1);
+ model.getPackagedElements().add(d11);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(d11, RequirementsPackage.eINSTANCE.getDeriveReqt());
+
+ Abstraction d12 = UMLFactory.eINSTANCE.createAbstraction();
+ d12.getClients().add(derived1);
+ d12.getSuppliers().add(derive2);
+ model.getPackagedElements().add(d12);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(d12, RequirementsPackage.eINSTANCE.getDeriveReqt());
+
+ Abstraction d22 = UMLFactory.eINSTANCE.createAbstraction();
+ d22.getClients().add(derived2);
+ d22.getSuppliers().add(derive2);
+ model.getPackagedElements().add(d22);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(d22, RequirementsPackage.eINSTANCE.getDeriveReqt());
+
+ // ////////////////////////////////////////////////////////////////////
+
+ // ////////////////////////////////////////////////////////////////////
+ // Prepare getSatisfiedBy test elements
+ // ////////////////////////////////////////////////////////////////////
+
+ satisfied = model.createOwnedClass("satisfied", false);
+ satisfied_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(satisfied, RequirementsPackage.eINSTANCE.getRequirement());
+
+ satisfyingNE1 = model.createOwnedClass("sNE1", false);
+ satisfyingNE2 = model.createOwnedClass("sNE2", false);
+
+ // Add "Satisfy" (Realization) between satisfyingNE(s) and satisfied
+ // requirement
+ // satisfyingNE1, satisfyingNE2 -> satisfied
+ Realization ne1_s1 = UMLFactory.eINSTANCE.createRealization();
+ ne1_s1.getClients().add(satisfyingNE1);
+ ne1_s1.getSuppliers().add(satisfied);
+ model.getPackagedElements().add(ne1_s1);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(ne1_s1, RequirementsPackage.eINSTANCE.getSatisfy());
+
+ Realization ne2_s1 = UMLFactory.eINSTANCE.createRealization();
+ ne2_s1.getClients().add(satisfyingNE2);
+ ne2_s1.getSuppliers().add(satisfied);
+ model.getPackagedElements().add(ne2_s1);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(ne2_s1, RequirementsPackage.eINSTANCE.getSatisfy());
+
+ // ////////////////////////////////////////////////////////////////////
+
+ // ////////////////////////////////////////////////////////////////////
+ // Prepare getRefinedBy test elements
+ // ////////////////////////////////////////////////////////////////////
+
+ refined = model.createOwnedClass("refined", false);
+ refined_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(refined, RequirementsPackage.eINSTANCE.getRequirement());
+
+ refiningNE1 = model.createOwnedClass("rNE1", false);
+ refiningNE2 = model.createOwnedClass("rNE2", false);
+
+ // Add "Refine" (Abstraction) between refiningNE(s) and refined
+ // requirement
+ // refiningNE1, refiningNE2 -> refined
+ Abstraction rne1_s1 = UMLFactory.eINSTANCE.createAbstraction();
+ rne1_s1.getClients().add(refiningNE1);
+ rne1_s1.getSuppliers().add(refined);
+ model.getPackagedElements().add(rne1_s1);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(rne1_s1, StandardPackage.eINSTANCE.getRefine());
+
+ Abstraction rne2_s1 = UMLFactory.eINSTANCE.createAbstraction();
+ rne2_s1.getClients().add(refiningNE2);
+ rne2_s1.getSuppliers().add(refined);
+ model.getPackagedElements().add(rne2_s1);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(rne2_s1, StandardPackage.eINSTANCE.getRefine());
+
+ // ////////////////////////////////////////////////////////////////////
+
+ // ////////////////////////////////////////////////////////////////////
+ // Prepare getTracedTo test elements
+ // ////////////////////////////////////////////////////////////////////
+
+ traced1 = model.createOwnedClass("traced1", false);
+ traced1_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(traced1, RequirementsPackage.eINSTANCE.getRequirement());
+
+ traced2 = model.createOwnedClass("traced2", false);
+ traced2_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(traced2, RequirementsPackage.eINSTANCE.getRequirement());
+
+ trace = model.createOwnedClass("trace", false);
+ trace_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(trace, RequirementsPackage.eINSTANCE.getRequirement());
+
+ // Add "Trace" (Abstraction)
+ // [traced1, traced2] -> trace
+ Abstraction t11 = UMLFactory.eINSTANCE.createAbstraction();
+ t11.getClients().add(traced1);
+ t11.getSuppliers().add(trace);
+ model.getPackagedElements().add(t11);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(t11, StandardPackage.eINSTANCE.getTrace());
+
+ Abstraction t12 = UMLFactory.eINSTANCE.createAbstraction();
+ t12.getClients().add(traced2);
+ t12.getSuppliers().add(trace);
+ model.getPackagedElements().add(t12);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(t12, StandardPackage.eINSTANCE.getTrace());
+
+ // ////////////////////////////////////////////////////////////////////
+
+ // ////////////////////////////////////////////////////////////////////
+ // Prepare getVerifiedBy test elements
+ // ////////////////////////////////////////////////////////////////////
+
+ verifierNamedElement = model.createOwnedClass("verifierNamedElement", false);
+
+ Class verified = model.createOwnedClass("verified", false);
+ verified_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(verified, RequirementsPackage.eINSTANCE.getRequirement());
+
+ Class testClass = model.createOwnedClass("testClass", false);
+ Operation op1 = testClass.createOwnedOperation("op1", null, null, null);
+ Operation op2 = testClass.createOwnedOperation("op2", null, null, null);
+
+ testCase1 = (org.eclipse.papyrus.sysml.requirements.TestCase)StereotypeApplicationHelper.getInstance(null).applyStereotype(op1, RequirementsPackage.eINSTANCE.getTestCase());
+ testCase2 = (org.eclipse.papyrus.sysml.requirements.TestCase)StereotypeApplicationHelper.getInstance(null).applyStereotype(op2, RequirementsPackage.eINSTANCE.getTestCase());
+
+ // Add "Verify" (Abstraction)
+ // testCase1, testCase2 -> verified
+ Abstraction t1_v = UMLFactory.eINSTANCE.createAbstraction();
+ t1_v.getClients().add(op1);
+ t1_v.getSuppliers().add(verified);
+ model.getPackagedElements().add(t1_v);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(t1_v, RequirementsPackage.eINSTANCE.getVerify());
+
+ Abstraction t2_v = UMLFactory.eINSTANCE.createAbstraction();
+ t2_v.getClients().add(op2);
+ t2_v.getSuppliers().add(verified);
+ model.getPackagedElements().add(t2_v);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(t2_v, RequirementsPackage.eINSTANCE.getVerify());
+
+ // Add "Verify" (Abstraction)
+ // verifierNamedElement -> verified
+ Abstraction t3_v = UMLFactory.eINSTANCE.createAbstraction();
+ t3_v.getClients().add(verifierNamedElement);
+ t3_v.getSuppliers().add(verified);
+ model.getPackagedElements().add(t3_v);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(t3_v, RequirementsPackage.eINSTANCE.getVerify());
+
+ // ////////////////////////////////////////////////////////////////////
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see junit.framework.TestCase#tearDown()
+ * @generated
+ */
+ @After
+ public void tearDown() throws Exception {
+ setFixture(null);
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerived()
+ * <em>Derived</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.requirements.Requirement#getDerived()
+ * @generated NOT
+ */
+ @Test
+ public void testGetDerived() {
+
+ // Isolated requirement : default_req.getDerived() = []
+ if(!default_req.getDerived().isEmpty()) {
+ fail();
+ }
+
+ // Verifies : derive1_req.getDerived() = [derived1_req]
+ if(!derive1_req.getDerived().contains(derived1_req)) {
+ fail();
+ }
+
+ // Verifies : derive2_req.getDerived() = [derived1_req, derived2_req]
+ if(!derive2_req.getDerived().contains(derived1_req)) {
+ fail();
+ }
+
+ if(!derive2_req.getDerived().contains(derived2_req)) {
+ fail();
+ }
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getDerivedFrom()
+ * <em>Derived From</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.requirements.Requirement#getDerivedFrom()
+ * @generated NOT
+ */
+ @Test
+ public void testGetDerivedFrom() {
+
+ // Isolated requirement : default_req.getDerivedFrom() = []
+ if(!default_req.getDerivedFrom().isEmpty()) {
+ fail();
+ }
+
+ // Verifies : derived2_req.getDerivedFrom() = [derive2_req]
+ if(!derived2_req.getDerivedFrom().contains(derive2_req)) {
+ fail();
+ }
+
+ // Verifies : derived1_req.getDerivedFrom() = [derive1_req, derive2_req]
+ if(!derived1_req.getDerivedFrom().contains(derive1_req)) {
+ fail();
+ }
+ if(!derived1_req.getDerivedFrom().contains(derive2_req)) {
+ fail();
+ }
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getMaster()
+ * <em>Master</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.requirements.Requirement#getMaster()
+ * @generated NOT
+ */
+ @Test
+ public void testGetMaster() {
+
+ // Isolated requirement : default_req.getMaster() = null
+ if(default_req.getMaster() != null) {
+ fail();
+ }
+
+ // Try retrieving Master from Copy requirement
+ if(!master_req.equals(copy_req.getMaster())) {
+ fail();
+ }
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getRefinedBy()
+ * <em>Refined By</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.requirements.Requirement#getRefinedBy()
+ * @generated NOT
+ */
+ @Test
+ public void testGetRefinedBy() {
+
+ // Isolated requirement : default_req.getRefinedBy() = []
+ if(!default_req.getRefinedBy().isEmpty()) {
+ fail();
+ }
+
+ // Verifies : refined_req.getRefinedBy() = [refiningNE1, refiningNE2]
+ if(!refined_req.getRefinedBy().contains(refiningNE1)) {
+ fail();
+ }
+ if(!refined_req.getRefinedBy().contains(refiningNE2)) {
+ fail();
+ }
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getSatisfiedBy()
+ * <em>Satisfied By</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.requirements.Requirement#getSatisfiedBy()
+ * @generated NOT
+ */
+ @Test
+ public void testGetSatisfiedBy() {
+
+ // Isolated requirement : default_req.getSatisfiedBy() = []
+ if(!default_req.getSatisfiedBy().isEmpty()) {
+ fail();
+ }
+
+ // Verifies : satisfied_req.getSatisfiedBy() = [satisfyingNE1, satisfyingNE2]
+ if(!satisfied_req.getSatisfiedBy().contains(satisfyingNE1)) {
+ fail();
+ }
+ if(!satisfied_req.getSatisfiedBy().contains(satisfyingNE2)) {
+ fail();
+ }
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getTracedTo()
+ * <em>Traced To</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.requirements.Requirement#getTracedTo()
+ * @generated NOT
+ */
+ @Test
+ public void testGetTracedTo() {
+
+ // Isolated requirement : default_req.getTracedTo = []
+ if(!default_req.getTracedTo().isEmpty()) {
+ fail();
+ }
+
+ // DeriveReqt / Verify / Copy inherits from Trace
+ // Test getter through Copy (should not be taken into account see bug #352563)
+ if(master_req.getTracedTo().contains(copy)) {
+ fail();
+ }
+
+ // Test getter through DeriveReqt (tracedTo = Clients)
+ // derived1 -> [derive1_req, derive2_req] (should not be taken into account see bug #352563)
+ // derived2 -> [derive2_req] (should not be taken into account see bug #352563)
+ if(derive1_req.getTracedTo().contains(derived1)) {
+ fail();
+ }
+ if(derive2_req.getTracedTo().contains(derived1)) {
+ fail();
+ }
+ if(derive2_req.getTracedTo().contains(derived2)) {
+ fail();
+ }
+
+ // Test getter through Verify (should not be taken into account see bug #352563)
+ // Should not happen...
+
+ // Direct test
+ if(!trace_req.getTracedTo().contains(traced1)) {
+ fail();
+ }
+ if(!trace_req.getTracedTo().contains(traced2)) {
+ fail();
+ }
+
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.requirements.Requirement#getVerifiedBy()
+ * <em>Verified By</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.requirements.Requirement#getVerifiedBy()
+ * @generated NOT
+ */
+ @Test
+ public void testGetVerifiedBy() {
+
+ // Isolated requirement : default_req.getVerifiedBy() = []
+ if(!default_req.getVerifiedBy().isEmpty()) {
+ fail();
+ }
+
+ // Test getVerifiedBy getter for
+ // [testCase1, testCase2, verifierNamedElement] -> verified_req
+ if(!verified_req.getVerifiedBy().contains(testCase1.getBase_Operation())) {
+ fail();
+ }
+ if(!verified_req.getVerifiedBy().contains(testCase2.getBase_Operation())) {
+ fail();
+ }
+ if(!verified_req.getVerifiedBy().contains(verifierNamedElement)) {
+ fail();
+ }
+ }
+
+} // RequirementTest
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/TestCaseTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/TestCaseTest.java
index d1dfacd8071..da57e128c30 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/TestCaseTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/TestCaseTest.java
@@ -1,194 +1,194 @@
-/*****************************************************************************
- * Copyright (c) 2009, 2014 CEA LIST and others.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- * Christian W. Damus (CEA) - bug 422257
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.requirements.tests;
-
-import static org.junit.Assert.fail;
-
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
-import org.eclipse.papyrus.sysml.requirements.Requirement;
-import org.eclipse.papyrus.sysml.requirements.RequirementsFactory;
-import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
-import org.eclipse.papyrus.sysml.utils.SysMLTestResources;
-import org.eclipse.uml2.uml.Abstraction;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-/**
- * <!-- begin-user-doc --> A test case for the model object '<em><b>Test Case</b></em>'. <!--
- * end-user-doc -->
- * <p>
- * The following features are tested:
- * <ul>
- * <li>{@link org.eclipse.papyrus.sysml.requirements.TestCase#getVerifies() <em>Verifies</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TestCaseTest extends AbstractPapyrusTest {
-
- @Rule
- public final HouseKeeper houseKeeper = new HouseKeeper();
-
- protected org.eclipse.papyrus.sysml.requirements.TestCase fixture = null;
-
- // ////////////////////////////////////////////////////////////////////
- protected Model model = null;
-
- protected Requirement verified1_req = null;
-
- protected Requirement verified2_req = null;
-
- protected org.eclipse.papyrus.sysml.requirements.TestCase testCase0 = null;
-
- protected org.eclipse.papyrus.sysml.requirements.TestCase testCase1 = null;
-
- protected org.eclipse.papyrus.sysml.requirements.TestCase testCase2 = null;
-
- // ////////////////////////////////////////////////////////////////////
-
- /**
- * Returns the fixture for this Test Case test case. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected org.eclipse.papyrus.sysml.requirements.TestCase getFixture() {
- return fixture;
- }
-
- /**
- * Sets the fixture for this Test Case test case.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void setFixture(org.eclipse.papyrus.sysml.requirements.TestCase fixture) {
- this.fixture = fixture;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see junit.framework.TestCase#setUp()
- * @generated NOT
- */
- @Before
- public void setUp() throws Exception {
- setFixture(RequirementsFactory.eINSTANCE.createTestCase());
-
- // Prepare test
- model = SysMLTestResources.createSysMLModel(houseKeeper.createResourceSet());
- if(model == null) {
- fail();
- }
-
- if(model.getAppliedProfiles().isEmpty()) {
- fail();
- }
-
- // ////////////////////////////////////////////////////////////////////
- // Prepare getVerifies test elements
- // ////////////////////////////////////////////////////////////////////
-
- Class verified1 = model.createOwnedClass("verified1", false);
- verified1_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(verified1, RequirementsPackage.eINSTANCE.getRequirement());
-
- Class verified2 = model.createOwnedClass("verified2", false);
- verified2_req = (Requirement)StereotypeApplicationHelper.INSTANCE.applyStereotype(verified2, RequirementsPackage.eINSTANCE.getRequirement());
-
- Class testClass = model.createOwnedClass("testClass", false);
- Operation op0 = testClass.createOwnedOperation("op0", null, null, null);
- Operation op1 = testClass.createOwnedOperation("op1", null, null, null);
- Operation op2 = testClass.createOwnedOperation("op2", null, null, null);
-
- testCase0 = (org.eclipse.papyrus.sysml.requirements.TestCase)StereotypeApplicationHelper.INSTANCE.applyStereotype(op0, RequirementsPackage.eINSTANCE.getTestCase());
- testCase1 = (org.eclipse.papyrus.sysml.requirements.TestCase)StereotypeApplicationHelper.INSTANCE.applyStereotype(op1, RequirementsPackage.eINSTANCE.getTestCase());
- testCase2 = (org.eclipse.papyrus.sysml.requirements.TestCase)StereotypeApplicationHelper.INSTANCE.applyStereotype(op2, RequirementsPackage.eINSTANCE.getTestCase());
-
- // Add "Verify" (Abstraction)
- // testCase1, testCase2 -> verified1
- // testCase2 -> verified2
- Abstraction t1_v1 = UMLFactory.eINSTANCE.createAbstraction();
- t1_v1.getClients().add(op1);
- t1_v1.getSuppliers().add(verified1);
- model.getPackagedElements().add(t1_v1);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(t1_v1, RequirementsPackage.eINSTANCE.getVerify());
-
- Abstraction t1_v2 = UMLFactory.eINSTANCE.createAbstraction();
- t1_v2.getClients().add(op1);
- t1_v2.getSuppliers().add(verified2);
- model.getPackagedElements().add(t1_v2);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(t1_v2, RequirementsPackage.eINSTANCE.getVerify());
-
- Abstraction t2_v2 = UMLFactory.eINSTANCE.createAbstraction();
- t2_v2.getClients().add(op2);
- t2_v2.getSuppliers().add(verified2);
- model.getPackagedElements().add(t2_v2);
- StereotypeApplicationHelper.INSTANCE.applyStereotype(t2_v2, RequirementsPackage.eINSTANCE.getVerify());
-
- // ////////////////////////////////////////////////////////////////////
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- @After
- public void tearDown() throws Exception {
- setFixture(null);
- }
-
- /**
- * Tests the '{@link org.eclipse.papyrus.sysml.requirements.TestCase#getVerifies()
- * <em>Verifies</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.sysml.requirements.TestCase#getVerifies()
- * @generated NOT
- */
- @Test
- public void testGetVerifies() {
-
- // testCase0 -> []
- if(!testCase0.getVerifies().isEmpty()) {
- fail();
- }
-
- // testCase1 -> [verified1_req, verified2_req]
- if(!testCase1.getVerifies().contains(verified1_req)) {
- fail();
- }
- if(!testCase1.getVerifies().contains(verified2_req)) {
- fail();
- }
-
- // testCase2 -> [verified2_req]
- if(!testCase2.getVerifies().contains(verified2_req)) {
- fail();
- }
-
- }
-
-} // TestCaseTest
+/*****************************************************************************
+ * Copyright (c) 2009, 2014 CEA LIST and others.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ * Christian W. Damus (CEA) - bug 422257
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.requirements.tests;
+
+import static org.junit.Assert.fail;
+
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.sysml.requirements.Requirement;
+import org.eclipse.papyrus.sysml.requirements.RequirementsFactory;
+import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
+import org.eclipse.papyrus.sysml.utils.SysMLTestResources;
+import org.eclipse.uml2.uml.Abstraction;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * <!-- begin-user-doc --> A test case for the model object '<em><b>Test Case</b></em>'. <!--
+ * end-user-doc -->
+ * <p>
+ * The following features are tested:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.sysml.requirements.TestCase#getVerifies() <em>Verifies</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class TestCaseTest extends AbstractPapyrusTest {
+
+ @Rule
+ public final HouseKeeper houseKeeper = new HouseKeeper();
+
+ protected org.eclipse.papyrus.sysml.requirements.TestCase fixture = null;
+
+ // ////////////////////////////////////////////////////////////////////
+ protected Model model = null;
+
+ protected Requirement verified1_req = null;
+
+ protected Requirement verified2_req = null;
+
+ protected org.eclipse.papyrus.sysml.requirements.TestCase testCase0 = null;
+
+ protected org.eclipse.papyrus.sysml.requirements.TestCase testCase1 = null;
+
+ protected org.eclipse.papyrus.sysml.requirements.TestCase testCase2 = null;
+
+ // ////////////////////////////////////////////////////////////////////
+
+ /**
+ * Returns the fixture for this Test Case test case. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ */
+ protected org.eclipse.papyrus.sysml.requirements.TestCase getFixture() {
+ return fixture;
+ }
+
+ /**
+ * Sets the fixture for this Test Case test case.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void setFixture(org.eclipse.papyrus.sysml.requirements.TestCase fixture) {
+ this.fixture = fixture;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see junit.framework.TestCase#setUp()
+ * @generated NOT
+ */
+ @Before
+ public void setUp() throws Exception {
+ setFixture(RequirementsFactory.eINSTANCE.createTestCase());
+
+ // Prepare test
+ model = SysMLTestResources.createSysMLModel(houseKeeper.createResourceSet());
+ if(model == null) {
+ fail();
+ }
+
+ if(model.getAppliedProfiles().isEmpty()) {
+ fail();
+ }
+
+ // ////////////////////////////////////////////////////////////////////
+ // Prepare getVerifies test elements
+ // ////////////////////////////////////////////////////////////////////
+
+ Class verified1 = model.createOwnedClass("verified1", false);
+ verified1_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(verified1, RequirementsPackage.eINSTANCE.getRequirement());
+
+ Class verified2 = model.createOwnedClass("verified2", false);
+ verified2_req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(verified2, RequirementsPackage.eINSTANCE.getRequirement());
+
+ Class testClass = model.createOwnedClass("testClass", false);
+ Operation op0 = testClass.createOwnedOperation("op0", null, null, null);
+ Operation op1 = testClass.createOwnedOperation("op1", null, null, null);
+ Operation op2 = testClass.createOwnedOperation("op2", null, null, null);
+
+ testCase0 = (org.eclipse.papyrus.sysml.requirements.TestCase)StereotypeApplicationHelper.getInstance(null).applyStereotype(op0, RequirementsPackage.eINSTANCE.getTestCase());
+ testCase1 = (org.eclipse.papyrus.sysml.requirements.TestCase)StereotypeApplicationHelper.getInstance(null).applyStereotype(op1, RequirementsPackage.eINSTANCE.getTestCase());
+ testCase2 = (org.eclipse.papyrus.sysml.requirements.TestCase)StereotypeApplicationHelper.getInstance(null).applyStereotype(op2, RequirementsPackage.eINSTANCE.getTestCase());
+
+ // Add "Verify" (Abstraction)
+ // testCase1, testCase2 -> verified1
+ // testCase2 -> verified2
+ Abstraction t1_v1 = UMLFactory.eINSTANCE.createAbstraction();
+ t1_v1.getClients().add(op1);
+ t1_v1.getSuppliers().add(verified1);
+ model.getPackagedElements().add(t1_v1);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(t1_v1, RequirementsPackage.eINSTANCE.getVerify());
+
+ Abstraction t1_v2 = UMLFactory.eINSTANCE.createAbstraction();
+ t1_v2.getClients().add(op1);
+ t1_v2.getSuppliers().add(verified2);
+ model.getPackagedElements().add(t1_v2);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(t1_v2, RequirementsPackage.eINSTANCE.getVerify());
+
+ Abstraction t2_v2 = UMLFactory.eINSTANCE.createAbstraction();
+ t2_v2.getClients().add(op2);
+ t2_v2.getSuppliers().add(verified2);
+ model.getPackagedElements().add(t2_v2);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(t2_v2, RequirementsPackage.eINSTANCE.getVerify());
+
+ // ////////////////////////////////////////////////////////////////////
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see junit.framework.TestCase#tearDown()
+ * @generated
+ */
+ @After
+ public void tearDown() throws Exception {
+ setFixture(null);
+ }
+
+ /**
+ * Tests the '{@link org.eclipse.papyrus.sysml.requirements.TestCase#getVerifies()
+ * <em>Verifies</em>}' feature getter. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.sysml.requirements.TestCase#getVerifies()
+ * @generated NOT
+ */
+ @Test
+ public void testGetVerifies() {
+
+ // testCase0 -> []
+ if(!testCase0.getVerifies().isEmpty()) {
+ fail();
+ }
+
+ // testCase1 -> [verified1_req, verified2_req]
+ if(!testCase1.getVerifies().contains(verified1_req)) {
+ fail();
+ }
+ if(!testCase1.getVerifies().contains(verified2_req)) {
+ fail();
+ }
+
+ // testCase2 -> [verified2_req]
+ if(!testCase2.getVerifies().contains(verified2_req)) {
+ fail();
+ }
+
+ }
+
+} // TestCaseTest
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
index 6957d3a3c7a..b6929830b94 100755..100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
@@ -1,26 +1,24 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.profile;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml.diagram.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.2.0",
- org.eclipse.ui.workbench;bundle-version="3.103.1",
- org.eclipse.ui.ide;bundle-version="3.8.1",
- org.eclipse.jface;bundle-version="3.8.101",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
- org.eclipse.core.resources,
- org.eclipse.core.runtime;bundle-version="3.10.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.junit;bundle-version="4.11.0"
-Export-Package: org.eclipse.papyrus.uml.diagram.wizards
-Bundle-Vendor: %providerName
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.uml2.uml;bundle-version="3.1.0",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.profile;bundle-version="1.2.0",
+ org.eclipse.ui.workbench;bundle-version="3.103.1",
+ org.eclipse.ui.ide;bundle-version="3.8.1",
+ org.eclipse.jface;bundle-version="3.8.101",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.junit;bundle-version="4.11.0"
+Export-Package: org.eclipse.papyrus.uml.diagram.wizards
+Bundle-Vendor: %providerName
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards.tests
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/AllTests.java
index 3d98e58a66b..78adb5bab00 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/AllTests.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/AllTests.java
@@ -1,29 +1,29 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.wizards;
-
-import org.junit.runner.RunWith;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
-import org.junit.runners.Suite.SuiteClasses;
-
-
-
-@RunWith(ClassificationSuite.class)
-@SuiteClasses({
- // {oep}.uml.diagram.wizards
- TestCreateModelWizard.class, TestCreateSysMLModelWizard.class, TestInitModelWizard.class, TestNewProjectWizard.class, TestNewSysMLProjectWizard.class, TestCreateModelFromExistingModelWizard.class })
-/**
- * Suite Class for all tests in the plugin
- */
-public class AllTests {
-
-}
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.wizards;
+
+import org.junit.runner.RunWith;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+
+@RunWith(ClassificationSuite.class)
+@SuiteClasses({
+ // {oep}.uml.diagram.wizards
+ TestCreateModelWizard.class, TestInitModelWizard.class, TestNewProjectWizard.class, TestCreateModelFromExistingModelWizard.class })
+/**
+ * Suite Class for all tests in the plugin
+ */
+public class AllTests {
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateSysMLModelWizard.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateSysMLModelWizard.java
deleted file mode 100644
index deb9f515bb9..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateSysMLModelWizard.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013, 2014 LIFL, CEA LIST, and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * LIFL - Initial API and implementation
- * CEA LIST - Update tests and re-integrate into automation suite
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.wizards;
-
-import static org.junit.Assert.assertEquals;
-
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateSysMLModelCommand;
-import org.eclipse.papyrus.sysml.diagram.ui.NewSysMLModelWizard;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectStorageProviderPage;
-import org.eclipse.ui.IWorkbenchWizard;
-import org.junit.Test;
-
-
-public class TestCreateSysMLModelWizard extends TestNewModelWizardBase {
-
- @Override
- protected IWorkbenchWizard createWizard() {
- return new NewSysMLModelWizard();
- }
-
- @Test
- public void testOrderOfPages() {
- // actual pages: [SelectStorageProvider -> SelectStorageProviderPage,
- // NewPapyrusModel -> NewModelFilePage, NewCDOModel -> NewModelPage, SelectDiagramKind -> SelectDiagramKindPage]
- // Class<?>[] expectedPages = new Class[] { SelectStorageProviderPage.class, NewModelFilePage.class, SelectDiagramKindPage.class };
- Class<?>[] expectedPages = new Class[] { NewModelFilePage.class, SelectDiagramKindPage.class };
-
- IWorkbenchWizard wizard = initWizardDialog();
- testOrderOfPages(wizard, expectedPages);
- }
-
- @Test
- public void testDiagramCategory() {
- class NewSysMLModelWizardWithPublicAccess extends NewSysMLModelWizard {
-
- // open access to protected method
- @Override
- public String[] getDiagramCategoryIds() {
- return super.getDiagramCategoryIds();
- }
- }
-
- NewSysMLModelWizardWithPublicAccess wizard = new NewSysMLModelWizardWithPublicAccess();
- initWizardDialog(wizard);
- String actualCategory = wizard.getDiagramCategoryIds()[0];
- assertEquals(CreateSysMLModelCommand.COMMAND_ID, actualCategory);
- }
-
- @Test
- public void testDiagramFileExtenstion() {
- final String expectedExtension = "di";
- NewSysMLModelWizard wizard = new NewSysMLModelWizard() {
-
- @Override
- protected String[] getDiagramCategoryIds() {
- return new String[] { CreateSysMLModelCommand.COMMAND_ID };
- }
-
- };
-
- initWizardDialog(wizard);
- NewModelFilePage page = getPage(wizard, NewModelFilePage.class);
- assertEquals(expectedExtension, page.getFileExtension());
- }
-
-}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestInitModelWizard.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestInitModelWizard.java
index 9f785501da6..a1bc29baca6 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestInitModelWizard.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestInitModelWizard.java
@@ -19,7 +19,6 @@ import org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand;
import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;
import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRootElementPage;
import org.eclipse.papyrus.uml.diagram.wizards.wizards.InitModelWizard;
import org.eclipse.ui.IWorkbenchWizard;
import org.junit.Test;
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewSysMLProjectWizard.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewSysMLProjectWizard.java
deleted file mode 100644
index 76bd8db1cc0..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewSysMLProjectWizard.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.papyrus.uml.diagram.wizards;
-
-import static org.junit.Assert.assertEquals;
-
-import org.eclipse.papyrus.sysml.diagram.common.commands.CreateSysMLModelCommand;
-import org.eclipse.papyrus.sysml.diagram.ui.NewSysMLProjectWizard;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.PapyrusProjectCreationPage;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage;
-import org.eclipse.ui.IWorkbenchWizard;
-import org.junit.Test;
-
-
-
-public class TestNewSysMLProjectWizard extends TestNewModelWizardBase {
-
-
- @Override
- protected IWorkbenchWizard createWizard() {
- return new NewSysMLProjectWizard();
- }
-
- @Test
- public void testOrderOfPages() {
-
- // actual pages: [PapyrusNewProjectPage -> PapyrusProjectCreationPage, SelectDiagramKind -> SelectDiagramKindPage]
- Class<?>[] expectedPages = new Class[] { PapyrusProjectCreationPage.class, SelectDiagramKindPage.class };
-
- IWorkbenchWizard wizard = initWizardDialog();
- testOrderOfPages(wizard, expectedPages);
- }
-
-
- @Test
- public void testDiagramCategory() {
- class NewSysMLProjectWizardWithPublicAccess extends NewSysMLProjectWizard {
-
- // open access to protected method
- @Override
- public String[] getDiagramCategoryIds() {
- return new String[] { CreateSysMLModelCommand.COMMAND_ID };
- }
- }
-
- NewSysMLProjectWizardWithPublicAccess wizard = new NewSysMLProjectWizardWithPublicAccess();
- initWizardDialog(wizard);
- String actualCategory = wizard.getDiagramCategoryIds()[0];
- assertEquals(CreateSysMLModelCommand.COMMAND_ID, actualCategory);
- }
-
-}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/plugin.properties b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/plugin.properties
index 0e8106ca634..084142e8a05 100755..100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/plugin.properties
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/plugin.properties
@@ -1,4 +1,4 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable.allocation.tests
-Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = Papyrus Table Generic Tests
+#Properties file for org.eclipse.papyrus.uml.nattable.generic.tests
+Bundle-Vendor = Eclipse Modeling Project
+Bundle-Name = Papyrus Table Generic Tests
Bundle-Description = This plugin provides Tests for the plugin org.eclipse.papyrus.uml.nattable.generic. \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/Bug458492_Edition_Enumeration.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/Bug458492_Edition_Enumeration.java
index a9596736c64..76d1945ba86 100755..100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/Bug458492_Edition_Enumeration.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/src/org/eclipse/papyrus/uml/nattable/generic/tests/tests/Bug458492_Edition_Enumeration.java
@@ -76,6 +76,7 @@ public class Bug458492_Edition_Enumeration extends AbstractGenericTableTest {
private static final String PORT_NAME = "flowport1"; //$NON-NLS-1$
+ //TODO #487932: Either use the standard profile or move the test to SysML 1.4
private static final String FLOW_PORT_STEREOTYPE_QN = "SysML::PortAndFlows::FlowPort"; //$NON-NLS-1$
private static final String DIRECTION_QN = "SysML::PortAndFlows::FlowPort::direction"; //$NON-NLS-1$
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/SysMLContentProviderTest.java b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/SysMLContentProviderTest.java
deleted file mode 100644
index 274f30fc846..00000000000
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/src/org/eclipse/papyrus/uml/tools/tests/tests/SysMLContentProviderTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.tests.tests;
-
-//TODO : Test profile-specific elements (Stereotype associations...)
-public class SysMLContentProviderTest {
-
-}

Back to the top