mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
api: remove powermock from tests (#7645)
This commit is contained in:
parent
c69e3c5f42
commit
9c65767f95
@ -52,9 +52,11 @@ public class CreateAccountCmdTest {
|
||||
private Integer accountType = 1;
|
||||
private Long domainId = 1L;
|
||||
|
||||
private AutoCloseable closeable;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
closeable = MockitoAnnotations.openMocks(this);
|
||||
ReflectionTestUtils.setField(createAccountCmd, "domainId", domainId);
|
||||
ReflectionTestUtils.setField(createAccountCmd, "accountType", accountType);
|
||||
CallContext.register(Mockito.mock(User.class), Mockito.mock(Account.class));
|
||||
@ -62,6 +64,7 @@ public class CreateAccountCmdTest {
|
||||
|
||||
@After
|
||||
public void tearDown() throws Exception {
|
||||
closeable.close();
|
||||
CallContext.unregister();
|
||||
}
|
||||
|
||||
|
||||
@ -18,6 +18,7 @@
|
||||
*/
|
||||
package org.apache.cloudstack.api.command.admin.annotation;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
@ -26,9 +27,16 @@ public class AddAnnotationCmdTest {
|
||||
|
||||
private AddAnnotationCmd addAnnotationCmd = new AddAnnotationCmd();
|
||||
|
||||
private AutoCloseable closeable;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
closeable = MockitoAnnotations.openMocks(this);
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() throws Exception {
|
||||
closeable.close();
|
||||
}
|
||||
|
||||
@Test (expected = IllegalStateException.class)
|
||||
|
||||
@ -20,23 +20,20 @@ import com.cloud.server.ManagementService;
|
||||
import com.cloud.user.Account;
|
||||
import com.cloud.utils.Pair;
|
||||
import org.apache.cloudstack.context.CallContext;
|
||||
import org.junit.After;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockedStatic;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.powermock.api.mockito.PowerMockito;
|
||||
import org.powermock.core.classloader.annotations.PowerMockIgnore;
|
||||
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||
import org.powermock.modules.junit4.PowerMockRunner;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
@RunWith(PowerMockRunner.class)
|
||||
@PrepareForTest(CallContext.class)
|
||||
@PowerMockIgnore({"javax.xml.*", "org.w3c.dom.*", "org.apache.xerces.*", "org.xml.*"})
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class PatchSystemVMCmdTest {
|
||||
|
||||
@Mock
|
||||
@ -45,9 +42,16 @@ public class PatchSystemVMCmdTest {
|
||||
@InjectMocks
|
||||
PatchSystemVMCmd cmd = new PatchSystemVMCmd();
|
||||
|
||||
private AutoCloseable closeable;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
closeable = MockitoAnnotations.openMocks(this);
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() throws Exception {
|
||||
closeable.close();
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -76,17 +80,16 @@ public class PatchSystemVMCmdTest {
|
||||
|
||||
@Test
|
||||
public void validateArgsForPatchSystemVMApi() {
|
||||
PowerMockito.mockStatic(CallContext.class);
|
||||
CallContext callContextMock = PowerMockito.mock(CallContext.class);
|
||||
PowerMockito.when(CallContext.current()).thenReturn(callContextMock);
|
||||
Account accountMock = PowerMockito.mock(Account.class);
|
||||
PowerMockito.when(callContextMock.getCallingAccount()).thenReturn(accountMock);
|
||||
Mockito.when(accountMock.getId()).thenReturn(2L);
|
||||
ReflectionTestUtils.setField(cmd, "id", 1L);
|
||||
Assert.assertEquals((long)cmd.getId(), 1L);
|
||||
Assert.assertFalse(cmd.isForced());
|
||||
Assert.assertEquals(cmd.getEntityOwnerId(), 2L);
|
||||
|
||||
|
||||
try (MockedStatic<CallContext> callContextMocked = Mockito.mockStatic(CallContext.class)) {
|
||||
CallContext callContextMock = Mockito.mock(CallContext.class);
|
||||
callContextMocked.when(CallContext::current).thenReturn(callContextMock);
|
||||
Account accountMock = Mockito.mock(Account.class);
|
||||
Mockito.when(callContextMock.getCallingAccount()).thenReturn(accountMock);
|
||||
Mockito.when(accountMock.getId()).thenReturn(2L);
|
||||
ReflectionTestUtils.setField(cmd, "id", 1L);
|
||||
Assert.assertEquals((long) cmd.getId(), 1L);
|
||||
Assert.assertFalse(cmd.isForced());
|
||||
Assert.assertEquals(cmd.getEntityOwnerId(), 2L);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -46,14 +46,17 @@ public class CreateUserCmdTest {
|
||||
@InjectMocks
|
||||
private CreateUserCmd createUserCmd = new CreateUserCmd();
|
||||
|
||||
private AutoCloseable closeable;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
closeable = MockitoAnnotations.openMocks(this);
|
||||
CallContext.register(Mockito.mock(User.class), Mockito.mock(Account.class));
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() throws Exception {
|
||||
closeable.close();
|
||||
CallContext.unregister();
|
||||
}
|
||||
|
||||
|
||||
@ -24,18 +24,17 @@ import org.apache.cloudstack.api.ResponseObject;
|
||||
import org.apache.cloudstack.api.command.user.vm.ResetVMUserDataCmd;
|
||||
import org.apache.cloudstack.api.response.UserVmResponse;
|
||||
import org.apache.cloudstack.context.CallContext;
|
||||
import org.junit.After;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockedStatic;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.powermock.api.mockito.PowerMockito;
|
||||
import org.powermock.core.classloader.annotations.PowerMockIgnore;
|
||||
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||
import org.powermock.modules.junit4.PowerMockRunner;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@ -45,9 +44,7 @@ import java.util.Map;
|
||||
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@RunWith(PowerMockRunner.class)
|
||||
@PrepareForTest(CallContext.class)
|
||||
@PowerMockIgnore({"javax.xml.*", "org.w3c.dom.*", "org.apache.xerces.*", "org.xml.*"})
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class ResetVMUserDataCmdTest {
|
||||
|
||||
@InjectMocks
|
||||
@ -66,14 +63,22 @@ public class ResetVMUserDataCmdTest {
|
||||
private static final long PROJECT_ID = 10L;
|
||||
private static final String ACCOUNT_NAME = "user";
|
||||
|
||||
private AutoCloseable closeable;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
closeable = MockitoAnnotations.openMocks(this);
|
||||
ReflectionTestUtils.setField(cmd, "accountName", ACCOUNT_NAME);
|
||||
ReflectionTestUtils.setField(cmd, "domainId", DOMAIN_ID);
|
||||
ReflectionTestUtils.setField(cmd, "projectId", PROJECT_ID);
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() throws Exception {
|
||||
closeable.close();
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testValidResetVMUserDataExecute() {
|
||||
UserVm result = Mockito.mock(UserVm.class);
|
||||
@ -95,22 +100,23 @@ public class ResetVMUserDataCmdTest {
|
||||
|
||||
@Test
|
||||
public void validateArgsCmd() {
|
||||
PowerMockito.mockStatic(CallContext.class);
|
||||
CallContext callContextMock = PowerMockito.mock(CallContext.class);
|
||||
PowerMockito.when(CallContext.current()).thenReturn(callContextMock);
|
||||
try (MockedStatic<CallContext> callContextMocked = Mockito.mockStatic(CallContext.class)) {
|
||||
CallContext callContextMock = Mockito.mock(CallContext.class);
|
||||
callContextMocked.when(CallContext::current).thenReturn(callContextMock);
|
||||
|
||||
ReflectionTestUtils.setField(cmd, "id", 1L);
|
||||
ReflectionTestUtils.setField(cmd, "userdataId", 2L);
|
||||
ReflectionTestUtils.setField(cmd, "userData", "testUserdata");
|
||||
ReflectionTestUtils.setField(cmd, "id", 1L);
|
||||
ReflectionTestUtils.setField(cmd, "userdataId", 2L);
|
||||
ReflectionTestUtils.setField(cmd, "userData", "testUserdata");
|
||||
|
||||
UserVm vm = Mockito.mock(UserVm.class);
|
||||
when(_responseGenerator.findUserVmById(1L)).thenReturn(vm);
|
||||
when(vm.getAccountId()).thenReturn(200L);
|
||||
UserVm vm = Mockito.mock(UserVm.class);
|
||||
when(_responseGenerator.findUserVmById(1L)).thenReturn(vm);
|
||||
when(vm.getAccountId()).thenReturn(200L);
|
||||
|
||||
Assert.assertEquals(1L, (long)cmd.getId());
|
||||
Assert.assertEquals(2L, (long)cmd.getUserdataId());
|
||||
Assert.assertEquals("testUserdata", cmd.getUserData());
|
||||
Assert.assertEquals(200L, cmd.getEntityOwnerId());
|
||||
Assert.assertEquals(1L, (long) cmd.getId());
|
||||
Assert.assertEquals(2L, (long) cmd.getUserdataId());
|
||||
Assert.assertEquals("testUserdata", cmd.getUserData());
|
||||
Assert.assertEquals(200L, cmd.getEntityOwnerId());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@ -20,29 +20,41 @@ import com.cloud.network.Network;
|
||||
import com.cloud.network.NetworkService;
|
||||
import com.cloud.utils.net.NetUtils;
|
||||
import org.apache.cloudstack.api.ServerApiException;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockedStatic;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.Spy;
|
||||
import org.powermock.api.mockito.PowerMockito;
|
||||
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||
import org.powermock.modules.junit4.PowerMockRunner;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@PrepareForTest(NetUtils.class)
|
||||
@RunWith(PowerMockRunner.class)
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class CreateEgressFirewallRuleCmdTest {
|
||||
|
||||
@Mock
|
||||
NetworkService networkServiceMock;
|
||||
|
||||
@Spy
|
||||
@InjectMocks
|
||||
CreateEgressFirewallRuleCmd cmdMock = new CreateEgressFirewallRuleCmd();
|
||||
|
||||
MockedStatic<NetUtils> netUtilsMocked;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
ReflectionTestUtils.setField(cmdMock, "_networkService", networkServiceMock);;
|
||||
netUtilsMocked = Mockito.mockStatic(NetUtils.class);
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() throws Exception {
|
||||
netUtilsMocked.close();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void validateCidrsTestValidCidrs(){
|
||||
ArrayList<String> listMock = new ArrayList<>();
|
||||
@ -59,10 +71,9 @@ public class CreateEgressFirewallRuleCmdTest {
|
||||
|
||||
Mockito.doReturn(cidrMock).when(networkMock).getCidr();
|
||||
|
||||
PowerMockito.mockStatic(NetUtils.class);
|
||||
PowerMockito.when(NetUtils.isValidIp4Cidr(cidrMock)).thenReturn(true);
|
||||
PowerMockito.when(NetUtils.isValidIp6Cidr(cidrMock)).thenReturn(false);
|
||||
PowerMockito.when(NetUtils.isNetworkAWithinNetworkB(cidrMock,cidrMock)).thenReturn(true);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp4Cidr(cidrMock)).thenReturn(true);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp6Cidr(cidrMock)).thenReturn(false);
|
||||
netUtilsMocked.when(() -> NetUtils.isNetworkAWithinNetworkB(cidrMock,cidrMock)).thenReturn(true);
|
||||
|
||||
cmdMock.validateCidrs();
|
||||
|
||||
@ -71,12 +82,9 @@ public class CreateEgressFirewallRuleCmdTest {
|
||||
Mockito.verify(networkServiceMock).getNetwork(networkIdMock);
|
||||
Mockito.verify(networkMock).getCidr();
|
||||
|
||||
PowerMockito.verifyStatic(NetUtils.class, Mockito.times(2));
|
||||
NetUtils.isValidIp4Cidr(cidrMock);
|
||||
NetUtils.isValidIp6Cidr(cidrMock);
|
||||
|
||||
PowerMockito.verifyStatic(NetUtils.class);
|
||||
NetUtils.isNetworkAWithinNetworkB(cidrMock,cidrMock);
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp4Cidr(cidrMock), Mockito.times(2));
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp6Cidr(cidrMock), Mockito.never());
|
||||
netUtilsMocked.verify(() -> NetUtils.isNetworkAWithinNetworkB(cidrMock,cidrMock), Mockito.times(1));
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -95,10 +103,9 @@ public class CreateEgressFirewallRuleCmdTest {
|
||||
|
||||
Mockito.doReturn("10.1.1.0/24").when(networkMock).getCidr();
|
||||
|
||||
PowerMockito.mockStatic(NetUtils.class);
|
||||
PowerMockito.when(NetUtils.isValidIp4Cidr(Mockito.eq("10.1.1.0/24"))).thenReturn(true);
|
||||
PowerMockito.when(NetUtils.isValidIp6Cidr(Mockito.eq("10.1.1.0/24"))).thenReturn(false);
|
||||
PowerMockito.when(NetUtils.isNetworkAWithinNetworkB(Mockito.eq("10.1.1.0/24"), Mockito.eq("10.1.1.0/24"))).thenReturn(true);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp4Cidr(Mockito.eq("10.1.1.0/24"))).thenReturn(true);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp6Cidr(Mockito.eq("10.1.1.0/24"))).thenReturn(false);
|
||||
netUtilsMocked.when(() -> NetUtils.isNetworkAWithinNetworkB(Mockito.eq("10.1.1.0/24"), Mockito.eq("10.1.1.0/24"))).thenReturn(true);
|
||||
|
||||
cmdMock.validateCidrs();
|
||||
|
||||
@ -107,12 +114,10 @@ public class CreateEgressFirewallRuleCmdTest {
|
||||
Mockito.verify(networkServiceMock).getNetwork(networkIdMock);
|
||||
Mockito.verify(networkMock).getCidr();
|
||||
|
||||
PowerMockito.verifyStatic(NetUtils.class, Mockito.times(2));
|
||||
NetUtils.isValidIp4Cidr(Mockito.eq("10.1.1.0/24"));
|
||||
NetUtils.isValidIp6Cidr(Mockito.eq("10.1.1.0/24"));
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp4Cidr(Mockito.eq("10.1.1.0/24")), Mockito.times(2));
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp6Cidr(Mockito.eq("10.1.1.0/24")), Mockito.never());
|
||||
|
||||
PowerMockito.verifyStatic(NetUtils.class);
|
||||
NetUtils.isNetworkAWithinNetworkB(Mockito.eq("10.1.1.0/24"), Mockito.eq("10.1.1.0/24"));
|
||||
netUtilsMocked.verify(() -> NetUtils.isNetworkAWithinNetworkB(Mockito.eq("10.1.1.0/24"), Mockito.eq("10.1.1.0/24")));
|
||||
}
|
||||
|
||||
@Test (expected = ServerApiException.class)
|
||||
@ -131,9 +136,8 @@ public class CreateEgressFirewallRuleCmdTest {
|
||||
|
||||
Mockito.doReturn("10.1.1.0/24").when(networkMock).getCidr();
|
||||
|
||||
PowerMockito.mockStatic(NetUtils.class);
|
||||
PowerMockito.when(NetUtils.isValidIp4Cidr(sourceCidrMock)).thenReturn(false);
|
||||
PowerMockito.when(NetUtils.isValidIp6Cidr(sourceCidrMock)).thenReturn(false);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp4Cidr(sourceCidrMock)).thenReturn(false);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp6Cidr(sourceCidrMock)).thenReturn(false);
|
||||
|
||||
cmdMock.validateCidrs();
|
||||
|
||||
@ -142,9 +146,8 @@ public class CreateEgressFirewallRuleCmdTest {
|
||||
Mockito.verify(networkServiceMock).getNetwork(networkIdMock);
|
||||
Mockito.verify(networkMock).getCidr();
|
||||
|
||||
PowerMockito.verifyStatic(NetUtils.class, Mockito.times(1));
|
||||
NetUtils.isValidIp4Cidr(sourceCidrMock);
|
||||
NetUtils.isValidIp6Cidr(sourceCidrMock);
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp4Cidr(sourceCidrMock), Mockito.times(1));
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp6Cidr(sourceCidrMock), Mockito.times(1));
|
||||
}
|
||||
|
||||
@Test (expected = ServerApiException.class)
|
||||
@ -167,13 +170,12 @@ public class CreateEgressFirewallRuleCmdTest {
|
||||
|
||||
Mockito.doReturn(sourceCidrMock).when(networkMock).getCidr();
|
||||
|
||||
PowerMockito.mockStatic(NetUtils.class);
|
||||
PowerMockito.when(NetUtils.isValidIp4Cidr(Mockito.eq(sourceCidrMock))).thenReturn(true);
|
||||
PowerMockito.when(NetUtils.isValidIp6Cidr(Mockito.eq(sourceCidrMock))).thenReturn(false);
|
||||
PowerMockito.when(NetUtils.isNetworkAWithinNetworkB(sourceCidrMock, sourceCidrMock)).thenReturn(true);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp4Cidr(Mockito.eq(sourceCidrMock))).thenReturn(true);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp6Cidr(Mockito.eq(sourceCidrMock))).thenReturn(false);
|
||||
netUtilsMocked.when(() -> NetUtils.isNetworkAWithinNetworkB(sourceCidrMock, sourceCidrMock)).thenReturn(true);
|
||||
|
||||
PowerMockito.when(NetUtils.isValidIp4Cidr(Mockito.eq(destCidrMock))).thenReturn(false);
|
||||
PowerMockito.when(NetUtils.isValidIp6Cidr(Mockito.eq(destCidrMock))).thenReturn(false);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp4Cidr(Mockito.eq(destCidrMock))).thenReturn(false);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp6Cidr(Mockito.eq(destCidrMock))).thenReturn(false);
|
||||
|
||||
cmdMock.validateCidrs();
|
||||
|
||||
@ -182,16 +184,14 @@ public class CreateEgressFirewallRuleCmdTest {
|
||||
Mockito.verify(networkServiceMock).getNetwork(networkIdMock);
|
||||
Mockito.verify(networkMock).getCidr();
|
||||
|
||||
PowerMockito.verifyStatic(NetUtils.class);
|
||||
NetUtils.isValidIp4Cidr(sourceCidrMock);
|
||||
NetUtils.isValidIp6Cidr(sourceCidrMock);
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp4Cidr(sourceCidrMock));
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp6Cidr(sourceCidrMock));
|
||||
|
||||
PowerMockito.verifyStatic(NetUtils.class);
|
||||
NetUtils.isNetworkAWithinNetworkB(sourceCidrMock,sourceCidrMock);
|
||||
netUtilsMocked.verify(() -> NetUtils.isNetworkAWithinNetworkB(sourceCidrMock, sourceCidrMock));
|
||||
|
||||
PowerMockito.verifyStatic(NetUtils.class);
|
||||
NetUtils.isValidIp4Cidr(destCidrMock);
|
||||
NetUtils.isValidIp6Cidr(destCidrMock);
|
||||
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp4Cidr(destCidrMock));
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp6Cidr(destCidrMock));
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -214,12 +214,11 @@ public class CreateEgressFirewallRuleCmdTest {
|
||||
|
||||
Mockito.doReturn(sourceCidrMock).when(networkMock).getCidr();
|
||||
|
||||
PowerMockito.mockStatic(NetUtils.class);
|
||||
PowerMockito.when(NetUtils.isValidIp4Cidr(Mockito.eq(sourceCidrMock))).thenReturn(true);
|
||||
PowerMockito.when(NetUtils.isValidIp6Cidr(Mockito.eq(sourceCidrMock))).thenReturn(false);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp4Cidr(Mockito.eq(sourceCidrMock))).thenReturn(true);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp6Cidr(Mockito.eq(sourceCidrMock))).thenReturn(false);
|
||||
|
||||
PowerMockito.when(NetUtils.isValidIp4Cidr(Mockito.eq(destCidrMock))).thenReturn(true);
|
||||
PowerMockito.when(NetUtils.isValidIp6Cidr(Mockito.eq(destCidrMock))).thenReturn(false);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp4Cidr(Mockito.eq(destCidrMock))).thenReturn(true);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp6Cidr(Mockito.eq(destCidrMock))).thenReturn(false);
|
||||
|
||||
cmdMock.validateCidrs();
|
||||
|
||||
@ -228,16 +227,13 @@ public class CreateEgressFirewallRuleCmdTest {
|
||||
Mockito.verify(networkServiceMock).getNetwork(networkIdMock);
|
||||
Mockito.verify(networkMock).getCidr();
|
||||
|
||||
PowerMockito.verifyStatic(NetUtils.class);
|
||||
NetUtils.isValidIp4Cidr(sourceCidrMock);
|
||||
NetUtils.isValidIp6Cidr(sourceCidrMock);
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp4Cidr(sourceCidrMock), Mockito.times(1));
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp6Cidr(sourceCidrMock), Mockito.never());
|
||||
|
||||
PowerMockito.verifyStatic(NetUtils.class, Mockito.never());
|
||||
NetUtils.isNetworkAWithinNetworkB(sourceCidrMock,sourceCidrMock);
|
||||
netUtilsMocked.verify(() -> NetUtils.isNetworkAWithinNetworkB(sourceCidrMock, sourceCidrMock), Mockito.never());
|
||||
|
||||
PowerMockito.verifyStatic(NetUtils.class);
|
||||
NetUtils.isValidIp4Cidr(destCidrMock);
|
||||
NetUtils.isValidIp6Cidr(destCidrMock);
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp4Cidr(destCidrMock));
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp6Cidr(destCidrMock), Mockito.never());
|
||||
}
|
||||
|
||||
@Test(expected = ServerApiException.class)
|
||||
@ -256,10 +252,9 @@ public class CreateEgressFirewallRuleCmdTest {
|
||||
|
||||
Mockito.doReturn(cidrMock).when(networkMock).getCidr();
|
||||
|
||||
PowerMockito.mockStatic(NetUtils.class);
|
||||
PowerMockito.when(NetUtils.isValidIp4Cidr(cidrMock)).thenReturn(true);
|
||||
PowerMockito.when(NetUtils.isValidIp6Cidr(cidrMock)).thenReturn(false);
|
||||
PowerMockito.when(NetUtils.isNetworkAWithinNetworkB(cidrMock, cidrMock)).thenReturn(false);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp4Cidr(cidrMock)).thenReturn(true);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp6Cidr(cidrMock)).thenReturn(false);
|
||||
netUtilsMocked.when(() -> NetUtils.isNetworkAWithinNetworkB(cidrMock, cidrMock)).thenReturn(false);
|
||||
|
||||
cmdMock.validateCidrs();
|
||||
|
||||
@ -268,12 +263,10 @@ public class CreateEgressFirewallRuleCmdTest {
|
||||
Mockito.verify(networkServiceMock).getNetwork(networkIdMock);
|
||||
Mockito.verify(networkMock).getCidr();
|
||||
|
||||
PowerMockito.verifyStatic(NetUtils.class, Mockito.times(1));
|
||||
NetUtils.isValidIp4Cidr(cidrMock);
|
||||
NetUtils.isValidIp6Cidr(cidrMock);
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp4Cidr(cidrMock));
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp6Cidr(cidrMock));
|
||||
|
||||
PowerMockito.verifyStatic(NetUtils.class);
|
||||
NetUtils.isNetworkAWithinNetworkB(cidrMock, cidrMock);
|
||||
netUtilsMocked.verify(() -> NetUtils.isNetworkAWithinNetworkB(cidrMock, cidrMock));
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -291,10 +284,9 @@ public class CreateEgressFirewallRuleCmdTest {
|
||||
|
||||
Mockito.doReturn(sourceCidrMock).when(networkMock).getCidr();
|
||||
|
||||
PowerMockito.mockStatic(NetUtils.class);
|
||||
PowerMockito.when(NetUtils.isValidIp4Cidr(Mockito.eq(sourceCidrMock))).thenReturn(true);
|
||||
PowerMockito.when(NetUtils.isValidIp6Cidr(Mockito.eq(sourceCidrMock))).thenReturn(false);
|
||||
PowerMockito.when(NetUtils.isNetworkAWithinNetworkB(sourceCidrMock, sourceCidrMock)).thenReturn(true);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp4Cidr(Mockito.eq(sourceCidrMock))).thenReturn(true);
|
||||
netUtilsMocked.when(() -> NetUtils.isValidIp6Cidr(Mockito.eq(sourceCidrMock))).thenReturn(false);
|
||||
netUtilsMocked.when(() -> NetUtils.isNetworkAWithinNetworkB(sourceCidrMock, sourceCidrMock)).thenReturn(true);
|
||||
|
||||
cmdMock.validateCidrs();
|
||||
|
||||
@ -303,15 +295,12 @@ public class CreateEgressFirewallRuleCmdTest {
|
||||
Mockito.verify(networkServiceMock).getNetwork(networkIdMock);
|
||||
Mockito.verify(networkMock).getCidr();
|
||||
|
||||
PowerMockito.verifyStatic(NetUtils.class);
|
||||
NetUtils.isValidIp4Cidr(sourceCidrMock);
|
||||
NetUtils.isValidIp6Cidr(sourceCidrMock);
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp4Cidr(sourceCidrMock));
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp6Cidr(sourceCidrMock), Mockito.never());
|
||||
|
||||
PowerMockito.verifyStatic(NetUtils.class);
|
||||
NetUtils.isNetworkAWithinNetworkB(sourceCidrMock,sourceCidrMock);
|
||||
netUtilsMocked.verify(() -> NetUtils.isNetworkAWithinNetworkB(sourceCidrMock, sourceCidrMock));
|
||||
|
||||
PowerMockito.verifyStatic(NetUtils.class, Mockito.never());
|
||||
NetUtils.isValidIp4Cidr(null);
|
||||
NetUtils.isValidIp6Cidr(null);
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp4Cidr(null), Mockito.never());
|
||||
netUtilsMocked.verify(() -> NetUtils.isValidIp6Cidr(null), Mockito.never());
|
||||
}
|
||||
}
|
||||
|
||||
@ -22,23 +22,20 @@ import com.cloud.user.AccountService;
|
||||
import org.apache.cloudstack.api.ServerApiException;
|
||||
import org.apache.cloudstack.api.response.SuccessResponse;
|
||||
import org.apache.cloudstack.context.CallContext;
|
||||
import org.junit.After;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockedStatic;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.powermock.api.mockito.PowerMockito;
|
||||
import org.powermock.core.classloader.annotations.PowerMockIgnore;
|
||||
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||
import org.powermock.modules.junit4.PowerMockRunner;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
@RunWith(PowerMockRunner.class)
|
||||
@PrepareForTest(CallContext.class)
|
||||
@PowerMockIgnore({"javax.xml.*", "org.w3c.dom.*", "org.apache.xerces.*", "org.xml.*"})
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class DeleteUserDataCmdTest {
|
||||
|
||||
@InjectMocks
|
||||
@ -53,14 +50,21 @@ public class DeleteUserDataCmdTest {
|
||||
private static final long PROJECT_ID = 10L;
|
||||
private static final String ACCOUNT_NAME = "user";
|
||||
|
||||
private AutoCloseable closeable;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
closeable = MockitoAnnotations.openMocks(this);
|
||||
ReflectionTestUtils.setField(cmd, "accountName", ACCOUNT_NAME);
|
||||
ReflectionTestUtils.setField(cmd, "domainId", DOMAIN_ID);
|
||||
ReflectionTestUtils.setField(cmd, "projectId", PROJECT_ID);
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() throws Exception {
|
||||
closeable.close();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testValidUserDataExecute() {
|
||||
Mockito.doReturn(true).when(_mgr).deleteUserData(cmd);
|
||||
@ -81,18 +85,18 @@ public class DeleteUserDataCmdTest {
|
||||
|
||||
@Test
|
||||
public void validateArgsCmd() {
|
||||
PowerMockito.mockStatic(CallContext.class);
|
||||
CallContext callContextMock = PowerMockito.mock(CallContext.class);
|
||||
PowerMockito.when(CallContext.current()).thenReturn(callContextMock);
|
||||
Account accountMock = PowerMockito.mock(Account.class);
|
||||
PowerMockito.when(callContextMock.getCallingAccount()).thenReturn(accountMock);
|
||||
Mockito.when(accountMock.getId()).thenReturn(2L);
|
||||
Mockito.doReturn(false).when(_accountService).isAdmin(2L);
|
||||
try (MockedStatic<CallContext> callContextMocked = Mockito.mockStatic(CallContext.class)) {
|
||||
CallContext callContextMock = Mockito.mock(CallContext.class);
|
||||
callContextMocked.when(CallContext::current).thenReturn(callContextMock);
|
||||
Account accountMock = Mockito.mock(Account.class);
|
||||
Mockito.when(callContextMock.getCallingAccount()).thenReturn(accountMock);
|
||||
Mockito.when(accountMock.getId()).thenReturn(2L);
|
||||
Mockito.doReturn(false).when(_accountService).isAdmin(2L);
|
||||
|
||||
ReflectionTestUtils.setField(cmd, "id", 1L);
|
||||
ReflectionTestUtils.setField(cmd, "id", 1L);
|
||||
|
||||
Assert.assertEquals(1L, (long)cmd.getId());
|
||||
Assert.assertEquals(2L, cmd.getEntityOwnerId());
|
||||
Assert.assertEquals(1L, (long) cmd.getId());
|
||||
Assert.assertEquals(2L, cmd.getEntityOwnerId());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -20,29 +20,25 @@ package org.apache.cloudstack.api.command.user.userdata;
|
||||
import com.cloud.storage.Storage;
|
||||
import com.cloud.template.TemplateApiService;
|
||||
import com.cloud.template.VirtualMachineTemplate;
|
||||
import com.cloud.user.Account;
|
||||
import com.cloud.user.UserData;
|
||||
import com.cloud.utils.db.EntityManager;
|
||||
import org.apache.cloudstack.api.ResponseGenerator;
|
||||
import org.apache.cloudstack.api.response.TemplateResponse;
|
||||
import org.apache.cloudstack.context.CallContext;
|
||||
import org.junit.After;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockedStatic;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.powermock.api.mockito.PowerMockito;
|
||||
import org.powermock.core.classloader.annotations.PowerMockIgnore;
|
||||
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||
import org.powermock.modules.junit4.PowerMockRunner;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
@RunWith(PowerMockRunner.class)
|
||||
@PrepareForTest(CallContext.class)
|
||||
@PowerMockIgnore({"javax.xml.*", "org.w3c.dom.*", "org.apache.xerces.*", "org.xml.*"})
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class LinkUserDataToTemplateCmdTest {
|
||||
|
||||
@Mock
|
||||
@ -60,9 +56,16 @@ public class LinkUserDataToTemplateCmdTest {
|
||||
@Mock
|
||||
VirtualMachineTemplate virtualMachineTemplate;
|
||||
|
||||
private AutoCloseable closeable;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
closeable = MockitoAnnotations.openMocks(this);
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() throws Exception {
|
||||
closeable.close();
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -84,21 +87,19 @@ public class LinkUserDataToTemplateCmdTest {
|
||||
|
||||
@Test
|
||||
public void validateArgsCmd() {
|
||||
PowerMockito.mockStatic(CallContext.class);
|
||||
CallContext callContextMock = PowerMockito.mock(CallContext.class);
|
||||
PowerMockito.when(CallContext.current()).thenReturn(callContextMock);
|
||||
Account accountMock = PowerMockito.mock(Account.class);
|
||||
PowerMockito.when(callContextMock.getCallingAccount()).thenReturn(accountMock);
|
||||
Mockito.when(accountMock.getId()).thenReturn(2L);
|
||||
ReflectionTestUtils.setField(cmd, "templateId", 1L);
|
||||
ReflectionTestUtils.setField(cmd, "userdataId", 3L);
|
||||
try (MockedStatic<CallContext> callContextMocked = Mockito.mockStatic(CallContext.class)) {
|
||||
CallContext callContextMock = Mockito.mock(CallContext.class);
|
||||
callContextMocked.when(CallContext::current).thenReturn(callContextMock);
|
||||
ReflectionTestUtils.setField(cmd, "templateId", 1L);
|
||||
ReflectionTestUtils.setField(cmd, "userdataId", 3L);
|
||||
|
||||
Mockito.doReturn(virtualMachineTemplate).when(_entityMgr).findById(VirtualMachineTemplate.class, cmd.getTemplateId());
|
||||
PowerMockito.when(virtualMachineTemplate.getAccountId()).thenReturn(1L);
|
||||
Mockito.doReturn(virtualMachineTemplate).when(_entityMgr).findById(VirtualMachineTemplate.class, cmd.getTemplateId());
|
||||
Mockito.when(virtualMachineTemplate.getAccountId()).thenReturn(1L);
|
||||
|
||||
Assert.assertEquals(1L, (long)cmd.getTemplateId());
|
||||
Assert.assertEquals(3L, (long)cmd.getUserdataId());
|
||||
Assert.assertEquals(1L, cmd.getEntityOwnerId());
|
||||
Assert.assertEquals(1L, (long) cmd.getTemplateId());
|
||||
Assert.assertEquals(3L, (long) cmd.getUserdataId());
|
||||
Assert.assertEquals(1L, cmd.getEntityOwnerId());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@ -20,10 +20,10 @@ import com.cloud.server.ManagementService;
|
||||
import com.cloud.user.UserData;
|
||||
import com.cloud.utils.Pair;
|
||||
import org.apache.cloudstack.api.response.ListResponse;
|
||||
import org.junit.After;
|
||||
import org.junit.Assert;
|
||||
import org.apache.cloudstack.api.ResponseGenerator;
|
||||
import org.apache.cloudstack.api.response.UserDataResponse;
|
||||
import org.apache.cloudstack.context.CallContext;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
@ -31,16 +31,12 @@ import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.powermock.core.classloader.annotations.PowerMockIgnore;
|
||||
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||
import org.powermock.modules.junit4.PowerMockRunner;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@RunWith(PowerMockRunner.class)
|
||||
@PrepareForTest(CallContext.class)
|
||||
@PowerMockIgnore({"javax.xml.*", "org.w3c.dom.*", "org.apache.xerces.*", "org.xml.*"})
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class ListUserDataCmdTest {
|
||||
|
||||
@InjectMocks
|
||||
@ -52,9 +48,16 @@ public class ListUserDataCmdTest {
|
||||
@Mock
|
||||
ResponseGenerator _responseGenerator;
|
||||
|
||||
private AutoCloseable closeable;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
closeable = MockitoAnnotations.openMocks(this);
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() throws Exception {
|
||||
closeable.close();
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@ -18,31 +18,27 @@ package org.apache.cloudstack.api.command.user.userdata;
|
||||
|
||||
import com.cloud.exception.InvalidParameterValueException;
|
||||
import com.cloud.server.ManagementService;
|
||||
import com.cloud.user.Account;
|
||||
import com.cloud.user.AccountService;
|
||||
import com.cloud.user.UserData;
|
||||
import org.apache.cloudstack.api.ResponseGenerator;
|
||||
import org.apache.cloudstack.api.response.UserDataResponse;
|
||||
import org.apache.cloudstack.context.CallContext;
|
||||
import org.junit.After;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockedStatic;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.powermock.api.mockito.PowerMockito;
|
||||
import org.powermock.core.classloader.annotations.PowerMockIgnore;
|
||||
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||
import org.powermock.modules.junit4.PowerMockRunner;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@RunWith(PowerMockRunner.class)
|
||||
@PrepareForTest(CallContext.class)
|
||||
@PowerMockIgnore({"javax.xml.*", "org.w3c.dom.*", "org.apache.xerces.*", "org.xml.*"})
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class RegisterUserDataCmdTest {
|
||||
|
||||
@InjectMocks
|
||||
@ -61,14 +57,22 @@ public class RegisterUserDataCmdTest {
|
||||
private static final long PROJECT_ID = 10L;
|
||||
private static final String ACCOUNT_NAME = "user";
|
||||
|
||||
private AutoCloseable closeable;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
closeable = MockitoAnnotations.openMocks(this);
|
||||
ReflectionTestUtils.setField(cmd, "accountName", ACCOUNT_NAME);
|
||||
ReflectionTestUtils.setField(cmd, "domainId", DOMAIN_ID);
|
||||
ReflectionTestUtils.setField(cmd, "projectId", PROJECT_ID);
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() throws Exception {
|
||||
closeable.close();
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testValidUserDataExecute() {
|
||||
UserData result = Mockito.mock(UserData.class);
|
||||
@ -87,20 +91,18 @@ public class RegisterUserDataCmdTest {
|
||||
|
||||
@Test
|
||||
public void validateArgsCmd() {
|
||||
PowerMockito.mockStatic(CallContext.class);
|
||||
CallContext callContextMock = PowerMockito.mock(CallContext.class);
|
||||
PowerMockito.when(CallContext.current()).thenReturn(callContextMock);
|
||||
Account accountMock = PowerMockito.mock(Account.class);
|
||||
PowerMockito.when(callContextMock.getCallingAccount()).thenReturn(accountMock);
|
||||
Mockito.when(accountMock.getId()).thenReturn(2L);
|
||||
ReflectionTestUtils.setField(cmd, "name", "testUserdataName");
|
||||
ReflectionTestUtils.setField(cmd, "userData", "testUserdata");
|
||||
try (MockedStatic<CallContext> callContextMocked = Mockito.mockStatic(CallContext.class)) {
|
||||
CallContext callContextMock = Mockito.mock(CallContext.class);
|
||||
callContextMocked.when(CallContext::current).thenReturn(callContextMock);
|
||||
ReflectionTestUtils.setField(cmd, "name", "testUserdataName");
|
||||
ReflectionTestUtils.setField(cmd, "userData", "testUserdata");
|
||||
|
||||
when(_accountService.finalyzeAccountId(ACCOUNT_NAME, DOMAIN_ID, PROJECT_ID, true)).thenReturn(200L);
|
||||
when(_accountService.finalyzeAccountId(ACCOUNT_NAME, DOMAIN_ID, PROJECT_ID, true)).thenReturn(200L);
|
||||
|
||||
Assert.assertEquals("testUserdataName", cmd.getName());
|
||||
Assert.assertEquals("testUserdata", cmd.getUserData());
|
||||
Assert.assertEquals(200L, cmd.getEntityOwnerId());
|
||||
Assert.assertEquals("testUserdataName", cmd.getName());
|
||||
Assert.assertEquals("testUserdata", cmd.getUserData());
|
||||
Assert.assertEquals(200L, cmd.getEntityOwnerId());
|
||||
}
|
||||
}
|
||||
|
||||
@Test(expected = InvalidParameterValueException.class)
|
||||
|
||||
@ -30,14 +30,15 @@ import org.apache.cloudstack.api.ResponseGenerator;
|
||||
import org.apache.cloudstack.api.ResponseObject;
|
||||
import org.apache.cloudstack.api.response.VpcResponse;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Mockito;
|
||||
import org.powermock.modules.junit4.PowerMockRunner;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
@RunWith(PowerMockRunner.class)
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class CreateVPCCmdTest extends TestCase {
|
||||
|
||||
@Mock
|
||||
@ -48,97 +49,107 @@ public class CreateVPCCmdTest extends TestCase {
|
||||
public AccountService _accountService;
|
||||
private ResponseGenerator responseGenerator;
|
||||
@InjectMocks
|
||||
CreateVPCCmd cmd = new CreateVPCCmd() {
|
||||
@Override
|
||||
public Long getEntityId() {
|
||||
return 2L;
|
||||
}
|
||||
};
|
||||
CreateVPCCmd cmd = new CreateVPCCmd();
|
||||
|
||||
@Test
|
||||
public void testGetAccountName() {
|
||||
String accountName = "admin";
|
||||
ReflectionTestUtils.setField(cmd, "accountName", accountName);
|
||||
Assert.assertEquals(cmd.getAccountName(), accountName);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetDomainId() {
|
||||
Long domainId = 1L;
|
||||
ReflectionTestUtils.setField(cmd, "domainId", domainId);
|
||||
Assert.assertEquals(cmd.getDomainId(), domainId);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetZoneId() {
|
||||
Long zoneId = 1L;
|
||||
ReflectionTestUtils.setField(cmd, "zoneId", zoneId);
|
||||
Assert.assertEquals(cmd.getZoneId(), zoneId);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetVpcName() {
|
||||
String vpcName = "vpcNet";
|
||||
ReflectionTestUtils.setField(cmd, "vpcName", vpcName);
|
||||
Assert.assertEquals(cmd.getVpcName(), vpcName);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetCidr() {
|
||||
String cidr = "10.0.0.0/8";
|
||||
ReflectionTestUtils.setField(cmd, "cidr", cidr);
|
||||
Assert.assertEquals(cmd.getCidr(), cidr);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetDisplayText() {
|
||||
String displayText = "VPC Network";
|
||||
ReflectionTestUtils.setField(cmd, "displayText", displayText);
|
||||
Assert.assertEquals(cmd.getDisplayText(), displayText);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetVpcOffering() {
|
||||
Long vpcOffering = 1L;
|
||||
ReflectionTestUtils.setField(cmd, "vpcOffering", vpcOffering);
|
||||
Assert.assertEquals(cmd.getVpcOffering(), vpcOffering);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetNetworkDomain() {
|
||||
String netDomain = "cs1cloud.internal";
|
||||
ReflectionTestUtils.setField(cmd, "networkDomain", netDomain);
|
||||
Assert.assertEquals(cmd.getNetworkDomain(), netDomain);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetPublicMtuWhenNotSet() {
|
||||
Integer publicMtu = null;
|
||||
ReflectionTestUtils.setField(cmd, "publicMtu", publicMtu);
|
||||
Assert.assertEquals(NetworkService.DEFAULT_MTU, cmd.getPublicMtu());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetPublicMtuWhenSet() {
|
||||
Integer publicMtu = 1450;
|
||||
ReflectionTestUtils.setField(cmd, "publicMtu", publicMtu);
|
||||
Assert.assertEquals(cmd.getPublicMtu(), publicMtu);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testIsStartWhenNull() {
|
||||
Boolean start = null;
|
||||
ReflectionTestUtils.setField(cmd, "start", start);
|
||||
Assert.assertTrue(cmd.isStart());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testIsStartWhenValidValuePassed() {
|
||||
Boolean start = true;
|
||||
ReflectionTestUtils.setField(cmd, "start", start);
|
||||
Assert.assertTrue(cmd.isStart());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetDisplayVpc() {
|
||||
Boolean display = true;
|
||||
ReflectionTestUtils.setField(cmd, "display", display);
|
||||
Assert.assertTrue(cmd.getDisplayVpc());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetDisplayTextWhenEmpty() {
|
||||
String netName = "net-vpc";
|
||||
ReflectionTestUtils.setField(cmd, "vpcName", netName);
|
||||
Assert.assertEquals(cmd.getDisplayText(), netName);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCreate() throws ResourceAllocationException {
|
||||
Vpc vpc = Mockito.mock(Vpc.class);
|
||||
ReflectionTestUtils.setField(cmd, "zoneId", 1L);
|
||||
@ -149,17 +160,18 @@ public class CreateVPCCmdTest extends TestCase {
|
||||
ReflectionTestUtils.setField(cmd, "networkDomain", "cs1cloud.internal");
|
||||
ReflectionTestUtils.setField(cmd, "display", true);
|
||||
ReflectionTestUtils.setField(cmd, "publicMtu", 1450);
|
||||
Mockito.when(_accountService.finalyzeAccountId(Mockito.anyString(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyBoolean())).thenReturn(1L);
|
||||
Mockito.when(cmd.getEntityOwnerId()).thenReturn(1L);
|
||||
Mockito.when(_vpcService.createVpc(Mockito.any(CreateVPCCmd.class))).thenReturn(vpc);
|
||||
cmd.create();
|
||||
Mockito.verify(_vpcService, Mockito.times(1)).createVpc(Mockito.any(CreateVPCCmd.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testExecute() throws ResourceUnavailableException, InsufficientCapacityException {
|
||||
ReflectionTestUtils.setField(cmd, "start", true);
|
||||
Vpc vpc = Mockito.mock(Vpc.class);
|
||||
VpcResponse response = Mockito.mock(VpcResponse.class);
|
||||
|
||||
ReflectionTestUtils.setField(cmd, "id", 1L);
|
||||
responseGenerator = Mockito.mock(ResponseGenerator.class);
|
||||
Mockito.when(_vpcService.startVpc(1L, true)).thenReturn(true);
|
||||
Mockito.when(_entityMgr.findById(Mockito.eq(Vpc.class), Mockito.any(Long.class))).thenReturn(vpc);
|
||||
|
||||
@ -23,17 +23,17 @@ import com.cloud.network.vpc.Vpc;
|
||||
import com.cloud.network.vpc.VpcService;
|
||||
import junit.framework.TestCase;
|
||||
import org.apache.cloudstack.api.ResponseGenerator;
|
||||
import org.apache.cloudstack.api.ResponseObject;
|
||||
import org.apache.cloudstack.api.response.VpcResponse;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Mockito;
|
||||
import org.powermock.modules.junit4.PowerMockRunner;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
@RunWith(PowerMockRunner.class)
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class UpdateVPCCmdTest extends TestCase {
|
||||
|
||||
@Mock
|
||||
@ -44,36 +44,42 @@ public class UpdateVPCCmdTest extends TestCase {
|
||||
@InjectMocks
|
||||
UpdateVPCCmd cmd = new UpdateVPCCmd();
|
||||
|
||||
@Test
|
||||
public void testGetVpcName() {
|
||||
String vpcName = "updatedVpcName";
|
||||
ReflectionTestUtils.setField(cmd, "vpcName", vpcName);
|
||||
Assert.assertEquals(cmd.getVpcName(), vpcName);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetDisplayText() {
|
||||
String displayText = "Updated VPC Name";
|
||||
ReflectionTestUtils.setField(cmd, "displayText", displayText);
|
||||
Assert.assertEquals(cmd.getDisplayText(), displayText);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetId() {
|
||||
Long id = 1L;
|
||||
ReflectionTestUtils.setField(cmd, "id", id);
|
||||
Assert.assertEquals(cmd.getId(), id);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testIsDisplayVpc() {
|
||||
Boolean display = true;
|
||||
ReflectionTestUtils.setField(cmd, "display", display);
|
||||
Assert.assertEquals(cmd.isDisplayVpc(), display);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetPublicMtu() {
|
||||
Integer publicMtu = 1450;
|
||||
ReflectionTestUtils.setField(cmd, "publicMtu", publicMtu);
|
||||
Assert.assertEquals(cmd.getPublicMtu(), publicMtu);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testExecute() throws ResourceUnavailableException, InsufficientCapacityException {
|
||||
ReflectionTestUtils.setField(cmd, "id", 1L);
|
||||
ReflectionTestUtils.setField(cmd, "vpcName", "updatedVpcName");
|
||||
@ -86,9 +92,6 @@ public class UpdateVPCCmdTest extends TestCase {
|
||||
VpcResponse response = Mockito.mock(VpcResponse.class);
|
||||
responseGenerator = Mockito.mock(ResponseGenerator.class);
|
||||
cmd._responseGenerator = responseGenerator;
|
||||
Mockito.when(_vpcService.updateVpc(Mockito.anyLong(), Mockito.anyString(), Mockito.anyString(),
|
||||
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt(), Mockito.anyString())).thenReturn(vpc);
|
||||
Mockito.when(responseGenerator.createVpcResponse(ResponseObject.ResponseView.Full, vpc)).thenReturn(response);
|
||||
Mockito.verify(_vpcService, Mockito.times(0)).updateVpc(Mockito.anyLong(), Mockito.anyString(), Mockito.anyString(),
|
||||
Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt(), Mockito.anyString());
|
||||
|
||||
|
||||
@ -0,0 +1 @@
|
||||
mock-maker-inline
|
||||
Loading…
x
Reference in New Issue
Block a user