From 572045fb2079f94bf1069fc26f60ef22f85248b1 Mon Sep 17 00:00:00 2001 From: Piotr Pekala Date: Fri, 7 Jun 2019 01:56:17 -0700 Subject: [PATCH] Fix for tests --- src/app/services/link.service.spec.ts | 20 +++++++++++++++++--- src/app/services/link.service.ts | 4 ++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/app/services/link.service.spec.ts b/src/app/services/link.service.spec.ts index 8db170da..e532b615 100644 --- a/src/app/services/link.service.spec.ts +++ b/src/app/services/link.service.spec.ts @@ -52,7 +52,7 @@ describe('LinkService', () => { targetPort.port_number = 3; targetPort.adapter_number = 4; - service.createLink(server, sourceNode, sourcePort, targetNode, targetPort).subscribe(); + service.createLink(server, sourceNode, sourcePort, targetNode, targetPort, 0, 0, 10, 10).subscribe(); const req = httpTestingController.expectOne('http://127.0.0.1:3080/v2/projects/myproject/links'); expect(req.request.method).toEqual('POST'); @@ -61,12 +61,26 @@ describe('LinkService', () => { { node_id: 'sourceid', port_number: 1, - adapter_number: 2 + adapter_number: 2, + label: { + rotation: 0, + style: "font-size: 10; font-style: Verdana", + text: sourcePort.short_name, + x: 0, + y: 0 + } }, { node_id: 'targetid', port_number: 3, - adapter_number: 4 + adapter_number: 4, + label: { + rotation: 0, + style: "font-size: 10; font-style: Verdana", + text: sourcePort.short_name, + x: 10, + y: 10 + } } ] }); diff --git a/src/app/services/link.service.ts b/src/app/services/link.service.ts index ece50bcc..df06230e 100644 --- a/src/app/services/link.service.ts +++ b/src/app/services/link.service.ts @@ -25,7 +25,7 @@ export class LinkService { label: { rotation: 0, style: "font-size: 10; font-style: Verdana", - text: "0/0", + text: source_port.short_name, x: xLabelSourceNode, y: yLabelSourceNode } @@ -37,7 +37,7 @@ export class LinkService { label: { rotation: 0, style: "font-size: 10; font-style: Verdana", - text: "0/0", + text: target_port.short_name, x: xLabelTargetNode, y: yLabelTargetNode }