This is an automated email from the ASF dual-hosted git repository. pearl11594 pushed a commit to branch nsx-reorder-acl in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 3b9615e5362d8965253228954bca62a9a7c6dc39 Author: nvazquez <[email protected]> AuthorDate: Tue Feb 6 13:02:41 2024 -0300 Fix tests --- .../network/vpc/NetworkACLServiceImplTest.java | 28 ++++++++++------------ 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java b/server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java index e9fcf32431c..938879d8f9f 100644 --- a/server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java +++ b/server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java @@ -35,7 +35,6 @@ import java.util.Map; import com.cloud.dc.DataCenter; import com.cloud.exception.PermissionDeniedException; import com.cloud.network.dao.NsxProviderDao; -import com.cloud.network.element.NsxProviderVO; import com.cloud.network.vpc.dao.VpcDao; import org.apache.cloudstack.acl.SecurityChecker.AccessType; import org.apache.cloudstack.api.ServerApiException; @@ -147,25 +146,23 @@ public class NetworkACLServiceImplTest { @Before public void setup() { - try (MockedStatic<CallContext> callContextMocked = Mockito.mockStatic(CallContext.class)) { - CallContext callContextMock = Mockito.mock(CallContext.class); - callContextMocked.when(CallContext::current).thenReturn(callContextMock); - Mockito.doReturn(Mockito.mock(User.class)).when(callContextMock).getCallingUser(); - Mockito.doReturn(Mockito.mock(Account.class)).when(callContextMock).getCallingAccount(); + callContextMocked = Mockito.mockStatic(CallContext.class); + Mockito.when(CallContext.current()).thenReturn(callContextMock); + Mockito.doReturn(Mockito.mock(User.class)).when(callContextMock).getCallingUser(); + Mockito.doReturn(Mockito.mock(Account.class)).when(callContextMock).getCallingAccount(); - Mockito.when(networkAclDaoMock.findById(networkAclListId)).thenReturn(networkACLVOMock); - Mockito.when(createNetworkAclCmdMock.getNetworkId()).thenReturn(1L); - Mockito.when(createNetworkAclCmdMock.getProtocol()).thenReturn("tcp"); + Mockito.when(networkAclDaoMock.findById(networkAclListId)).thenReturn(networkACLVOMock); + Mockito.when(createNetworkAclCmdMock.getNetworkId()).thenReturn(1L); + Mockito.when(createNetworkAclCmdMock.getProtocol()).thenReturn("tcp"); - Mockito.when(networkMock.getNetworkOfferingId()).thenReturn(networkOfferingMockId); - Mockito.when(networkMock.getVpcId()).thenReturn(networkMockVpcMockId); + Mockito.when(networkMock.getNetworkOfferingId()).thenReturn(networkOfferingMockId); + Mockito.when(networkMock.getVpcId()).thenReturn(networkMockVpcMockId); - Mockito.when(moveNetworkAclItemCmdMock.getUuidRuleBeingMoved()).thenReturn(uuidAclRuleBeingMoved); + Mockito.when(moveNetworkAclItemCmdMock.getUuidRuleBeingMoved()).thenReturn(uuidAclRuleBeingMoved); - Mockito.when(aclRuleBeingMovedMock.getAclId()).thenReturn(networkAclMockId); + Mockito.when(aclRuleBeingMovedMock.getAclId()).thenReturn(networkAclMockId); - Mockito.when(networkAclMock.getVpcId()).thenReturn(networkMockVpcMockId); - } + Mockito.when(networkAclMock.getVpcId()).thenReturn(networkMockVpcMockId); } @After @@ -1014,7 +1011,6 @@ public class NetworkACLServiceImplTest { Mockito.doReturn(previousAclRuleMock).when(networkAclServiceImpl).retrieveAndValidateAclRule(previousAclRuleUuid); Mockito.doReturn(nextAclRuleMock).when(networkAclServiceImpl).retrieveAndValidateAclRule(nextAclRuleUuid); - when(nsxProviderDao.findByZoneId(anyLong())).then(null); configureMoveMethodsToDoNothing();
