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=7deef6e2068fd2c5f9380c209c80046e86b108fd;hb=f45eedd18774bf9856800b43387bee3fa2e6152d;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..7deef6e2 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,41 +20,52 @@ package org.oransc.policyagent.dmaap; +import static ch.qos.logback.classic.Level.WARN; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; 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.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.onap.dmaap.mr.client.MRBatchingPublisher; -import org.onap.dmaap.mr.client.response.MRPublisherResponse; +import org.mockito.ArgumentCaptor; 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.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; -public class DmaapMessageHandlerTest { - +class DmaapMessageHandlerTest { + private static final Logger logger = LoggerFactory.getLogger(DmaapMessageHandlerTest.class); 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 dmaapClient = mock(AsyncRestClient.class); private final AsyncRestClient agentClient = mock(AsyncRestClient.class); private DmaapMessageHandler testedObject; private static Gson gson = new GsonBuilder() // - .serializeNulls() // .create(); // @BeforeEach @@ -62,16 +73,28 @@ 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) { - return ImmutableDmaapRequestMessage.builder().apiVersion("apiVersion") // + 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") // - .type("type") // .url(URL) // .build(); } @@ -80,31 +103,69 @@ public class DmaapMessageHandlerTest { return gson.toJson(dmaapRequestMessage(operation)); } + private Mono> okResponse() { + ResponseEntity entity = new ResponseEntity<>("OK", HttpStatus.OK); + return Mono.just(entity); + } + + private Mono> notOkResponse() { + ResponseEntity entity = new ResponseEntity<>("NOK", HttpStatus.BAD_GATEWAY); + return Mono.just(entity); + } + + @Test + void testMessageParsing() { + String message = dmaapInputMessage(Operation.DELETE); + logger.info(message); + DmaapRequestMessage parsedMessage = gson.fromJson(message, ImmutableDmaapRequestMessage.class); + assertNotNull(parsedMessage); + assertFalse(parsedMessage.payload().isPresent()); + + message = dmaapInputMessage(Operation.PUT); + logger.info(message); + parsedMessage = gson.fromJson(message, ImmutableDmaapRequestMessage.class); + assertNotNull(parsedMessage); + assertTrue(parsedMessage.payload().isPresent()); + } + + @Test + void unparseableMessage_thenWarning() { + final ListAppender logAppender = + LoggingUtils.getLogListAppender(DmaapMessageHandler.class, WARN); + + String msg = "bad message"; + testedObject.handleDmaapMsg(msg); + + assertThat(logAppender.list.get(0).getFormattedMessage()).startsWith( + "handleDmaapMsg failure org.oransc.policyagent.exceptions.ServiceException: Received unparsable " + + "message from DMAAP: \"" + msg + "\", reason: "); + } + @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(); + void successfulDelete() throws IOException { + doReturn(okResponse()).when(agentClient).deleteForEntity(anyString()); + doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString()); + + 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).deleteForEntity(URL); verifyNoMoreInteractions(agentClient); - verify(dmaapClient, times(1)).send(anyString()); - verify(dmaapClient, times(1)).sendBatchWithResponse(); + verify(dmaapClient).post(anyString(), anyString()); + verifyNoMoreInteractions(dmaapClient); } @Test - public void successfulGet() throws IOException { - doReturn(Mono.just("OK")).when(agentClient).get(anyString()); - doReturn(1).when(dmaapClient).send(anyString()); - doReturn(new MRPublisherResponse()).when(dmaapClient).sendBatchWithResponse(); + void successfulGet() throws IOException { + doReturn(okResponse()).when(agentClient).getForEntity(anyString()); + doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString()); StepVerifier // .create(testedObject.createTask(dmaapInputMessage(Operation.GET))) // @@ -112,19 +173,17 @@ public class DmaapMessageHandlerTest { .expectNext("OK") // .verifyComplete(); // - verify(agentClient, times(1)).get(URL); + verify(agentClient).getForEntity(URL); verifyNoMoreInteractions(agentClient); - verify(dmaapClient, times(1)).send(anyString()); - verify(dmaapClient, times(1)).sendBatchWithResponse(); + verify(dmaapClient).post(anyString(), anyString()); verifyNoMoreInteractions(dmaapClient); } @Test - public void successfulPut() throws IOException { - doReturn(Mono.just("OK")).when(agentClient).put(anyString(), anyString()); - doReturn(1).when(dmaapClient).send(anyString()); - doReturn(new MRPublisherResponse()).when(dmaapClient).sendBatchWithResponse(); + void successfulPut() throws IOException { + doReturn(okResponse()).when(agentClient).putForEntity(anyString(), anyString()); + doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString()); StepVerifier // .create(testedObject.createTask(dmaapInputMessage(Operation.PUT))) // @@ -132,19 +191,17 @@ public class DmaapMessageHandlerTest { .expectNext("OK") // .verifyComplete(); // - verify(agentClient, times(1)).put(URL, PAYLOAD); + verify(agentClient).putForEntity(URL, payloadAsString()); verifyNoMoreInteractions(agentClient); - verify(dmaapClient, times(1)).send(anyString()); - verify(dmaapClient, times(1)).sendBatchWithResponse(); + verify(dmaapClient).post(anyString(), anyString()); verifyNoMoreInteractions(dmaapClient); } @Test - public void successfulPost() throws IOException { - doReturn(Mono.just("OK")).when(agentClient).post(anyString(), anyString()); - doReturn(1).when(dmaapClient).send(anyString()); - doReturn(new MRPublisherResponse()).when(dmaapClient).sendBatchWithResponse(); + void successfulPost() throws IOException { + doReturn(okResponse()).when(agentClient).postForEntity(anyString(), anyString()); + doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString()); StepVerifier // .create(testedObject.createTask(dmaapInputMessage(Operation.POST))) // @@ -152,31 +209,60 @@ public class DmaapMessageHandlerTest { .expectNext("OK") // .verifyComplete(); // - verify(agentClient, times(1)).post(URL, PAYLOAD); + verify(agentClient).postForEntity(URL, payloadAsString()); verifyNoMoreInteractions(agentClient); - verify(dmaapClient, times(1)).send(anyString()); - verify(dmaapClient, times(1)).sendBatchWithResponse(); + verify(dmaapClient).post(anyString(), anyString()); verifyNoMoreInteractions(dmaapClient); } @Test - public void errorCase() throws IOException { - doReturn(Mono.error(new Exception("Refused"))).when(agentClient).put(anyString(), anyString()); - doReturn(1).when(dmaapClient).send(anyString()); - doReturn(new MRPublisherResponse()).when(dmaapClient).sendBatchWithResponse(); - StepVerifier // - .create(testedObject.createTask(dmaapInputMessage(Operation.PUT))) // - .expectSubscription() // - .verifyComplete(); // + void exceptionWhenCallingPolicyAgent_thenNotFoundResponse() throws IOException { + + doReturn(notOkResponse()).when(agentClient).putForEntity(anyString(), anyString()); + doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString()); - verify(agentClient, times(1)).put(URL, PAYLOAD); + testedObject.createTask(dmaapInputMessage(Operation.PUT)).block(); + + verify(agentClient).putForEntity(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).post(anyString(), captor.capture()); + String actualMessage = captor.getValue(); + assertThat(actualMessage.contains(HttpStatus.BAD_GATEWAY.toString())) + .as("Message \"%s\" sent to DMaaP contains %s", actualMessage, HttpStatus.BAD_GATEWAY) // + .isTrue(); + verifyNoMoreInteractions(dmaapClient); } + @Test + 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).post(anyString(), captor.capture()); + String actualMessage = captor.getValue(); + assertThat(actualMessage.contains("Not implemented operation")).isTrue(); + assertThat(actualMessage.contains("BAD_REQUEST")).isTrue(); + } + + @Test + 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, WARN); + + testedObject.handleDmaapMsg(message); + + assertThat(logAppender.list.get(0).getFormattedMessage()) + .startsWith("Expected payload in message from DMAAP: "); + } }