From 1c13230d8c329c023a3ae244b42801686bca70f9 Mon Sep 17 00:00:00 2001 From: Kai Date: Fri, 21 Feb 2020 12:19:37 +0800 Subject: [PATCH] unit test for tca-gen2 Issue-ID: DCAEGEN2-1900 Signed-off-by: Kai Lu Change-Id: I55c1e45a77e3ee647b94f030349c2f29940cb5f6 --- .../dcae/analytics/model/DmaapMrConstants.java | 2 +- .../ConfigBindingServiceConstants.java | 11 +---- .../dcae/analytics/tca/web/TcaAppProperties.java | 4 +- ...caAppPropsToAaiRestClientPrefsFunctionTest.java | 48 ++++++++++++++++++++++ .../TcaAppPropsToMrPublisherPrefsFunctionTest.java | 48 ++++++++++++++++++++++ ...TcaAppPropsToMrSubscriberPrefsFunctionTest.java | 48 ++++++++++++++++++++++ 6 files changed, 149 insertions(+), 12 deletions(-) create mode 100644 dcae-analytics/dcae-analytics-tca-web/src/test/java/org/onap/dcae/analytics/tca/web/util/function/TcaAppPropsToAaiRestClientPrefsFunctionTest.java create mode 100644 dcae-analytics/dcae-analytics-tca-web/src/test/java/org/onap/dcae/analytics/tca/web/util/function/TcaAppPropsToMrPublisherPrefsFunctionTest.java create mode 100644 dcae-analytics/dcae-analytics-tca-web/src/test/java/org/onap/dcae/analytics/tca/web/util/function/TcaAppPropsToMrSubscriberPrefsFunctionTest.java diff --git a/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/DmaapMrConstants.java b/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/DmaapMrConstants.java index 1171f44..26f2210 100644 --- a/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/DmaapMrConstants.java +++ b/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/DmaapMrConstants.java @@ -64,7 +64,7 @@ public abstract class DmaapMrConstants { public static final String DMAAP_MR_SUBSCRIBER_OUTPUT_MESSAGE_STORE_GROUP_ID = "mrSubscriberMessageStoreGroup"; public static final String DMAAP_MR_PUBLISHER_RECOVERY_MESSAGE_STORE_GROUP_ID = "mrPublisherRecoveryStoreGroup"; - public DmaapMrConstants() { + private DmaapMrConstants() { // private constructor } } diff --git a/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/configbindingservice/ConfigBindingServiceConstants.java b/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/configbindingservice/ConfigBindingServiceConstants.java index 0267f5b..7384e97 100644 --- a/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/configbindingservice/ConfigBindingServiceConstants.java +++ b/dcae-analytics/dcae-analytics-model/src/main/java/org/onap/dcae/analytics/model/configbindingservice/ConfigBindingServiceConstants.java @@ -34,16 +34,9 @@ public abstract class ConfigBindingServiceConstants { // ================== CONFIG SERVICE CONSTANTS ============================== // public static final String CONSUL_HOST_ENV_VARIABLE_KEY = "CONSUL_HOST"; - public static final Integer DEFAULT_CONSUL_PORT_ENV_VARIABLE_VALUE = 8500; - public static final String CONSUL_HOST_ENV_VARIABLE_VALUE = System.getenv(CONSUL_HOST_ENV_VARIABLE_KEY); public static final String CONFIG_BINDING_SERVICE_ENV_VARIABLE_KEY = "CONFIG_BINDING_SERVICE"; - public static final String CONFIG_BINDING_SERVICE_ENV_VARIABLE_VALUE = - System.getenv(CONFIG_BINDING_SERVICE_ENV_VARIABLE_KEY); public static final String SERVICE_NAME_ENV_VARIABLE_KEY = "HOSTNAME"; public static final String SERVICE_NAME_ENV_VARIABLE_VALUE = System.getenv(SERVICE_NAME_ENV_VARIABLE_KEY); - public static final String CONSUL_QUERY_URL_STRING = String.format("http://%s:8500/v1/catalog/service/%s", - CONSUL_HOST_ENV_VARIABLE_VALUE, CONFIG_BINDING_SERVICE_ENV_VARIABLE_VALUE); - public static final String CONFIG_SERVICE_QUERY_URL_STRING = "http://%s:%s/service_component/%s"; public static final String ENV_CBS_PORT = "CONFIG_BINDING_SERVICE_SERVICE_PORT"; public static final String CONFIG_BINDING_SERVICE_PROPERTIES_KEY = "config-binding-service"; @@ -58,8 +51,8 @@ public abstract class ConfigBindingServiceConstants { public static final String POLICY = "config-binding-service.tca.policy"; public static final String PROCESSINGBATCHSIZE = "config-binding-service.tca.processing_batch_size"; public static final String ENABLEABATEMENT = "config-binding-service.tca.enable_abatement"; - public static final String EnableEcompLogging = "config-binding-service.tca.enable_ecomp_logging"; - public static final String EnableEnrichment = "config-binding-service.tca.aai.enable_enrichment"; + public static final String ENABLEECOMPLOGGING = "config-binding-service.tca.enable_ecomp_logging"; + public static final String ENABLEENRICHMENT = "config-binding-service.tca.aai.enable_enrichment"; public static final String AAIURL = "config-binding-service.tca.aai.url"; public static final String AAIUSERNAME = "config-binding-service.tca.aai.username"; public static final String AAIPASSWORD = "config-binding-service.tca.aai.password"; diff --git a/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java b/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java index 63fd2f6..2698d9b 100644 --- a/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java +++ b/dcae-analytics/dcae-analytics-tca-web/src/main/java/org/onap/dcae/analytics/tca/web/TcaAppProperties.java @@ -81,10 +81,10 @@ public class TcaAppProperties extends BaseConfigBindingServiceProperties { tca.setPolicy(environment.getProperty(ConfigBindingServiceConstants.POLICY)); tca.setProcessingBatchSize(environment.getProperty(ConfigBindingServiceConstants.PROCESSINGBATCHSIZE, Integer.class)); tca.setEnableAbatement(environment.getProperty(ConfigBindingServiceConstants.ENABLEABATEMENT, Boolean.class)); - tca.setEnableEcompLogging(environment.getProperty(ConfigBindingServiceConstants.EnableEcompLogging, Boolean.class)); + tca.setEnableEcompLogging(environment.getProperty(ConfigBindingServiceConstants.ENABLEECOMPLOGGING, Boolean.class)); Aai aai = tca.getAai(); - aai.setEnableEnrichment(environment.getProperty(ConfigBindingServiceConstants.EnableEnrichment, Boolean.class)); + aai.setEnableEnrichment(environment.getProperty(ConfigBindingServiceConstants.ENABLEENRICHMENT, Boolean.class)); aai.setUrl(environment.getProperty(ConfigBindingServiceConstants.AAIURL)); aai.setUsername(environment.getProperty(ConfigBindingServiceConstants.AAIUSERNAME)); aai.setPassword(environment.getProperty(ConfigBindingServiceConstants.AAIPASSWORD)); diff --git a/dcae-analytics/dcae-analytics-tca-web/src/test/java/org/onap/dcae/analytics/tca/web/util/function/TcaAppPropsToAaiRestClientPrefsFunctionTest.java b/dcae-analytics/dcae-analytics-tca-web/src/test/java/org/onap/dcae/analytics/tca/web/util/function/TcaAppPropsToAaiRestClientPrefsFunctionTest.java new file mode 100644 index 0000000..1993bdb --- /dev/null +++ b/dcae-analytics/dcae-analytics-tca-web/src/test/java/org/onap/dcae/analytics/tca/web/util/function/TcaAppPropsToAaiRestClientPrefsFunctionTest.java @@ -0,0 +1,48 @@ +/* + * ================================================================================ + * Copyright (c) 2020 China Mobile. 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.dcae.analytics.tca.web.util.function; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.onap.dcae.analytics.model.AnalyticsProfile; +import org.onap.dcae.analytics.tca.web.TcaAppProperties; +import org.onap.dcae.analytics.tca.web.aai.TcaAaiRestClientPreferences; +import org.onap.dcae.analytics.test.BaseAnalyticsSpringBootIT; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; +import org.springframework.test.context.ActiveProfiles; + +/** + * @author Kai Lu + */ +@ActiveProfiles({AnalyticsProfile.DEV_PROFILE_NAME}) +public class TcaAppPropsToAaiRestClientPrefsFunctionTest extends BaseAnalyticsSpringBootIT { + + @Autowired + Environment environment; + + @Test + void TestTcaAppPropsToAaiRestClientPrefsFunction() { + TcaAppProperties properties = new TcaAppProperties(environment); + TcaAppPropsToAaiRestClientPrefsFunction validate = new TcaAppPropsToAaiRestClientPrefsFunction(); + TcaAaiRestClientPreferences tcaAaiRestClientPreferences = validate.apply(properties); + Assertions.assertEquals("aai-rest-client", tcaAaiRestClientPreferences.getHttpClientId()); + } + +} diff --git a/dcae-analytics/dcae-analytics-tca-web/src/test/java/org/onap/dcae/analytics/tca/web/util/function/TcaAppPropsToMrPublisherPrefsFunctionTest.java b/dcae-analytics/dcae-analytics-tca-web/src/test/java/org/onap/dcae/analytics/tca/web/util/function/TcaAppPropsToMrPublisherPrefsFunctionTest.java new file mode 100644 index 0000000..bfd92b5 --- /dev/null +++ b/dcae-analytics/dcae-analytics-tca-web/src/test/java/org/onap/dcae/analytics/tca/web/util/function/TcaAppPropsToMrPublisherPrefsFunctionTest.java @@ -0,0 +1,48 @@ +/* + * ================================================================================ + * Copyright (c) 2020 China Mobile. 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.dcae.analytics.tca.web.util.function; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.onap.dcae.analytics.model.AnalyticsProfile; +import org.onap.dcae.analytics.tca.web.TcaAppProperties; +import org.onap.dcae.analytics.test.BaseAnalyticsSpringBootIT; +import org.onap.dcae.analytics.web.dmaap.MrPublisherPreferences; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; +import org.springframework.test.context.ActiveProfiles; + +/** + * @author Kai Lu + */ +@ActiveProfiles({AnalyticsProfile.DEV_PROFILE_NAME}) +public class TcaAppPropsToMrPublisherPrefsFunctionTest extends BaseAnalyticsSpringBootIT { + + @Autowired + Environment environment; + + @Test + void TestTcaAppPropsToMrPublisherPrefsFunction() { + TcaAppProperties properties = new TcaAppProperties(environment); + TcaAppPropsToMrPublisherPrefsFunction validate = new TcaAppPropsToMrPublisherPrefsFunction(); + MrPublisherPreferences mrPublisherPreferences = validate.apply(properties); + Assertions.assertEquals("http://localhost:8080/events/PubTopic", mrPublisherPreferences.getRequestURL()); + } + +} diff --git a/dcae-analytics/dcae-analytics-tca-web/src/test/java/org/onap/dcae/analytics/tca/web/util/function/TcaAppPropsToMrSubscriberPrefsFunctionTest.java b/dcae-analytics/dcae-analytics-tca-web/src/test/java/org/onap/dcae/analytics/tca/web/util/function/TcaAppPropsToMrSubscriberPrefsFunctionTest.java new file mode 100644 index 0000000..71b8014 --- /dev/null +++ b/dcae-analytics/dcae-analytics-tca-web/src/test/java/org/onap/dcae/analytics/tca/web/util/function/TcaAppPropsToMrSubscriberPrefsFunctionTest.java @@ -0,0 +1,48 @@ +/* + * ================================================================================ + * Copyright (c) 2020 China Mobile. 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.dcae.analytics.tca.web.util.function; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.onap.dcae.analytics.model.AnalyticsProfile; +import org.onap.dcae.analytics.tca.web.TcaAppProperties; +import org.onap.dcae.analytics.test.BaseAnalyticsSpringBootIT; +import org.onap.dcae.analytics.web.dmaap.MrSubscriberPreferences; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; +import org.springframework.test.context.ActiveProfiles; + +/** + * @author Kai Lu + */ +@ActiveProfiles({AnalyticsProfile.DEV_PROFILE_NAME}) +public class TcaAppPropsToMrSubscriberPrefsFunctionTest extends BaseAnalyticsSpringBootIT { + + @Autowired + Environment environment; + + @Test + void TestTcaAppPropsToMrPublisherPrefsFunction() { + TcaAppProperties properties = new TcaAppProperties(environment); + TcaAppPropsToMrSubscriberPrefsFunction validate = new TcaAppPropsToMrSubscriberPrefsFunction(); + MrSubscriberPreferences mrSubscriberPreferences = validate.apply(properties); + Assertions.assertEquals("http://localhost:8080/events/SubTopic", mrSubscriberPreferences.getRequestURL()); + } + +} -- 2.16.6