Use Mockito's JUnit Jupiter extension #147

pom.xml

@@ -363,6 +363,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>${mockito.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>

src/test/java/biz/paluch/logging/gelf/intern/CloserUnitTests.java

@@ -11,8 +11,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-
-import external.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 /**
  * @author Mark Paluch

src/test/java/biz/paluch/logging/gelf/intern/GelfSenderFactoryUnitTests.java

@@ -19,9 +19,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import biz.paluch.logging.gelf.GelfMessageAssembler;
-import external.MockitoExtension;
 
 /**
  * @author Mark Paluch

src/test/java/biz/paluch/logging/gelf/intern/MessagePostprocessingErrorReporterTests.java

@@ -7,8 +7,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-
-import external.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 /**
  * @author Mark Paluch

src/test/java/biz/paluch/logging/gelf/intern/sender/GelfHTTPSenderIntegrationTests.java

@@ -17,11 +17,11 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import biz.paluch.logging.gelf.intern.ErrorReporter;
 import biz.paluch.logging.gelf.intern.GelfMessage;
 import biz.paluch.logging.gelf.netty.NettyLocalHTTPServer;
-import external.MockitoExtension;
 import io.netty.handler.codec.http.HttpResponseStatus;
 
 /**

src/test/java/biz/paluch/logging/gelf/intern/sender/GelfTCPSenderUnitTests.java

@@ -22,10 +22,10 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import biz.paluch.logging.gelf.intern.ErrorReporter;
 import biz.paluch.logging.gelf.intern.GelfMessage;
-import external.MockitoExtension;
 
 /**
  * @author Mark Paluch

src/test/java/biz/paluch/logging/gelf/intern/sender/GelfUDPSenderUnitTests.java

@@ -13,10 +13,10 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import biz.paluch.logging.gelf.intern.ErrorReporter;
 import biz.paluch.logging.gelf.intern.GelfMessage;
-import external.MockitoExtension;
 
 /**
  * @author Mark Paluch

src/test/java/biz/paluch/logging/gelf/jul/GelfLogHandlerErrorsTests.java

@@ -17,12 +17,12 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import biz.paluch.logging.gelf.GelfMessageAssembler;
 import biz.paluch.logging.gelf.intern.GelfSenderConfiguration;
 import biz.paluch.logging.gelf.intern.GelfSenderFactory;
 import biz.paluch.logging.gelf.intern.GelfSenderProvider;
-import external.MockitoExtension;
 
 /**
  * @author Mark Paluch
@@ -46,22 +46,23 @@ public class GelfLogHandlerErrorsTests {
 
     @BeforeEach
     public void before() throws Exception {
-        GelfSenderFactory.addGelfSenderProvider(senderProvider);
 
-        when(senderProvider.supports(anyString())).thenReturn(true);
+        GelfSenderFactory.addGelfSenderProvider(senderProvider);
         sut.setErrorManager(errorManager);
-
     }
 
     @AfterEach
-    public void after() throws Exception {
+    public void after() {
         GelfSenderFactory.removeGelfSenderProvider(senderProvider);
         GelfSenderFactory.removeAllAddedSenderProviders();
     }
 
     @Test
     public void testRuntimeExceptionOnCreateSender() throws Exception {
+
         sut.setGraylogHost(THE_HOST);
+
+        when(senderProvider.supports(anyString())).thenReturn(true);
         when(senderProvider.create(any(GelfSenderConfiguration.class))).thenThrow(new IllegalStateException());
 
         sut.publish(MESSAGE);
@@ -70,15 +71,15 @@ public void testRuntimeExceptionOnCreateSender() throws Exception {
     }
 
     @Test
-    public void testInvalidMessage() throws Exception {
+    public void testInvalidMessage() {
 
         sut.publish(MESSAGE);
 
         verify(errorManager, atLeast(1)).error(anyString(), ArgumentMatchers.<Exception> isNull(), anyInt());
     }
 
     @Test
-    public void testErrorOnSend() throws Exception {
+    public void testErrorOnSend() {
 
         sut.publish(MESSAGE);
 

src/test/java/biz/paluch/logging/gelf/log4j/GelfLogAppenderErrorsUnitTests.java

@@ -17,11 +17,11 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import biz.paluch.logging.gelf.GelfMessageAssembler;
 import biz.paluch.logging.gelf.intern.GelfSenderFactory;
 import biz.paluch.logging.gelf.intern.GelfSenderProvider;
-import external.MockitoExtension;
 
 /**
  * @author Mark Paluch

src/test/java/biz/paluch/logging/gelf/logback/GelfLogbackAppenderErrorsUnitTests.java

@@ -10,6 +10,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import biz.paluch.logging.gelf.intern.GelfSenderFactory;
 import biz.paluch.logging.gelf.intern.GelfSenderProvider;
@@ -19,7 +20,6 @@
 import ch.qos.logback.core.Context;
 import ch.qos.logback.core.status.Status;
 import ch.qos.logback.core.status.StatusManager;
-import external.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
 public class GelfLogbackAppenderErrorsUnitTests {