Skip to content

Commit 20877f3

Browse files
author
Henrique Sato
committed
Fix tests
1 parent 5535203 commit 20877f3

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

server/src/test/java/com/cloud/network/vpc/VpcManagerImplTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,13 +364,13 @@ public void testCreateVpcNetwork() throws InsufficientCapacityException, Resourc
364364
Mockito.when(entityMgr.findById(NetworkOffering.class, 1L)).thenReturn(offering);
365365
Mockito.when(vpcMock.getId()).thenReturn(VPC_ID);
366366
Mockito.when(vpcDao.acquireInLockTable(VPC_ID)).thenReturn(vpcMockVO);
367-
Mockito.when(networkDao.countVpcNetworks(anyLong())).thenReturn(1L);
368367
Mockito.when(offering.getGuestType()).thenReturn(Network.GuestType.Isolated);
369368
Mockito.when(networkModel.listNetworkOfferingServices(anyLong())).thenReturn(services);
370369
Mockito.when(networkOfferingServiceMapDao.listByNetworkOfferingId(anyLong())).thenReturn(serviceMap);
371370
Mockito.when(vpcMock.getCidr()).thenReturn("10.0.0.0/8");
372371
Mockito.when(vpcMock.getNetworkDomain()).thenReturn("cs1cloud.internal");
373372
Mockito.when(manager.existsVpcDomainRouterWithSufficientNicCapacity(VPC_ID)).thenReturn(true);
373+
Mockito.doNothing().when(manager).checkIfVpcNumberOfTiersIsNotExceeded(Mockito.anyLong(), Mockito.any());
374374

375375
manager.validateNewVpcGuestNetwork("10.10.10.0/24", "10.10.10.1", accountMock, vpcMock, "cs1cloud.internal");
376376
manager.validateNtwkOffForNtwkInVpc(2L, 1, "10.10.10.0/24", "111-", vpcMock, "10.1.1.1", new AccountVO(), null);
@@ -560,11 +560,10 @@ public void existsVpcDomainRouterWithSufficientNicCapacityTestNullRouterReturnsF
560560

561561
@Test
562562
public void checkIfVpcNumberOfTiersIsNotExceededTestExceededTiersThrowCloudRuntimeException() {
563-
int maxNetworks = 3;
564563
AccountVO accountMock = Mockito.mock(AccountVO.class);
565564
Mockito.doReturn(5L).when(networkDao).countVpcNetworks(1L);
566565

567-
Assert.assertThrows(CloudRuntimeException.class, () -> manager.checkIfVpcNumberOfTiersIsNotExceeded(vpcId, maxNetworks, accountMock));
566+
Assert.assertThrows(CloudRuntimeException.class, () -> manager.checkIfVpcNumberOfTiersIsNotExceeded(vpcId, accountMock));
568567
}
569568

570569
@Test

0 commit comments

Comments
 (0)