Review fixes

src/app/components/project-map/project-map.component.spec.ts

@@ -14,39 +14,23 @@ import { ProjectWebServiceHandler } from '../../handlers/project-web-service-han
 import { MapChangeDetectorRef } from '../../cartography/services/map-change-detector-ref';
 import { NodeWidget } from '../../cartography/widgets/node';
 import { MapNodeToNodeConverter } from '../../cartography/converters/map/map-node-to-node-converter';
-import { MapPortToPortConverter } from '../../cartography/converters/map/map-port-to-port-converter';
 import { NodesDataSource } from '../../cartography/datasources/nodes-datasource';
 import { LinksDataSource } from '../../cartography/datasources/links-datasource';
-import { NodesEventSource } from '../../cartography/events/nodes-event-source';
-import { DrawingsEventSource } from '../../cartography/events/drawings-event-source';
-import { LinksEventSource } from '../../cartography/events/links-event-source';
-import { MapDrawingToSvgConverter } from '../../cartography/converters/map/map-drawing-to-svg-converter';
 import { DrawingsDataSource } from '../../cartography/datasources/drawings-datasource';
 import { CommonModule } from '@angular/common';
 import { ANGULAR_MAP_DECLARATIONS } from '../../cartography/angular-map.imports';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { SymbolService } from '../../services/symbol.service';
 import { MockedSettingsService } from '../../services/settings.service.spec';
 import { MockedServerService } from '../../services/server.service.spec';
 import { MockedProjectService } from '../../services/project.service.spec';
 import { Observable } from 'rxjs/Rx';
 import { Drawing } from '../../cartography/models/drawing';
 import { D3MapComponent } from '../../cartography/components/d3-map/d3-map.component';
-import { Project } from '../../models/project';
 import { of } from 'rxjs';
-import { DrawingElement } from '../../cartography/models/drawings/drawing-element';
-import { RectElement } from '../../cartography/models/drawings/rect-element';
-import { MapDrawing } from '../../cartography/models/map/map-drawing';
 import { Server } from '../../models/server';
-import { ResizedDataEvent } from '../../cartography/events/event-source';
-import { MapLabelToLabelConverter } from '../../cartography/converters/map/map-label-to-label-converter';
-import { DefaultDrawingsFactory } from '../../cartography/helpers/default-drawings-factory';
-import { Label } from '../../cartography/models/label';
 import { Node } from '../../cartography/models/node';
-import { Port } from '../../models/port';
-import { Link } from '../../models/link';
-import { LinkNode } from '../../models/link-node';
+import { ToolsService } from '../../services/tools.service';
 
 export class MockedProgressService {
   public activate() {}
@@ -56,11 +40,11 @@ export class MockedNodeService {
   public node = { label: {} } as Node;
   constructor() {}
 
-  updateLabel(server: Server, node: Node, label: Label): Observable<Node> {
+  updateLabel(): Observable<Node> {
     return of(this.node);
   }
 
-  updatePosition(server: Server, node: Node, x: number, y: number): Observable<Node> {
+  updatePosition(): Observable<Node> {
     return of(this.node);
   }
 }
@@ -97,11 +81,11 @@ export class MockedDrawingService {
 export class MockedLinkService {
   constructor() {}
 
-  createLink(server: Server, source_node: Node, source_port: Port, target_node: Node, target_port: Port) {
+  createLink() {
     return of({});
   }
 
-  updateNodes(server: Server, link: Link, nodes: LinkNode[]){
+  updateNodes(){
     return of({});
   }
 }
@@ -142,7 +126,6 @@ describe('ProjectMapComponent', () => {
         { provide: ActivatedRoute },
         { provide: ServerService, useClass: MockedServerService },
         { provide: ProjectService, useClass: MockedProjectService },
-        { provide: SymbolService },
         { provide: NodeService },
         { provide: LinkService },
         { provide: DrawingService, useValue: drawingService},
@@ -151,19 +134,11 @@ describe('ProjectMapComponent', () => {
         { provide: MapChangeDetectorRef },
         { provide: NodeWidget },
         { provide: MapNodeToNodeConverter },
-        { provide: MapPortToPortConverter },
         { provide: NodesDataSource },
         { provide: LinksDataSource },
         { provide: DrawingsDataSource, useValue: drawingsDataSource},
-        { provide: NodesEventSource },
-        { provide: DrawingsEventSource },
-        { provide: LinksEventSource },
-        { provide: DefaultDrawingsFactory },
-        { provide: MapDrawingToSvgConverter, useValue: {
-          convert: () => { return ''}
-        } },
         { provide: SettingsService, useClass: MockedSettingsService },
-        { provide: MapLabelToLabelConverter}
+        { provide: ToolsService }
       ],
       declarations: [
         ProjectMapComponent,
@@ -186,47 +161,6 @@ describe('ProjectMapComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  xit('should update position on resizing event', () => {
-    let drawingElement: DrawingElement;
-    let rect = new RectElement();
-    rect.fill = "#ffffff";
-    rect.fill_opacity = 1.0;
-    rect.stroke = "#000000";
-    rect.stroke_width = 2;
-    rect.width = 200;
-    rect.height = 100;
-    drawingElement = rect;
-    let mapDrawing = new MapDrawing;
-    mapDrawing.id = '1';
-    mapDrawing.projectId = '1';
-    mapDrawing.rotation = 1;
-    mapDrawing.svg = '';
-    mapDrawing.x = 0;
-    mapDrawing.y = 0;
-    mapDrawing.z = 0;
-    mapDrawing.element = drawingElement;
-    let event = new ResizedDataEvent<MapDrawing>(mapDrawing,0,0,100,100);
-    spyOn(drawingService, 'updateSizeAndPosition').and.returnValue( Observable.of({}));
-
-    //component.onDrawingResized(event);
-
-    expect(drawingService.updateSizeAndPosition).toHaveBeenCalled();
-  });
-
-  xit('should add selected drawing', () => {
-    component.mapChild = { context: {} } as D3MapComponent;
-    component.project = { project_id: "1" } as Project;
-    component.mapChild.context.getZeroZeroTransformationPoint = jasmine.createSpy('HTML element').and.callFake(() => { return {x: 0, y: 0}});
-    var dummyElement = document.createElement('map');
-    document.getElementsByClassName = jasmine.createSpy('HTML element').and.callFake(() => { return ([dummyElement])});
-    spyOn(drawingsDataSource, 'add');
-
-    component.addDrawing("rectangle");
-    dummyElement.click();
-
-    expect(drawingsDataSource.add).toHaveBeenCalled();
-  });
-
   it('should hide draw tools when hide menu is called', () => {
     var dummyElement = document.createElement('map');
     document.getElementsByClassName = jasmine.createSpy('HTML element').and.callFake(() => { return ([dummyElement])});
@@ -236,4 +170,12 @@ describe('ProjectMapComponent', () => {
 
     expect(component.resetDrawToolChoice).toHaveBeenCalled();
   });
+
+  it('should reset choice on draw menu after saving drawing', () => {
+    spyOn(component, 'resetDrawToolChoice');
+
+    component.onDrawingSaved();
+
+    expect(component.resetDrawToolChoice).toHaveBeenCalled();
+  });
 });