Merge pull request #794 from liimaorg/update_mockito

chore: update to Mockito to 4.11.0

AMW_business/pom.xml

@@ -90,10 +90,6 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- Envers -->
-		<!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-envers</artifactId> <version>3.6.8.Final</version> 
-			</dependency> -->
-
 		<!-- JSR-303 (Bean Validation) Implementation -->
 		<!-- Provides portable constraints such as @Email -->
 		<!-- Hibernate Validator is shipped in JBoss AS 7 -->

AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/boundary/DeploymentBoundaryPersistenceTest.java

@@ -57,8 +57,8 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyList;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.Mockito.*;
 
 @RunWith(PersistenceTestRunner.class)

AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentAsynchronousExecuterTest.java

@@ -20,7 +20,7 @@
 
 package ch.puzzle.itc.mobiliar.business.deploy.control;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 

AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentExecuterServiceTest.java

@@ -45,8 +45,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
 
 public class DeploymentExecuterServiceTest {

AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/deploy/control/DeploymentNotificationServiceTest.java

@@ -41,8 +41,8 @@
 import java.util.logging.Logger;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
 
 public class DeploymentNotificationServiceTest {

AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/generator/control/GeneratorDomainServiceWithAppServerRelationsTest.java

@@ -35,7 +35,7 @@
 import org.mockito.MockitoAnnotations;
 
 import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 
 public class GeneratorDomainServiceWithAppServerRelationsTest {
 

AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/generator/control/factory/GenerationUnitFactoryAmwTest.java

@@ -31,8 +31,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 

AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/resourcegroup/boundary/ResourceBoundaryPersistenceTest.java

@@ -60,7 +60,7 @@
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

AMW_business/src/test/java/ch/puzzle/itc/mobiliar/business/security/boundary/PermissionBoundaryTest.java

@@ -56,7 +56,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 public class PermissionBoundaryTest {
@@ -724,7 +724,7 @@ public void shouldInvokeTheRightMethodOfPermissionServiceToAskForResourceTemplat
         // when
         permissionBoundary.hasPermissionToAddTemplate(resource);
         // then
-        verify(permissionService, never()).hasPermissionToAddResourceTypeTemplate((ResourceTypeEntity) anyObject());
+        verify(permissionService, never()).hasPermissionToAddResourceTypeTemplate(any(ResourceTypeEntity.class));
         verify(permissionService).hasPermissionToAddResourceTemplate(resource);
     }
 
@@ -737,7 +737,7 @@ public void shouldInvokeTheRightMethodOfPermissionServiceToAskForResourceTypeTem
         // when
         permissionBoundary.hasPermissionToAddTemplate(type);
         // then
-        verify(permissionService, never()).hasPermissionToAddResourceTemplate((ResourceEntity) anyObject());
+        verify(permissionService, never()).hasPermissionToAddResourceTemplate(any(ResourceEntity.class));
         verify(permissionService).hasPermissionToAddResourceTypeTemplate(type);
     }
 

AMW_business/src/test/java/ch/puzzle/itc/mobiliar/test/PersistingEntityBuilder.java

@@ -49,7 +49,7 @@ public PersistingEntityBuilder(EntityManager entityManager) {
 
 	@Override
 	protected void build() {
-		// dont build amw by default
+		// don't build amw by default
 	}
 
 	public PersistingEntityBuilder buildAmw() {

pom.xml

@@ -386,7 +386,7 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-                <version>3.4.6</version>
+                <version>4.11.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>