diff options
| author | Florian Barbin | 2014-12-05 09:58:22 +0000 |
|---|---|---|
| committer | Florian Barbin | 2014-12-09 08:54:13 +0000 |
| commit | c4c4d5784f891c6748ed5c54e5d40a12505c4453 (patch) | |
| tree | 4cac907c9da9d87522eac72ae6b46a722b9ed733 | |
| parent | 7a95f585d148508b6b1e137c8b692141ea9ac488 (diff) | |
| download | org.eclipse.sirius-c4c4d5784f891c6748ed5c54e5d40a12505c4453.tar.gz org.eclipse.sirius-c4c4d5784f891c6748ed5c54e5d40a12505c4453.tar.xz org.eclipse.sirius-c4c4d5784f891c6748ed5c54e5d40a12505c4453.zip | |
[453036] Remove obselete test.
* This test was testing that a warning is launched within the error log
when attempting to reconnect an edge without the expected reconnect
source or target. But since this fix[1], the command doesn't fail. The
specifier could create a reconnect tool with a different behavior than
reconnect the source or the target as expected by the feedback.
[1]
http://git.eclipse.org/c/sirius/org.eclipse.sirius.git/commit/?id=aa71fd0455b1bdaea07dee635ede6b09d9a7c146
Bug: 453036
Change-Id: I28e3eb74921cad8b546aebeb379456ba197ab3f4
Signed-off-by: Florian Barbin <florian.barbin@obeo.fr>
6 files changed, 0 insertions, 385 deletions
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/reconnect/VP-3744/VP-3744.aird b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/reconnect/VP-3744/VP-3744.aird deleted file mode 100644 index 8c85522777..0000000000 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/reconnect/VP-3744/VP-3744.aird +++ /dev/null @@ -1,184 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<viewpoint:DAnalysis xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:VP-3744="VP-3744" 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:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" 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="VP-3744 VP-3744.ecore 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/1.1.0#//diagram/description http://www.eclipse.org/sirius/diagram/1.1.0 http://www.eclipse.org/sirius/1.1.0#//diagram http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/1.1.0#//diagram/description/style" xmi:id="_RRyGkT33EeK42ZvcCLO7TQ" selectedViews="_SdtHID33EeK42ZvcCLO7TQ" version="8.0.0"> - <models xmi:type="VP-3744:Root" href="VP-3744.xmi#/"/> - <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_SdtHID33EeK42ZvcCLO7TQ" initialized="true"> - <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_H3qgED34EeK42ZvcCLO7TQ" name="new VP-3744_Diagram"> - <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_H304ID34EeK42ZvcCLO7TQ" source="GMF_DIAGRAMS"> - <data xmi:type="notation:Diagram" xmi:id="_H304IT34EeK42ZvcCLO7TQ" type="Sirius" element="_H3qgED34EeK42ZvcCLO7TQ" measurementUnit="Pixel"> - <children xmi:type="notation:Node" xmi:id="_H32tUD34EeK42ZvcCLO7TQ" type="2002" element="_H3qgET34EeK42ZvcCLO7TQ"> - <children xmi:type="notation:Node" xmi:id="_H33UYD34EeK42ZvcCLO7TQ" type="5006"/> - <children xmi:type="notation:Node" xmi:id="_H33UYT34EeK42ZvcCLO7TQ" type="7001"> - <styles xmi:type="notation:SortingStyle" xmi:id="_H33UYj34EeK42ZvcCLO7TQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_H33UYz34EeK42ZvcCLO7TQ"/> - </children> - <children xmi:type="notation:Node" xmi:id="_H35wpD34EeK42ZvcCLO7TQ" type="3012" element="_H3qgEj34EeK42ZvcCLO7TQ"> - <children xmi:type="notation:Node" xmi:id="_H36Xsj34EeK42ZvcCLO7TQ" type="5010"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_H36Xsz34EeK42ZvcCLO7TQ" x="31"/> - </children> - <children xmi:type="notation:Node" xmi:id="_H38M4D34EeK42ZvcCLO7TQ" type="3003" element="_H3qgEz34EeK42ZvcCLO7TQ"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_H38M4T34EeK42ZvcCLO7TQ" fontName="Ubuntu"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H38M4j34EeK42ZvcCLO7TQ"/> - </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_H36XsD34EeK42ZvcCLO7TQ" fontName="Ubuntu" fontHeight="8"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H36XsT34EeK42ZvcCLO7TQ" x="-22" width="30" height="30"/> - </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_H32tUT34EeK42ZvcCLO7TQ" fontName="Ubuntu" fontHeight="8"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H32tUj34EeK42ZvcCLO7TQ" x="115" y="155"/> - </children> - <children xmi:type="notation:Node" xmi:id="_H337cD34EeK42ZvcCLO7TQ" type="2002" element="_H3qgHD34EeK42ZvcCLO7TQ"> - <children xmi:type="notation:Node" xmi:id="_H34igD34EeK42ZvcCLO7TQ" type="5006"/> - <children xmi:type="notation:Node" xmi:id="_H34igT34EeK42ZvcCLO7TQ" type="7001"> - <styles xmi:type="notation:SortingStyle" xmi:id="_H34igj34EeK42ZvcCLO7TQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_H34igz34EeK42ZvcCLO7TQ"/> - </children> - <children xmi:type="notation:Node" xmi:id="_H38z8D34EeK42ZvcCLO7TQ" type="3012" element="_H3qgHT34EeK42ZvcCLO7TQ"> - <children xmi:type="notation:Node" xmi:id="_H39bAD34EeK42ZvcCLO7TQ" type="5010"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_H39bAT34EeK42ZvcCLO7TQ" x="31"/> - </children> - <children xmi:type="notation:Node" xmi:id="_H3-CED34EeK42ZvcCLO7TQ" type="3003" element="_H3qgHj34EeK42ZvcCLO7TQ"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_H3-CET34EeK42ZvcCLO7TQ" fontName="Ubuntu"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3-CEj34EeK42ZvcCLO7TQ"/> - </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_H38z8T34EeK42ZvcCLO7TQ" fontName="Ubuntu" fontHeight="8"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H38z8j34EeK42ZvcCLO7TQ" x="-22" width="30" height="30"/> - </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_H337cT34EeK42ZvcCLO7TQ" fontName="Ubuntu" fontHeight="8"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H337cj34EeK42ZvcCLO7TQ" x="325" y="155"/> - </children> - <children xmi:type="notation:Node" xmi:id="_H35JkD34EeK42ZvcCLO7TQ" type="2002" element="_H3rHIT34EeK42ZvcCLO7TQ"> - <children xmi:type="notation:Node" xmi:id="_H35woD34EeK42ZvcCLO7TQ" type="5006"/> - <children xmi:type="notation:Node" xmi:id="_H35woT34EeK42ZvcCLO7TQ" type="7001"> - <styles xmi:type="notation:SortingStyle" xmi:id="_H35woj34EeK42ZvcCLO7TQ"/> - <styles xmi:type="notation:FilteringStyle" xmi:id="_H35woz34EeK42ZvcCLO7TQ"/> - </children> - <children xmi:type="notation:Node" xmi:id="_H3-pID34EeK42ZvcCLO7TQ" type="3012" element="_H3rHIj34EeK42ZvcCLO7TQ"> - <children xmi:type="notation:Node" xmi:id="_H3_QMD34EeK42ZvcCLO7TQ" type="5010"> - <layoutConstraint xmi:type="notation:Location" xmi:id="_H3_QMT34EeK42ZvcCLO7TQ" x="31"/> - </children> - <children xmi:type="notation:Node" xmi:id="_H3_3QD34EeK42ZvcCLO7TQ" type="3003" element="_H3rHIz34EeK42ZvcCLO7TQ"> - <styles xmi:type="notation:ShapeStyle" xmi:id="_H3_3QT34EeK42ZvcCLO7TQ" fontName="Ubuntu"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3_3Qj34EeK42ZvcCLO7TQ"/> - </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_H3-pIT34EeK42ZvcCLO7TQ" fontName="Ubuntu" fontHeight="8"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H3-pIj34EeK42ZvcCLO7TQ" x="-22" width="30" height="30"/> - </children> - <styles xmi:type="notation:ShapeStyle" xmi:id="_H35JkT34EeK42ZvcCLO7TQ" fontName="Ubuntu" fontHeight="8"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H35Jkj34EeK42ZvcCLO7TQ" x="535" y="155"/> - </children> - <styles xmi:type="notation:DiagramStyle" xmi:id="_H304Ij34EeK42ZvcCLO7TQ"/> - <edges xmi:type="notation:Edge" xmi:id="_H4BFYD34EeK42ZvcCLO7TQ" type="4001" element="_H3rHLD34EeK42ZvcCLO7TQ" source="_H35wpD34EeK42ZvcCLO7TQ" target="_H32tUD34EeK42ZvcCLO7TQ"> - <children xmi:type="notation:Node" xmi:id="_H4BscD34EeK42ZvcCLO7TQ" type="6001"> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H4BscT34EeK42ZvcCLO7TQ" y="-10"/> - </children> - <children xmi:type="notation:Node" xmi:id="_H4Bscj34EeK42ZvcCLO7TQ" type="6002"> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H4Bscz34EeK42ZvcCLO7TQ" y="10"/> - </children> - <children xmi:type="notation:Node" xmi:id="_H4BsdD34EeK42ZvcCLO7TQ" type="6003"> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H4CTgD34EeK42ZvcCLO7TQ" y="10"/> - </children> - <styles xmi:type="notation:ConnectorStyle" xmi:id="_H4BFYT34EeK42ZvcCLO7TQ"/> - <styles xmi:type="notation:FontStyle" xmi:id="_H4BFYj34EeK42ZvcCLO7TQ" fontName="Ubuntu"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H4BFYz34EeK42ZvcCLO7TQ" points="[0, 0, 0, 0]$[-1, -1, -1, -1]"/> - <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H4CTgT34EeK42ZvcCLO7TQ" id="(0.5,0.5)"/> - <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_H4C6kD34EeK42ZvcCLO7TQ" id="(0.5,0.5)"/> - </edges> - </data> - </ownedAnnotationEntries> - <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_H3qgET34EeK42ZvcCLO7TQ" name="node1" incomingEdges="_H3rHLD34EeK42ZvcCLO7TQ"> - <target xmi:type="VP-3744:Node" href="VP-3744.xmi#//@nodes.0"/> - <semanticElements xmi:type="VP-3744:Node" href="VP-3744.xmi#//@nodes.0"/> - <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_H3qgEj34EeK42ZvcCLO7TQ" name="borderedNode1" outgoingEdges="_H3rHLD34EeK42ZvcCLO7TQ" width="3" height="3" resizeKind="NSEW"> - <target xmi:type="VP-3744:BorderNode" href="VP-3744.xmi#//@nodes.0/@borderNodes.0"/> - <semanticElements xmi:type="VP-3744:BorderNode" href="VP-3744.xmi#//@nodes.0/@borderNodes.0"/> - <ownedStyle xmi:type="diagram:Square" xmi:id="_H3qgEz34EeK42ZvcCLO7TQ"> - <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_H3qgFD34EeK42ZvcCLO7TQ"/> - <description xmi:type="style:SquareDescription" href="VP-3744.odesign#//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer/@containerMappings[name='container']/@borderedNodeMappings[name='border']/@style"/> - <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_H3qgFT34EeK42ZvcCLO7TQ"/> - <color xmi:type="viewpoint:RGBValues" xmi:id="_H3qgFj34EeK42ZvcCLO7TQ" red="136" green="136" blue="136"/> - </ownedStyle> - <actualMapping xmi:type="description_1:NodeMapping" href="VP-3744.odesign#//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer/@containerMappings[name='container']/@borderedNodeMappings[name='border']"/> - </ownedBorderedNodes> - <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> - <arrangeConstraints>KEEP_SIZE</arrangeConstraints> - <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_H3qgFz34EeK42ZvcCLO7TQ"> - <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_H3qgGD34EeK42ZvcCLO7TQ"/> - <description xmi:type="style:FlatContainerStyleDescription" href="VP-3744.odesign#//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer/@containerMappings[name='container']/@style"/> - <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_H3qgGT34EeK42ZvcCLO7TQ"/> - <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_H3qgGj34EeK42ZvcCLO7TQ" red="255" green="255" blue="255"/> - <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_H3qgGz34EeK42ZvcCLO7TQ" red="209" green="209" blue="209"/> - </ownedStyle> - <actualMapping xmi:type="description_1:ContainerMapping" href="VP-3744.odesign#//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer/@containerMappings[name='container']"/> - </ownedDiagramElements> - <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_H3qgHD34EeK42ZvcCLO7TQ" name="node2"> - <target xmi:type="VP-3744:Node" href="VP-3744.xmi#//@nodes.1"/> - <semanticElements xmi:type="VP-3744:Node" href="VP-3744.xmi#//@nodes.1"/> - <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_H3qgHT34EeK42ZvcCLO7TQ" name="borderedNode2" width="3" height="3" resizeKind="NSEW"> - <target xmi:type="VP-3744:BorderNode" href="VP-3744.xmi#//@nodes.1/@borderNodes.0"/> - <semanticElements xmi:type="VP-3744:BorderNode" href="VP-3744.xmi#//@nodes.1/@borderNodes.0"/> - <ownedStyle xmi:type="diagram:Square" xmi:id="_H3qgHj34EeK42ZvcCLO7TQ"> - <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_H3qgHz34EeK42ZvcCLO7TQ"/> - <description xmi:type="style:SquareDescription" href="VP-3744.odesign#//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer/@containerMappings[name='container']/@borderedNodeMappings[name='border']/@style"/> - <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_H3qgID34EeK42ZvcCLO7TQ"/> - <color xmi:type="viewpoint:RGBValues" xmi:id="_H3qgIT34EeK42ZvcCLO7TQ" red="136" green="136" blue="136"/> - </ownedStyle> - <actualMapping xmi:type="description_1:NodeMapping" href="VP-3744.odesign#//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer/@containerMappings[name='container']/@borderedNodeMappings[name='border']"/> - </ownedBorderedNodes> - <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> - <arrangeConstraints>KEEP_SIZE</arrangeConstraints> - <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_H3qgIj34EeK42ZvcCLO7TQ"> - <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_H3qgIz34EeK42ZvcCLO7TQ"/> - <description xmi:type="style:FlatContainerStyleDescription" href="VP-3744.odesign#//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer/@containerMappings[name='container']/@style"/> - <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_H3qgJD34EeK42ZvcCLO7TQ"/> - <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_H3qgJT34EeK42ZvcCLO7TQ" red="255" green="255" blue="255"/> - <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_H3rHID34EeK42ZvcCLO7TQ" red="209" green="209" blue="209"/> - </ownedStyle> - <actualMapping xmi:type="description_1:ContainerMapping" href="VP-3744.odesign#//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer/@containerMappings[name='container']"/> - </ownedDiagramElements> - <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_H3rHIT34EeK42ZvcCLO7TQ" name="node3"> - <target xmi:type="VP-3744:Node" href="VP-3744.xmi#//@nodes.2"/> - <semanticElements xmi:type="VP-3744:Node" href="VP-3744.xmi#//@nodes.2"/> - <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_H3rHIj34EeK42ZvcCLO7TQ" name="borderedNode3" width="3" height="3" resizeKind="NSEW"> - <target xmi:type="VP-3744:BorderNode" href="VP-3744.xmi#//@nodes.2/@borderNodes.0"/> - <semanticElements xmi:type="VP-3744:BorderNode" href="VP-3744.xmi#//@nodes.2/@borderNodes.0"/> - <ownedStyle xmi:type="diagram:Square" xmi:id="_H3rHIz34EeK42ZvcCLO7TQ"> - <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_H3rHJD34EeK42ZvcCLO7TQ"/> - <description xmi:type="style:SquareDescription" href="VP-3744.odesign#//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer/@containerMappings[name='container']/@borderedNodeMappings[name='border']/@style"/> - <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_H3rHJT34EeK42ZvcCLO7TQ"/> - <color xmi:type="viewpoint:RGBValues" xmi:id="_H3rHJj34EeK42ZvcCLO7TQ" red="136" green="136" blue="136"/> - </ownedStyle> - <actualMapping xmi:type="description_1:NodeMapping" href="VP-3744.odesign#//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer/@containerMappings[name='container']/@borderedNodeMappings[name='border']"/> - </ownedBorderedNodes> - <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> - <arrangeConstraints>KEEP_SIZE</arrangeConstraints> - <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_H3rHJz34EeK42ZvcCLO7TQ"> - <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_H3rHKD34EeK42ZvcCLO7TQ"/> - <description xmi:type="style:FlatContainerStyleDescription" href="VP-3744.odesign#//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer/@containerMappings[name='container']/@style"/> - <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_H3rHKT34EeK42ZvcCLO7TQ"/> - <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_H3rHKj34EeK42ZvcCLO7TQ" red="255" green="255" blue="255"/> - <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_H3rHKz34EeK42ZvcCLO7TQ" red="209" green="209" blue="209"/> - </ownedStyle> - <actualMapping xmi:type="description_1:ContainerMapping" href="VP-3744.odesign#//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer/@containerMappings[name='container']"/> - </ownedDiagramElements> - <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_H3rHLD34EeK42ZvcCLO7TQ" name="link1" sourceNode="_H3qgEj34EeK42ZvcCLO7TQ" targetNode="_H3qgET34EeK42ZvcCLO7TQ"> - <target xmi:type="VP-3744:Link" href="VP-3744.xmi#//@links.0"/> - <semanticElements xmi:type="VP-3744:Link" href="VP-3744.xmi#//@links.0"/> - <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_H3rHLT34EeK42ZvcCLO7TQ" size="2"> - <description xmi:type="style:EdgeStyleDescription" href="VP-3744.odesign#//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer/@edgeMappings[name='edgeLink']/@style"/> - <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_H3rHLj34EeK42ZvcCLO7TQ" red="136" green="136" blue="136"/> - <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_H3rHLz34EeK42ZvcCLO7TQ"> - <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_H3rHMD34EeK42ZvcCLO7TQ"/> - </centerLabelStyle> - </ownedStyle> - <actualMapping xmi:type="description_1:EdgeMapping" href="VP-3744.odesign#//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer/@edgeMappings[name='edgeLink']"/> - </ownedDiagramElements> - <description xmi:type="description_1:DiagramDescription" href="VP-3744.odesign#//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']"/> - <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_H3rHMT34EeK42ZvcCLO7TQ"/> - <activatedLayers xmi:type="description_1:Layer" href="VP-3744.odesign#//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer"/> - <target xmi:type="VP-3744:Root" href="VP-3744.xmi#/"/> - </ownedRepresentations> - <viewpoint xmi:type="description:Viewpoint" href="VP-3744.odesign#//@ownedViewpoints[name='VP-3744_Viewpoint']"/> - </ownedViews> -</viewpoint:DAnalysis> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/reconnect/VP-3744/VP-3744.ecore b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/reconnect/VP-3744/VP-3744.ecore deleted file mode 100644 index 767d34d195..0000000000 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/reconnect/VP-3744/VP-3744.ecore +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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="VP_3744" - nsURI="VP-3744" nsPrefix="VP-3744"> - <eClassifiers xsi:type="ecore:EClass" name="Root"> - <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1" - eType="#//Node" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="links" upperBound="-1" - eType="#//Link" containment="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Node"> - <eStructuralFeatures xsi:type="ecore:EReference" name="borderNodes" upperBound="-1" - eType="#//BorderNode" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="BorderNode"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Link"> - <eStructuralFeatures xsi:type="ecore:EReference" name="left" eType="#//BorderNode"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="right" eType="#//Node"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> -</ecore:EPackage> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/reconnect/VP-3744/VP-3744.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/reconnect/VP-3744/VP-3744.odesign deleted file mode 100644 index 7232d8307d..0000000000 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/reconnect/VP-3744/VP-3744.odesign +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<description:Group 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:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP-3744" version="8.0.0"> - <ownedViewpoints name="VP-3744_Viewpoint"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-3744_Diagram" initialisation="true" domainClass="Root"> - <metamodel href="VP-3744.ecore#/"/> - <defaultLayer name="Default"> - <edgeMappings name="edgeLink" sourceMapping="//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer/@containerMappings[name='container']/@borderedNodeMappings[name='border']" targetMapping="//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer/@containerMappings[name='container']" targetFinderExpression="<%right%>" sourceFinderExpression="<%left%>" domainClass="Link" useDomainElement="true" reconnections="//@ownedViewpoints[name='VP-3744_Viewpoint']/@ownedRepresentations[name='VP-3744_Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='reco%20source']"> - <style sizeComputationExpression="2"> - <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> - <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - </centerLabelStyleDescription> - </style> - </edgeMappings> - <containerMappings name="container" semanticCandidatesExpression="<%nodes%>" domainClass="Node"> - <borderedNodeMappings name="border" semanticCandidatesExpression="<%borderNodes%>" domainClass="BorderNode"> - <style xsi:type="style:SquareDescription" resizeKind="NSEW"> - <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - </style> - </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> - <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> - <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> - </style> - </containerMappings> - <toolSections> - <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="reco source" reconnectionKind="RECONNECT_SOURCE"> - <source name="source"/> - <target name="target"/> - <sourceView name="sourceView"/> - <targetView name="targetView"/> - <element name="element"/> - <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"/> - </initialOperation> - <edgeView name="edgeView"/> - </ownedTools> - </toolSections> - </defaultLayer> - </ownedRepresentations> - </ownedViewpoints> -</description:Group> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/reconnect/VP-3744/VP-3744.xmi b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/reconnect/VP-3744/VP-3744.xmi deleted file mode 100644 index f70b45d0b5..0000000000 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/reconnect/VP-3744/VP-3744.xmi +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<VP-3744:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:VP-3744="VP-3744" xsi:schemaLocation="VP-3744 VP-3744.ecore"> - <nodes name="node1"> - <borderNodes name="borderedNode1"/> - </nodes> - <nodes name="node2"> - <borderNodes name="borderedNode2"/> - </nodes> - <nodes name="node3"> - <borderNodes name="borderedNode3"/> - </nodes> - <links left="//@nodes.0/@borderNodes.0" right="//@nodes.0" name="link1"/> -</VP-3744:Root> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/InvalidReconnectEdgeToolTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/InvalidReconnectEdgeToolTest.java deleted file mode 100644 index a77be354c4..0000000000 --- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/InvalidReconnectEdgeToolTest.java +++ /dev/null @@ -1,116 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES. - * 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: - * Obeo - initial API and implementation - *******************************************************************************/ -package org.eclipse.sirius.tests.swtbot; - -import java.util.Collection; - -import org.eclipse.core.runtime.ILogListener; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.draw2d.geometry.Point; -import org.eclipse.sirius.business.api.preferences.SiriusPreferencesKeys; -import org.eclipse.sirius.diagram.DDiagram; -import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramBorderNodeEditPart; -import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramEdgeEditPart.ViewEdgeFigure; -import org.eclipse.sirius.tests.swtbot.support.api.AbstractSiriusSwtBotGefTestCase; -import org.eclipse.sirius.tests.swtbot.support.api.business.UIResource; -import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEditor; -import org.eclipse.sirius.tests.swtbot.support.utils.SWTBotUtils; -import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefConnectionEditPart; -import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart; - -import com.google.common.collect.Lists; - -/** - * A test case to check that attempting a reconnect with a invalid reconnect - * edge tool does not throws exception. But a error entry in the error log - * informing the specifier that the reconnect tool is incorrect. - * - * See VP-3744. - * - * @author <a href="mailto:esteban.dugueperoux@obeo.fr">Esteban Dugueperoux</a> - */ -public class InvalidReconnectEdgeToolTest extends AbstractSiriusSwtBotGefTestCase { - - private static final String PATH = "/data/unit/reconnect/VP-3744/"; - - private static final String METAMODEL_RESOURCE_NAME = "VP-3744.ecore"; - - private static final String MODELER_RESOURCE_NAME = "VP-3744.odesign"; - - private static final String SEMANTIC_RESOURCE_NAME = "VP-3744.xmi"; - - private static final String REPRESENTATIONS_RESOURCE_NAME = "VP-3744.aird"; - - private static final String REPRESENTATION_DESCRIPTION_NAME = "VP-3744_Diagram"; - - private static final String REPRESENTATION_NAME = "new " + REPRESENTATION_DESCRIPTION_NAME; - - @Override - protected void onSetUpBeforeClosingWelcomePage() throws Exception { - copyFileToTestProject(Activator.PLUGIN_ID, PATH, METAMODEL_RESOURCE_NAME, MODELER_RESOURCE_NAME, SEMANTIC_RESOURCE_NAME, REPRESENTATIONS_RESOURCE_NAME); - } - - @Override - protected void onSetUpAfterOpeningDesignerPerspective() throws Exception { - changeSiriusPreference(SiriusPreferencesKeys.PREF_AUTO_REFRESH.name(), true); - sessionAirdResource = new UIResource(designerProject, "/", REPRESENTATIONS_RESOURCE_NAME); - localSession = designerPerspective.openSessionFromFile(sessionAirdResource); - - editor = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME, DDiagram.class); - } - - /** - * A test case to check that attempting a reconnect with a invalid reconnect - * edge tool does not throws exception. But a error entry in the error log - * informing the specifier that the reconnect tool is incorrect. - * - * See VP-3744. - */ - public void testInvalidReconnectEdgeToolTest() { - final Collection<IStatus> warnings = Lists.newArrayList(); - ILogListener warningDetector = new ILogListener() { - - public void logging(IStatus status, String plugin) { - if (status.getSeverity() == IStatus.WARNING) { - warnings.add(status); - } - } - }; - Platform.addLogListener(warningDetector); - - SWTBotGefEditPart borderedNode1EditPartBot = editor.getEditPart("borderedNode1", AbstractDiagramBorderNodeEditPart.class); - SWTBotGefEditPart borderedNode2EditPartBot = editor.getEditPart("borderedNode2", AbstractDiagramBorderNodeEditPart.class); - SWTBotGefConnectionEditPart link1ConnectionEditPartBot = borderedNode1EditPartBot.sourceConnections().get(0); - ViewEdgeFigure viewEdgeFigure = (ViewEdgeFigure) link1ConnectionEditPartBot.part().getFigure(); - Point from = viewEdgeFigure.getPoints().getPoint(0); - Point to = editor.getBounds(borderedNode2EditPartBot).getCenter(); - link1ConnectionEditPartBot.select(); - editor.drag(from, to); - SWTBotUtils.waitAllUiEvents(); - - Platform.removeLogListener(warningDetector); - assertFalse("Reconnect attempt with a invalid reconnect tool should not throws exception", doesAnErrorOccurs()); - assertTrue("Reconnect attempt with a invalid reconnect tool should log one warning", warnings.size() == 1); - - IStatus detectedWarning = warnings.iterator().next(); - assertEquals(IStatus.WARNING, detectedWarning.getSeverity()); - assertEquals("The expected warning should come from org.eclipse.sirius.diagram", "org.eclipse.sirius.diagram", detectedWarning.getPlugin()); - assertEquals("The semantic model was not correctly updated by the reconnect tool, the diagram part of the reconnect cannot be done", detectedWarning.getMessage()); - } - - @Override - protected void tearDown() throws Exception { - editor.close(); - super.tearDown(); - } - -} diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java index 4ab3ee8951..322b1ddcbf 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java +++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java @@ -135,7 +135,6 @@ public class AllTestSuite extends TestCase { suite.addTestSuite(HideRevealDiagramElementsLabelsTest.class); suite.addTestSuite(HideRevealDiagramElementsLabelsTestWithOldUI.class); suite.addTestSuite(HideLabelIconsWithPreferencesTest.class); - suite.addTestSuite(InvalidReconnectEdgeToolTest.class); suite.addTestSuite(KeyboardDeleteFromDiagramTests.class); suite.addTestSuite(KeyboardDeletionFromLabelTests.class); suite.addTestSuite(LabelFontModificationsTest.class); |
