Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorptessier2013-04-02 10:46:40 -0400
committerptessier2013-04-02 10:46:40 -0400
commite3354c77dd6e479bf8d431227b061529214d8bf2 (patch)
tree85d8de7c8e0c7f78254fa28c65e093300ead264e /tests
parent04bcc891505d54b20a669bc671ad838a364c2b66 (diff)
downloadorg.eclipse.papyrus-e3354c77dd6e479bf8d431227b061529214d8bf2.tar.gz
org.eclipse.papyrus-e3354c77dd6e479bf8d431227b061529214d8bf2.tar.xz
org.eclipse.papyrus-e3354c77dd6e479bf8d431227b061529214d8bf2.zip
399255: [OCL for Papyrus]The validation options for a UML Class Diagram should show the Constraints contributed by Stereotypes
https://bugs.eclipse.org/bugs/show_bug.cgi?id=399255
Diffstat (limited to 'tests')
-rw-r--r--tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/profileEdition/EditConstraintOnPropertyofSterotype.profile.di2
-rw-r--r--tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/profileEdition/EditConstraintOnPropertyofSterotype.profile.uml56
-rw-r--r--tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/validation/model.di2
-rw-r--r--tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/validation/model.notation10
-rw-r--r--tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/validation/model.uml13
5 files changed, 55 insertions, 28 deletions
diff --git a/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/profileEdition/EditConstraintOnPropertyofSterotype.profile.di b/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/profileEdition/EditConstraintOnPropertyofSterotype.profile.di
index 33dbd555dc5..9235aa132a8 100644
--- a/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/profileEdition/EditConstraintOnPropertyofSterotype.profile.di
+++ b/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/profileEdition/EditConstraintOnPropertyofSterotype.profile.di
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>
+<?xml version="1.0" encoding="UTF-8"?>
<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
<pageList>
<availablePage>
diff --git a/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/profileEdition/EditConstraintOnPropertyofSterotype.profile.uml b/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/profileEdition/EditConstraintOnPropertyofSterotype.profile.uml
index 4a47fff2100..1ad9fc1250d 100644
--- a/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/profileEdition/EditConstraintOnPropertyofSterotype.profile.uml
+++ b/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/profileEdition/EditConstraintOnPropertyofSterotype.profile.uml
@@ -1,23 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<uml:Profile xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_929swG-zEeK5cr7NUZ6onQ" name="EditConstraintOnPropertyOfStereotype" metaclassReference="_ERI64G-0EeK5cr7NUZ6onQ">
<eAnnotations xmi:id="_-67nAW-6EeK5cr7NUZ6onQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <contents xmi:type="ecore:EPackage" xmi:id="_-67nAm-6EeK5cr7NUZ6onQ" name="EditConstraintOnPropertyOfStereotype" nsURI="http:///schemas/EditConstraintOnPropertyOfStereotype/_-67nAG-6EeK5cr7NUZ6onQ/0" nsPrefix="EditConstraintOnPropertyOfStereotype">
- <eAnnotations xmi:id="_-68OEW-6EeK5cr7NUZ6onQ" source="PapyrusVersion">
- <details xmi:id="_-68OEm-6EeK5cr7NUZ6onQ" key="Version" value="0.0.1"/>
- <details xmi:id="_-68OE2-6EeK5cr7NUZ6onQ" key="Comment" value=""/>
- <details xmi:id="_-68OFG-6EeK5cr7NUZ6onQ" key="Copyright" value=""/>
- <details xmi:id="_-68OFW-6EeK5cr7NUZ6onQ" key="Date" value="2013-02-05"/>
- <details xmi:id="_-68OFm-6EeK5cr7NUZ6onQ" key="Author" value=""/>
+ <contents xmi:type="ecore:EPackage" xmi:id="_KiQ3gZuiEeK-8bwrpj4Hxg" name="EditConstraintOnPropertyOfStereotype" nsURI="http:///schemas/EditConstraintOnPropertyOfStereotype/_KiQ3gJuiEeK-8bwrpj4Hxg/1" nsPrefix="EditConstraintOnPropertyOfStereotype">
+ <eAnnotations xmi:id="_KiQ3gpuiEeK-8bwrpj4Hxg" source="http://www.eclipse.org/emf/2002/Ecore">
+ <details xmi:id="_KiQ3g5uiEeK-8bwrpj4Hxg" key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
</eAnnotations>
- <eClassifiers xmi:type="ecore:EClass" xmi:id="_-67nA2-6EeK5cr7NUZ6onQ" name="Stereotype1">
- <eAnnotations xmi:id="_-67nBG-6EeK5cr7NUZ6onQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ElEjgG-0EeK5cr7NUZ6onQ"/>
- <eAnnotations xmi:id="_-67nBW-6EeK5cr7NUZ6onQ" source="http://www.eclipse.org/emf/2002/GenModel">
- <details xmi:id="_-67nBm-6EeK5cr7NUZ6onQ" key="documentation" value="self.Property1.oclAsType(Integer)>10"/>
- </eAnnotations>
- <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_-67nB2-6EeK5cr7NUZ6onQ" name="Property1" ordered="false" lowerBound="1">
+ <eAnnotations xmi:id="_KijycJuiEeK-8bwrpj4Hxg" source="PapyrusVersion">
+ <details xmi:id="_KijycZuiEeK-8bwrpj4Hxg" key="Version" value="0.0.2"/>
+ <details xmi:id="_KijycpuiEeK-8bwrpj4Hxg" key="Comment" value=""/>
+ <details xmi:id="_Kijyc5uiEeK-8bwrpj4Hxg" key="Copyright" value=""/>
+ <details xmi:id="_KijydJuiEeK-8bwrpj4Hxg" key="Date" value="2013-04-02"/>
+ <details xmi:id="_KijydZuiEeK-8bwrpj4Hxg" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_KiQ3hJuiEeK-8bwrpj4Hxg" name="Stereotype1">
+ <eAnnotations xmi:id="_KiQ3hZuiEeK-8bwrpj4Hxg" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ElEjgG-0EeK5cr7NUZ6onQ"/>
+ <eOperations xmi:id="_KiQ3hpuiEeK-8bwrpj4Hxg" name="Constraint1">
+ <eAnnotations xmi:id="_KiQ3h5uiEeK-8bwrpj4Hxg" source="http://www.eclipse.org/emf/2002/Ecore/OCL">
+ <details xmi:id="_KiQ3iJuiEeK-8bwrpj4Hxg" key="body" value="self.Property1>10"/>
+ </eAnnotations>
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eParameters xmi:id="_KiQ3ipuiEeK-8bwrpj4Hxg" name="diagnostics">
+ <eAnnotations xmi:id="_KiQ3i5uiEeK-8bwrpj4Hxg" source="http://www.eclipse.org/emf/2002/GenModel">
+ <details xmi:id="_KiQ3jJuiEeK-8bwrpj4Hxg" key="documentation" value="The chain of diagnostics to which problems are to be appended."/>
+ </eAnnotations>
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
+ </eParameters>
+ <eParameters xmi:id="_KiQ3jpuiEeK-8bwrpj4Hxg" name="context">
+ <eAnnotations xmi:id="_KiQ3j5uiEeK-8bwrpj4Hxg" source="http://www.eclipse.org/emf/2002/GenModel">
+ <details xmi:id="_KiQ3kJuiEeK-8bwrpj4Hxg" key="documentation" value="The cache of context-specific information."/>
+ </eAnnotations>
+ <eGenericType xmi:id="_KiQ3kZuiEeK-8bwrpj4Hxg">
+ <eTypeArguments xmi:id="_KiQ3kpuiEeK-8bwrpj4Hxg">
+ <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+ </eTypeArguments>
+ <eTypeArguments xmi:id="_KiQ3k5uiEeK-8bwrpj4Hxg">
+ <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+ </eTypeArguments>
+ <eClassifier xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EMap"/>
+ </eGenericType>
+ </eParameters>
+ </eOperations>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_KiQ3lJuiEeK-8bwrpj4Hxg" name="Property1" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Integer"/>
</eStructuralFeatures>
- <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_-67nCW-6EeK5cr7NUZ6onQ" name="base_NamedElement" ordered="false" lowerBound="1">
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_KiQ3lpuiEeK-8bwrpj4Hxg" name="base_NamedElement" ordered="false" lowerBound="1">
<eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</eStructuralFeatures>
</eClassifiers>
@@ -33,7 +59,7 @@
<ownedRule xmi:id="_LXqRoG-0EeK5cr7NUZ6onQ" name="Constraint1" constrainedElement="_H5h94G-0EeK5cr7NUZ6onQ">
<specification xmi:type="uml:OpaqueExpression" xmi:id="_RHneEG-0EeK5cr7NUZ6onQ">
<language>OCL</language>
- <body>self.Property1.oclAsType(Integer)>10</body>
+ <body>self.Property1>10</body>
</specification>
</ownedRule>
<ownedAttribute xmi:id="_H5h94G-0EeK5cr7NUZ6onQ" name="Property1">
diff --git a/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/validation/model.di b/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/validation/model.di
index 358934f01c4..5d3433b49bc 100644
--- a/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/validation/model.di
+++ b/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/validation/model.di
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>
+<?xml version="1.0" encoding="UTF-8"?>
<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
<pageList>
<availablePage>
diff --git a/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/validation/model.notation b/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/validation/model.notation
index 9ada8e85f84..2ba373ee160 100644
--- a/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/validation/model.notation
+++ b/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/validation/model.notation
@@ -2,11 +2,11 @@
<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_OPIe8G-9EeKko_sFXbAb-Q" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_OrhgAG-9EeKko_sFXbAb-Q" type="2008">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_P5kAcG-9EeKko_sFXbAb-Q" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P5kAcW-9EeKko_sFXbAb-Q" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P5kngG-9EeKko_sFXbAb-Q" key="StereotypeList" value="EditConstraintOnPropertyOfStereotype::Stereotype1"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P5kngW-9EeKko_sFXbAb-Q" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P5kngm-9EeKko_sFXbAb-Q" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_P5kng2-9EeKko_sFXbAb-Q" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QkUglZuiEeK-8bwrpj4Hxg" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QkUglpuiEeK-8bwrpj4Hxg" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QkUgl5uiEeK-8bwrpj4Hxg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QkUgmJuiEeK-8bwrpj4Hxg" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QkUgmZuiEeK-8bwrpj4Hxg" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_OrhgAm-9EeKko_sFXbAb-Q" type="5029"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_Or1pEG-9EeKko_sFXbAb-Q" type="7017">
diff --git a/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/validation/model.uml b/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/validation/model.uml
index 0b59bea6983..44b8d030214 100644
--- a/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/validation/model.uml
+++ b/tests/recipes/plugins/uml/org.eclipse.papyrus.uml.ocl.recipetest/models/validation/model.uml
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:EditConstraintOnPropertyOfStereotype="http:///schemas/EditConstraintOnPropertyOfStereotype/_-67nAG-6EeK5cr7NUZ6onQ/0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http:///schemas/EditConstraintOnPropertyOfStereotype/_-67nAG-6EeK5cr7NUZ6onQ/0 ../profileEdition/EditConstraintOnPropertyofSterotype.profile.uml#_-67nAm-6EeK5cr7NUZ6onQ">
+<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:EditConstraintOnPropertyOfStereotype="http:///schemas/EditConstraintOnPropertyOfStereotype/_-67nAG-6EeK5cr7NUZ6onQ/0" xmlns:EditConstraintOnPropertyOfStereotype_1="http:///schemas/EditConstraintOnPropertyOfStereotype/_KiQ3gJuiEeK-8bwrpj4Hxg/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http:///schemas/EditConstraintOnPropertyOfStereotype/_-67nAG-6EeK5cr7NUZ6onQ/0 ../profileEdition/EditConstraintOnPropertyofSterotype.profile.uml#_-67nAm-6EeK5cr7NUZ6onQ http:///schemas/EditConstraintOnPropertyOfStereotype/_KiQ3gJuiEeK-8bwrpj4Hxg/1 ../profileEdition/EditConstraintOnPropertyofSterotype.profile.uml#_KiQ3gZuiEeK-8bwrpj4Hxg">
<uml:Model xmi:id="_Inyb8G-9EeKko_sFXbAb-Q" name="model">
- <ownedComment xmi:id="_kt05kG-9EeKko_sFXbAb-Q">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_kt05kG-9EeKko_sFXbAb-Q">
<body>Normally this model is not valid, beacause the property of applied sterotype is lower than 10 (constraint defined in the applied profile)</body>
</ownedComment>
<packagedElement xmi:type="uml:Class" xmi:id="_OrBJsG-9EeKko_sFXbAb-Q" name="Class1"/>
- <profileApplication xmi:id="_NITZwG-9EeKko_sFXbAb-Q">
- <eAnnotations xmi:id="_NIV2AG-9EeKko_sFXbAb-Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="../profileEdition/EditConstraintOnPropertyofSterotype.profile.uml#_-67nAm-6EeK5cr7NUZ6onQ"/>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_NITZwG-9EeKko_sFXbAb-Q">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NIV2AG-9EeKko_sFXbAb-Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="../profileEdition/EditConstraintOnPropertyofSterotype.profile.uml#_KiQ3gZuiEeK-8bwrpj4Hxg"/>
</eAnnotations>
- <appliedProfile href="../profileEdition/EditConstraintOnPropertyofSterotype.profile.uml#_929swG-zEeK5cr7NUZ6onQ"/>
+ <appliedProfile xmi:type="uml:Profile" href="../profileEdition/EditConstraintOnPropertyofSterotype.profile.uml#_929swG-zEeK5cr7NUZ6onQ"/>
</profileApplication>
</uml:Model>
<EditConstraintOnPropertyOfStereotype:Stereotype1 xmi:id="_P4UqUG-9EeKko_sFXbAb-Q" Property1="5" base_NamedElement="_OrBJsG-9EeKko_sFXbAb-Q"/>
+ <EditConstraintOnPropertyOfStereotype_1:Stereotype1 xmi:id="_TmLIAJuiEeK-8bwrpj4Hxg" Property1="5" base_NamedElement="_OrBJsG-9EeKko_sFXbAb-Q"/>
</xmi:XMI>

Back to the top