From a5a9ffc9a61aad67f8b30c24cd8f5049f43b87f4 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Sat, 15 Feb 2025 14:16:55 +0100 Subject: Reenable tests for most of the adapters - mso-adapter-utils - mso-adapters-rest-interface - mso-openstack-adapters - mso-sdnc-adapters - so-appc-orchestrator Issue-ID: SO-4140 Change-Id: I279bc01ad1ac3777c1b5d4b0389cddafd33304bd Signed-off-by: Fiete Ostkamp --- .../onap/so/adapters/vevnfm/aai/AaiConnection.java | 18 +++++++++------- adapters/mso-adapter-utils/pom.xml | 25 +++++++++++++--------- .../onap/so/openstack/utils/MsoHeatUtilsTest.java | 1 - adapters/mso-adapters-rest-interface/pom.xml | 5 +++++ adapters/mso-openstack-adapters/pom.xml | 17 +++++++++------ adapters/mso-sdnc-adapter/pom.xml | 15 ++++++++----- adapters/so-appc-orchestrator/pom.xml | 7 +++++- 7 files changed, 57 insertions(+), 31 deletions(-) diff --git a/adapters/etsi-sol002-adapter/src/main/java/org/onap/so/adapters/vevnfm/aai/AaiConnection.java b/adapters/etsi-sol002-adapter/src/main/java/org/onap/so/adapters/vevnfm/aai/AaiConnection.java index f326d92927..74d07dc36f 100644 --- a/adapters/etsi-sol002-adapter/src/main/java/org/onap/so/adapters/vevnfm/aai/AaiConnection.java +++ b/adapters/etsi-sol002-adapter/src/main/java/org/onap/so/adapters/vevnfm/aai/AaiConnection.java @@ -115,7 +115,8 @@ public class AaiConnection { } private List receiveVnfmInternal() { - final AAIPluralResourceUri resourceUri = AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.externalSystem().esrVnfmList()); + final AAIPluralResourceUri resourceUri = + AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.externalSystem().esrVnfmList()); final Optional response = getResourcesClient().get(EsrVnfmList.class, resourceUri); if (response.isPresent()) { @@ -137,8 +138,8 @@ public class AaiConnection { } private List receiveVnfmServiceUrl(final String vnfmId) { - final Optional response = getResourcesClient().get(EsrVnfm.class, - AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.externalSystem().esrVnfm(vnfmId)).depth(Depth.ONE)); + final Optional response = getResourcesClient().get(EsrVnfm.class, AAIUriFactory + .createResourceUri(AAIFluentTypeBuilder.externalSystem().esrVnfm(vnfmId)).depth(Depth.ONE)); if (response.isPresent()) { final EsrVnfm esrVnfm = response.get(); @@ -154,8 +155,8 @@ public class AaiConnection { } public String receiveGenericVnfId(final String href) { - final AAIPluralResourceUri resourceUri = - AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().genericVnfs()).queryParam(SELFLINK, href); + final AAIPluralResourceUri resourceUri = AAIUriFactory + .createResourceUri(AAIFluentTypeBuilder.network().genericVnfs()).queryParam(SELFLINK, href); final Optional response = getResourcesClient().get(GenericVnfs.class, resourceUri); if (response.isPresent()) { @@ -176,7 +177,8 @@ public class AaiConnection { } public String receiveVserverName(final String genericId) { - final AAIResourceUri resourceUri = AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().genericVnf(genericId)); + final AAIResourceUri resourceUri = + AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().genericVnf(genericId)); final Optional response = getResourcesClient().get(GenericVnf.class, resourceUri); if (response.isPresent()) { @@ -209,8 +211,8 @@ public class AaiConnection { private String receiveVserverNameFromParams(final String cloudOwner, final String cloudId, final String tenantId, final String vserverId) { - final AAIResourceUri resourceUri = - AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.cloudInfrastructure().cloudRegion(cloudOwner, cloudId).tenant(tenantId).vserver(vserverId)); + final AAIResourceUri resourceUri = AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.cloudInfrastructure() + .cloudRegion(cloudOwner, cloudId).tenant(tenantId).vserver(vserverId)); final Optional response = getResourcesClient().get(Vserver.class, resourceUri); if (response.isPresent()) { diff --git a/adapters/mso-adapter-utils/pom.xml b/adapters/mso-adapter-utils/pom.xml index cc7040318c..852a09850b 100644 --- a/adapters/mso-adapter-utils/pom.xml +++ b/adapters/mso-adapter-utils/pom.xml @@ -107,16 +107,6 @@ org.yaml snakeyaml - - org.springframework.boot - spring-boot-starter-test - test - - - com.h2database - h2 - test - org.apache.cxf cxf-rt-rs-client @@ -142,5 +132,20 @@ com.github.ben-manes.caffeine caffeine + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + test + + + com.h2database + h2 + test + diff --git a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsTest.java index 85219c3b5c..8543ac0798 100644 --- a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsTest.java +++ b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/MsoHeatUtilsTest.java @@ -439,7 +439,6 @@ public class MsoHeatUtilsTest extends MsoHeatUtils { String requestId = getRequestId(); doReturn(heatClient).when(heatUtils).getHeatClient(cloudSiteId, tenantId); - doNothing().when(heatUtils).saveStackRequest(eq(createStackParam), isNull(), eq("stackName")); doReturn(stackResource).when(heatClient).getStacks(); doReturn(mockCreateStack).when(stackResource).create(createStackParam); diff --git a/adapters/mso-adapters-rest-interface/pom.xml b/adapters/mso-adapters-rest-interface/pom.xml index 64edd7207a..1bdf0abba2 100644 --- a/adapters/mso-adapters-rest-interface/pom.xml +++ b/adapters/mso-adapters-rest-interface/pom.xml @@ -74,5 +74,10 @@ common ${project.version} + + org.junit.vintage + junit-vintage-engine + test + diff --git a/adapters/mso-openstack-adapters/pom.xml b/adapters/mso-openstack-adapters/pom.xml index 470222b5b0..0de2a57553 100644 --- a/adapters/mso-openstack-adapters/pom.xml +++ b/adapters/mso-openstack-adapters/pom.xml @@ -86,7 +86,7 @@ - org.eclipse.m2e @@ -154,11 +154,6 @@ org.apache.cxf cxf-rt-rs-service-description-openapi-v3 - - org.springframework.boot - spring-boot-starter-test - test - janino janino @@ -213,6 +208,16 @@ mso-adapters-rest-interface ${project.version} + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + test + javax.servlet javax.servlet-api diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml index 8bc7d0918c..f09732d54e 100644 --- a/adapters/mso-sdnc-adapter/pom.xml +++ b/adapters/mso-sdnc-adapter/pom.xml @@ -135,11 +135,6 @@ io.swagger.core.v3 swagger-jaxrs2 - - org.springframework.boot - spring-boot-starter-test - test - org.springframework.boot spring-boot-starter-validation @@ -186,5 +181,15 @@ cxf-logging ${project.version} + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + test + diff --git a/adapters/so-appc-orchestrator/pom.xml b/adapters/so-appc-orchestrator/pom.xml index 57702f5a61..8d9354b401 100644 --- a/adapters/so-appc-orchestrator/pom.xml +++ b/adapters/so-appc-orchestrator/pom.xml @@ -83,7 +83,7 @@ - org.eclipse.m2e @@ -144,6 +144,11 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + test + org.camunda.bpm camunda-external-task-client -- cgit