etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix tests

This commit is contained in:
nvazquez 2024-02-06 13:02:41 -03:00
parent 08ed58066d
commit a428933b14
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/src/test/java/com/cloud/network/vpc/NetworkACLServiceImplTest.java
View File

@ -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();