Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Redor2016-08-22 10:15:50 +0000
committerLaurent Redor2016-08-22 10:17:00 +0000
commit1ed66fe6dbfe032dbaf82af97cd6164a1bf1dd68 (patch)
treedb0569ff41c4703e4cd8d5ba42c4d99cf8cf4011
parent557e7efa7b5d77d19b89e4edd62f32ad9c4586a0 (diff)
downloadorg.eclipse.sirius-1ed66fe6dbfe032dbaf82af97cd6164a1bf1dd68.tar.gz
org.eclipse.sirius-1ed66fe6dbfe032dbaf82af97cd6164a1bf1dd68.tar.xz
org.eclipse.sirius-1ed66fe6dbfe032dbaf82af97cd6164a1bf1dd68.zip
[496466] Fix tests by modifying data
The data have not been correctly "refactored" during the last commit [1]. This concerns: * org.eclipse.sirius.tests.swtbot.layout.ContainerAndNodeCopyPasteFormatTest * org.eclipse.sirius.tests.swtbot.layout.BorderedNodeCopyPasteFormatTest * org.eclipse.sirius.tests.swtbot.layout.EdgeCopyPasteFormatTest [1] http://git.eclipse.org/c/sirius/org.eclipse.sirius.git/commit/?id=0ad066a071687f40b3757ba6b148a8498908fb16 Bug: 496466 Change-Id: I21073e042f2aed355c92b3e719d024e7a206fd36 Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.ecore6
-rw-r--r--plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeCopyPasteLayout/My.ecore6
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.ecore b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.ecore
index c49ef21760..c2b8708236 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.ecore
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.ecore
@@ -3,11 +3,11 @@
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="root">
<eSubpackages name="LogicalSystem" nsPrefix="">
<eSubpackages name="LC1">
- <eAnnotations source="refinement.link" references="#//LogicalSystem/LC2"/>
+ <eAnnotations source="refinement.link.format" references="#//LogicalSystem/LC2"/>
<eClassifiers xsi:type="ecore:EClass" name="LogicalFunction1">
- <eAnnotations source="refinement.link" references="#//LogicalSystem/LC2/LogicalFunction2"/>
+ <eAnnotations source="refinement.link.format" references="#//LogicalSystem/LC2/LogicalFunction2"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="a1">
- <eAnnotations source="refinement.link" references="#//LogicalSystem/LC2/LogicalFunction2/b1"/>
+ <eAnnotations source="refinement.link.format" references="#//LogicalSystem/LC2/LogicalFunction2/b1"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="a2"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="a3"/>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeCopyPasteLayout/My.ecore b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeCopyPasteLayout/My.ecore
index d29a646587..60de1c3cbf 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeCopyPasteLayout/My.ecore
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeCopyPasteLayout/My.ecore
@@ -2,13 +2,13 @@
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="root" nsPrefix="">
<eClassifiers xsi:type="ecore:EClass" name="NewEClass1">
- <eAnnotations source="refinement.link" references="#//NewEClass3"/>
+ <eAnnotations source="refinement.link.format" references="#//NewEClass3"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="newEReference1" eType="#//NewEClass2">
- <eAnnotations source="refinement.link" references="#//NewEClass3/newEReference2"/>
+ <eAnnotations source="refinement.link.format" references="#//NewEClass3/newEReference2"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="NewEClass2">
- <eAnnotations source="refinement.link" references="#//NewEClass4"/>
+ <eAnnotations source="refinement.link.format" references="#//NewEClass4"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="NewEClass3">
<eStructuralFeatures xsi:type="ecore:EReference" name="newEReference2" eType="#//NewEClass4"/>

Back to the top