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.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
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 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.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
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 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() //
return Mono.just(entity);
}
+ private Mono<ResponseEntity<String>> notOkResponse() {
+ ResponseEntity<String> entity = new ResponseEntity<>("NOK", HttpStatus.BAD_GATEWAY);
+ return Mono.just(entity);
+ }
+
@Test
- public void testMessageParsing() {
+ void testMessageParsing() {
String message = dmaapInputMessage(Operation.DELETE);
logger.info(message);
DmaapRequestMessage parsedMessage = gson.fromJson(message, ImmutableDmaapRequestMessage.class);
- assertTrue(parsedMessage != null);
+ assertNotNull(parsedMessage);
assertFalse(parsedMessage.payload().isPresent());
message = dmaapInputMessage(Operation.PUT);
logger.info(message);
parsedMessage = gson.fromJson(message, ImmutableDmaapRequestMessage.class);
- assertTrue(parsedMessage != null);
+ assertNotNull(parsedMessage);
assertTrue(parsedMessage.payload().isPresent());
}
@Test
- public void unparseableMessage_thenWarning() {
- final ListAppender<ILoggingEvent> logAppender = LoggingUtils.getLogListAppender(DmaapMessageHandler.class);
+ void unparseableMessage_thenWarning() {
+ final ListAppender<ILoggingEvent> logAppender =
+ LoggingUtils.getLogListAppender(DmaapMessageHandler.class, WARN);
- testedObject.handleDmaapMsg("bad message");
+ String msg = "bad message";
+ testedObject.handleDmaapMsg(msg);
- assertThat(logAppender.list.get(0).getLevel()).isEqualTo(Level.WARN);
- assertThat(logAppender.list.toString().contains("handleDmaapMsg failure ")).isTrue();
+ 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 {
+ void successfulDelete() throws IOException {
doReturn(okResponse()).when(agentClient).deleteForEntity(anyString());
- doReturn(1).when(dmaapClient).send(anyString());
- doReturn(new MRPublisherResponse()).when(dmaapClient).sendBatchWithResponse();
+ doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
String message = dmaapInputMessage(Operation.DELETE);
verify(agentClient).deleteForEntity(URL);
verifyNoMoreInteractions(agentClient);
- verify(dmaapClient).send(anyString());
- verify(dmaapClient).sendBatchWithResponse();
+ verify(dmaapClient).post(anyString(), anyString());
+
verifyNoMoreInteractions(dmaapClient);
}
@Test
- public void successfulGet() throws IOException {
+ void successfulGet() throws IOException {
doReturn(okResponse()).when(agentClient).getForEntity(anyString());
- doReturn(1).when(dmaapClient).send(anyString());
- doReturn(new MRPublisherResponse()).when(dmaapClient).sendBatchWithResponse();
+ doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
StepVerifier //
.create(testedObject.createTask(dmaapInputMessage(Operation.GET))) //
verify(agentClient).getForEntity(URL);
verifyNoMoreInteractions(agentClient);
- verify(dmaapClient).send(anyString());
- verify(dmaapClient).sendBatchWithResponse();
+ verify(dmaapClient).post(anyString(), anyString());
verifyNoMoreInteractions(dmaapClient);
}
@Test
- public void successfulPut() throws IOException {
+ void successfulPut() throws IOException {
doReturn(okResponse()).when(agentClient).putForEntity(anyString(), anyString());
- doReturn(1).when(dmaapClient).send(anyString());
- doReturn(new MRPublisherResponse()).when(dmaapClient).sendBatchWithResponse();
+ doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
StepVerifier //
.create(testedObject.createTask(dmaapInputMessage(Operation.PUT))) //
verify(agentClient).putForEntity(URL, payloadAsString());
verifyNoMoreInteractions(agentClient);
- verify(dmaapClient).send(anyString());
- verify(dmaapClient).sendBatchWithResponse();
+ verify(dmaapClient).post(anyString(), anyString());
verifyNoMoreInteractions(dmaapClient);
}
@Test
- public void successfulPost() throws IOException {
+ void successfulPost() throws IOException {
doReturn(okResponse()).when(agentClient).postForEntity(anyString(), anyString());
- doReturn(1).when(dmaapClient).send(anyString());
- doReturn(new MRPublisherResponse()).when(dmaapClient).sendBatchWithResponse();
+ doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
StepVerifier //
.create(testedObject.createTask(dmaapInputMessage(Operation.POST))) //
verify(agentClient).postForEntity(URL, payloadAsString());
verifyNoMoreInteractions(agentClient);
- verify(dmaapClient).send(anyString());
- verify(dmaapClient).sendBatchWithResponse();
+ verify(dmaapClient).post(anyString(), anyString());
verifyNoMoreInteractions(dmaapClient);
}
@Test
- public void exceptionWhenCallingPolicyAgent_thenNotFoundResponse() throws IOException {
- WebClientResponseException except = new WebClientResponseException(400, "Refused", null, null, null, null);
- doReturn(Mono.error(except)).when(agentClient).putForEntity(anyString(), any());
- doReturn(1).when(dmaapClient).send(anyString());
- doReturn(new MRPublisherResponse()).when(dmaapClient).sendBatchWithResponse();
+ void exceptionWhenCallingPolicyAgent_thenNotFoundResponse() throws IOException {
- StepVerifier //
- .create(testedObject.createTask(dmaapInputMessage(Operation.PUT))) //
- .expectSubscription() //
- .verifyComplete(); //
+ doReturn(notOkResponse()).when(agentClient).putForEntity(anyString(), anyString());
+ doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
+
+ testedObject.createTask(dmaapInputMessage(Operation.PUT)).block();
verify(agentClient).putForEntity(anyString(), anyString());
verifyNoMoreInteractions(agentClient);
ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
- verify(dmaapClient).send(captor.capture());
+ verify(dmaapClient).post(anyString(), captor.capture());
String actualMessage = captor.getValue();
- assertThat(actualMessage.contains(HttpStatus.BAD_REQUEST.toString())).isTrue();
+ assertThat(actualMessage.contains(HttpStatus.BAD_GATEWAY.toString()))
+ .as("Message \"%s\" sent to DMaaP contains %s", actualMessage, HttpStatus.BAD_GATEWAY) //
+ .isTrue();
- verify(dmaapClient).sendBatchWithResponse();
verifyNoMoreInteractions(dmaapClient);
}
@Test
- public void unsupportedOperationInMessage_thenNotFoundResponseWithNotImplementedOperation() throws Exception {
+ 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());
+ verify(dmaapClient).post(anyString(), captor.capture());
String actualMessage = captor.getValue();
- assertThat(actualMessage
- .contains(HttpStatus.BAD_REQUEST + "\",\"message\":\"Not implemented operation: " + badOperation)).isTrue();
-
- verify(dmaapClient).sendBatchWithResponse();
- verifyNoMoreInteractions(dmaapClient);
+ assertThat(actualMessage.contains("Not implemented operation")).isTrue();
+ assertThat(actualMessage.contains("BAD_REQUEST")).isTrue();
}
@Test
- public void putWithoutPayload_thenNotFoundResponseWithWarning() throws Exception {
+ 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);
+ final ListAppender<ILoggingEvent> logAppender =
+ LoggingUtils.getLogListAppender(DmaapMessageHandler.class, WARN);
testedObject.handleDmaapMsg(message);
- assertThat(logAppender.list.get(0).getLevel()).isEqualTo(Level.WARN);
- assertThat(logAppender.list.toString().contains("Expected payload in message from DMAAP: ")).isTrue();
+ assertThat(logAppender.list.get(0).getFormattedMessage())
+ .startsWith("Expected payload in message from DMAAP: ");
}
}
Code Review / nonrtric.git / blobdiff