From 4c87ecaa8cce40f078f8540a15928e7e805e4ef7 Mon Sep 17 00:00:00 2001 From: Yoav Schneiderman Date: Wed, 18 Dec 2019 21:04:38 +0200 Subject: Refactor Generic Generators Issue-ID: VID-731 Signed-off-by: Yoav Schneiderman Change-Id: Ib851ff4056d64e12eaf415c5d689c832196ec8b0 Signed-off-by: Yoav Schneiderman --- .../objectToInstanceTree/objectToInstanceTree.service.spec.ts | 6 ++++-- .../objectToModelTree/objectToModelTree.service.spec.ts | 6 ++++-- .../service-planning/objectsToTree/shared.tree.service.spec.ts | 8 +++++--- 3 files changed, 13 insertions(+), 7 deletions(-) (limited to 'vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree') diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts index c17d9c74c..1cec62b2c 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts @@ -11,7 +11,7 @@ import {ObjectToTreeService} from "../objectToTree.service"; import {DrawingBoardModes} from "../../drawing-board.modes"; import {DialogService} from "ng2-bootstrap-modal"; import {VnfPopupService} from "../../../../shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service"; -import {BasicControlGenerator} from "../../../../shared/components/genericForm/formControlsServices/basic.control.generator"; +import {ControlGeneratorUtil} from "../../../../shared/components/genericForm/formControlsServices/control.generator.util.service"; import {AaiService} from "../../../../shared/services/aaiService/aai.service"; import {FeatureFlagsService} from "../../../../shared/services/featureFlag/feature-flags.service"; import {VnfControlGenerator} from "../../../../shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator"; @@ -33,6 +33,7 @@ import {ComponentInfoService} from "../../component-info/component-info.service" import {NetworkStepService} from "../models/vrf/vrfModal/networkStep/network.step.service"; import {VpnStepService} from "../models/vrf/vrfModal/vpnStep/vpn.step.service"; import {VfModuleUpgradePopupService} from "../../../../shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service"; +import {SharedControllersService} from "../../../../shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service"; class MockAppStore { getState() { @@ -65,7 +66,8 @@ describe('Model Tree Generator service', () => { SharedTreeService, VnfPopupService, VnfGroupPopupService, - BasicControlGenerator, + ControlGeneratorUtil, + SharedControllersService, GenericFormService, FormBuilder, LogService, diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.spec.ts index 8674a619e..0f7bf9a61 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.spec.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.spec.ts @@ -14,7 +14,7 @@ import { } from "../../available-models-tree/available-models-tree.service"; import {DialogService} from "ng2-bootstrap-modal"; import {VnfPopupService} from "../../../../shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service"; -import {BasicControlGenerator} from "../../../../shared/components/genericForm/formControlsServices/basic.control.generator"; +import {ControlGeneratorUtil} from "../../../../shared/components/genericForm/formControlsServices/control.generator.util.service"; import {GenericFormService} from "../../../../shared/components/genericForm/generic-form.service"; import {FormBuilder} from "@angular/forms"; import {LogService} from "../../../../shared/utils/log/log.service"; @@ -36,6 +36,7 @@ import {IModelTreeNodeModel} from "../../../objectsToTree/objectToModelTree/mode import {VpnStepService} from "../models/vrf/vrfModal/vpnStep/vpn.step.service"; import {NetworkStepService} from "../models/vrf/vrfModal/networkStep/network.step.service"; import {VfModuleUpgradePopupService} from "../../../../shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service"; +import {SharedControllersService} from "../../../../shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service"; class MockAppStore { getState() { @@ -90,7 +91,7 @@ describe('Model Tree Generator service', () => { DialogService, VnfPopupService, VnfGroupPopupService, - BasicControlGenerator, + ControlGeneratorUtil, GenericFormService, FormBuilder, LogService, @@ -111,6 +112,7 @@ describe('Model Tree Generator service', () => { ComponentInfoService, NetworkStepService, VpnStepService, + SharedControllersService, {provide: NgRedux, useClass: MockAppStore}, MockNgRedux ] }).compileComponents(); diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts index 277ea941e..3a65b93ef 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts @@ -8,7 +8,7 @@ import {DefaultDataGeneratorService} from "../../../shared/services/defaultDataS import {DynamicInputsService} from "./dynamicInputs.service"; import {DialogService} from "ng2-bootstrap-modal"; import {VnfPopupService} from "../../../shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service"; -import {BasicControlGenerator} from "../../../shared/components/genericForm/formControlsServices/basic.control.generator"; +import {ControlGeneratorUtil} from "../../../shared/components/genericForm/formControlsServices/control.generator.util.service"; import {AaiService} from "../../../shared/services/aaiService/aai.service"; import {NetworkPopupService} from "../../../shared/components/genericFormPopup/genericFormServices/network/network.popup.service"; import {NetworkControlGenerator} from "../../../shared/components/genericForm/formControlsServices/networkGenerator/network.control.generator"; @@ -41,6 +41,7 @@ import {ModelInformationItem} from "../../../shared/components/model-information import {VpnStepService} from "./models/vrf/vrfModal/vpnStep/vpn.step.service"; import {NetworkStepService} from "./models/vrf/vrfModal/networkStep/network.step.service"; import {VfModuleUpgradePopupService} from "../../../shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service"; +import {SharedControllersService} from "../../../shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service"; class MockAppStore { getState() { @@ -82,11 +83,12 @@ describe('Shared Tree Service', () => { imports: [HttpClientTestingModule, NgReduxTestingModule, SdcUiComponentsModule], providers: [ SharedTreeService, + SharedControllersService, ObjectToTreeService, DefaultDataGeneratorService, DialogService, VnfPopupService, - BasicControlGenerator, + ControlGeneratorUtil, AaiService, LogService, BasicPopupService, @@ -165,7 +167,7 @@ describe('Shared Tree Service', () => { let modelInfoServiceMock: ILevelNodeInfo = new VnfModelInfo(null, null, null, null, null, null, null, - null, null, null, null,null); + null, null, null, null,null, null); const modelMock = {"a": "a"}; const instanceMock = {"instance": "instance", "trackById": "123456789"}; const instanceTypeMock = "instanceTypeMock"; -- cgit 1.2.3-korg