ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-04-09 03:24:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
ziajka 2018-11-05 15:10:13 +01:00
parent e279a1403f
commit e296dd004f
10 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/cartography/tools/moving-tool.spec.ts
View File

@ -12,7 +12,9 @@ describe('MovingTool', () => {
let node: SVGSelection;
beforeEach(() => {
tool = new MovingTool();
context = new Context();
tool = new MovingTool(context);
svg = new TestSVGCanvas();
node = svg.canvas
@ -21,11 +23,8 @@ describe('MovingTool', () => {
.attr('x', 10)
.attr('y', 20);
context = new Context();
tool.connect(svg.svg, context);
tool.setEnabled(true);
tool.draw(svg.svg, context);
tool.activate();
});
afterEach(() => {
@ -86,7 +85,8 @@ describe('MovingTool', () => {
describe('MovingTool can be deactivated', () => {
beforeEach(() => {
tool.deactivate();
tool.setEnabled(false);
tool.draw(svg.svg, context);
svg.svg.node().dispatchEvent(
new MouseEvent('mousedown', {

13
src/app/cartography/tools/selection-tool.spec.ts
View File

@ -16,18 +16,17 @@ describe('SelectionTool', () => {
let selected_rectangle: Rectangle;
beforeEach(() => {
tool = new SelectionTool();
context = new Context();
tool = new SelectionTool(context);
tool.rectangleSelected.subscribe((rectangle: Rectangle) => {
selected_rectangle = rectangle;
});
svg = new TestSVGCanvas();
context = new Context();
tool.connect(svg.svg, context);
tool.setEnabled(true);
tool.draw(svg.svg, context);
tool.activate();
selection_line_tool = svg.svg.select('g.selection-line-tool');
path_selection = selection_line_tool.select('path.selection');
});
@ -105,7 +104,9 @@ describe('SelectionTool', () => {
describe('SelectionTool can be deactivated', () => {
beforeEach(() => {
tool.deactivate();
tool.setEnabled(false);
tool.draw(svg.svg, context);
svg.svg.node().dispatchEvent(new MouseEvent('mousedown', {clientX: 100, clientY: 100}));
});

3
src/app/cartography/widgets/drawings/ellipse-drawing.spec.ts
View File

@ -2,6 +2,7 @@ import { TestSVGCanvas } from "../../testing";
import { Drawing } from "../../models/drawing";
import { EllipseDrawingWidget } from "./ellipse-drawing";
import { EllipseElement } from "../../models/drawings/ellipse-element";
import { QtDasharrayFixer } from "../../helpers/qt-dasharray-fixer";
describe('EllipseDrawingWidget', () => {
@ -13,7 +14,7 @@ describe('EllipseDrawingWidget', () => {
beforeEach(() => {
svg = new TestSVGCanvas();
drawing = new Drawing();
widget = new EllipseDrawingWidget();
widget = new EllipseDrawingWidget(new QtDasharrayFixer());
});
afterEach(() => {

3
src/app/cartography/widgets/drawings/line-drawing.spec.ts
View File

@ -2,6 +2,7 @@ import { TestSVGCanvas } from "../../testing";
import { Drawing } from "../../models/drawing";
import { LineDrawingWidget } from "./line-drawing";
import { LineElement } from "../../models/drawings/line-element";
import { QtDasharrayFixer } from "../../helpers/qt-dasharray-fixer";
describe('LineDrawingWidget', () => {
@ -13,7 +14,7 @@ describe('LineDrawingWidget', () => {
beforeEach(() => {
svg = new TestSVGCanvas();
drawing = new Drawing();
widget = new LineDrawingWidget();
widget = new LineDrawingWidget(new QtDasharrayFixer());
});
afterEach(() => {

3
src/app/cartography/widgets/drawings/rect-drawing.spec.ts
View File

@ -2,6 +2,7 @@ import { TestSVGCanvas } from "../../testing";
import { Drawing } from "../../models/drawing";
import { RectDrawingWidget } from "./rect-drawing";
import { RectElement } from "../../models/drawings/rect-element";
import { QtDasharrayFixer } from "../../helpers/qt-dasharray-fixer";
describe('RectDrawingWidget', () => {
@ -13,7 +14,7 @@ describe('RectDrawingWidget', () => {
beforeEach(() => {
svg = new TestSVGCanvas();
drawing = new Drawing();
widget = new RectDrawingWidget();
widget = new RectDrawingWidget(new QtDasharrayFixer());
});
afterEach(() => {

3
src/app/cartography/widgets/drawings/text-drawing.spec.ts
View File

@ -2,6 +2,7 @@ import { TestSVGCanvas } from "../../testing";
import { TextDrawingWidget } from "./text-drawing";
import { Drawing } from "../../models/drawing";
import { TextElement } from "../../models/drawings/text-element";
import { FontFixer } from "../../helpers/font-fixer";
describe('TextDrawingWidget', () => {
let svg: TestSVGCanvas;
@ -12,7 +13,7 @@ describe('TextDrawingWidget', () => {
beforeEach(() => {
svg = new TestSVGCanvas();
drawing = new Drawing();
widget = new TextDrawingWidget();
widget = new TextDrawingWidget(new FontFixer());
});
afterEach(() => {

17
src/app/cartography/widgets/layers.spec.ts
View File

@ -1,4 +1,4 @@
import { instance, mock, when } from "ts-mockito";
import { instance, mock, when, verify } from "ts-mockito";
import { TestSVGCanvas } from "../testing";
import { LayersWidget } from "./layers";
@ -6,13 +6,11 @@ import { Layer } from "../models/layer";
import { LinksWidget } from "./links";
import { NodesWidget } from "./nodes";
import { DrawingsWidget } from "./drawings";
import { GraphLayout } from "./graph-layout";
describe('LayersWidget', () => {
let svg: TestSVGCanvas;
let widget: LayersWidget;
let mockedGraphLayout: GraphLayout;
let mockedLinksWidget: LinksWidget;
let mockedNodesWidget: NodesWidget;
let mockedDrawingsWidget: DrawingsWidget;
@ -20,16 +18,11 @@ describe('LayersWidget', () => {
beforeEach(() => {
svg = new TestSVGCanvas();
widget = new LayersWidget();
mockedGraphLayout = mock(GraphLayout);
mockedLinksWidget = mock(LinksWidget);
mockedNodesWidget = mock(NodesWidget);
mockedDrawingsWidget = mock(DrawingsWidget);
when(mockedGraphLayout.getLinksWidget()).thenReturn(instance(mockedLinksWidget));
when(mockedGraphLayout.getNodesWidget()).thenReturn(instance(mockedNodesWidget));
when(mockedGraphLayout.getDrawingsWidget()).thenReturn(instance(mockedDrawingsWidget));
mockedLinksWidget = instance(mock(LinksWidget));
mockedNodesWidget = instance(mock(NodesWidget));
mockedDrawingsWidget = instance(mock(DrawingsWidget));
widget.graphLayout = instance(mockedGraphLayout);
widget = new LayersWidget(mockedLinksWidget, mockedNodesWidget, mockedDrawingsWidget);
const layer_1 = new Layer();
layer_1.index = 1;

5
src/app/cartography/widgets/links.spec.ts
View File

@ -8,6 +8,7 @@ import { LinksWidget } from "./links";
import { Node } from "../models/node";
import { Link } from "../../models/link";
import { LinkWidget } from "./link";
import { MultiLinkCalculatorHelper } from "../helpers/multi-link-calculator-helper";
describe('LinksWidget', () => {
@ -15,10 +16,12 @@ describe('LinksWidget', () => {
let widget: LinksWidget;
let layersEnter: Selection<SVGGElement, Layer, SVGGElement, any>;
let layer: Layer;
let mockedLinkWidget: LinkWidget;
beforeEach(() => {
svg = new TestSVGCanvas();
widget = new LinksWidget();
mockedLinkWidget = instance(mock(LinkWidget));
widget = new LinksWidget(new MultiLinkCalculatorHelper(), mockedLinkWidget);
const node_1 = new Node();
node_1.node_id = "1";

7
src/app/cartography/widgets/nodes.spec.ts
View File

@ -3,6 +3,8 @@ import { TestSVGCanvas } from "../testing";
import { NodesWidget } from "./nodes";
import { Node } from "../models/node";
import { Label } from "../models/label";
import { CssFixer } from "../helpers/css-fixer";
import { FontFixer } from "../helpers/font-fixer";
describe('NodesWidget', () => {
@ -11,7 +13,10 @@ describe('NodesWidget', () => {
beforeEach(() => {
svg = new TestSVGCanvas();
widget = new NodesWidget();
widget = new NodesWidget(
new CssFixer(),
new FontFixer()
);
});
afterEach(() => {

4
src/app/components/project-map/project-map-shortcuts/project-map-shortcuts.component.spec.ts
View File

@ -4,7 +4,7 @@ import { inject } from "@angular/core/testing";
import { mock, instance, capture, when } from "ts-mockito";
import { HotkeyModule, HotkeysService, Hotkey } from "angular2-hotkeys";
import { Observable, of } from "rxjs";
import { of } from "rxjs";
import { ProjectMapShortcutsComponent } from './project-map-shortcuts.component';
import { ToasterService, } from "../../../services/toaster.service";
@ -64,7 +64,7 @@ describe('ProjectMapShortcutsComponent', () => {
component.ngOnInit();
const [hotkey] = capture(hotkeyServiceMock.add).last();
expect((hotkey as Hotkey).combo).toEqual([ 'del' ]);
expect((hotkey as Hotkey).callback).toEqual(component.onDeleteHandler);
expect((hotkey as Hotkey).callback).toBeDefined();
});
it('should remove binding', () => {