Added test cases for DME2 Client

Increased the coverage from 0% to 90%

Issue-ID: APPC-1395
Change-Id: I9651ab4326e500559e5bd9b99abdff84d93cfa1d
Signed-off-by: Lathishbabu Ganesan <lathishbabu.ganesan@ericsson.com>

2 files changed, 26 insertions, 12 deletions

diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/dme2client/Dme2Client.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/dme2client/Dme2Client.java
index b6c35e505..51bd9c1e3 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/dme2client/Dme2Client.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/dme2client/Dme2Client.java
@@ -6,6 +6,8 @@
  * ================================================================================
  * 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.
  * You may obtain a copy of the License at
@@ -23,15 +25,6 @@
 
 package org.onap.appc.instar.dme2client;
 
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.config.DefaultClientConfig;
-import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter;
-import com.sun.jersey.client.urlconnection.HTTPSProperties;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -45,6 +38,14 @@ import javax.ws.rs.core.MediaType;
 import org.apache.commons.io.IOUtils;
 import org.onap.appc.instar.utils.InstarClientConstant;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.config.DefaultClientConfig;
+import com.sun.jersey.api.client.filter.HTTPBasicAuthFilter;
+import com.sun.jersey.client.urlconnection.HTTPSProperties;
 
 public class Dme2Client {
 
@@ -64,12 +65,12 @@ public class Dme2Client {
             this.ipAddress = data.get("ipAddress");
             this.mask = data.get("mask");
         }
-        String propDir = System.getenv(SDNC_CONFIG_DIR_VAR);
+        String propDir = InstarClientConstant.getEnvironmentVariable(SDNC_CONFIG_DIR_VAR);
         if (propDir == null) {
             throw new IOException("Cannot find Property file -" + SDNC_CONFIG_DIR_VAR);
         }
         String propFile = propDir + InstarClientConstant.OUTBOUND_PROPERTIES;
-        InputStream propStream = new FileInputStream(propFile);
+        InputStream propStream = InstarClientConstant.getInputStream(propFile);
         try {
             properties.load(propStream);
         } catch (Exception e) {
@@ -117,7 +118,6 @@ public class Dme2Client {
                 .put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES, new HTTPSProperties(getHostnameVerifier(), sslContext));
             client = Client.create(defaultClientConfig);
             client.addFilter(new HTTPBasicAuthFilter(userId, password));
-
             webResource = client.resource(new URI(resourceUri));
             webResource.setProperty("Content-Type", "application/json;charset=UTF-8");
 
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/utils/InstarClientConstant.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/utils/InstarClientConstant.java
index 713d2ae47..da3672843 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/utils/InstarClientConstant.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/utils/InstarClientConstant.java
@@ -6,6 +6,8 @@
  * ================================================================================
  * 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.
  * You may obtain a copy of the License at
@@ -23,6 +25,10 @@
 
 package org.onap.appc.instar.utils;
 
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+
 public class InstarClientConstant {
 
     public static final String INPUT_PARAM_RESPONSE_PRIFIX = "responsePrefix";
@@ -74,5 +80,13 @@ public class InstarClientConstant {
     public static final String OUTBOUND_PROPERTIES = "/outbound.properties";
 
     private InstarClientConstant() {}
+    
+    public static String getEnvironmentVariable(String env) {
+      return System.getenv(env);
+    }
+    
+    public static InputStream getInputStream(String file) throws FileNotFoundException {
+      return new FileInputStream(file);
+    }
 }