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=09dbf92fe6b1b00b373a3ef199d9cdb4d716f2a5;hpb=842b9d220588fba7fc17df0cf9c094f91005118b;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 09dbf92f..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,26 +20,39 @@ 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; 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; import java.io.IOException; +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.configuration.ApplicationConfig; 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; @@ -47,14 +60,11 @@ import reactor.test.StepVerifier; public class DmaapMessageHandlerTest { private static final String URL = "url"; - private static final String PAYLOAD = "payload"; - private ApplicationConfig appConfig = mock(ApplicationConfig.class); private final MRBatchingPublisher dmaapClient = mock(MRBatchingPublisher.class); private final AsyncRestClient agentClient = mock(AsyncRestClient.class); private DmaapMessageHandler testedObject; private static Gson gson = new GsonBuilder() // - .serializeNulls() // .create(); // @BeforeEach @@ -62,12 +72,24 @@ public class DmaapMessageHandlerTest { testedObject = spy(new DmaapMessageHandler(dmaapClient, agentClient)); } + static JsonObject payloadAsJson() { + return gson.fromJson(payloadAsString(), JsonObject.class); + } + + static String payloadAsString() { + PolicyType pt = ImmutablePolicyType.builder().name("name").schema("schema").build(); + return gson.toJson(pt); + } + DmaapRequestMessage dmaapRequestMessage(Operation operation) { + Optional payload = + ((operation == Operation.PUT || operation == Operation.POST) ? Optional.of(payloadAsJson()) + : Optional.empty()); return ImmutableDmaapRequestMessage.builder().apiVersion("apiVersion") // .correlationId("correlationId") // .operation(operation) // .originatorId("originatorId") // - .payload(PAYLOAD) // + .payload(payload) // .requestId("requestId") // .target("target") // .timestamp("timestamp") // @@ -80,23 +102,50 @@ public class DmaapMessageHandlerTest { return gson.toJson(dmaapRequestMessage(operation)); } + @Test + public void testMessageParsing() { + String message = dmaapInputMessage(Operation.DELETE); + System.out.println(message); + DmaapRequestMessage parsedMessage = gson.fromJson(message, ImmutableDmaapRequestMessage.class); + assertTrue(parsedMessage != null); + assertFalse(parsedMessage.payload().isPresent()); + + message = dmaapInputMessage(Operation.PUT); + System.out.println(message); + parsedMessage = gson.fromJson(message, ImmutableDmaapRequestMessage.class); + assertTrue(parsedMessage != null); + assertTrue(parsedMessage.payload().isPresent()); + } + + @Test + public void unparseableMessage_thenWarning() { + final ListAppender 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()); doReturn(1).when(dmaapClient).send(anyString()); doReturn(new MRPublisherResponse()).when(dmaapClient).sendBatchWithResponse(); + String message = dmaapInputMessage(Operation.DELETE); + StepVerifier // - .create(testedObject.createTask(dmaapInputMessage(Operation.DELETE))) // + .create(testedObject.createTask(message)) // .expectSubscription() // .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); } @@ -112,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); } @@ -132,11 +181,11 @@ public class DmaapMessageHandlerTest { .expectNext("OK") // .verifyComplete(); // - verify(agentClient, times(1)).put(URL, PAYLOAD); + 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); } @@ -152,31 +201,67 @@ public class DmaapMessageHandlerTest { .expectNext("OK") // .verifyComplete(); // - verify(agentClient, times(1)).post(URL, PAYLOAD); + 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(), anyString()); + 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(URL, PAYLOAD); + verify(agentClient).put(anyString(), anyString()); verifyNoMoreInteractions(agentClient); - // Error response - verify(dmaapClient, times(1)).send(anyString()); - verify(dmaapClient, times(1)).sendBatchWithResponse(); + ArgumentCaptor 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 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 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(); + } }