From 8ee120e21f2c894a18e0585504cc1f95c08a8f4b Mon Sep 17 00:00:00 2001 From: Grzegorz Wielgosinski Date: Tue, 13 Jul 2021 13:23:41 +0200 Subject: Multicloud URL refactoring Issue-ID: SO-3711 Signed-off-by: Grzegorz Wielgosinski Change-Id: Id1ee3f40c703b480d1296e657e1f7977cdd60f08 --- .../onap/so/adapters/cnf/CnfAdapterRestTest.java | 63 ---------------------- .../so/adapters/cnf/rest/CnfAdapterRestTest.java | 4 ++ .../cnf/service/CnfAdapterServiceTest.java | 5 +- 3 files changed, 8 insertions(+), 64 deletions(-) delete mode 100644 so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/CnfAdapterRestTest.java (limited to 'so-cnf-adapter-application/src/test') diff --git a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/CnfAdapterRestTest.java b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/CnfAdapterRestTest.java deleted file mode 100644 index ee7a771..0000000 --- a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/CnfAdapterRestTest.java +++ /dev/null @@ -1,63 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2020 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - - -package org.onap.so.adapters.cnf; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import java.util.HashMap; -import java.util.Map; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.onap.so.adapters.cnf.model.BpmnInstanceRequest; -import org.onap.so.adapters.cnf.rest.CnfAdapterRest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -public class CnfAdapterRestTest { - - @InjectMocks - CnfAdapterRest cnfAdapterRest; - - @Test - public void createInstanceTest() throws Exception { - - Map labels = new HashMap(); - labels.put("custom-label-1", "label1"); - Map overrideValues = new HashMap(); - labels.put("image.tag", "latest"); - labels.put("dcae_collector_ip", "1.2.3.4"); - BpmnInstanceRequest bpmnInstanceRequest = new BpmnInstanceRequest(); - bpmnInstanceRequest.setCloudRegionId("v1"); - bpmnInstanceRequest.setLabels(labels); - bpmnInstanceRequest.setModelInvariantId("krd"); - bpmnInstanceRequest.setModelVersionId("p1"); - bpmnInstanceRequest.setOverrideValues(overrideValues); - bpmnInstanceRequest.setVfModuleUUID("20200824"); - - String mockedResponse = "K8sRBProfileName is required"; - String actualResponse = cnfAdapterRest.createInstance(bpmnInstanceRequest); - assertNotNull(actualResponse); - assertEquals(mockedResponse, actualResponse); - } - -} -*/ diff --git a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/CnfAdapterRestTest.java b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/CnfAdapterRestTest.java index cfd6ba1..979f13b 100644 --- a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/CnfAdapterRestTest.java +++ b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/CnfAdapterRestTest.java @@ -26,6 +26,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; +import org.onap.so.adapters.cnf.MulticloudConfiguration; import org.onap.so.adapters.cnf.model.*; import org.onap.so.adapters.cnf.service.CnfAdapterService; import org.springframework.http.HttpStatus; @@ -49,6 +50,9 @@ public class CnfAdapterRestTest { @Mock CnfAdapterService cnfAdapterService; + @Mock + private MulticloudConfiguration multicloudConfiguration; + @Mock ResponseEntity instacneMiniResponseList; diff --git a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/CnfAdapterServiceTest.java b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/CnfAdapterServiceTest.java index 130f6f0..bdad347 100644 --- a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/CnfAdapterServiceTest.java +++ b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/CnfAdapterServiceTest.java @@ -24,6 +24,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; +import org.onap.so.adapters.cnf.MulticloudConfiguration; import org.onap.so.adapters.cnf.model.BpmnInstanceRequest; import org.springframework.http.ResponseEntity; import org.springframework.test.context.junit4.SpringRunner; @@ -33,7 +34,6 @@ import java.util.HashMap; import java.util.Map; @RunWith(SpringRunner.class) - public class CnfAdapterServiceTest { private static final String INSTANCE_CREATE_PATH = "/v1/instance"; @Mock @@ -42,6 +42,9 @@ public class CnfAdapterServiceTest { @InjectMocks CnfAdapterService cnfAdapterService; + @Mock + private MulticloudConfiguration multicloudConfiguration; + @Mock ResponseEntity instanceResponse; -- cgit 1.2.3-korg