Skip to content

Commit

Permalink
[test] Revert migration of some test that should not have been migrated
Browse files Browse the repository at this point in the history 
Some old sample for the migration tests have been migrated by commit
77a9975 "#2913 Migrate all data tests to 7.0.1" when it shouldn't have
been migrated. This commit revert these migrations.

Signed-off-by: Séraphin Costa <[email protected]>
  • Loading branch information
@scosta-obeo @pdulth
scosta-obeo authored and pdulth committed Jan 23, 2025
1 parent e072c1a commit b7ba0e5
Show file tree
Hide file tree
Showing 14 changed files with 675 additions and 695 deletions.
446 changes: 223 additions & 223 deletions ....test.migration.ju/model/FunctionalChainsNonRegression/FunctionalChainsNonRegression.aird
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...st.migration.ju/model/FunctionalChainsNonRegression/FunctionalChainsNonRegression.capella
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--Capella_Version_7.0.0-->
<!--Capella_Version_7.0.1-->
<org.polarsys.capella.core.data.capellamodeller:Project xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:libraries="http://www.polarsys.org/capella/common/libraries/7.0.0"
xmlns:org.polarsys.capella.core.data.capellacommon="http://www.polarsys.org/capella/core/common/7.0.0"
Expand Down
2 changes: 1 addition & 1 deletion ....polarsys.capella.test.migration.ju/model/InvalidAirdElement-1_4_x/InvalidAirdElement.afm
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_9rQsgBpqEeqVaNY29bPcxg">
<viewpointReferences id="_9sATYBpqEeqVaNY29bPcxg" vpId="org.polarsys.capella.core.viewpoint" version="7.0.1"/>
<viewpointReferences id="_9sATYBpqEeqVaNY29bPcxg" vpId="org.polarsys.capella.core.viewpoint" version="1.4.2"/>
</metadata:Metadata>
18 changes: 8 additions & 10 deletions ...polarsys.capella.test.migration.ju/model/InvalidAirdElement-1_4_x/InvalidAirdElement.aird
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:org.polarsys.capella.core.data.ctx="http://www.polarsys.org/capella/core/ctx/7.0.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/filter/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/filter http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
<viewpoint:DAnalysis uid="_9radgBpqEeqVaNY29bPcxg" selectedViews="_9sTOUBpqEeqVaNY29bPcxg _98sawBpqEeqVaNY29bPcxg _99vjoBpqEeqVaNY29bPcxg _99vjoRpqEeqVaNY29bPcxg _9-CekBpqEeqVaNY29bPcxg _9-MPkBpqEeqVaNY29bPcxg _9-o7gBpqEeqVaNY29bPcxg" version="15.4.1.202403191723">
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:org.polarsys.capella.core.data.ctx="http://www.polarsys.org/capella/core/ctx/5.0.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/filter/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/filter http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
<viewpoint:DAnalysis uid="_9radgBpqEeqVaNY29bPcxg" selectedViews="_9sTOUBpqEeqVaNY29bPcxg _98sawBpqEeqVaNY29bPcxg _99vjoBpqEeqVaNY29bPcxg _99vjoRpqEeqVaNY29bPcxg _9-CekBpqEeqVaNY29bPcxg _9-MPkBpqEeqVaNY29bPcxg _9-o7gBpqEeqVaNY29bPcxg" version="14.3.1.202003261200">
<semanticResources>InvalidAirdElement.afm</semanticResources>
<semanticResources>InvalidAirdElement.capella</semanticResources>
<semanticResources>InvalidAirdElement.melodymodeller</semanticResources>
<ownedViews xmi:type="viewpoint:DView" uid="_9sTOUBpqEeqVaNY29bPcxg">
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.polarsys.kitalpha.ad.integration.sirius/description/ad.odesign#//@ownedViewpoints[name='ad']"/>
</ownedViews>
<ownedViews xmi:type="viewpoint:DView" uid="_98sawBpqEeqVaNY29bPcxg">
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/context.odesign#//@ownedViewpoints[name='System%20Analysis']"/>
<ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="__8RF0xpqEeqVaNY29bPcxg" name="[SDFB] Root System Function" repPath="#__7-K4BpqEeqVaNY29bPcxg" changeId="1730972143312">
<ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="__8RF0xpqEeqVaNY29bPcxg" name="[SDFB] Root System Function" repPath="#__7-K4BpqEeqVaNY29bPcxg">
<description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/context.odesign#//@ownedViewpoints[name='System%20Analysis']/@ownedRepresentations[name='System%20Data%20Flow%20Blank']"/>
<target xmi:type="org.polarsys.capella.core.data.ctx:SystemFunction" href="InvalidAirdElement.capella#a332d077-f373-475f-8b12-138bae48a9a2"/>
<target xmi:type="org.polarsys.capella.core.data.ctx:SystemFunction" href="InvalidAirdElement.melodymodeller#a332d077-f373-475f-8b12-138bae48a9a2"/>
</ownedRepresentationDescriptors>
</ownedViews>
<ownedViews xmi:type="viewpoint:DView" uid="_99vjoBpqEeqVaNY29bPcxg">
Expand Down Expand Up @@ -73,8 +73,8 @@
</data>
</ownedAnnotationEntries>
<ownedDiagramElements xmi:type="diagram:DNodeContainer" uid="_AVKG8BprEeqVaNY29bPcxg" name="SystemFunction 1">
<target xmi:type="org.polarsys.capella.core.data.ctx:SystemFunction" href="InvalidAirdElement.capella#9f9eba9a-46f6-4fbf-a09c-13f8068343a8"/>
<semanticElements xmi:type="org.polarsys.capella.core.data.ctx:SystemFunction" href="InvalidAirdElement.capella#9f9eba9a-46f6-4fbf-a09c-13f8068343a8"/>
<target xmi:type="org.polarsys.capella.core.data.ctx:SystemFunction" href="InvalidAirdElement.melodymodeller#9f9eba9a-46f6-4fbf-a09c-13f8068343a8"/>
<semanticElements xmi:type="org.polarsys.capella.core.data.ctx:SystemFunction" href="InvalidAirdElement.melodymodeller#9f9eba9a-46f6-4fbf-a09c-13f8068343a8"/>
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
Expand All @@ -85,10 +85,8 @@
</ownedDiagramElements>
<description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/context.odesign#//@ownedViewpoints[name='System%20Analysis']/@ownedRepresentations[name='System%20Data%20Flow%20Blank']"/>
<activatedFilters xmi:type="filter:CompositeFilterDescription" href="platform:/plugin/org.polarsys.kitalpha.ad.integration.sirius/description/ad.odesign#//@ownedViewpoints[name='ad']/@ownedRepresentations[name='AD%20diagram']/@filters[name='ModelExtensionFilter']"/>
<activatedFilters xmi:type="filter:CompositeFilterDescription" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/context.odesign#//@ownedViewpoints[name='System%20Analysis']/@ownedRepresentations[name='System%20Data%20Flow%20Blank']/@filters[name='hide.overlappedfunctional.chains.icon.filter']"/>
<activatedFilters xmi:type="filter:CompositeFilterDescription" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/context.odesign#//@ownedViewpoints[name='System%20Analysis']/@ownedRepresentations[name='System%20Data%20Flow%20Blank']/@filters[name='hide.overlappedfunctional.chains.label.filter']"/>
<filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="__7-K4RpqEeqVaNY29bPcxg"/>
<activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/context.odesign#//@ownedViewpoints[name='System%20Analysis']/@ownedRepresentations[name='System%20Data%20Flow%20Blank']/@defaultLayer"/>
<target xmi:type="org.polarsys.capella.core.data.ctx:SystemFunction" href="InvalidAirdElement.capella#a332d077-f373-475f-8b12-138bae48a9a2"/>
<target xmi:type="org.polarsys.capella.core.data.ctx:SystemFunction" href="InvalidAirdElement.melodymodeller#a332d077-f373-475f-8b12-138bae48a9a2"/>
</diagram:DSemanticDiagram>
</xmi:XMI>
32 changes: 16 additions & 16 deletions ...arsys.capella.test.migration.ju/model/InvalidAirdElement-1_4_x/InvalidAirdElement.capella
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--Capella_Version_7.0.0-->
<!--Capella_Version_1.4.2-->
<org.polarsys.capella.core.data.capellamodeller:Project xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:libraries="http://www.polarsys.org/capella/common/libraries/7.0.0"
xmlns:org.polarsys.capella.core.data.capellacommon="http://www.polarsys.org/capella/core/common/7.0.0"
xmlns:org.polarsys.capella.core.data.capellacore="http://www.polarsys.org/capella/core/core/7.0.0"
xmlns:org.polarsys.capella.core.data.capellamodeller="http://www.polarsys.org/capella/core/modeller/7.0.0"
xmlns:org.polarsys.capella.core.data.cs="http://www.polarsys.org/capella/core/cs/7.0.0"
xmlns:org.polarsys.capella.core.data.ctx="http://www.polarsys.org/capella/core/ctx/7.0.0"
xmlns:org.polarsys.capella.core.data.epbs="http://www.polarsys.org/capella/core/epbs/7.0.0"
xmlns:org.polarsys.capella.core.data.fa="http://www.polarsys.org/capella/core/fa/7.0.0"
xmlns:org.polarsys.capella.core.data.information="http://www.polarsys.org/capella/core/information/7.0.0"
xmlns:org.polarsys.capella.core.data.information.datatype="http://www.polarsys.org/capella/core/information/datatype/7.0.0"
xmlns:org.polarsys.capella.core.data.information.datavalue="http://www.polarsys.org/capella/core/information/datavalue/7.0.0"
xmlns:org.polarsys.capella.core.data.la="http://www.polarsys.org/capella/core/la/7.0.0"
xmlns:org.polarsys.capella.core.data.oa="http://www.polarsys.org/capella/core/oa/7.0.0"
xmlns:org.polarsys.capella.core.data.pa="http://www.polarsys.org/capella/core/pa/7.0.0"
xmlns:re="http://www.polarsys.org/capella/common/re/7.0.0" id="d7edf870-63b9-41d1-ab0b-90d279c4fd20"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:libraries="http://www.polarsys.org/capella/common/libraries/5.0.0"
xmlns:org.polarsys.capella.core.data.capellacommon="http://www.polarsys.org/capella/core/common/5.0.0"
xmlns:org.polarsys.capella.core.data.capellacore="http://www.polarsys.org/capella/core/core/5.0.0"
xmlns:org.polarsys.capella.core.data.capellamodeller="http://www.polarsys.org/capella/core/modeller/5.0.0"
xmlns:org.polarsys.capella.core.data.cs="http://www.polarsys.org/capella/core/cs/5.0.0"
xmlns:org.polarsys.capella.core.data.ctx="http://www.polarsys.org/capella/core/ctx/5.0.0"
xmlns:org.polarsys.capella.core.data.epbs="http://www.polarsys.org/capella/core/epbs/5.0.0"
xmlns:org.polarsys.capella.core.data.fa="http://www.polarsys.org/capella/core/fa/5.0.0"
xmlns:org.polarsys.capella.core.data.information="http://www.polarsys.org/capella/core/information/5.0.0"
xmlns:org.polarsys.capella.core.data.information.datatype="http://www.polarsys.org/capella/core/information/datatype/5.0.0"
xmlns:org.polarsys.capella.core.data.information.datavalue="http://www.polarsys.org/capella/core/information/datavalue/5.0.0"
xmlns:org.polarsys.capella.core.data.la="http://www.polarsys.org/capella/core/la/5.0.0"
xmlns:org.polarsys.capella.core.data.oa="http://www.polarsys.org/capella/core/oa/5.0.0"
xmlns:org.polarsys.capella.core.data.pa="http://www.polarsys.org/capella/core/pa/5.0.0"
xmlns:re="http://www.polarsys.org/capella/common/re/5.0.0" id="d7edf870-63b9-41d1-ab0b-90d279c4fd20"
name="InvalidAirdElement">
<ownedExtensions xsi:type="libraries:ModelInformation" id="ddf0098a-34bc-4520-a9d4-ebb6e133e587"/>
<ownedEnumerationPropertyTypes xsi:type="org.polarsys.capella.core.data.capellacore:EnumerationPropertyType"
Expand Down
2 changes: 1 addition & 1 deletion ....polarsys.capella.test.migration.ju/model/InvalidAirdElement-5_2_0/InvalidAirdElement.afm
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata:Metadata xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:metadata="http://www.polarsys.org/kitalpha/ad/metadata/1.0.0" id="_9rQsgBpqEeqVaNY29bPcxg">
<viewpointReferences id="_9sATYBpqEeqVaNY29bPcxg" vpId="org.polarsys.capella.core.viewpoint" version="7.0.1"/>
<viewpointReferences id="_9sATYBpqEeqVaNY29bPcxg" vpId="org.polarsys.capella.core.viewpoint" version="5.2.0"/>
</metadata:Metadata>
6 changes: 3 additions & 3 deletions ...polarsys.capella.test.migration.ju/model/InvalidAirdElement-5_2_0/InvalidAirdElement.aird
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:org.polarsys.capella.core.data.ctx="http://www.polarsys.org/capella/core/ctx/7.0.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/filter/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/filter http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
<viewpoint:DAnalysis uid="_9radgBpqEeqVaNY29bPcxg" selectedViews="_9sTOUBpqEeqVaNY29bPcxg _98sawBpqEeqVaNY29bPcxg _99vjoBpqEeqVaNY29bPcxg _99vjoRpqEeqVaNY29bPcxg _9-CekBpqEeqVaNY29bPcxg _9-MPkBpqEeqVaNY29bPcxg _9-o7gBpqEeqVaNY29bPcxg" version="15.4.1.202403191723">
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:org.polarsys.capella.core.data.ctx="http://www.polarsys.org/capella/core/ctx/5.0.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/filter/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/filter http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
<viewpoint:DAnalysis uid="_9radgBpqEeqVaNY29bPcxg" selectedViews="_9sTOUBpqEeqVaNY29bPcxg _98sawBpqEeqVaNY29bPcxg _99vjoBpqEeqVaNY29bPcxg _99vjoRpqEeqVaNY29bPcxg _9-CekBpqEeqVaNY29bPcxg _9-MPkBpqEeqVaNY29bPcxg _9-o7gBpqEeqVaNY29bPcxg" version="14.6.0.202110251100">
<semanticResources>InvalidAirdElement.afm</semanticResources>
<semanticResources>InvalidAirdElement.capella</semanticResources>
<ownedViews xmi:type="viewpoint:DView" uid="_9sTOUBpqEeqVaNY29bPcxg">
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.polarsys.kitalpha.ad.integration.sirius/description/ad.odesign#//@ownedViewpoints[name='ad']"/>
</ownedViews>
<ownedViews xmi:type="viewpoint:DView" uid="_98sawBpqEeqVaNY29bPcxg">
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/context.odesign#//@ownedViewpoints[name='System%20Analysis']"/>
<ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="__8RF0xpqEeqVaNY29bPcxg" name="[SDFB] Root System Function" repPath="#__7-K4BpqEeqVaNY29bPcxg" changeId="1730972146835">
<ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="__8RF0xpqEeqVaNY29bPcxg" name="[SDFB] Root System Function" repPath="#__7-K4BpqEeqVaNY29bPcxg" changeId="de7632cc-18ea-4f0d-9203-ae89cc7c8dd1">
<description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.polarsys.capella.core.sirius.analysis/description/context.odesign#//@ownedViewpoints[name='System%20Analysis']/@ownedRepresentations[name='System%20Data%20Flow%20Blank']"/>
<target xmi:type="org.polarsys.capella.core.data.ctx:SystemFunction" href="InvalidAirdElement.capella#a332d077-f373-475f-8b12-138bae48a9a2"/>
</ownedRepresentationDescriptors>
Expand Down
Loading

0 comments on commit b7ba0e5

Please sign in to comment.