inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-5449 Bump mockito-core from 4.9.0 to 5.4.0 (#2071)

Browse Source
This commit is contained in:
Oskar Rajzner
2023-07-26 11:37:59 +02:00
committed by GitHub
parent fcf3e005e4
commit 4faeaff6b6
5 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -63,7 +63,7 @@
<dependency.opencmis.version>1.0.0</dependency.opencmis.version> <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
<dependency.webscripts.version>8.45</dependency.webscripts.version> <dependency.webscripts.version>8.45</dependency.webscripts.version>
<dependency.bouncycastle.version>1.70</dependency.bouncycastle.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.assertj.version>3.24.2</dependency.assertj.version>
<dependency.org-json.version>20230618</dependency.org-json.version> <dependency.org-json.version>20230618</dependency.org-json.version>
<dependency.commons-dbcp.version>2.9.0</dependency.commons-dbcp.version> <dependency.commons-dbcp.version>2.9.0</dependency.commons-dbcp.version>

4
repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java
View File

@@ -2,7 +2,7 @@
* #%L * #%L
* Alfresco Repository * Alfresco Repository
* %% * %%
* Copyright (C) 2005 - 2018 Alfresco Software Limited * Copyright (C) 2005 - 2023 Alfresco Software Limited
* %% * %%
* This file is part of the Alfresco software. * This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of * 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 PolicyComponent policyComponent;
private class LockServicePoliciesImpl implements LockServicePolicies.BeforeLock, public class LockServicePoliciesImpl implements LockServicePolicies.BeforeLock,
LockServicePolicies.BeforeUnlock LockServicePolicies.BeforeUnlock
{ {
@Override @Override

10
repository/src/test/java/org/alfresco/repo/rule/RuleServiceImplUnitTest.java
View File

@@ -2,7 +2,7 @@
* #%L * #%L
* Alfresco Repository * Alfresco Repository
* %% * %%
* Copyright (C) 2005 - 2022 Alfresco Software Limited * Copyright (C) 2005 - 2023 Alfresco Software Limited
* %% * %%
* This file is part of the Alfresco software. * This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of * 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.ArgumentMatchers.nullable;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.then; import static org.mockito.BDDMockito.then;
import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.*;
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.MockitoAnnotations.openMocks; import static org.mockito.MockitoAnnotations.openMocks;
import java.io.Serializable; import java.io.Serializable;
@@ -97,7 +93,7 @@ public class RuleServiceImplUnitTest
@Mock @Mock
private PermissionService permissionService; private PermissionService permissionService;
@Mock @Mock
private SimpleCache nodeRulesCache; private SimpleCache<NodeRef, List<Rule>> nodeRulesCache;
@Mock @Mock
private NodeService runtimeNodeService; private NodeService runtimeNodeService;
@Mock @Mock

25
repository/src/test/resources/test-messaging-context.xml
View File

@@ -8,6 +8,18 @@
<property name="location" value="test-messaging.properties" /> <property name="location" value="test-messaging.properties" />
</bean> </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" /> <import resource="classpath:/alfresco/subsystems/Messaging/default/messaging-context.xml" />
<bean id="messagingExceptionProcessor" <bean id="messagingExceptionProcessor"
@@ -25,19 +37,8 @@
<property name="routeContextId" value="customRoutes" /> <property name="routeContextId" value="customRoutes" />
</bean> </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"> <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>
<bean id="transformRequestProcessor" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.alfresco.repo.rendition2.TransformRequestProcessor" />
</bean>
</beans> </beans>

10
repository/src/test/resources/test-nodeLocatorServiceImpl-context.xml
View File

@@ -3,23 +3,23 @@
<beans> <beans>
<bean id="repositoryHelper" class="org.mockito.Mockito" factory-method="mock"> <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>
<bean id="SiteService" class="org.mockito.Mockito" factory-method="mock"> <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>
<bean id="NodeService" class="org.mockito.Mockito" factory-method="mock"> <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>
<bean id="NamespaceService" class="org.mockito.Mockito" factory-method="mock"> <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>
<bean id="SearchService" class="org.mockito.Mockito" factory-method="mock"> <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> </bean>
</beans> </beans>