fix test coverage

Author: Daniel Bustamante Ospina

async/async-commons-api/src/test/java/org/reactivecommons/async/api/HandlerRegistryTest.java

@@ -77,6 +77,13 @@ void shouldRegisterDynamicEventsHandler() {
                 .isSameAs(registry);
     }
 
+    @Test
+    public void shouldRegisterNotificationEventListener() {
+        registry.listenNotificationEvent(name, message -> Mono.empty(), SomeDataClass.class);
+        assertThat(registry.getEventNotificationListener()).anySatisfy(listener ->
+            assertThat(listener.getPath()).isEqualTo(name));
+    }
+
     @Test
     @SuppressWarnings("unchecked")
     public void listenEvent() {

async/async-commons/src/test/java/org/reactivecommons/async/impl/listeners/ApplicationCommandListenerPerfTest.java

@@ -11,7 +11,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.reactivecommons.api.domain.Command;
 import org.reactivecommons.async.api.DefaultCommandHandler;
@@ -27,9 +26,7 @@
 import org.reactivecommons.async.impl.ext.CustomErrorReporter;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.rabbitmq.AcknowledgableDelivery;
-import reactor.rabbitmq.ConsumeOptions;
-import reactor.rabbitmq.Receiver;
+import reactor.rabbitmq.*;
 
 import java.math.BigInteger;
 import java.time.Duration;
@@ -39,8 +36,10 @@
 import java.util.stream.IntStream;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static reactor.core.publisher.Flux.range;
+import static reactor.core.publisher.Mono.just;
 
 @ExtendWith(MockitoExtension.class)
 public class ApplicationCommandListenerPerfTest {
@@ -68,6 +67,10 @@ public class ApplicationCommandListenerPerfTest {
 
     @BeforeEach
     public void setUp() {
+        Mockito.when(topologyCreator.declare(any(ExchangeSpecification.class))).thenReturn(just(mock(AMQP.Exchange.DeclareOk.class)));
+        Mockito.when(topologyCreator.declareDLQ(any(String.class), any(String.class), any(Integer.class), any(Optional.class))).thenReturn(just(mock(AMQP.Queue.DeclareOk.class)));
+        Mockito.when(topologyCreator.declareQueue(any(String.class), any(String.class), any(Optional.class))).thenReturn(just(mock(AMQP.Queue.DeclareOk.class)));
+        Mockito.when(topologyCreator.bind(any(BindingSpecification.class))).thenReturn(just(mock(AMQP.Queue.BindOk.class)));
         reactiveMessageListener = new ReactiveMessageListener(receiver, topologyCreator);
     }
 
@@ -303,11 +306,6 @@ public StubGenericMessageListener(String queueName, ReactiveMessageListener list
             super(listener, queueName, handlerResolver, "directExchange", messageConverter, true, 10, 10, Optional.empty(), discardNotifier, errorReporter);
         }
 
-        @Override
-        protected Mono<Void> setUpBindings(TopologyCreator creator) {
-            return Mono.empty(); //Do Nothing
-        }
-
     }
 }
 

async/async-commons/src/test/java/org/reactivecommons/async/impl/listeners/ApplicationCommandListenerTest.java

@@ -6,14 +6,12 @@
 import org.reactivecommons.api.domain.Command;
 import org.reactivecommons.async.api.HandlerRegistry;
 import org.reactivecommons.async.impl.HandlerResolver;
-import org.reactivecommons.async.impl.communications.TopologyCreator;
 import reactor.core.publisher.Mono;
 
 import java.util.Optional;
 import java.util.UUID;
 
-import static reactor.core.publisher.Mono.empty;
-import static reactor.core.publisher.Mono.error;
+import static reactor.core.publisher.Mono.*;
 
 @ExtendWith(MockitoExtension.class)
 public class ApplicationCommandListenerTest extends ListenerReporterTestSuperClass{
@@ -47,11 +45,5 @@ class StubGenericMessageListener extends ApplicationCommandListener {
         public StubGenericMessageListener(HandlerResolver handlerResolver) {
             super(reactiveMessageListener, "queueName", handlerResolver, "directExchange", messageConverter, true,  10, 10, Optional.empty(), discardNotifier, errorReporter);
         }
-
-        @Override
-        protected Mono<Void> setUpBindings(TopologyCreator creator) {
-            return empty(); //Do Nothing
-        }
-
     }
 }

async/async-commons/src/test/java/org/reactivecommons/async/impl/listeners/ApplicationEventListenerTest.java

@@ -6,13 +6,11 @@
 import org.reactivecommons.api.domain.DomainEvent;
 import org.reactivecommons.async.api.HandlerRegistry;
 import org.reactivecommons.async.impl.HandlerResolver;
-import org.reactivecommons.async.impl.communications.TopologyCreator;
 import reactor.core.publisher.Mono;
 
 import java.util.Optional;
 import java.util.UUID;
 
-import static reactor.core.publisher.Mono.empty;
 import static reactor.core.publisher.Mono.error;
 
 @ExtendWith(MockitoExtension.class)
@@ -46,11 +44,5 @@ class StubGenericMessageListener extends ApplicationEventListener {
         public StubGenericMessageListener(HandlerResolver handlerResolver) {
             super(reactiveMessageListener, "queueName", handlerResolver, "", messageConverter, true, 10, 10, Optional.empty(), discardNotifier, errorReporter, "");
         }
-
-        @Override
-        protected Mono<Void> setUpBindings(TopologyCreator creator) {
-            return empty(); //Do Nothing
-        }
-
     }
 }

