Issue-ID: DCAEGEN2-1055 RestConfCollector UnitTest

Change-Id: I513ddb61d710f12ab3ccc6fca2329f3f74b4e39c
Signed-off-by: s00370346 <swarup.nayak1@huawei.com>

4 files changed, 196 insertions, 11 deletions

diff --git a/src/test/java/org/onap/dcae/common/AdditionalHeaderWebTargetTest.java b/src/test/java/org/onap/dcae/common/AdditionalHeaderWebTargetTest.java
new file mode 100644
index 0000000..8f47899
--- /dev/null
+++ b/src/test/java/org/onap/dcae/common/AdditionalHeaderWebTargetTest.java
@@ -0,0 +1,50 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * org.onap.dcaegen2.restconfcollector
+ * ================================================================================
+ * Copyright (C) 2018-2019 Huawei. 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.common;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import javax.ws.rs.client.WebTarget;
+import static org.mockito.Mockito.*;
+
+@RunWith(MockitoJUnitRunner.Silent.class)
+public class AdditionalHeaderWebTargetTest {
+
+
+    @Test
+    public void  AdditionalHaderWebTargettestBase() {
+        WebTarget target = mock(WebTarget.class);
+        AdditionalHeaderWebTarget t =  new AdditionalHeaderWebTarget(target, "aaa112", "someheader");
+        t.getConfiguration();
+        t.getUri();
+        t.getUriBuilder();
+        t.path("");
+        t.register(AdditionalHeaderWebTarget.class);
+        t.register(AdditionalHeaderWebTarget.class,0);
+        t.register(AdditionalHeaderWebTarget.class, AdditionalHeaderWebTarget.class);
+        Object obj = new Object();
+        t.register(obj);
+        t.register(obj, 0);
+        t.register(obj, AdditionalHeaderWebTarget.class);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/dcae/common/EventProcessorTest.java b/src/test/java/org/onap/dcae/common/EventProcessorTest.java
index f32cc2e..e23a3df 100644
--- a/src/test/java/org/onap/dcae/common/EventProcessorTest.java
+++ b/src/test/java/org/onap/dcae/common/EventProcessorTest.java
@@ -33,12 +33,9 @@ import org.onap.dcae.ApplicationSettings;
 import org.onap.dcae.RestConfCollector;
 import org.onap.dcae.common.publishing.DMaaPConfigurationParser;
 import org.onap.dcae.common.publishing.EventPublisher;
-import org.onap.dcae.common.publishing.PublisherConfig;
 import org.onap.dcae.controller.AccessController;
 import org.onap.dcae.controller.PersistentEventConnection;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.test.mock.mockito.MockBean;
 
 
 import java.nio.file.Path;
@@ -87,8 +84,8 @@ public class EventProcessorTest {
         when(properties.truststorePasswordFileLocation()).thenReturn(TRUSTSTORE_PASSWORD_FILE.toString());
         when(properties.keystoreFileLocation()).thenReturn(KEYSTORE.toString());
         when(properties.keystorePasswordFileLocation()).thenReturn(KEYSTORE_PASSWORD_FILE.toString());
-        when(properties.rcc_keystoreFileLocation()).thenReturn(RCC_KEYSTORE.toString());
-        when(properties.rcc_keystorePasswordFileLocation()).thenReturn(RCC_KEYSTORE_PASSWORD_FILE.toString());
+        when(properties.rccKeystoreFileLocation()).thenReturn(RCC_KEYSTORE.toString());
+        when(properties.rccKeystorePasswordFileLocation()).thenReturn(RCC_KEYSTORE_PASSWORD_FILE.toString());
         JSONObject controller = new JSONObject("{\"controller_name\":\"AccessM&C\",\"controller_restapiUrl\":\"10.118.191.43:26335\",\"controller_restapiUser\":\"access\",\"controller_restapiPassword\":\"Huawei@123\",\"controller_accessTokenUrl\":\"/rest/plat/smapp/v1/oauth/token\",\"controller_accessTokenFile\":\"./etc/access-token.json\",\"controller_accessTokenMethod\":\"put\",\"controller_subsMethod\":\"post\",\"controller_subscriptionUrl\":\"/restconf/v1/operations/huawei-nce-notification-action:establish-subscription\",\"event_details\":[{\"event_name\":\"ONT_registration\",\"event_description\":\"ONTregistartionevent\",\"event_sseventUrlEmbed\":\"true\",\"event_sseventsField\":\"output.url\",\"event_sseventsUrl\":\"null\",\"event_subscriptionTemplate\":\"./etc/ont_registartion_subscription_template.json\",\"event_unSubscriptionTemplate\":\"./etc/ont_registartion_unsubscription_template.json\",\"event_ruleId\":\"777777777\"}]}");
         AccessController acClr = new AccessController(controller,
                 properties);
diff --git a/src/test/java/org/onap/dcae/common/RestApiCallNodeTest.java b/src/test/java/org/onap/dcae/common/RestApiCallNodeTest.java
new file mode 100644
index 0000000..3534a6c
--- /dev/null
+++ b/src/test/java/org/onap/dcae/common/RestApiCallNodeTest.java
@@ -0,0 +1,131 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * org.onap.dcaegen2.restconfcollector
+ * ================================================================================
+ * Copyright (C) 2018-2019 Huawei. 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.common;
+
+import com.sun.jersey.api.client.WebResource;
+import org.glassfish.jersey.client.ClientResponse;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.*;
+
+public class RestApiCallNodeTest {
+    @Test
+    public void RestApiCallNodeTestSendEmptyMessageNoTemplate() {
+        RestapiCallNode rest = new RestapiCallNode();
+        RestConfContext ctx = new RestConfContext();
+        Map<String, String> paraMap = new HashMap<>();
+        paraMap.put(Constants.KDEFAULT_TEMP_FILENAME, null);
+        paraMap.put(Constants.KSETTING_REST_API_URL, "https://127.0.0.1:8080/rest/sample");
+        paraMap.put(Constants.KSETTING_HTTP_METHOD, "post");
+        paraMap.put(Constants.KSETTING_RESP_PREFIX, "responsePrefix");
+        paraMap.put(Constants.KSETTING_SKIP_SENDING, "false");
+        paraMap.put(Constants.KSETTING_SSE_CONNECT_URL, null);
+        paraMap.put(Constants.KSETTING_FORMAT, "json");
+
+        paraMap.put(Constants.KSETTING_REST_UNAME, null);
+        paraMap.put(Constants.KSETTING_REST_PASSWD, null);
+        paraMap.put(Constants.KDEFAULT_REQUESTBODY, null);
+
+        paraMap.put(Constants.KSETTING_AUTH_TYPE, "unspecified");
+        paraMap.put(Constants.KSETTING_CONTENT_TYPE, "application/json");
+        paraMap.put(Constants.KSETTING_OAUTH_CONSUMER_KEY, null);
+        paraMap.put(Constants.KSETTING_OAUTH_CONSUMER_SECRET, null);
+        paraMap.put(Constants.KSETTING_OAUTH_SIGNATURE_METHOD, null);
+        paraMap.put(Constants.KSETTING_OAUTH_VERSION, null);
+
+        paraMap.put(Constants.KSETTING_CUSTOMHTTP_HEADER, null);
+        paraMap.put(Constants.KSETTING_TOKENID, null);
+        paraMap.put(Constants.KSETTING_DUMP_HEADER, "false");
+        paraMap.put(Constants.KSETTING_RETURN_REQUEST_PAYLOAD, "false");
+
+        paraMap.put(Constants.KSETTING_TRUST_STORE_FILENAME, null);
+        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);
+
+
+        WebResource webResource = mock(WebResource.class);
+        WebResource.Builder webResourceBuilder = mock(WebResource.Builder.class);
+        ClientResponse clientResponse = mock(ClientResponse.class);
+        try {
+            Mockito.doNothing().when(webResourceBuilder).method("post");
+            when(webResource.accept(anyString())).thenReturn(webResourceBuilder);
+
+            rest.sendRequest(paraMap, ctx, 1);
+        }catch (Exception e){}
+    }
+
+    @Test
+    public void RestApiCallNodeTestSendEmptyMessageWithTemplate() {
+        RestapiCallNode rest = new RestapiCallNode();
+        RestConfContext ctx = new RestConfContext();
+        Map<String, String> paraMap = new HashMap<>();
+        paraMap.put(Constants.KDEFAULT_TEMP_FILENAME, "src/test/resources/testTemplatefile");
+        paraMap.put(Constants.KSETTING_REST_API_URL, "https://127.0.0.1:8080/rest/sample");
+        paraMap.put(Constants.KSETTING_HTTP_METHOD, "post");
+        paraMap.put(Constants.KSETTING_RESP_PREFIX, "responsePrefix");
+        paraMap.put(Constants.KSETTING_SKIP_SENDING, "false");
+        paraMap.put(Constants.KSETTING_SSE_CONNECT_URL, null);
+        paraMap.put(Constants.KSETTING_FORMAT, "json");
+
+        paraMap.put(Constants.KSETTING_REST_UNAME, null);
+        paraMap.put(Constants.KSETTING_REST_PASSWD, null);
+        paraMap.put(Constants.KDEFAULT_REQUESTBODY, null);
+
+        paraMap.put(Constants.KSETTING_AUTH_TYPE, "unspecified");
+        paraMap.put(Constants.KSETTING_CONTENT_TYPE, "application/json");
+        paraMap.put(Constants.KSETTING_OAUTH_CONSUMER_KEY, null);
+        paraMap.put(Constants.KSETTING_OAUTH_CONSUMER_SECRET, null);
+        paraMap.put(Constants.KSETTING_OAUTH_SIGNATURE_METHOD, null);
+        paraMap.put(Constants.KSETTING_OAUTH_VERSION, null);
+
+        paraMap.put(Constants.KSETTING_CUSTOMHTTP_HEADER, null);
+        paraMap.put(Constants.KSETTING_TOKENID, null);
+        paraMap.put(Constants.KSETTING_DUMP_HEADER, "false");
+        paraMap.put(Constants.KSETTING_RETURN_REQUEST_PAYLOAD, "false");
+
+        paraMap.put(Constants.KSETTING_TRUST_STORE_FILENAME, null);
+        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);
+
+
+        WebResource webResource = mock(WebResource.class);
+        WebResource.Builder webResourceBuilder = mock(WebResource.Builder.class);
+        ClientResponse clientResponse = mock(ClientResponse.class);
+        try {
+            Mockito.doNothing().when(webResourceBuilder).method("post");
+            when(webResource.accept(anyString())).thenReturn(webResourceBuilder);
+
+            rest.sendRequest(paraMap, ctx, 1);
+        }catch (Exception e){}
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/dcae/common/XmlJsonUtilTest.java b/src/test/java/org/onap/dcae/common/XmlJsonUtilTest.java
index 3cf065e..f05541f 100644
--- a/src/test/java/org/onap/dcae/common/XmlJsonUtilTest.java
+++ b/src/test/java/org/onap/dcae/common/XmlJsonUtilTest.java
@@ -43,6 +43,10 @@ public class XmlJsonUtilTest {
         mm.put("result.output", "xml2json");
         mm.put("result.[", "start");
         mm.put("result.]", "end");
+        mm.put("result.list", "<LIST>\n" +
+                "          <LITERAL VALUE=\"\"/>\n" +
+                "        </LIST>");
+
         try {
             String str = XmlJsonUtil.getXml(mm, var);
             assertEquals(str.startsWith("<"), true);
@@ -66,16 +70,19 @@ public class XmlJsonUtilTest {
 
     @Test
     public void removeEmptystructFromJson() {
-        String var = "{\n" +
-                "\t\"output\": \"xml2json\",\n" +
-                "\t\"time\": \"2018 12:04\",\n" +
-                "\t\"\": \"end\",\n" +
-                "\t\"status\": \"200\"\n" +
-                "}";
+        String var = "{\"name\":\"john\",\"age\":22,\"class\":\"mca\", \"data\":{}, \"arr\" : [\"some\" : {}]}";
         Map<String, String> mm = new HashMap<>();
 
         try {
             String str = XmlJsonUtil.removeEmptyStructJson(var);
         }catch (Exception e) {}
     }
+
+    @Test
+    public void removeLastCommaJson() {
+        String var2 ="{\"name\":\"john\",\"age\":22,\"class\":\"mca\", \"data\":{}, \"arr\" : [\"some\" : {},],}";
+        try {
+            String str = XmlJsonUtil.removeLastCommaJson(var2);
+        }catch (Exception e) {}
+    }
 }
\ No newline at end of file