[997] Write tests for the sirius move command

Move eveything related to the sirius drag and drop module in a specific folder including the resize feature Bug: #997 Signed-off-by: Guillaume Coutable <guillaume.coutable@obeo.fr>
eclipse-sirius · Oct 4, 2022 · 6e71b98 · 6e71b98
1 parent b60dcac
commit 6e71b98
Show file tree

Hide file tree

Showing 12 changed files with 456 additions and 13 deletions.
diff --git a/packages/diagrams/frontend/sirius-components-diagrams/src/sprotty/DependencyInjection.ts b/packages/diagrams/frontend/sirius-components-diagrams/src/sprotty/DependencyInjection.ts
@@ -53,12 +53,12 @@ import { siriusCommonModule } from './common/siriusCommonModule';
 import { BorderNode, Label, Node } from './Diagram.types';
 import { DiagramServer, HIDE_CONTEXTUAL_TOOLBAR_ACTION, SPROTTY_DELETE_ACTION } from './DiagramServer';
 import { SetActiveConnectorToolsAction, SetActiveToolAction } from './DiagramServer.types';
+import { siriusDragAndDropModule } from './dragAndDrop/siriusDragAndDropModule';
 import { edgeCreationFeedback } from './edgeCreationFeedback';
 import { siriusEdgeEditModule } from './edgeEdition/siriusEdgeEditModule';
 import { EditLabelUIWithInitialContent } from './EditLabelUIWithInitialContent';
 import { GraphFactory } from './GraphFactory';
 import { siriusRoutingModule } from './routing/siriusRoutingModule';
-import siriusDragAndDropModule from './siriusDragAndDropModule';
 import { DiagramView } from './views/DiagramView';
 import { EdgeView } from './views/EdgeView';
 import { IconLabelView } from './views/IconLabelView';

diff --git a/packages/diagrams/frontend/sirius-components-diagrams/src/sprotty/DiagramServer.tsx b/packages/diagrams/frontend/sirius-components-diagrams/src/sprotty/DiagramServer.tsx
@@ -64,7 +64,7 @@ import {
   SourceElementAction,
   SprottySelectAction,
 } from './DiagramServer.types';
-import { ResizeAction, SiriusResizeCommand } from './resize/siriusResize';
+import { ResizeAction, SiriusResizeCommand } from './dragAndDrop/siriusResize';
 
 /** Action to delete a sprotty element */
 export const SPROTTY_DELETE_ACTION = 'sprottyDeleteElement';

diff --git a/...es/diagrams/frontend/sirius-components-diagrams/src/sprotty/__tests__/borderNodes.test.ts b/...es/diagrams/frontend/sirius-components-diagrams/src/sprotty/__tests__/borderNodes.test.ts
@@ -16,7 +16,7 @@ import { Point } from 'sprotty-protocol/';
 import { expect, test } from 'vitest';
 import { convertDiagram } from '../convertDiagram';
 import { BorderNode } from '../Diagram.types';
-import { SiriusDragAndDropMouseListener } from '../siriusDragAndDropMouseListener';
+import { SiriusDragAndDropMouseListener } from '../dragAndDrop/siriusDragAndDropMouseListener';
 import { siriusWebDiagram } from './siriusWebDiagram';
 
 const httpOrigin = 'http://localhost';

diff --git a/...diagrams/frontend/sirius-components-diagrams/src/sprotty/__tests__/convertDiagram.test.ts b/...diagrams/frontend/sirius-components-diagrams/src/sprotty/__tests__/convertDiagram.test.ts
@@ -33,7 +33,7 @@ import {
 } from '../../representation/DiagramRepresentation.types';
 import { convertDiagram } from '../convertDiagram';
 import { Diagram, Edge, ImageNodeStyle, Label, Node, RectangularNodeStyle } from '../Diagram.types';
-import { resizeFeature } from '../resize/model';
+import { resizeFeature } from '../dragAndDrop/model';
 import { siriusWebDiagram } from './siriusWebDiagram';
 
 const isImageNodeStyle = (nodeStyle: GQLINodeStyle): nodeStyle is GQLImageNodeStyle =>

diff --git a/packages/diagrams/frontend/sirius-components-diagrams/src/sprotty/convertDiagram.tsx b/packages/diagrams/frontend/sirius-components-diagrams/src/sprotty/convertDiagram.tsx
@@ -58,7 +58,7 @@ import {
   RectangularNodeStyle,
   ParametricSVGNodeStyle,
 } from './Diagram.types';
-import { resizeFeature } from './resize/model';
+import { resizeFeature } from './dragAndDrop/model';
 
 /**
  * Convert the given diagram object to a Sprotty diagram.