[syncope] branch 2_1_X updated: Upgrading Mockito

[ilgrosso]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/2_1_X by this push:
     new 2baffcf  Upgrading Mockito
2baffcf is described below

commit 2baffcf668427d283907e9cb08e5243636233ba1
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Mon Jul 20 06:45:21 2020 +0200

    Upgrading Mockito
---
 .../org/apache/syncope/core/provisioning/api/AbstractTest.java |  2 +-
 .../apache/syncope/core/provisioning/java/AbstractTest.java    | 10 +++++-----
 pom.xml                                                        |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/AbstractTest.java
 
b/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/AbstractTest.java
index 9993be0..deccfdd 100644
--- 
a/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/AbstractTest.java
+++ 
b/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/AbstractTest.java
@@ -32,6 +32,6 @@ public class AbstractTest {
 
     @BeforeEach
     public void init() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 }
diff --git 
a/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/AbstractTest.java
 
b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/AbstractTest.java
index abed343..eb82953 100644
--- 
a/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/AbstractTest.java
+++ 
b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/AbstractTest.java
@@ -40,11 +40,6 @@ import 
org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 @ExtendWith(MockitoExtension.class)
 public abstract class AbstractTest {
 
-    @BeforeEach 
-    public void initMocks() {
-        MockitoAnnotations.initMocks(this);
-    }
-
     protected EntityManager entityManager() {
         EntityManager entityManager = 
EntityManagerFactoryUtils.getTransactionalEntityManager(
                 EntityManagerFactoryUtils.findEntityManagerFactory(
@@ -60,4 +55,9 @@ public abstract class AbstractTest {
     public static void init() {
         EntitlementsHolder.getInstance().init(StandardEntitlement.values());
     }
+
+    @BeforeEach
+    public void initMocks() {
+        MockitoAnnotations.openMocks(this);
+    }
 }
diff --git a/pom.xml b/pom.xml
index fc0c348..f9da643 100644
--- a/pom.xml
+++ b/pom.xml
@@ -450,7 +450,7 @@ under the License.
     <h2.version>1.4.200</h2.version>
 
     <junit.version>5.6.2</junit.version>
-    <mockito.version>3.4.2</mockito.version>
+    <mockito.version>3.4.4</mockito.version>
 
     <conf.directory>${project.build.directory}/test-classes</conf.directory>
     <bundles.directory>${project.build.directory}/bundles</bundles.directory>