From 4faeaff6b6df7f14ba0d3e2460b0e86224d7cb07 Mon Sep 17 00:00:00 2001
From: Oskar Rajzner <115808064+viepovsky@users.noreply.github.com>
Date: Wed, 26 Jul 2023 11:37:59 +0200
Subject: [PATCH] ACS-5449 Bump mockito-core from 4.9.0 to 5.4.0 (#2071)

---
 pom.xml                                       |  2 +-
 .../repo/lock/LockServiceImplTest.java        |  4 +-
 .../repo/rule/RuleServiceImplUnitTest.java    | 10 ++---
 .../test/resources/test-messaging-context.xml | 41 ++++++++++---------
 .../test-nodeLocatorServiceImpl-context.xml   | 10 ++---
 5 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8a9ec894c6..b11c79cb8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
         <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
         <dependency.webscripts.version>8.45</dependency.webscripts.version>
         <dependency.bouncycastle.version>1.70</dependency.bouncycastle.version>
-        <dependency.mockito-core.version>4.9.0</dependency.mockito-core.version>
+        <dependency.mockito-core.version>5.4.0</dependency.mockito-core.version>
         <dependency.assertj.version>3.24.2</dependency.assertj.version>
         <dependency.org-json.version>20230618</dependency.org-json.version>
         <dependency.commons-dbcp.version>2.9.0</dependency.commons-dbcp.version>
diff --git a/repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java b/repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java
index 0cefdf716f..fd7f819855 100644
--- a/repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java
+++ b/repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -114,7 +114,7 @@ public class LockServiceImplTest extends BaseSpringTest
     private PolicyComponent policyComponent;
 
 
-    private class LockServicePoliciesImpl implements LockServicePolicies.BeforeLock,
+    public class LockServicePoliciesImpl implements LockServicePolicies.BeforeLock,
             LockServicePolicies.BeforeUnlock
     {
         @Override
diff --git a/repository/src/test/java/org/alfresco/repo/rule/RuleServiceImplUnitTest.java b/repository/src/test/java/org/alfresco/repo/rule/RuleServiceImplUnitTest.java
index 8d03048175..0423143abd 100644
--- a/repository/src/test/java/org/alfresco/repo/rule/RuleServiceImplUnitTest.java
+++ b/repository/src/test/java/org/alfresco/repo/rule/RuleServiceImplUnitTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of
@@ -48,11 +48,7 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.then;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.openMocks;
 
 import java.io.Serializable;
@@ -97,7 +93,7 @@ public class RuleServiceImplUnitTest
     @Mock
     private PermissionService permissionService;
     @Mock
-    private SimpleCache nodeRulesCache;
+    private SimpleCache<NodeRef, List<Rule>> nodeRulesCache;
     @Mock
     private NodeService runtimeNodeService;
     @Mock
diff --git a/repository/src/test/resources/test-messaging-context.xml b/repository/src/test/resources/test-messaging-context.xml
index fda5961a26..5f25f04446 100644
--- a/repository/src/test/resources/test-messaging-context.xml
+++ b/repository/src/test/resources/test-messaging-context.xml
@@ -8,36 +8,37 @@
         <property name="location" value="test-messaging.properties" />
     </bean>
 
+    <bean id="transactionAwareEventProducer" class="org.mockito.Mockito" factory-method="mock">
+        <constructor-arg type="java.lang.Class" value="org.alfresco.repo.rawevents.TransactionAwareEventProducer" />
+    </bean>
+
+    <bean id="policyComponent" class="org.mockito.Mockito" factory-method="mock">
+        <constructor-arg type="java.lang.Class" value="org.alfresco.repo.policy.PolicyComponentImpl"/>
+    </bean>
+
+    <bean id="transformRequestProcessor" class="org.mockito.Mockito" factory-method="mock">
+        <constructor-arg type="java.lang.Class" value="org.alfresco.repo.rendition2.TransformRequestProcessor" />
+    </bean>
+
     <import resource="classpath:/alfresco/subsystems/Messaging/default/messaging-context.xml" />
 
-    <bean id="messagingExceptionProcessor" 
-        class="org.alfresco.messaging.camel.MockExceptionProcessor" />
-        
-    <bean id="mockConsumer" 
-        class="org.alfresco.messaging.camel.MockConsumer" />
+    <bean id="messagingExceptionProcessor"
+          class="org.alfresco.messaging.camel.MockExceptionProcessor" />
+
+    <bean id="mockConsumer"
+          class="org.alfresco.messaging.camel.MockConsumer" />
+
+    <bean id="mockExceptionThrowingConsumer"
+          class="org.alfresco.messaging.camel.MockExceptionThrowingConsumer" />
 
-    <bean id="mockExceptionThrowingConsumer" 
-        class="org.alfresco.messaging.camel.MockExceptionThrowingConsumer" />
-    
     <import resource="testRoutes.xml" />
     <bean id="testNewRouteLoader" class="org.alfresco.messaging.camel.SpringContextRouteLoader">
         <property name="camelContextId" value="alfrescoCamelContext" />
         <property name="routeContextId" value="customRoutes" />
     </bean>
 
-    <bean id="transactionAwareEventProducer" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.repo.rawevents.TransactionAwareEventProducer" />
-    </bean>
-
-    <bean id="policyComponent" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.repo.policy.PolicyComponentImpl"/>
-    </bean>
-
     <bean id="renditionEventProcessor" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.repo.rendition2.RenditionEventProcessor"/>
+        <constructor-arg type="java.lang.Class" value="org.alfresco.repo.rendition2.RenditionEventProcessor"/>
     </bean>
 
-    <bean id="transformRequestProcessor" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.repo.rendition2.TransformRequestProcessor" />
-    </bean>
 </beans>
\ No newline at end of file
diff --git a/repository/src/test/resources/test-nodeLocatorServiceImpl-context.xml b/repository/src/test/resources/test-nodeLocatorServiceImpl-context.xml
index db4be946b4..39f1ffca06 100644
--- a/repository/src/test/resources/test-nodeLocatorServiceImpl-context.xml
+++ b/repository/src/test/resources/test-nodeLocatorServiceImpl-context.xml
@@ -3,23 +3,23 @@
 <beans>
 
     <bean id="repositoryHelper" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.repo.model.Repository" />
+        <constructor-arg type="java.lang.Class" value="org.alfresco.repo.model.Repository" />
     </bean>
 
     <bean id="SiteService" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.repo.site.SiteServiceInternal" />
+        <constructor-arg type="java.lang.Class" value="org.alfresco.repo.site.SiteServiceInternal" />
     </bean>
 
     <bean id="NodeService" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.service.cmr.repository.NodeService" />
+        <constructor-arg type="java.lang.Class" value="org.alfresco.service.cmr.repository.NodeService" />
     </bean>
 
     <bean id="NamespaceService" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.service.namespace.NamespaceService" />
+        <constructor-arg type="java.lang.Class" value="org.alfresco.service.namespace.NamespaceService" />
     </bean>
 
     <bean id="SearchService" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.service.cmr.search.SearchService" />
+        <constructor-arg type="java.lang.Class" value="org.alfresco.service.cmr.search.SearchService" />
     </bean>
 
 </beans>
\ No newline at end of file