From 60cfc820823fa68b7454ae522dbaf6bb060671c0 Mon Sep 17 00:00:00 2001 From: Arundathi Patil Date: Mon, 24 Jun 2019 21:47:28 +0530 Subject: template-configuration spec- fixed errors Fixed errors in test file. Issue-ID: APPC-1632 Change-Id: I12e86f230550fd30042917d46cd6ee141320dc49 Signed-off-by: Arundathi Patil --- .../template-configuration.component.spec.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/vnfs/build-artifacts/template-holder/template-configuration/template-configuration.component.spec.ts b/src/app/vnfs/build-artifacts/template-holder/template-configuration/template-configuration.component.spec.ts index bba9673..8c0ca77 100644 --- a/src/app/vnfs/build-artifacts/template-holder/template-configuration/template-configuration.component.spec.ts +++ b/src/app/vnfs/build-artifacts/template-holder/template-configuration/template-configuration.component.spec.ts @@ -179,7 +179,7 @@ describe('GoldenConfigurationComponent', () => { component = fixture.componentInstance; mappingEditorService.fromScreen === 'MappingScreen' component.configMappingEditorContent = "\n 15.1X49-D50.3\n \n node0\n \n \n ${sync_auto-pop_name1}\n ${sync_auto-pop_address1}\n \n \n ${node0_tacplus_server_name2}\n ${sync_auto-pop_address1}\n \n \n \n " - mappingEditorService.initialise(component.templateeditor.getEditor(), component.configMappingEditorContent, component.modal); + mappingEditorService.initialise(component.templateeditor.getEditor(), component.configMappingEditorContent); var pdData = [{ "name": "sync_auto-pop_name1", "type": null, "description": null, "required": null, "default": null, "source": "A&AI", "rule-type": "vnfc-oam-ipv4-address-list", "request-keys": [{ "key-name": null, "key-value": null }, { "key-name": null, "key-value": null }, { "key-name": null, "key-value": null }], "response-keys": [{ "key-name": "unique-key-name", "key-value": "parent-name" }, { "key-name": "unique-key-value", "key-value": "vnfc" }, { "key-name": "field-key-name", "key-value": "ipaddress-v4-oam-vip" }, { "key-name": null, "key-value": "vm-number" }, { "key-name": null, "key-value": "test" }], "ruleTypeValues": [null, "vnf-name", "vm-name-list", "vnfc-name-list", "vnf-oam-ipv4-address", "vnfc-oam-ipv4-address-list"], "showFilterFields": true, "enableFilterByValue": true }, { "name": "sync_auto-pop_address1", "type": null, "description": null, "required": null, "default": null, "source": "A&AI", "rule-type": "vm-name-list", "request-keys": [{ "key-name": null, "key-value": null }, { "key-name": null, "key-value": null }, { "key-name": null, "key-value": null }], "response-keys": [{ "key-name": "unique-key-name", "key-value": "parent-name" }, { "key-name": "unique-key-value", "key-value": "vserver" }, { "key-name": "field-key-name", "key-value": "vserver-name" }, { "key-name": null, "key-value": "vnfc-function-code" }, { "key-name": null, "key-value": null }], "ruleTypeValues": [null, "vnf-name", "vm-name-list", "vnfc-name-list", "vnf-oam-ipv4-address", "vnfc-oam-ipv4-address-list"], "showFilterFields": true, "enableFilterByValue": true }, { "name": "node0_tacplus_server_name2", "type": null, "description": null, "required": null, "default": null, "source": "Manual", "rule-type": null, "request-keys": [{ "key-name": null, "key-value": null }, { "key-name": null, "key-value": null }, { "key-name": null, "key-value": null }], "response-keys": [{ "key-name": null, "key-value": null }, { "key-name": null, "key-value": null }, { "key-name": null, "key-value": null }, { "key-name": null, "key-value": null }, { "key-name": null, "key-value": null }], "ruleTypeValues": [null] }]; paramShareService.setSessionParamData([pdData]); @@ -188,7 +188,7 @@ describe('GoldenConfigurationComponent', () => { "sync_auto-pop_address1": "", "node0_tacplus_server_name2": "192.34.45.5" }; - expect(component.syncTemplate()); + expect(component.syncTemplate("1")); })); @@ -198,12 +198,12 @@ describe('GoldenConfigurationComponent', () => { component = fixture.componentInstance; mappingEditorService.fromScreen === 'MappingScreen' component.configMappingEditorContent = "\n 15.1X49-D50.3\n \n node0\n \n \n ${sync_auto-pop_name1}\n ${sync_auto-pop_address1}\n \n \n ${node0_tacplus_server_name2}\n ${sync_auto-pop_address1}\n \n \n \n " - mappingEditorService.initialise(component.templateeditor.getEditor(), component.configMappingEditorContent, component.modal); + mappingEditorService.initialise(component.templateeditor.getEditor(), component.configMappingEditorContent); var pdData = []; paramShareService.setSessionParamData([pdData]); localStorage["paramsContent"] = {}; - expect(component.syncTemplate()); + expect(component.syncTemplate("0")); })); @@ -216,7 +216,7 @@ describe('GoldenConfigurationComponent', () => { component.ngAfterViewInit(); component.appDataObject = { reference: {}, template: { templateData: {}, nameValueData: {} }, pd: {} }; component.configMappingEditorContent = "\n 15.1X49-D50.3\n \n node0\n \n \n ${sync_auto-pop_name1}\n ${sync_auto-pop_address1}\n \n \n ${node0_tacplus_server_name2}\n ${sync_auto-pop_address1}\n \n \n \n " - mappingEditorService.initialise(component.templateeditor.getEditor(), component.configMappingEditorContent, component.modal); + mappingEditorService.initialise(component.templateeditor.getEditor(), component.configMappingEditorContent); localStorage["paramsContent"] = JSON.stringify({ "sync_auto-pop_name1": "10.0.1.34", "sync_auto-pop_address1": "", "node0_tacplus_server_name2": "192.34.45.5" }); component.userId = "sj108s"; @@ -291,7 +291,7 @@ describe('GoldenConfigurationComponent', () => { pd: { pdData: '', pdFileName: '' } }; component.configMappingEditorContent = "\r\n 15.1X49-D50.3\r\n \r\n node0\r\n \r\n \r\n 199.37.184.211\r\n 135.144.3.125\r\n \r\n \r\n 199.37.184.242\r\n 135.144.3.125\r\n \r\n \r\n \r\n "; - mappingEditorService.initialise(component.templateeditor.getEditor(), component.configMappingEditorContent, component.modal); + mappingEditorService.initialise(component.templateeditor.getEditor(), component.configMappingEditorContent); localStorage["paramsContent"] = JSON.stringify({ "node0_tacplus_server_name1": "199.37.184.211", "node0_tacplus_server_source_address1": "135.144.3.125", @@ -301,7 +301,7 @@ describe('GoldenConfigurationComponent', () => { expect(component.mergeStatus).toBe(true); component.configMappingEditorContent = "\n 15.1X49-D50.3\n \n node0\n \n \n ${sync_auto-pop_name1}\n ${sync_auto-pop_address1}\n \n \n ${node0_tacplus_server_name2}\n ${sync_auto-pop_address1}\n \n \n \n " - mappingEditorService.initialise(component.templateeditor.getEditor(), component.configMappingEditorContent, component.modal); + mappingEditorService.initialise(component.templateeditor.getEditor(), component.configMappingEditorContent); component.mergeParams(); expect(component.mergeStatus).toBe(false); @@ -315,7 +315,7 @@ describe('GoldenConfigurationComponent', () => { component.ngAfterViewInit(); component.configMappingEditorContent = "\r\n 15.1X49-D50.3\r\n \r\n node0\r\n \r\n \r\n 199.37.184.211\r\n 135.144.3.125\r\n \r\n \r\n 199.37.184.242\r\n 135.144.3.125\r\n \r\n \r\n \r\n "; - mappingEditorService.initialise(component.templateeditor.getEditor(), component.configMappingEditorContent, component.modal); + mappingEditorService.initialise(component.templateeditor.getEditor(), component.configMappingEditorContent); component.selectedWord = "node0"; expect(component.handleAnnotation(component.modal)); })); @@ -328,7 +328,7 @@ describe('GoldenConfigurationComponent', () => { component.ngAfterViewInit(); component.configMappingEditorContent = "\r\n 15.1X49-D50.3\r\n \r\n node0\r\n \r\n \r\n {(node1)=(name1)}\r\n 135.144.3.125\r\n \r\n \r\n 199.37.184.242\r\n 135.144.3.125\r\n \r\n \r\n \r\n "; - mappingEditorService.initialise(component.templateeditor.getEditor(), component.configMappingEditorContent, component.modal); + mappingEditorService.initialise(component.templateeditor.getEditor(), component.configMappingEditorContent); component.selectedWord = "node0"; component.tempName = "name0"; component.submitNameValues() -- cgit 1.2.3-korg