X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fdmaap%2FDmaapMessageHandlerTest.java;h=67d00a22e973d96402985b2d18f8c7951c65c65c;hb=379306b6879d2fd0e807784bc3c0c5c2ac704813;hp=6576c699d9147f25299634a06f504e55b64d31a9;hpb=72c98f3b7ef556cf3556c398e12078d9b9eb6d1a;p=nonrtric.git

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 6576c699..67d00a22 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
@@ -20,6 +20,7 @@
 
 package org.oransc.policyagent.dmaap;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
@@ -27,10 +28,13 @@ import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 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 ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.read.ListAppender;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
@@ -40,12 +44,15 @@ import java.util.Optional;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
 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.dmaap.DmaapRequestMessage.Operation;
 import org.oransc.policyagent.repository.ImmutablePolicyType;
 import org.oransc.policyagent.repository.PolicyType;
+import org.oransc.policyagent.utils.LoggingUtils;
+import org.springframework.http.HttpStatus;
 
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
@@ -110,6 +117,16 @@ public class DmaapMessageHandlerTest {
         assertTrue(parsedMessage.payload().isPresent());
     }
 
+    @Test
+    public void unparseableMessage_thenWarning() {
+        final ListAppender<ILoggingEvent> logAppender = LoggingUtils.getLogListAppender(DmaapMessageHandler.class);
+
+        testedObject.handleDmaapMsg("bad message");
+
+        assertThat(logAppender.list.get(0).getLevel()).isEqualTo(Level.WARN);
+        assertThat(logAppender.list.toString().contains("handleDmaapMsg failure ")).isTrue();
+    }
+
     @Test
     public void successfulDelete() throws IOException {
         doReturn(Mono.just("OK")).when(agentClient).delete(anyString());
@@ -124,11 +141,11 @@ public class DmaapMessageHandlerTest {
             .expectNext("OK") //
             .verifyComplete(); //
 
-        verify(agentClient, times(1)).delete(URL);
+        verify(agentClient).delete(URL);
         verifyNoMoreInteractions(agentClient);
 
-        verify(dmaapClient, times(1)).send(anyString());
-        verify(dmaapClient, times(1)).sendBatchWithResponse();
+        verify(dmaapClient).send(anyString());
+        verify(dmaapClient).sendBatchWithResponse();
         verifyNoMoreInteractions(dmaapClient);
     }
 
@@ -144,11 +161,11 @@ public class DmaapMessageHandlerTest {
             .expectNext("OK") //
             .verifyComplete(); //
 
-        verify(agentClient, times(1)).get(URL);
+        verify(agentClient).get(URL);
         verifyNoMoreInteractions(agentClient);
 
-        verify(dmaapClient, times(1)).send(anyString());
-        verify(dmaapClient, times(1)).sendBatchWithResponse();
+        verify(dmaapClient).send(anyString());
+        verify(dmaapClient).sendBatchWithResponse();
         verifyNoMoreInteractions(dmaapClient);
     }
 
@@ -164,11 +181,11 @@ public class DmaapMessageHandlerTest {
             .expectNext("OK") //
             .verifyComplete(); //
 
-        verify(agentClient, times(1)).put(URL, payloadAsString());
+        verify(agentClient).put(URL, payloadAsString());
         verifyNoMoreInteractions(agentClient);
 
-        verify(dmaapClient, times(1)).send(anyString());
-        verify(dmaapClient, times(1)).sendBatchWithResponse();
+        verify(dmaapClient).send(anyString());
+        verify(dmaapClient).sendBatchWithResponse();
         verifyNoMoreInteractions(dmaapClient);
     }
 
@@ -184,31 +201,67 @@ public class DmaapMessageHandlerTest {
             .expectNext("OK") //
             .verifyComplete(); //
 
-        verify(agentClient, times(1)).post(URL, payloadAsString());
+        verify(agentClient).post(URL, payloadAsString());
         verifyNoMoreInteractions(agentClient);
 
-        verify(dmaapClient, times(1)).send(anyString());
-        verify(dmaapClient, times(1)).sendBatchWithResponse();
+        verify(dmaapClient).send(anyString());
+        verify(dmaapClient).sendBatchWithResponse();
         verifyNoMoreInteractions(dmaapClient);
     }
 
     @Test
-    public void errorCase() throws IOException {
-        doReturn(Mono.error(new Exception("Refused"))).when(agentClient).put(anyString(), any());
+    public void exceptionWhenCallingPolicyAgent_thenNotFoundResponse() throws IOException {
+        String errorCause = "Refused";
+        doReturn(Mono.error(new Exception(errorCause))).when(agentClient).put(anyString(), any());
         doReturn(1).when(dmaapClient).send(anyString());
         doReturn(new MRPublisherResponse()).when(dmaapClient).sendBatchWithResponse();
+
         StepVerifier //
             .create(testedObject.createTask(dmaapInputMessage(Operation.PUT))) //
             .expectSubscription() //
             .verifyComplete(); //
 
-        verify(agentClient, times(1)).put(anyString(), anyString());
+        verify(agentClient).put(anyString(), anyString());
         verifyNoMoreInteractions(agentClient);
 
-        // Error response
-        verify(dmaapClient, times(1)).send(anyString());
-        verify(dmaapClient, times(1)).sendBatchWithResponse();
+        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+        verify(dmaapClient).send(captor.capture());
+        String actualMessage = captor.getValue();
+        assertThat(actualMessage.contains(HttpStatus.NOT_FOUND + "\",\"message\":\"java.lang.Exception: " + errorCause))
+            .isTrue();
+
+        verify(dmaapClient).sendBatchWithResponse();
+        verifyNoMoreInteractions(dmaapClient);
+    }
+
+    @Test
+    public void unsupportedOperationInMessage_thenNotFoundResponseWithNotImplementedOperation() throws Exception {
+        String message = dmaapInputMessage(Operation.PUT).toString();
+        String badOperation = "BAD";
+        message = message.replace(Operation.PUT.toString(), badOperation);
+
+        testedObject.handleDmaapMsg(message);
+
+        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
+        verify(dmaapClient).send(captor.capture());
+        String actualMessage = captor.getValue();
+        assertThat(actualMessage
+            .contains(HttpStatus.NOT_FOUND + "\",\"message\":\"Not implemented operation: " + badOperation)).isTrue();
+
+        verify(dmaapClient).sendBatchWithResponse();
         verifyNoMoreInteractions(dmaapClient);
     }
 
+    @Test
+    public void putWithoutPayload_thenNotFoundResponseWithWarning() throws Exception {
+        String message = dmaapInputMessage(Operation.PUT).toString();
+        message = message.replace(",\"payload\":{\"name\":\"name\",\"schema\":\"schema\"}", "");
+
+        final ListAppender<ILoggingEvent> logAppender = LoggingUtils.getLogListAppender(DmaapMessageHandler.class);
+
+        testedObject.handleDmaapMsg(message);
+
+        assertThat(logAppender.list.get(0).getLevel()).isEqualTo(Level.WARN);
+        assertThat(logAppender.list.toString().contains("Expected payload in message from DMAAP: ")).isTrue();
+    }
 }