diff options
Diffstat (limited to 'mod/bpgenerator/onap/src/test/java/org/onap')
8 files changed, 206 insertions, 37 deletions
diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/AppConfigServiceTest.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/AppConfigServiceTest.java new file mode 100644 index 0000000..86e304e --- /dev/null +++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/AppConfigServiceTest.java @@ -0,0 +1,174 @@ +/* + * + * * ============LICENSE_START======================================================= + * * org.onap.dcae + * * ================================================================================ + * * Copyright (c) 2021 Nokia Intellectual Property. 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.blueprintgenerator.service.common; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.when; + +import java.util.HashMap; +import java.util.Map; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.onap.blueprintgenerator.model.common.Appconfig; +import org.onap.blueprintgenerator.model.common.GetInput; +import org.onap.blueprintgenerator.model.componentspec.OnapComponentSpec; +import org.onap.blueprintgenerator.model.componentspec.common.Parameters; +import org.onap.blueprintgenerator.service.InfoService; +import org.onap.blueprintgenerator.service.base.BlueprintHelperService; +import org.onap.blueprintgenerator.service.common.kafka.KafkaStreamService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.ConfigFileApplicationContextInitializer; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = {AppConfigService.class, BlueprintHelperService.class, DmaapService.class, + InfoService.class, StreamService.class, KafkaStreamService.class}, + initializers = ConfigFileApplicationContextInitializer.class) +public class AppConfigServiceTest { + + private static final String TEST_PARAMETER_NAME = "testParameter"; + private static final String INPUTS = "inputs"; + private static final String TYPE = "type"; + private static final String DEFAULT = "default"; + + private static final String PARAMETERS_TYPE_STRING = "string"; + private static final String PARAMETERS_TYPE_INTEGER = "integer"; + private static final String PARAMETERS_TYPE_BOOLEAN = "boolean"; + private static final String PARAMETERS_TYPE_NUMBER = "number"; + + private static final String STRING_INPUT_TYPE = "string"; + private static final String INTEGER_INPUT_TYPE = "integer"; + private static final String BOOLEAN_INPUT_TYPE = "boolean"; + private static final String UNKNOWN_TYPE = "test_unknown_type"; + + private static final boolean BOOLEAN_TEST_VALUE = true; + private static final String TEST_STRING_VALUE = "testValue"; + private static final String APP_CONFIG = "appconfig"; + + @Autowired + private AppConfigService appConfigService; + + private OnapComponentSpec componentSpec; + + @Before + public void setUp() { + componentSpec = Mockito.mock(OnapComponentSpec.class); + } + + @Test + public void shouldCreateStringInputForStringParameter() { + + mockParameters(PARAMETERS_TYPE_STRING, TEST_STRING_VALUE); + Map<String, Map<String, Object>> inputs = new HashMap<>(); + + Map<String, Object> appConfig = appConfigService.createAppconfig(inputs, componentSpec, false); + Map<String, Object> createdInputs = (Map<String, Object>) appConfig.get(INPUTS); + Map<String, Object> createdParameters = (Map<String, Object>) createdInputs.get(TEST_PARAMETER_NAME); + + assertAppConfigContainsParameterWithCorrectInputName(appConfig); + assertEquals(STRING_INPUT_TYPE, createdParameters.get(TYPE)); + assertEquals(TEST_STRING_VALUE, createdParameters.get(DEFAULT)); + } + + @Test + public void shouldCreateStringInputForUnknownParameter() { + + mockParameters(UNKNOWN_TYPE, TEST_STRING_VALUE); + Map<String, Map<String, Object>> inputs = new HashMap<>(); + + Map<String, Object> appConfig = appConfigService.createAppconfig(inputs, componentSpec, false); + Map<String, Object> createdInputs = (Map<String, Object>) appConfig.get(INPUTS); + Map<String, Object> createdParameters = (Map<String, Object>) createdInputs.get(TEST_PARAMETER_NAME); + + assertAppConfigContainsParameterWithCorrectInputName(appConfig); + assertEquals(STRING_INPUT_TYPE, createdParameters.get(TYPE)); + assertEquals(TEST_STRING_VALUE, createdParameters.get(DEFAULT)); + } + + @Test + public void shouldCreateBooleanInputForBooleanParameter() { + + mockParameters(PARAMETERS_TYPE_BOOLEAN, BOOLEAN_TEST_VALUE); + Map<String, Map<String, Object>> inputs = new HashMap<>(); + + Map<String, Object> appConfig = appConfigService.createAppconfig(inputs, componentSpec, false); + Map<String, Object> createdInputs = (Map<String, Object>) appConfig.get(INPUTS); + Map<String, Object> createdParameters = (Map<String, Object>) createdInputs.get(TEST_PARAMETER_NAME); + + assertAppConfigContainsParameterWithCorrectInputName(appConfig); + assertEquals(BOOLEAN_INPUT_TYPE, createdParameters.get(TYPE)); + assertEquals(BOOLEAN_TEST_VALUE, createdParameters.get(DEFAULT)); + } + + @Test + public void shouldCreateIntegerInputForIntegerParameter() { + + mockParameters(PARAMETERS_TYPE_INTEGER, 123); + Map<String, Map<String, Object>> inputs = new HashMap<>(); + + Map<String, Object> appConfig = appConfigService.createAppconfig(inputs, componentSpec, false); + Map<String, Object> createdInputs = (Map<String, Object>) appConfig.get(INPUTS); + Map<String, Object> createdParameters = (Map<String, Object>) createdInputs.get(TEST_PARAMETER_NAME); + + assertAppConfigContainsParameterWithCorrectInputName(appConfig); + assertEquals(INTEGER_INPUT_TYPE, createdParameters.get(TYPE)); + assertEquals(123, createdParameters.get(DEFAULT)); + } + + @Test + public void shouldCreateIntegerInputForNumberParameter() { + + mockParameters(PARAMETERS_TYPE_NUMBER, 123); + Map<String, Map<String, Object>> inputs = new HashMap<>(); + + Map<String, Object> appConfig = appConfigService.createAppconfig(inputs, componentSpec, false); + Map<String, Object> createdInputs = (Map<String, Object>) appConfig.get(INPUTS); + Map<String, Object> createdParameters = (Map<String, Object>) createdInputs.get(TEST_PARAMETER_NAME); + + + assertAppConfigContainsParameterWithCorrectInputName(appConfig); + assertEquals(INTEGER_INPUT_TYPE, createdParameters.get(TYPE)); + assertEquals(123, createdParameters.get(DEFAULT)); + } + + private void assertAppConfigContainsParameterWithCorrectInputName(Map<String, Object> appConfig) { + Appconfig appConfigModel = (Appconfig) appConfig.get(APP_CONFIG); + Object bpInputName = ((GetInput) appConfigModel.getParams().get(TEST_PARAMETER_NAME)).getBpInputName(); + assertEquals(bpInputName, TEST_PARAMETER_NAME); + } + + private void mockParameters(String type, Object value) { + Parameters testParameter = new Parameters(); + testParameter.setName(TEST_PARAMETER_NAME); + testParameter.setType(type); + testParameter.setSourced_at_deployment(true); + testParameter.setValue(value); + Parameters[] parametersArray = new Parameters[1]; + parametersArray[0] = testParameter; + when(componentSpec.getParameters()).thenReturn(parametersArray); + } +} diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/PropertiesServiceTest.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/PropertiesServiceTest.java index a598315..468a402 100644 --- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/PropertiesServiceTest.java +++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/PropertiesServiceTest.java @@ -128,7 +128,7 @@ public class PropertiesServiceTest { OnapComponentSpec onapComponentSpec = getOnapComponentSpecWithStreamsPublishes(); Publishes publishes = onapComponentSpec.getStreams().getPublishes()[0]; when(blueprintHelperService.isMessageRouterType(eq(publishes.getType()))).thenReturn(true); - when(streamsService.createStreams(any(), eq(publishes.getConfig_key() + Constants._TOPIC), + when(streamsService.createStreams(any(), eq(publishes.getConfig_key() + Constants.A_TOPIC), eq(publishes.getType()), eq(publishes.getConfig_key()), eq(publishes.getRoute()), @@ -153,7 +153,7 @@ public class PropertiesServiceTest { OnapComponentSpec onapComponentSpec = getOnapComponentSpecWithStreamsPublishes(); Publishes publishes = onapComponentSpec.getStreams().getPublishes()[0]; when(blueprintHelperService.isDataRouterType(eq(publishes.getType()))).thenReturn(true); - when(streamsService.createStreams(any(), eq(publishes.getConfig_key() + Constants._FEED), + when(streamsService.createStreams(any(), eq(publishes.getConfig_key() + Constants.A_FEED), eq(publishes.getType()), eq(publishes.getConfig_key()), eq(publishes.getRoute()), @@ -178,7 +178,7 @@ public class PropertiesServiceTest { OnapComponentSpec onapComponentSpec = getOnapComponentSpecWithStreamsSubscribes(); Subscribes subscribes = onapComponentSpec.getStreams().getSubscribes()[0]; when(blueprintHelperService.isMessageRouterType(eq(subscribes.getType()))).thenReturn(true); - when(streamsService.createStreams(any(), eq(subscribes.getConfig_key() + Constants._TOPIC), + when(streamsService.createStreams(any(), eq(subscribes.getConfig_key() + Constants.A_TOPIC), eq(subscribes.getType()), eq(subscribes.getConfig_key()), eq(subscribes.getRoute()), @@ -203,7 +203,7 @@ public class PropertiesServiceTest { OnapComponentSpec onapComponentSpec = getOnapComponentSpecWithStreamsSubscribes(); Subscribes subscribes = onapComponentSpec.getStreams().getSubscribes()[0]; when(blueprintHelperService.isDataRouterType(eq(subscribes.getType()))).thenReturn(true); - when(streamsService.createStreams(any(), eq(subscribes.getConfig_key() + Constants._FEED), + when(streamsService.createStreams(any(), eq(subscribes.getConfig_key() + Constants.A_FEED), eq(subscribes.getType()), eq(subscribes.getConfig_key()), eq(subscribes.getRoute()), diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/StreamServiceTest.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/StreamServiceTest.java index fe93f5f..d2936da 100644 --- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/StreamServiceTest.java +++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/StreamServiceTest.java @@ -279,11 +279,11 @@ class StreamServiceTest { return subscribes; } - private Map<String, LinkedHashMap<String, Object>> createInputs() { - LinkedHashMap<String, Object> map = new LinkedHashMap<>(); + private Map<String, Map<String, Object>> createInputs() { + Map<String, Object> map = new LinkedHashMap<>(); map.put("key-1", "obj-1"); - Map<String, LinkedHashMap<String, Object>> mapsMap = new HashMap<>(); + Map<String, Map<String, Object>> mapsMap = new HashMap<>(); mapsMap.put("inputs", map); return mapsMap; } diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/kafka/KafkaStreamServiceTest.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/kafka/KafkaStreamServiceTest.java index cad3b71..54beabb 100644 --- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/kafka/KafkaStreamServiceTest.java +++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/kafka/KafkaStreamServiceTest.java @@ -27,7 +27,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.util.LinkedHashMap; import java.util.Map; import org.junit.Test; @@ -55,12 +54,12 @@ public class KafkaStreamServiceTest { @Test public void createCorrectStreamCommonInputs() { - Map<String, LinkedHashMap<String, Object>> publishInputs = kafkaStreamService + Map<String, Map<String, Object>> publishInputs = kafkaStreamService .createStreamPublishInputs("test_stream_name"); - LinkedHashMap<String, Object> kafka_bootstrap_servers = publishInputs.get("kafka_bootstrap_servers"); - LinkedHashMap<String, Object> kafka_username = publishInputs.get("kafka_username"); - LinkedHashMap<String, Object> kafka_password = publishInputs.get("kafka_password"); + Map<String, Object> kafka_bootstrap_servers = publishInputs.get("kafka_bootstrap_servers"); + Map<String, Object> kafka_username = publishInputs.get("kafka_username"); + Map<String, Object> kafka_password = publishInputs.get("kafka_password"); assertNotNull(kafka_bootstrap_servers); assertNotNull(kafka_username); @@ -73,10 +72,10 @@ public class KafkaStreamServiceTest { @Test public void createCorrectStreamPublishInput() { - Map<String, LinkedHashMap<String, Object>> publishInputs = kafkaStreamService + Map<String, Map<String, Object>> publishInputs = kafkaStreamService .createStreamPublishInputs(TEST_STREAM_NAME); - LinkedHashMap<String, Object> kafka_stream_name = publishInputs.get(TEST_STREAM_NAME + PUBLISH_URL_SUFFIX); + Map<String, Object> kafka_stream_name = publishInputs.get(TEST_STREAM_NAME + PUBLISH_URL_SUFFIX); assertNotNull(kafka_stream_name); @@ -85,10 +84,10 @@ public class KafkaStreamServiceTest { @Test public void createCorrectStreamSubscribeInput() { - Map<String, LinkedHashMap<String, Object>> publishInputs = kafkaStreamService + Map<String, Map<String, Object>> publishInputs = kafkaStreamService .createStreamSubscribeInputs(TEST_STREAM_NAME); - LinkedHashMap<String, Object> kafka_stream_name = publishInputs.get(TEST_STREAM_NAME + SUBSCRIBE_URL_SUFFIX); + Map<String, Object> kafka_stream_name = publishInputs.get(TEST_STREAM_NAME + SUBSCRIBE_URL_SUFFIX); assertNotNull(kafka_stream_name); diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/ExternalCertificateParametersFactoryServiceTest.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/ExternalCertificateParametersFactoryServiceTest.java index 718ea4a..85563d8 100644 --- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/ExternalCertificateParametersFactoryServiceTest.java +++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/ExternalCertificateParametersFactoryServiceTest.java @@ -1,7 +1,7 @@ /*============LICENSE_START======================================================= org.onap.dcae ================================================================================ -Copyright (c) 2020 Nokia Intellectual Property. All rights reserved. +Copyright (c) 2020-2021 Nokia Intellectual Property. All rights reserved. Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,7 +26,6 @@ import org.onap.blueprintgenerator.service.common.ExternalCertificateParametersF import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import java.util.LinkedHashMap; import java.util.Map; import static org.junit.Assert.assertEquals; @@ -65,7 +64,7 @@ public class ExternalCertificateParametersFactoryServiceTest extends BlueprintGe @Test public void shouldCreateCorrectInputListWithDefaultValuesTakenFromComponentSpec() { - Map<String, LinkedHashMap<String, Object>> result = + Map<String, Map<String, Object>> result = externalCertificateParametersFactoryService.createInputList(); assertEquals( Constants.DEFAULT_COMMON_NAME, result.get(PREFIXED_COMMON_NAME_FIELD).get(DEFAULT)); diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapBlueprintCreatorServiceTest.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapBlueprintCreatorServiceTest.java index 866a324..0862191 100644 --- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapBlueprintCreatorServiceTest.java +++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapBlueprintCreatorServiceTest.java @@ -4,7 +4,7 @@ * * org.onap.dcae * * ================================================================================ * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. - * * Copyright (c) 2020 Nokia. All rights reserved. + * * Copyright (c) 2020-2021 Nokia. 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. @@ -30,7 +30,6 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; import java.nio.file.Paths; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import org.junit.Test; @@ -82,7 +81,7 @@ public class OnapBlueprintCreatorServiceTest extends BlueprintGeneratorTests { "Service Name Override K8s", onapBlueprint, Constants.TOSCA_DEF_VERSION); onapTestUtils.verifyBpImports("Service Name Override K8s", onapBlueprint, false); - Map<String, LinkedHashMap<String, Object>> k8sBpInputs = onapBlueprint.getInputs(); + Map<String, Map<String, Object>> k8sBpInputs = onapBlueprint.getInputs(); assertNotNull("Service Name Override K8s Blueprint Inputs Section is NULL", k8sBpInputs); assertTrue( "Service Name Override K8s Blueprint Inputs Section is Empty", k8sBpInputs.size() > 0); @@ -92,7 +91,7 @@ public class OnapBlueprintCreatorServiceTest extends BlueprintGeneratorTests { + Constants.ONAP_INPUT_CPU_LIMIT + " Default is not matching", k8sBpInputs.get(Constants.ONAP_INPUT_CPU_LIMIT).get("default"), - Constants.ONAP_DEFAULT250m); + Constants.ONAP_DEFAULT250M); assertEquals( "Service Name Override K8s Blueprint:Inputs " + Constants.SERVICE_COMPONENT_NAME_OVERRIDE @@ -119,7 +118,7 @@ public class OnapBlueprintCreatorServiceTest extends BlueprintGeneratorTests { "Service Name Override K8s Blueprint Node Templates:Properties Section is NULL", k8sBpNodeTemplateProperties); - Map<String, LinkedHashMap<String, Object>> bpInputs = onapBlueprint.getInputs(); + Map<String, Map<String, Object>> bpInputs = onapBlueprint.getInputs(); onapTestUtils .verifyArtifacts("Service Name Override K8s", onapComponentSpec, bpInputs, "o"); @@ -173,7 +172,7 @@ public class OnapBlueprintCreatorServiceTest extends BlueprintGeneratorTests { onapTestUtils.verifyBpImportsFromFile( "Service Name Override with Import File K8s", onapBlueprint, input.getImportPath()); - Map<String, LinkedHashMap<String, Object>> k8sBpInputs = onapBlueprint.getInputs(); + Map<String, Map<String, Object>> k8sBpInputs = onapBlueprint.getInputs(); assertNotNull( "Service Name Override with Import File K8s Blueprint Inputs Section is NULL", k8sBpInputs); @@ -186,7 +185,7 @@ public class OnapBlueprintCreatorServiceTest extends BlueprintGeneratorTests { + Constants.ONAP_INPUT_CPU_LIMIT + " Default is not matching", k8sBpInputs.get(Constants.ONAP_INPUT_CPU_LIMIT).get("default"), - Constants.ONAP_DEFAULT250m); + Constants.ONAP_DEFAULT250M); assertEquals( "Service Name Override with Import File K8s Blueprint:Inputs " + Constants.SERVICE_COMPONENT_NAME_OVERRIDE @@ -213,7 +212,7 @@ public class OnapBlueprintCreatorServiceTest extends BlueprintGeneratorTests { "Service Name Override with Import File K8s Blueprint Node Templates:Properties Section is NULL", k8sBpNodeTemplateProperties); - Map<String, LinkedHashMap<String, Object>> bpInputs = onapBlueprint.getInputs(); + Map<String, Map<String, Object>> bpInputs = onapBlueprint.getInputs(); onapTestUtils.verifyArtifacts( "Service Name Override with Import File K8s", onapComponentSpec, bpInputs, "o"); @@ -300,7 +299,7 @@ public class OnapBlueprintCreatorServiceTest extends BlueprintGeneratorTests { onapTestUtils .verifyToscaDefVersion("DMAAP K8s", onapBlueprint, Constants.TOSCA_DEF_VERSION); - Map<String, LinkedHashMap<String, Object>> k8sBpInputs = onapBlueprint.getInputs(); + Map<String, Map<String, Object>> k8sBpInputs = onapBlueprint.getInputs(); assertNotNull("DMAAP K8s Blueprint Inputs Section is NULL", k8sBpInputs); assertTrue("DMAAP K8s Blueprint Inputs Section is Empty", k8sBpInputs.size() > 0); @@ -308,7 +307,7 @@ public class OnapBlueprintCreatorServiceTest extends BlueprintGeneratorTests { "DMAAP K8s Blueprint:Inputs " + Constants.ONAP_INPUT_CPU_LIMIT + " Default is not matching", k8sBpInputs.get(Constants.ONAP_INPUT_CPU_LIMIT).get("default"), - Constants.ONAP_DEFAULT250m); + Constants.ONAP_DEFAULT250M); assertEquals( "DMAAP K8s Blueprint:Inputs " + Constants.SERVICE_COMPONENT_NAME_OVERRIDE @@ -385,7 +384,7 @@ public class OnapBlueprintCreatorServiceTest extends BlueprintGeneratorTests { onapTestUtils.verifyBpImportsFromFile( "DMAAP with Import File K8s", onapBlueprint, input.getImportPath()); - Map<String, LinkedHashMap<String, Object>> k8sBpInputs = onapBlueprint.getInputs(); + Map<String, Map<String, Object>> k8sBpInputs = onapBlueprint.getInputs(); assertNotNull("DMAAP with Import File K8s Blueprint Inputs Section is NULL", k8sBpInputs); assertTrue( "DMAAP with Import File K8s Blueprint Inputs Section is Empty", k8sBpInputs.size() > 0); @@ -395,7 +394,7 @@ public class OnapBlueprintCreatorServiceTest extends BlueprintGeneratorTests { + Constants.ONAP_INPUT_CPU_LIMIT + " Default is not matching", k8sBpInputs.get(Constants.ONAP_INPUT_CPU_LIMIT).get("default"), - Constants.ONAP_DEFAULT250m); + Constants.ONAP_DEFAULT250M); assertEquals( "DMAAP with Import File K8s Blueprint:Inputs " + Constants.SERVICE_COMPONENT_NAME_OVERRIDE diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapTestUtils.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapTestUtils.java index 4b37ed8..e4abeaa 100644 --- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapTestUtils.java +++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapTestUtils.java @@ -46,7 +46,6 @@ import org.springframework.stereotype.Component; import java.io.File; import java.io.IOException; import java.util.Arrays; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -384,7 +383,7 @@ public class OnapTestUtils extends BlueprintGeneratorTests { public void verifyArtifacts( String type, OnapComponentSpec onapComponentSpec, - Map<String, LinkedHashMap<String, Object>> inputs, + Map<String, Map<String, Object>> inputs, String bptype) { Artifacts[] csArtifacts = onapComponentSpec.getArtifacts(); assertNotNull(type + " ComponentSpec Artifacts Section is NULL", csArtifacts); diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/TlsInfoTest.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/TlsInfoTest.java index 433240f..4d23aa5 100644 --- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/TlsInfoTest.java +++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/TlsInfoTest.java @@ -1,7 +1,7 @@ /*============LICENSE_START======================================================= org.onap.dcae ================================================================================ -Copyright (c) 2020 Nokia. All rights reserved. +Copyright (c) 2020-2021 Nokia. All rights reserved. Copyright (c) 2020 AT&T. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,6 +20,7 @@ limitations under the License. package org.onap.blueprintgenerator.test; +import java.util.Map; import org.junit.Test; import org.junit.runners.Parameterized; import org.onap.blueprintgenerator.model.common.Input; @@ -31,7 +32,6 @@ import org.onap.blueprintgenerator.model.dmaap.TlsInfo; import java.nio.file.Paths; import java.util.Arrays; -import java.util.LinkedHashMap; import java.util.List; import static org.junit.Assert.assertEquals; @@ -43,7 +43,6 @@ import static org.junit.Assert.assertNull; * Test Case for Tls Info * */ -// @RunWith(Parameterized.class) public class TlsInfoTest extends BlueprintGeneratorTests { @Parameterized.Parameter @@ -201,7 +200,7 @@ public class TlsInfoTest extends BlueprintGeneratorTests { private void assertContainsInputWithDefault( OnapBlueprint bp, String inputName, Object defaultValue) { - LinkedHashMap<String, Object> input = bp.getInputs().get(inputName); + Map<String, Object> input = bp.getInputs().get(inputName); assertNotNull(input); assertEquals(defaultValue, input.get("default")); } |