From 94e8c3345d2dac96a6122807d86c2971d16d212a Mon Sep 17 00:00:00 2001
From: Lathish <lathishbabu.ganesan@est.tech>
Date: Thu, 30 Jan 2020 14:57:07 +0000
Subject: [PATCH] Test cases fixed

Issue-ID: NONRTRIC-107
Change-Id: I6a873d7b6be193d41feb5ec4785a660d780e0edc
Signed-off-by: Lathish <lathishbabu.ganesan@est.tech>
---
 .../policyagent/configuration/ApplicationConfigParserTest.java |  7 ++-----
 .../org/oransc/policyagent/dmaap/DmaapMessageHandlerTest.java  | 10 +++++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigParserTest.java b/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigParserTest.java
index b122ed4e..e0c17b4b 100644
--- a/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigParserTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigParserTest.java
@@ -22,14 +22,12 @@ package org.oransc.policyagent.configuration;
 
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
 import com.google.gson.JsonIOException;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -37,7 +35,6 @@ import java.io.InputStreamReader;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Properties;
-
 import org.junit.jupiter.api.Test;
 import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
 import org.springframework.http.MediaType;
@@ -62,7 +59,7 @@ public class ApplicationConfigParserTest {
             () -> assertEquals("admin", actualPublisherConfig.get("password")),
             () -> assertEquals(ProtocolTypeConstants.HTTPNOAUTH.toString(), actualPublisherConfig.get("TransportType")),
             () -> assertEquals(15000, actualPublisherConfig.get("timeout")),
-            () -> assertEquals(1000, actualPublisherConfig.get("limit")));
+            () -> assertEquals(100, actualPublisherConfig.get("limit")));
 
         Properties actualConsumerConfig = parserUnderTest.getDmaapConsumerConfig();
         assertAll("consumerConfig",
@@ -76,7 +73,7 @@ public class ApplicationConfigParserTest {
             () -> assertEquals("policy-agent", actualConsumerConfig.get("id")),
             () -> assertEquals(ProtocolTypeConstants.HTTPNOAUTH.toString(), actualConsumerConfig.get("TransportType")),
             () -> assertEquals(15000, actualConsumerConfig.get("timeout")),
-            () -> assertEquals(1000, actualConsumerConfig.get("limit")));
+            () -> assertEquals(100, actualConsumerConfig.get("limit")));
     }
 
     private JsonObject getJsonRootObject() throws JsonIOException, JsonSyntaxException, IOException {
diff --git a/policy-agent/src/test/java/org/oransc/policyagent/dmaap/DmaapMessageHandlerTest.java b/policy-agent/src/test/java/org/oransc/policyagent/dmaap/DmaapMessageHandlerTest.java
index 66e83f87..5aeb2404 100644
--- a/policy-agent/src/test/java/org/oransc/policyagent/dmaap/DmaapMessageHandlerTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/dmaap/DmaapMessageHandlerTest.java
@@ -27,19 +27,16 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-
 import java.io.IOException;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.onap.dmaap.mr.client.MRBatchingPublisher;
+import org.onap.dmaap.mr.client.response.MRPublisherResponse;
 import org.oransc.policyagent.clients.AsyncRestClient;
 import org.oransc.policyagent.configuration.ApplicationConfig;
 import org.oransc.policyagent.dmaap.DmaapRequestMessage.Operation;
-
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
@@ -80,6 +77,7 @@ public class DmaapMessageHandlerTest {
     public void successfulCase() throws IOException {
         doReturn(Mono.just("OK")).when(agentClient).delete("url");
         doReturn(1).when(dmaapClient).send(anyString());
+        doReturn(new MRPublisherResponse()).when(dmaapClient).sendBatchWithResponse();
 
         StepVerifier //
             .create(testedObject.createTask(dmaapInputMessage(Operation.DELETE))) //
@@ -91,6 +89,7 @@ public class DmaapMessageHandlerTest {
         verifyNoMoreInteractions(agentClient);
 
         verify(dmaapClient, times(1)).send(anyString());
+        verify(dmaapClient, times(1)).sendBatchWithResponse();
         verifyNoMoreInteractions(dmaapClient);
     }
 
@@ -98,7 +97,7 @@ public class DmaapMessageHandlerTest {
     public void errorCase() throws IOException {
         doReturn(Mono.error(new Exception("Refused"))).when(agentClient).put("url", "payload");
         doReturn(1).when(dmaapClient).send(anyString());
-
+        doReturn(new MRPublisherResponse()).when(dmaapClient).sendBatchWithResponse();
         StepVerifier //
             .create(testedObject.createTask(dmaapInputMessage(Operation.PUT))) //
             .expectSubscription() //
@@ -109,6 +108,7 @@ public class DmaapMessageHandlerTest {
 
         // Error response
         verify(dmaapClient, times(1)).send(anyString());
+        verify(dmaapClient, times(1)).sendBatchWithResponse();
         verifyNoMoreInteractions(dmaapClient);
     }
 
-- 
2.16.6