From 423a91b62f381167bf7852c4ac987b96ba06f35c Mon Sep 17 00:00:00 2001 From: Joss Armstrong Date: Tue, 26 Feb 2019 09:05:11 +0000 Subject: Test coverage for CCAActivator Increased coverage from 0% to 93% Issue-ID: APPC-1497 Change-Id: Ie78ac50a08b47cac9bedb9d34b089ac3ad23ab22 Signed-off-by: Joss Armstrong --- .../java/org/onap/appc/ccadaptor/CCAActivator.java | 15 +++++----- .../onap/appc/ccadaptor/CcAdaptorConstants.java | 34 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CcAdaptorConstants.java (limited to 'appc-config/appc-config-adaptor/provider/src/main') diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java index 6815b4c01..6cb72b66f 100644 --- a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java +++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java @@ -5,6 +5,8 @@ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Copyright (C) 2017 Amdocs + * ================================================================================ + * Modifications Copyright (C) 2019 Ericsson * ============================================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,9 +39,6 @@ import org.osgi.framework.ServiceRegistration; public class CCAActivator implements BundleActivator { - private static final String CCA_PROP_FILE_VAR = "SDNC_CCA_PROPERTIES"; - private static final String APPC_CONFIG_DIR_VAR = "APPC_CONFIG_DIR"; - @SuppressWarnings("rawtypes") private ServiceRegistration registration = null; @@ -52,16 +51,18 @@ public class CCAActivator implements BundleActivator Properties props = new Properties(); // Read properties from appc-config-adaptor.properties - String propFileName = System.getenv(CCA_PROP_FILE_VAR); + String propFileName = CcAdaptorConstants.getEnvironmentVariable(CcAdaptorConstants.CCA_PROP_FILE_VAR); if (propFileName == null) { - String propDir = System.getenv(APPC_CONFIG_DIR_VAR); + String propDir = CcAdaptorConstants.getEnvironmentVariable(CcAdaptorConstants.APPC_CONFIG_DIR_VAR); if (propDir == null) throw new ConfigurationException( - "Cannot find config file - " + CCA_PROP_FILE_VAR + " and " + APPC_CONFIG_DIR_VAR + " unset"); + "Cannot find config file - " + CcAdaptorConstants.CCA_PROP_FILE_VAR + " and " + + CcAdaptorConstants.APPC_CONFIG_DIR_VAR + " unset"); propFileName = propDir + "/appc-config-adaptor.properties"; - log.warn("Environment variable " + CCA_PROP_FILE_VAR + " unset - defaulting to " + propFileName); + log.warn("Environment variable " + CcAdaptorConstants.CCA_PROP_FILE_VAR + " unset - defaulting to " + + propFileName); } File propFile = new File(propFileName); diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CcAdaptorConstants.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CcAdaptorConstants.java new file mode 100644 index 000000000..af6dede6d --- /dev/null +++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CcAdaptorConstants.java @@ -0,0 +1,34 @@ +/* + * ============LICENSE_START======================================================= + * ONAP : APPC + * ================================================================================ + * Copyright (C) 2019 Ericsson + * ================================================================================ + * 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.appc.ccadaptor; + +public class CcAdaptorConstants { + + public static final String CCA_PROP_FILE_VAR = "SDNC_CCA_PROPERTIES"; + public static final String APPC_CONFIG_DIR_VAR = "APPC_CONFIG_DIR"; + + private CcAdaptorConstants() {} + + public static String getEnvironmentVariable(String env) { + return System.getenv(env); + } +} -- cgit 1.2.3-korg