Composed Tasks Flo editor tests

Author: BoykoAlex

ui/package.json

@@ -37,7 +37,7 @@
     "ngx-pagination": "3.0.1",
     "rxjs": "5.5.2",
     "sockjs-client": "1.1.4",
-    "spring-flo": "git://github.com/spring-projects/spring-flo#0ee041142d50044512b091b504e9ab9df3ffcd48",
+    "spring-flo": "0.7.0",
     "stompjs": "2.3.3",
     "tixif-ngx-busy": "0.0.5",
     "zone.js": "0.8.18",

ui/src/app/shared/flo/decoration/decoration.component.spec.ts

@@ -1,9 +1,11 @@
 import { Shapes } from 'spring-flo';
 import { dia } from 'jointjs';
 import { RenderService } from '../../../streams/flo/render.service';
-import { MockMetamodelService } from '../../../streams/flo/mocks/mock-metamodel.service';
 import { DecorationComponent } from './decoration.component';
 import { Constants } from 'spring-flo';
+import { MockSharedAppService } from '../../../tests/mocks/shared-app';
+import { MetamodelService } from '../../../streams/flo/metamodel.service';
+import { async } from '@angular/core/testing';
 
 import * as _joint from 'jointjs';
 const joint: any = _joint;
@@ -16,22 +18,24 @@ function createMockView(cell: dia.Element): any {
 
 describe('DecorationComponent Tests.', () => {
 
-  const MOCK_METAMODEL_SERVICE = new MockMetamodelService();
-  const RENDER_SERVICE = new RenderService(MOCK_METAMODEL_SERVICE);
+  const METAMODEL_SERVICE = new MetamodelService(new MockSharedAppService());
+  const RENDER_SERVICE = new RenderService(METAMODEL_SERVICE);
 
   let graph: dia.Graph;
   let component: DecorationComponent;
   let parentNode: dia.Element;
 
-  beforeEach(() => {
-    graph = new joint.dia.Graph();
-    component = new DecorationComponent();
-    parentNode = Shapes.Factory.createNode({
-      metadata: MOCK_METAMODEL_SERVICE.data.get('source').get('http'),
-      renderer: RENDER_SERVICE,
-      graph: graph
+  beforeEach(async(() => {
+    METAMODEL_SERVICE.load().then(metamodel => {
+      graph = new joint.dia.Graph();
+      component = new DecorationComponent();
+      parentNode = Shapes.Factory.createNode({
+        metadata: metamodel.get('source').get('http'),
+        renderer: RENDER_SERVICE,
+        graph: graph
+      });
     });
-  });
+  }));
 
   it('No decoration view', () => {
     expect(component.kind).toEqual('');

ui/src/app/shared/flo/graph-view/graph-view.component.spec.ts

@@ -1,8 +1,9 @@
 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import { GraphViewComponent } from './graph-view.component';
 import { FloModule } from 'spring-flo';
-import { MockMetamodelService } from '../../../streams/flo/mocks/mock-metamodel.service';
 import { RenderService } from '../../../streams/flo/render.service';
+import { MockSharedAppService } from '../../../tests/mocks/shared-app';
+import { MetamodelService } from '../../../streams/flo/metamodel.service';
 
 /**
  * Test {@link GraphViewComponent}.
@@ -30,7 +31,7 @@ describe('StreamGraphViewComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(GraphViewComponent);
     component = fixture.componentInstance;
-    const metamodel = new MockMetamodelService();
+    const metamodel = new MetamodelService(new MockSharedAppService());
     component.metamodel = metamodel;
     component.renderer = new RenderService(metamodel);
   });

ui/src/app/shared/flo/handle/handle.component.spec.ts

@@ -1,9 +1,11 @@
 import { Shapes } from 'spring-flo';
 import { dia } from 'jointjs';
 import { RenderService } from '../../../streams/flo/render.service';
-import { MockMetamodelService } from '../../../streams/flo/mocks/mock-metamodel.service';
 import { HandleComponent } from './handle.component';
 import { Constants } from 'spring-flo';
+import { MockSharedAppService } from '../../../tests/mocks/shared-app';
+import { MetamodelService } from '../../../streams/flo/metamodel.service';
+import { async } from '@angular/core/testing';
 
 import * as _joint from 'jointjs';
 const joint: any = _joint;
@@ -16,22 +18,24 @@ function createMockView(cell: dia.Element): any {
 
 describe('HandleComponent Tests.', () => {
 
-  const MOCK_METAMODEL_SERVICE = new MockMetamodelService();
-  const RENDER_SERVICE = new RenderService(MOCK_METAMODEL_SERVICE);
+  const METAMODEL_SERVICE = new MetamodelService(new MockSharedAppService());
+  const RENDER_SERVICE = new RenderService(METAMODEL_SERVICE);
 
   let graph: dia.Graph;
   let component: HandleComponent;
   let parentNode: dia.Element;
 
-  beforeEach(() => {
-    graph = new joint.dia.Graph();
-    component = new HandleComponent();
-    parentNode = Shapes.Factory.createNode({
-      metadata: MOCK_METAMODEL_SERVICE.data.get('source').get('http'),
-      renderer: RENDER_SERVICE,
-      graph: graph
+  beforeEach(async(() => {
+    METAMODEL_SERVICE.load().then(metamodel => {
+      graph = new joint.dia.Graph();
+      component = new HandleComponent();
+      parentNode = Shapes.Factory.createNode({
+        metadata: metamodel.get('source').get('http'),
+        renderer: RENDER_SERVICE,
+        graph: graph
+      });
     });
-  });
+  }));
 
   it('No handle view', () => {
     expect(component.placement).toEqual('top');

ui/src/app/streams/flo/editor.service.spec.ts

@@ -1,6 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { FloModule, EditorComponent } from 'spring-flo';
-import { MockMetamodelService } from '../flo/mocks/mock-metamodel.service';
 import { MetamodelService } from '../flo/metamodel.service';
 import { RenderService } from '../flo/render.service';
 
@@ -13,6 +12,7 @@ import * as _joint from 'jointjs';
 const joint: any = _joint;
 
 import { EditorService } from './editor.service';
+import {MockSharedAppService} from '../../tests/mocks/shared-app';
 
 describe('editor.service', () => {
     const editorService = new EditorService(null);
@@ -398,13 +398,15 @@ describe('editor.service', () => {
 describe('editor.service : Auto-Link', () => {
   let component: EditorComponent;
   let fixture: ComponentFixture<EditorComponent>;
-  const metamodelService = new MockMetamodelService();
+  const metamodelService = new MetamodelService(new MockSharedAppService());
   const renderService = new RenderService(metamodelService);
   const editorService = new EditorService(null);
+  let metamodel: Map<string, Map<string, Flo.ElementMetadata>>;
 
   let flo: Flo.EditorContext;
 
   beforeEach(async(() => {
+    metamodelService.load().then(data => metamodel = data);
     TestBed.configureTestingModule({
       imports: [
         FloModule
@@ -443,33 +445,33 @@ describe('editor.service : Auto-Link', () => {
   }
 
   it('DnD on empty canvas', () => {
-    dropOnCanvas(metamodelService.data.get('source').get('http'));
+    dropOnCanvas(metamodel.get('source').get('http'));
     expect(flo.getGraph().getElements().length).toEqual(1);
     expect(flo.getGraph().getElements()[0].attr('metadata/name')).toEqual('http');
   });
 
   it('Auto-Link: OFF. Drop processor with available source port', () => {
-    flo.createNode(metamodelService.data.get('source').get('http'));
+    flo.createNode(metamodel.get('source').get('http'));
     expect(flo.getGraph().getElements().length).toEqual(1);
-    dropOnCanvas(metamodelService.data.get('processor').get('filter'));
+    dropOnCanvas(metamodel.get('processor').get('filter'));
     expect(flo.getGraph().getElements().length).toEqual(2);
     expect(flo.getGraph().getLinks().length).toEqual(0);
   });
 
   it('Auto-Link: ON. Drop processor with available source port', () => {
     flo.autolink = true;
-    flo.createNode(metamodelService.data.get('source').get('http'));
+    flo.createNode(metamodel.get('source').get('http'));
     expect(flo.getGraph().getElements().length).toEqual(1);
-    dropOnCanvas(metamodelService.data.get('processor').get('filter'));
+    dropOnCanvas(metamodel.get('processor').get('filter'));
     expect(flo.getGraph().getElements().length).toEqual(2);
     expect(flo.getGraph().getLinks().length).toEqual(1);
   });
 
   it('Auto-Link: ON. Drop processor with sink on canvas', () => {
     flo.autolink = true;
-    const sinkNode = flo.createNode(metamodelService.data.get('sink').get('null'));
+    const sinkNode = flo.createNode(metamodel.get('sink').get('null'));
     expect(flo.getGraph().getElements().length).toEqual(1);
-    dropOnCanvas(metamodelService.data.get('processor').get('filter'));
+    dropOnCanvas(metamodel.get('processor').get('filter'));
     expect(flo.getGraph().getElements().length).toEqual(2);
     expect(flo.getGraph().getLinks().length).toEqual(1);
     const l = flo.getGraph().getLinks()[0];
@@ -479,8 +481,8 @@ describe('editor.service : Auto-Link', () => {
 
   it('Auto-Link: ON. Drop processor but no available ports', () => {
     flo.autolink = true;
-    const httpNode = flo.createNode(metamodelService.data.get('source').get('http'));
-    const nullNode = flo.createNode(metamodelService.data.get('sink').get('null'));
+    const httpNode = flo.createNode(metamodel.get('source').get('http'));
+    const nullNode = flo.createNode(metamodel.get('sink').get('null'));
     flo.createLink({
       id: httpNode.id,
       selector: '.output-port',
@@ -492,15 +494,15 @@ describe('editor.service : Auto-Link', () => {
     }, null, null);
     expect(flo.getGraph().getElements().length).toEqual(2);
     expect(flo.getGraph().getLinks().length).toEqual(1);
-    dropOnCanvas(metamodelService.data.get('processor').get('filter'));
+    dropOnCanvas(metamodel.get('processor').get('filter'));
     expect(flo.getGraph().getElements().length).toEqual(3);
     expect(flo.getGraph().getLinks().length).toEqual(1);
   });
 
   it('Auto-Link: ON. Drop processor available port has tap-link', () => {
     flo.autolink = true;
-    const httpNode = flo.createNode(metamodelService.data.get('source').get('http'));
-    const nullNode = flo.createNode(metamodelService.data.get('sink').get('null'));
+    const httpNode = flo.createNode(metamodel.get('source').get('http'));
+    const nullNode = flo.createNode(metamodel.get('sink').get('null'));
     flo.createLink({
       id: httpNode.id,
       selector: '.output-port',
@@ -513,19 +515,19 @@ describe('editor.service : Auto-Link', () => {
     expect(flo.getGraph().getElements().length).toEqual(2);
     expect(flo.getGraph().getLinks().length).toEqual(1);
     expect(flo.getGraph().getLinks().filter(l => l.attr('props/isTapLink')).length).toEqual(1);
-    dropOnCanvas(metamodelService.data.get('processor').get('filter'));
+    dropOnCanvas(metamodel.get('processor').get('filter'));
     expect(flo.getGraph().getElements().length).toEqual(3);
     expect(flo.getGraph().getLinks().length).toEqual(2);
     expect(flo.getGraph().getLinks().filter(l => !l.attr('props/isTapLink')).length).toEqual(1);
   });
 
   it('Auto-Link: ON. More than one port available', () => {
     flo.autolink = true;
-    flo.createNode(metamodelService.data.get('source').get('http'));
-    flo.createNode(metamodelService.data.get('processor').get('filter'));
+    flo.createNode(metamodel.get('source').get('http'));
+    flo.createNode(metamodel.get('processor').get('filter'));
     expect(flo.getGraph().getElements().length).toEqual(2);
     expect(flo.getGraph().getLinks().length).toEqual(0);
-    dropOnCanvas(metamodelService.data.get('processor').get('filter'));
+    dropOnCanvas(metamodel.get('processor').get('filter'));
     expect(flo.getGraph().getElements().length).toEqual(3);
     expect(flo.getGraph().getLinks().length).toEqual(0);
   });