From 36582b71676428a30810f206729d9a21cbd87f1a Mon Sep 17 00:00:00 2001 From: vasraz Date: Mon, 7 Nov 2022 22:10:37 +0000 Subject: Interface is formatted using extended notation when no implementation added at VFC level Signed-off-by: Vasyl Razinkov Change-Id: I4e6e6d61b851fe2efaa47c9f8fad0cb546f2fcb7 Issue-ID: SDC-4255 --- .../openecomp/sdc/be/tosca/InterfacesOperationsConverterTest.java | 8 +++----- .../java/org/openecomp/sdc/be/tosca/ToscaExportHandlerTest.java | 3 +-- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'catalog-be/src/test/java/org') diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/InterfacesOperationsConverterTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/InterfacesOperationsConverterTest.java index caae11bdee..b3470561f2 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/InterfacesOperationsConverterTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/InterfacesOperationsConverterTest.java @@ -208,7 +208,7 @@ class InterfacesOperationsConverterTest { final String interfaceType = "normalizedComponentName-interface"; component.setInterfaces(new HashMap<>()); component.getInterfaces().put(interfaceType, addedInterface); - final var interfacesMap = interfacesOperationsConverter.getInterfacesMap(component, null, component.getInterfaces(), null, false, true); + final var interfacesMap = interfacesOperationsConverter.getInterfacesMap(component, null, component.getInterfaces(), null, false); assertNotNull(interfacesMap); assertEquals(1, interfacesMap.size()); assertTrue(interfacesMap.containsKey("resourceName")); @@ -385,8 +385,7 @@ class InterfacesOperationsConverterTest { component.setInterfaces(new HashMap<>()); component.getInterfaces().put(interfaceName, interfaceDefinition); //when - Map interfacesMap = interfacesOperationsConverter - .getInterfacesMap(component, null, component.getInterfaces(), null, false, true); + Map interfacesMap = interfacesOperationsConverter.getInterfacesMap(component, null, component.getInterfaces(), null, false); //then assertTrue(interfacesMap.containsKey(interfaceName)); final Map actualInterfaceMap = (Map) interfacesMap.get(interfaceName); @@ -679,8 +678,7 @@ class InterfacesOperationsConverterTest { service.setInterfaces(Collections.singletonMap("NotLocal", new InterfaceDefinition("NotLocal", null, new HashMap<>()))); - Map resultMap = interfacesOperationsConverter.getInterfacesMap(service, null, - service.getInterfaces(), null, false, false); + Map resultMap = interfacesOperationsConverter.getInterfacesMap(service, null, service.getInterfaces(), null, false); assertTrue(MapUtils.isNotEmpty(resultMap) && resultMap.containsKey("NotLocal")); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaExportHandlerTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaExportHandlerTest.java index 040907b3f0..736fcbcd7f 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaExportHandlerTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaExportHandlerTest.java @@ -172,8 +172,7 @@ class ToscaExportHandlerTest extends BaseConfDependent { void setUpMock() { MockitoAnnotations.openMocks(this); doReturn(new ToscaProperty()).when(propertyConvertor).convertProperty(any(), any(), eq(PROPERTY)); - doReturn(new HashMap()).when(interfacesOperationsConverter) - .getInterfacesMap(any(), isNull(), anyMap(), anyMap(), anyBoolean(), anyBoolean()); + doReturn(new HashMap()).when(interfacesOperationsConverter).getInterfacesMap(any(), isNull(), anyMap(), anyMap(), anyBoolean()); } private Resource getNewResource() { -- cgit 1.2.3-korg