async/async-commons/src/test/java/org/reactivecommons/async/impl/listeners/ApplicationNotificationListenerTest.java

@@ -1,25 +1,35 @@
 package org.reactivecommons.async.impl.listeners;
 
+import com.rabbitmq.client.AMQP;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.reactivecommons.api.domain.DomainEvent;
 import org.reactivecommons.async.api.HandlerRegistry;
 import org.reactivecommons.async.impl.HandlerResolver;
-import org.reactivecommons.async.impl.communications.TopologyCreator;
 import reactor.core.publisher.Mono;
+import reactor.rabbitmq.QueueSpecification;
 
 import java.util.UUID;
 
-import static reactor.core.publisher.Mono.empty;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
 import static reactor.core.publisher.Mono.error;
+import static reactor.core.publisher.Mono.just;
 
 @ExtendWith(MockitoExtension.class)
 public class ApplicationNotificationListenerTest extends ListenerReporterTestSuperClass {
 
     private DomainEvent<DummyMessage> event1 = new DomainEvent<>("app.event.test", UUID.randomUUID().toString(), new DummyMessage());
     private DomainEvent<DummyMessage> event2 = new DomainEvent<>("app.event.test2", UUID.randomUUID().toString(), new DummyMessage());
 
+    @BeforeEach
+    public void initCreator() {
+        Mockito.when(topologyCreator.declare(any(QueueSpecification.class))).thenReturn(just(mock(AMQP.Queue.DeclareOk.class)));
+    }
+
     @Test
     public void shouldSendErrorToCustomErrorReporter() throws InterruptedException {
         final HandlerRegistry registry = HandlerRegistry.register()
@@ -47,10 +57,5 @@ public StubGenericMessageListener(HandlerResolver handlerResolver) {
             super(reactiveMessageListener, "exchange", "queue", handlerResolver, messageConverter, discardNotifier, errorReporter);
         }
 
-        @Override
-        protected Mono<Void> setUpBindings(TopologyCreator creator) {
-            return empty(); //Do Nothing
-        }
-
     }
 }

async/async-commons/src/test/java/org/reactivecommons/async/impl/listeners/ApplicationQueryListenerErrorTest.java

