fix test

datasafe-storage/datasafe-storage-api/pom.xml

@@ -32,11 +32,6 @@
  <artifactId>junit-jupiter-api</artifactId>
  <scope>test</scope>
  </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
- <scope>test</scope>
- </dependency>
  <dependency>
  <groupId>org.assertj</groupId>
  <artifactId>assertj-core</artifactId>

datasafe-types-api/pom.xml

@@ -39,11 +39,6 @@
  <artifactId>mockito-core</artifactId>
  <scope>test</scope>
  </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
- <scope>test</scope>
- </dependency>
  <dependency>
  <groupId>com.google.guava</groupId>
  <artifactId>guava</artifactId>

datasafe-types-api/src/test/java/de/adorsys/datasafe/types/api/shared/BaseMockitoTest.java

@@ -3,27 +3,29 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.MockitoAnnotations;
 
 /**
  * This class configures Mockito so that it will inject annotated mocks and display exceptions always
  * at correct places.
  * Tests that use Mockito should use this class.
  */
-@ExtendWith(MockitoExtension.class)
 public abstract class BaseMockitoTest {
 
+ AutoCloseable openMocks;
+
  @BeforeEach
  public void setup() {
+ openMocks = MockitoAnnotations.openMocks(this);
  System.setProperty("SECURE_LOGS", "off");
  System.setProperty("SECURE_SENSITIVE", "off");
  }
 
  @AfterEach
- public void validate() {
+ public void validate() throws Exception {
  Mockito.validateMockitoUsage();
+ openMocks.close();
  }
 
  @AfterAll

pom.xml

@@ -275,12 +275,6 @@
  <version>${mockito.version}</version>
  <scope>test</scope>
  </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-junit-jupiter</artifactId>
- <version>${mockito.version}</version>
- <scope>test</scope>
- </dependency>
  <dependency>
  <groupId>org.testcontainers</groupId>
  <artifactId>testcontainers</artifactId>