1 files changed, 73 insertions, 54 deletions

diff --git a/src/test/java/org/onap/dcae/RestApiCallNodeUtilTest.java b/src/test/java/org/onap/dcae/RestApiCallNodeUtilTest.java
index 723ffea..477975c 100644
--- a/src/test/java/org/onap/dcae/RestApiCallNodeUtilTest.java
+++ b/src/test/java/org/onap/dcae/RestApiCallNodeUtilTest.java
@@ -20,17 +20,20 @@
 
 package org.onap.dcae;
 
-import org.junit.Test;
-import org.onap.dcae.common.*;
+import static org.junit.Assert.assertEquals;
 
+
+import java.util.HashMap;
+import java.util.Map;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
-import java.util.*;
-import java.util.Map;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import org.junit.Test;
+import org.onap.dcae.common.AuthType;
+import org.onap.dcae.common.Constants;
+import org.onap.dcae.common.Parameters;
+import org.onap.dcae.common.RestapiCallNodeUtil;
+
 
 /**
  * Created by koblosz on 07.06.18.
@@ -69,12 +72,14 @@ public class RestApiCallNodeUtilTest {
         String trustPassword = "admin";
         paraMap.put(Constants.KSETTING_TRUST_STORE_PASSWORD, trustPassword);
         paraMap.put(Constants.KSETTING_KEY_STORE_FILENAME, null);
-        String KeyPassword = "admin";
-        paraMap.put(Constants.KSETTING_KEY_STORE_PASSWD, KeyPassword);
+        String keyPassword = "admin";
+        paraMap.put(Constants.KSETTING_KEY_STORE_PASSWD, keyPassword);
         try {
-            Parameters p = RestapiCallNodeUtil.getParameters(paraMap);
-            assertEquals(p.contentType, "application/json");
-        } catch (Exception e) {}
+            Parameters parameters = RestapiCallNodeUtil.getParameters(paraMap);
+            assertEquals(parameters.contentType, "application/json");
+        } catch (Exception e) {
+            System.out.println("Exception " + e);
+        }
 
     }
 
@@ -82,7 +87,11 @@ public class RestApiCallNodeUtilTest {
     public void parseComplexParam() {
         Map<String, String> paraMap = new HashMap<>();
         paraMap.put(Constants.KDEFAULT_TEMP_FILENAME, null);
-        paraMap.put(Constants.KSETTING_REST_API_URL, "https://sonar.onap.org/component_measures?id=org.onap.dcaegen2.collectors.restconf%3Arestconfcollector&metric=coverage&selected=org.onap.dcaegen2.collectors.restconf%3Arestconfcollector%3Asrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdcae%2Fcommon%2FRestapiCallNodeUtil.java");
+        paraMap.put(Constants.KSETTING_REST_API_URL,
+                "https://sonar.onap.org/component_measures?id=org.onap.dcaegen2.collectors."
+                        + "restconf%3Arestconfcollector&metric=coverage&selected=org.onap.dcaegen2.collectors"
+                        + ".restconf%3Arestconfcollector%3Asrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdcae%2Fcommon%2F"
+                        + "RestapiCallNodeUtil.java");
         paraMap.put(Constants.KSETTING_HTTP_METHOD, "post");
         paraMap.put(Constants.KSETTING_RESP_PREFIX, "responsePrefix");
         paraMap.put(Constants.KSETTING_SKIP_SENDING, "false");
@@ -109,21 +118,25 @@ public class RestApiCallNodeUtilTest {
         String trustPassword = "admin";
         paraMap.put(Constants.KSETTING_TRUST_STORE_PASSWORD, trustPassword);
         paraMap.put(Constants.KSETTING_KEY_STORE_FILENAME, null);
-        String KeyPassword = "admin";
-        paraMap.put(Constants.KSETTING_KEY_STORE_PASSWD, KeyPassword);
+        String keyPassword = "admin";
+        paraMap.put(Constants.KSETTING_KEY_STORE_PASSWD, keyPassword);
         try {
-            Parameters p = RestapiCallNodeUtil.getParameters(paraMap);
-            assertEquals(p.contentType, "application/json");
-        } catch (Exception e) {}
+            Parameters parameters = RestapiCallNodeUtil.getParameters(paraMap);
+            assertEquals(parameters.contentType, "application/json");
+        } catch (Exception e) {
+            System.out.println("Exception " + e);
+        }
     }
 
     @Test
     public void parseinValidUrl() {
         Map<String, String> paraMap = new HashMap<>();
-        paraMap.put(Constants.KSETTING_REST_API_URL, "");
+        paraMap.put(Constants.KSETTING_REST_API_URL, "$$$");
         try {
-            Parameters p = RestapiCallNodeUtil.getParameters(paraMap);
-        } catch (Exception e) {}
+            Parameters parameters = RestapiCallNodeUtil.getParameters(paraMap);
+        } catch (Exception e) {
+            System.out.println("Exception " + e);
+        }
     }
 
     @Test
@@ -158,47 +171,53 @@ public class RestApiCallNodeUtilTest {
         String trustPassword = "admin";
         paraMap.put(Constants.KSETTING_TRUST_STORE_PASSWORD, trustPassword);
         paraMap.put(Constants.KSETTING_KEY_STORE_FILENAME, null);
-        String KeyPassword = "admin";
-        paraMap.put(Constants.KSETTING_KEY_STORE_PASSWD, KeyPassword);
+        String keyPassword = "admin";
+        paraMap.put(Constants.KSETTING_KEY_STORE_PASSWD, keyPassword);
 
 
         Client client = ClientBuilder.newBuilder().build();
         try {
-            Parameters p = RestapiCallNodeUtil.getParameters(paraMap);
-            p.restapiUser = "restapiUser";
-            p.restapiPassword = "restapiPassword";
-            RestapiCallNodeUtil.addAuthType(client, p);
-
-            p.restapiUser = null;
-            p.restapiPassword = null;
-            p.oAuthConsumerKey = "restapiUser";
-            p.oAuthSignatureMethod = "restapiPassword";
-            p.oAuthConsumerSecret = "someval";
-            RestapiCallNodeUtil.addAuthType(client, p);
-
-            p.authtype = AuthType.DIGEST;
-            p.restapiUser = "restapiUser";
-            p.restapiPassword = "restapiPassword";
-            RestapiCallNodeUtil.addAuthType(client, p);
-        } catch (Exception e) {}
+            Parameters parameters = RestapiCallNodeUtil.getParameters(paraMap);
+            parameters.restapiUser = "restapiUser";
+            parameters.restapiPassword = "restapiPassword";
+            RestapiCallNodeUtil.addAuthType(client, parameters);
+
+            parameters.restapiUser = null;
+            parameters.restapiPassword = null;
+            parameters.oAuthConsumerKey = "restapiUser";
+            parameters.oAuthSignatureMethod = "restapiPassword";
+            parameters.oAuthConsumerSecret = "someval";
+            RestapiCallNodeUtil.addAuthType(client, parameters);
+
+            parameters.authtype = AuthType.DIGEST;
+            parameters.restapiUser = "restapiUser";
+            parameters.restapiPassword = "restapiPassword";
+            RestapiCallNodeUtil.addAuthType(client, parameters);
+        } catch (Exception e) {
+            System.out.println("Exception " + e);
+        }
 
         try {
-            Parameters p = RestapiCallNodeUtil.getParameters(paraMap);
-            p.authtype = AuthType.BASIC;
-            p.restapiUser = "restapiUser";
-            p.restapiPassword = "restapiPassword";
-            RestapiCallNodeUtil.addAuthType(client, p);
+            Parameters parameters = RestapiCallNodeUtil.getParameters(paraMap);
+            parameters.authtype = AuthType.BASIC;
+            parameters.restapiUser = "restapiUser";
+            parameters.restapiPassword = "restapiPassword";
+            RestapiCallNodeUtil.addAuthType(client, parameters);
 
-        } catch (Exception e) {}
+        } catch (Exception e) {
+            System.out.println("Exception " + e);
+        }
 
         try {
-            Parameters p = RestapiCallNodeUtil.getParameters(paraMap);
-            p.authtype = AuthType.OAUTH;
-            p.oAuthConsumerKey = "restapiUser";
-            p.oAuthSignatureMethod = "restapiPassword";
-            p.oAuthConsumerSecret = "someval";
-            RestapiCallNodeUtil.addAuthType(client, p);
-
-        } catch (Exception e) {}
+            Parameters parameters = RestapiCallNodeUtil.getParameters(paraMap);
+            parameters.authtype = AuthType.OAUTH;
+            parameters.oAuthConsumerKey = "restapiUser";
+            parameters.oAuthSignatureMethod = "restapiPassword";
+            parameters.oAuthConsumerSecret = "someval";
+            RestapiCallNodeUtil.addAuthType(client, parameters);
+
+        } catch (Exception e) {
+            System.out.println("Exception " + e);
+        }
     }
 }
\ No newline at end of file