@@ -7,13 +7,11 @@
 import org.reactivecommons.async.api.HandlerRegistry;
 import org.reactivecommons.async.impl.HandlerResolver;
 import org.reactivecommons.async.impl.communications.ReactiveMessageSender;
-import org.reactivecommons.async.impl.communications.TopologyCreator;
 import reactor.core.publisher.Mono;
 
 import java.util.Optional;
 
 import static org.mockito.Mockito.mock;
-import static reactor.core.publisher.Mono.empty;
 import static reactor.core.publisher.Mono.error;
 
 @ExtendWith(MockitoExtension.class)
@@ -49,10 +47,5 @@ public StubGenericMessageListener(HandlerResolver handlerResolver) {
             super(reactiveMessageListener, "queueName", handlerResolver, mock(ReactiveMessageSender.class), "exchange", messageConverter, "exchange", true, 10L, 100, Optional.of(1), discardNotifier, errorReporter);
         }
 
-        @Override
-        protected Mono<Void> setUpBindings(TopologyCreator creator) {
-            return empty(); //Do Nothing
-        }
-
     }
 }

async/async-commons/src/test/java/org/reactivecommons/async/impl/listeners/ListenerReporterTestSuperClass.java

@@ -5,6 +5,7 @@
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Delivery;
 import com.rabbitmq.client.Envelope;
+import org.junit.jupiter.api.BeforeEach;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 import org.reactivecommons.api.domain.DomainEvent;
@@ -23,9 +24,7 @@
 import org.reactivecommons.async.impl.converters.json.JacksonMessageConverter;
 import org.reactivecommons.async.impl.ext.CustomErrorReporter;
 import reactor.core.publisher.Flux;
-import reactor.rabbitmq.AcknowledgableDelivery;
-import reactor.rabbitmq.ConsumeOptions;
-import reactor.rabbitmq.Receiver;
+import reactor.rabbitmq.*;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -41,13 +40,14 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 import static reactor.core.publisher.Mono.empty;
+import static reactor.core.publisher.Mono.just;
 
 public abstract class ListenerReporterTestSuperClass {
 
     private final ObjectMapper mapper = new ObjectMapper();
 
     private final Receiver receiver = mock(Receiver.class);
-    private final TopologyCreator topologyCreator = mock(TopologyCreator.class);
+    protected final TopologyCreator topologyCreator = mock(TopologyCreator.class);
     protected final DiscardNotifier discardNotifier = mock(DiscardNotifier.class);
     protected final MessageConverter messageConverter = new JacksonMessageConverter(new DefaultObjectMapperSupplier().get());
     protected final CustomErrorReporter errorReporter = mock(CustomErrorReporter.class);
@@ -57,6 +57,13 @@ public abstract class ListenerReporterTestSuperClass {
     protected final Semaphore successSemaphore = new Semaphore(0);
     protected final ReactiveMessageListener reactiveMessageListener = new ReactiveMessageListener(receiver, topologyCreator);
 
+    @BeforeEach
+    public void init() {
+        Mockito.when(topologyCreator.declare(any(ExchangeSpecification.class))).thenReturn(just(mock(AMQP.Exchange.DeclareOk.class)));
+        Mockito.when(topologyCreator.declareDLQ(any(String.class), any(String.class), any(Integer.class), any(Optional.class))).thenReturn(just(mock(AMQP.Queue.DeclareOk.class)));
+        Mockito.when(topologyCreator.declareQueue(any(String.class), any(String.class), any(Optional.class))).thenReturn(just(mock(AMQP.Queue.DeclareOk.class)));
+        Mockito.when(topologyCreator.bind(any(BindingSpecification.class))).thenReturn(just(mock(AMQP.Queue.BindOk.class)));
+    }
 
     protected void assertContinueAfterSendErrorToCustomReporter(HandlerRegistry handlerRegistry, Flux<AcknowledgableDelivery> source) throws InterruptedException {
         final HandlerResolver handlerResolver = createHandlerResolver(handlerRegistry);