apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reworked the formatting and structure of the api project's unit tests.

Browse Source 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
This commit is contained in:
Chip Childers 2012-11-21 09:56:22 -05:00
parent e953b77492
commit b1c063298d
28 changed files with 2028 additions and 1746 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
api/src/com/cloud/agent/api/SnapshotCommand.java
View File

@ -17,7 +17,8 @@
package com.cloud.agent.api;
/**
* This currently assumes that both primary and secondary storage are mounted on the XenServer.
* This currently assumes that both primary and secondary storage are mounted on
* the XenServer.
*/
public class SnapshotCommand extends Command {
protected String primaryStoragePoolNameLabel;
@ -34,20 +35,20 @@ public class SnapshotCommand extends Command {
}
/**
* @param primaryStoragePoolNameLabel The primary storage Pool
* @param snapshotUuid The UUID of the snapshot which is going to be backed up
* @param secondaryStoragePoolURL This is what shows up in the UI when you click on Secondary storage.
* In the code, it is present as: In the vmops.host_details table, there is a field mount.parent. This is the value of that field
* If you have better ideas on how to get it, you are welcome.
* @param primaryStoragePoolNameLabel
* The primary storage Pool
* @param snapshotUuid
* The UUID of the snapshot which is going to be backed up
* @param secondaryStoragePoolURL
* This is what shows up in the UI when you click on Secondary
* storage. In the code, it is present as: In the
* vmops.host_details table, there is a field mount.parent. This
* is the value of that field If you have better ideas on how to
* get it, you are welcome.
*/
public SnapshotCommand(String primaryStoragePoolNameLabel,
String secondaryStorageUrl,
String snapshotUuid,
String snapshotName,
Long dcId,
Long accountId,
Long volumeId)
{
String secondaryStorageUrl, String snapshotUuid,
String snapshotName, Long dcId, Long accountId, Long volumeId) {
this.primaryStoragePoolNameLabel = primaryStoragePoolNameLabel;
this.snapshotUuid = snapshotUuid;
this.secondaryStorageUrl = secondaryStorageUrl;
@ -82,7 +83,6 @@ public class SnapshotCommand extends Command {
return secondaryStorageUrl;
}
public Long getDataCenterId() {
return dcId;
}

7
api/test/src/com/cloud/agent/api/test/AgentControlAnswerTest.java
View File

@ -16,10 +16,13 @@
// under the License.
package src.com.cloud.agent.api.test;
import com.cloud.agent.api.*;
import static org.junit.Assert.*;
import static org.junit.Assert.assertFalse;
import org.junit.Test;
import com.cloud.agent.api.AgentControlAnswer;
import com.cloud.agent.api.AgentControlCommand;
public class AgentControlAnswerTest {
AgentControlCommand acc = new AgentControlCommand();
AgentControlAnswer aca = new AgentControlAnswer(acc);

6
api/test/src/com/cloud/agent/api/test/AgentControlCommandTest.java
View File

@ -16,10 +16,12 @@
// under the License.
package src.com.cloud.agent.api.test;
import com.cloud.agent.api.*;
import static org.junit.Assert.*;
import static org.junit.Assert.assertFalse;
import org.junit.Test;
import com.cloud.agent.api.AgentControlCommand;
public class AgentControlCommandTest {
AgentControlCommand acc = new AgentControlCommand();

12
api/test/src/com/cloud/agent/api/test/AnswerTest.java
View File

@ -16,10 +16,15 @@
// under the License.
package src.com.cloud.agent.api.test;
import com.cloud.agent.api.*;
import static org.junit.Assert.*;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import com.cloud.agent.api.AgentControlCommand;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.UnsupportedAnswer;
public class AnswerTest {
AgentControlCommand acc = new AgentControlCommand();
Answer a = new Answer(acc, true, "details");
@ -52,7 +57,8 @@ public class AnswerTest {
assertFalse(b);
String d = usa.getDetails();
assertTrue(d.equals("Unsupported command issued:" + acc.toString() + ". Are you sure you got the right type of server?"));
assertTrue(d.equals("Unsupported command issued:" + acc.toString()
+ ". Are you sure you got the right type of server?"));
usa = Answer.createUnsupportedVersionAnswer(acc);
b = usa.executeInSequence();

7
api/test/src/com/cloud/agent/api/test/AttachIsoCommandTest.java
View File

@ -16,10 +16,13 @@
// under the License.
package src.com.cloud.agent.api.test;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import com.cloud.agent.api.*;
import com.cloud.agent.api.AttachIsoCommand;
public class AttachIsoCommandTest {
AttachIsoCommand aic = new AttachIsoCommand("vmname", "isopath", false);

14
api/test/src/com/cloud/agent/api/test/AttachVolumeAnswerTest.java
View File

@ -16,13 +16,19 @@
// under the License.
package src.com.cloud.agent.api.test;
import com.cloud.agent.api.*;
import com.cloud.storage.Storage.StoragePoolType;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import com.cloud.agent.api.AttachVolumeAnswer;
import com.cloud.agent.api.AttachVolumeCommand;
import com.cloud.storage.Storage.StoragePoolType;
public class AttachVolumeAnswerTest {
AttachVolumeCommand avc = new AttachVolumeCommand(true, "vmname", StoragePoolType.Filesystem, "vFolder", "vPath", "vName", 123456789L, "chainInfo");
AttachVolumeCommand avc = new AttachVolumeCommand(true, "vmname",
StoragePoolType.Filesystem, "vFolder", "vPath", "vName",
123456789L, "chainInfo");
AttachVolumeAnswer ava1 = new AttachVolumeAnswer(avc);
String results = "";
AttachVolumeAnswer ava2 = new AttachVolumeAnswer(avc, results);

12
api/test/src/com/cloud/agent/api/test/AttachVolumeCommandTest.java
View File

@ -16,14 +16,18 @@
// under the License.
package src.com.cloud.agent.api.test;
import com.cloud.storage.Storage.StoragePoolType;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import com.cloud.agent.api.*;
import com.cloud.agent.api.AttachVolumeCommand;
import com.cloud.storage.Storage.StoragePoolType;
public class AttachVolumeCommandTest {
AttachVolumeCommand avc = new AttachVolumeCommand(true, "vmname", StoragePoolType.Filesystem, "vFolder", "vPath", "vName", 123456789L, "chainInfo");
AttachVolumeCommand avc = new AttachVolumeCommand(true, "vmname",
StoragePoolType.Filesystem, "vFolder", "vPath", "vName",
123456789L, "chainInfo");
@Test
public void testExecuteInSequence() {

27
api/test/src/com/cloud/agent/api/test/BackupSnapshotAnswerTest.java
View File

@ -16,13 +16,32 @@
// under the License.
package src.com.cloud.agent.api.test;
import com.cloud.agent.api.*;
import static org.junit.Assert.*;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import com.cloud.agent.api.BackupSnapshotAnswer;
import com.cloud.agent.api.BackupSnapshotCommand;
import com.cloud.storage.StoragePool;
public class BackupSnapshotAnswerTest {
BackupSnapshotCommand bsc = new BackupSnapshotCommand();
BackupSnapshotAnswer bsa = new BackupSnapshotAnswer(bsc, true, "results", "bussname", false);
private BackupSnapshotCommand bsc;
private BackupSnapshotAnswer bsa;
@Before
public void setUp() {
StoragePool pool = Mockito.mock(StoragePool.class);
bsc = new BackupSnapshotCommand("primaryStoragePoolNameLabel",
"secondaryStoragePoolURL", 101L, 102L, 103L, 104L,
"volumePath", pool, "snapshotUuid", "snapshotName",
"prevSnapshotUuid", "prevBackupUuid", false, "vmName", 5);
bsa = new BackupSnapshotAnswer(bsc, true, "results", "bussname", false);
}
@Test
public void testExecuteInSequence() {

143
api/test/src/com/cloud/agent/api/test/BackupSnapshotCommandTest.java
View File

@ -16,68 +16,118 @@
// under the License.
package src.com.cloud.agent.api.test;
import com.cloud.agent.api.*;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.junit.Test;
import com.cloud.agent.api.BackupSnapshotCommand;
import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.agent.api.to.SwiftTO;
import com.cloud.storage.StoragePool;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.StoragePool;
import com.cloud.storage.StoragePoolStatus;
import java.util.Date;
import java.text.SimpleDateFormat;
import java.text.ParseException;
public class BackupSnapshotCommandTest {
public StoragePool pool = new StoragePool() {
public long getId() {return 1L;};
public String getName() {return "name";};
public String getUuid() {return "bed9f83e-cac3-11e1-ac8a-0050568b007e";};
public StoragePoolType getPoolType() {return StoragePoolType.Filesystem;};
public long getId() {
return 1L;
};
public String getName() {
return "name";
};
public String getUuid() {
return "bed9f83e-cac3-11e1-ac8a-0050568b007e";
};
public StoragePoolType getPoolType() {
return StoragePoolType.Filesystem;
};
public Date getCreated() {
Date date = null;
try {
date = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss").parse("01/01/1970 12:12:12");
}
catch (ParseException e) {
date = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss")
.parse("01/01/1970 12:12:12");
} catch (ParseException e) {
e.printStackTrace();
}
return date;
}
public Date getUpdateTime() {return new Date();};
public long getDataCenterId() {return 0L;};
public long getCapacityBytes() {return 0L;};
public long getAvailableBytes() {return 0L;};
public Long getClusterId() {return 0L;};
public String getHostAddress() {return "hostAddress";};
public String getPath() {return "path";};
public String getUserInfo() {return "userInfo";};
public boolean isShared() {return false;};
public boolean isLocal() {return false;};
public StoragePoolStatus getStatus() {return StoragePoolStatus.Up;};
public int getPort() {return 25;};
public Long getPodId() {return 0L;};
public Date getUpdateTime() {
return new Date();
};
public long getDataCenterId() {
return 0L;
};
public long getCapacityBytes() {
return 0L;
};
public long getAvailableBytes() {
return 0L;
};
public Long getClusterId() {
return 0L;
};
public String getHostAddress() {
return "hostAddress";
};
public String getPath() {
return "path";
};
public String getUserInfo() {
return "userInfo";
};
public boolean isShared() {
return false;
};
public boolean isLocal() {
return false;
};
public StoragePoolStatus getStatus() {
return StoragePoolStatus.Up;
};
public int getPort() {
return 25;
};
public Long getPodId() {
return 0L;
};
};
BackupSnapshotCommand bsc = new BackupSnapshotCommand(
"primaryStoragePoolNameLabel",
"http://secondary.Storage.Url",
101L,
102L,
103L,
104L,
"vPath",
pool,
"420fa39c-4ef1-a83c-fd93-46dc1ff515ae",
"sName",
"primaryStoragePoolNameLabel", "http://secondary.Storage.Url",
101L, 102L, 103L, 104L, "vPath", pool,
"420fa39c-4ef1-a83c-fd93-46dc1ff515ae", "sName",
"9012793e-0657-11e2-bebc-0050568b0057",
"7167e0b2-f5b0-11e1-8414-0050568b0057",
false,
"vmName",
5
);
"7167e0b2-f5b0-11e1-8414-0050568b0057", false, "vmName", 5);
BackupSnapshotCommand bsc1 = new BackupSnapshotCommand();
BackupSnapshotCommand bsc1 = new BackupSnapshotCommand(
"primaryStoragePoolNameLabel", "http://secondary.Storage.Url",
101L, 102L, 103L, 104L, "vPath", pool,
"420fa39c-4ef1-a83c-fd93-46dc1ff515ae", "sName",
"9012793e-0657-11e2-bebc-0050568b0057",
"7167e0b2-f5b0-11e1-8414-0050568b0057", false, "vmName", 5);
@Test
public void testGetPrimaryStoragePoolNameLabel() {
@ -147,17 +197,18 @@ public class BackupSnapshotCommandTest {
assertEquals(StoragePoolType.Filesystem, type);
String str = pool.toString();
assertTrue(str.equals("Pool[" + id.toString() + "|" + host + ":" + port.toString() + "|" + path + "]"));
assertTrue(str.equals("Pool[" + id.toString() + "|" + host + ":"
+ port.toString() + "|" + path + "]"));
}
@Test
public void testGetCreated() {
try {
Date date = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss").parse("01/01/1970 12:12:12");
Date date = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss")
.parse("01/01/1970 12:12:12");
Date d = pool.getCreated();
assertTrue(d.compareTo(date) == 0);
}
catch (ParseException e) {
} catch (ParseException e) {
e.printStackTrace();
}
}

28
api/test/src/com/cloud/agent/api/test/BumpUpPriorityCommandTest.java
View File

@ -16,12 +16,16 @@
// under the License.
package src.com.cloud.agent.api.test;
import com.cloud.agent.api.*;
import com.cloud.agent.api.routing.*;
import static org.junit.Assert.*;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import com.cloud.agent.api.BumpUpPriorityCommand;
import com.cloud.agent.api.routing.NetworkElementCommand;
public class BumpUpPriorityCommandTest {
BumpUpPriorityCommand bupc = new BumpUpPriorityCommand();
// test super class
@ -32,15 +36,19 @@ public class BumpUpPriorityCommandTest {
value = bupc.getAccessDetail(NetworkElementCommand.ACCOUNT_ID);
assertTrue(value.equals("accountID"));
bupc.setAccessDetail(NetworkElementCommand.GUEST_NETWORK_CIDR, "GuestNetworkCIDR");
bupc.setAccessDetail(NetworkElementCommand.GUEST_NETWORK_CIDR,
"GuestNetworkCIDR");
value = bupc.getAccessDetail(NetworkElementCommand.GUEST_NETWORK_CIDR);
assertTrue(value.equals("GuestNetworkCIDR"));
bupc.setAccessDetail(NetworkElementCommand.GUEST_NETWORK_GATEWAY, "GuestNetworkGateway");
value = bupc.getAccessDetail(NetworkElementCommand.GUEST_NETWORK_GATEWAY);
bupc.setAccessDetail(NetworkElementCommand.GUEST_NETWORK_GATEWAY,
"GuestNetworkGateway");
value = bupc
.getAccessDetail(NetworkElementCommand.GUEST_NETWORK_GATEWAY);
assertTrue(value.equals("GuestNetworkGateway"));
bupc.setAccessDetail(NetworkElementCommand.GUEST_VLAN_TAG, "GuestVlanTag");
bupc.setAccessDetail(NetworkElementCommand.GUEST_VLAN_TAG,
"GuestVlanTag");
value = bupc.getAccessDetail(NetworkElementCommand.GUEST_VLAN_TAG);
assertTrue(value.equals("GuestVlanTag"));
@ -52,11 +60,13 @@ public class BumpUpPriorityCommandTest {
value = bupc.getAccessDetail(NetworkElementCommand.ROUTER_IP);
assertTrue(value.equals("RouterIP"));
bupc.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, "RouterGuestIP");
bupc.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP,
"RouterGuestIP");
value = bupc.getAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP);
assertTrue(value.equals("RouterGuestIP"));
bupc.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, "ZoneNetworkType");
bupc.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE,
"ZoneNetworkType");
value = bupc.getAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE);
assertTrue(value.equals("ZoneNetworkType"));

7
api/test/src/com/cloud/agent/api/test/CancelCommandTest.java
View File

@ -16,10 +16,13 @@
// under the License.
package src.com.cloud.agent.api.test;
import com.cloud.agent.api.*;
import static org.junit.Assert.*;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import com.cloud.agent.api.CancelCommand;
public class CancelCommandTest {
CancelCommand cc = new CancelCommand(123456789L, "goodreason");

13
api/test/src/com/cloud/agent/api/test/ChangeAgentAnswerTest.java
View File

@ -16,13 +16,18 @@
// under the License.
package src.com.cloud.agent.api.test;
import com.cloud.agent.api.*;
import com.cloud.host.Status.Event;
import static org.junit.Assert.*;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import com.cloud.agent.api.ChangeAgentAnswer;
import com.cloud.agent.api.ChangeAgentCommand;
import com.cloud.host.Status.Event;
public class ChangeAgentAnswerTest {
ChangeAgentCommand cac = new ChangeAgentCommand(123456789L, Event.AgentConnected);
ChangeAgentCommand cac = new ChangeAgentCommand(123456789L,
Event.AgentConnected);
ChangeAgentAnswer caa = new ChangeAgentAnswer(cac, true);
@Test

14
api/test/src/com/cloud/agent/api/test/ChangeAgentCommandTest.java
View File

@ -16,13 +16,19 @@
// under the License.
package src.com.cloud.agent.api.test;
import com.cloud.agent.api.*;
import com.cloud.host.Status.Event;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import com.cloud.agent.api.ChangeAgentCommand;
import com.cloud.host.Status.Event;
public class ChangeAgentCommandTest {
ChangeAgentCommand cac = new ChangeAgentCommand(123456789L, Event.AgentConnected);
ChangeAgentCommand cac = new ChangeAgentCommand(123456789L,
Event.AgentConnected);
@Test
public void testGetAgentId() {

8
api/test/src/com/cloud/agent/api/test/CheckHealthAnswerTest.java
View File

@ -16,10 +16,14 @@
// under the License.
package src.com.cloud.agent.api.test;
import com.cloud.agent.api.*;
import static org.junit.Assert.*;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import com.cloud.agent.api.CheckHealthAnswer;
import com.cloud.agent.api.CheckHealthCommand;
public class CheckHealthAnswerTest {
CheckHealthCommand chc = new CheckHealthCommand();
CheckHealthAnswer cha = new CheckHealthAnswer(chc, true);

7
api/test/src/com/cloud/agent/api/test/CheckHealthCommandTest.java
View File

@ -16,10 +16,13 @@
// under the License.
package src.com.cloud.agent.api.test;
import com.cloud.agent.api.*;
import static org.junit.Assert.*;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import com.cloud.agent.api.CheckHealthCommand;
public class CheckHealthCommandTest {
CheckHealthCommand chc = new CheckHealthCommand();

21
api/test/src/com/cloud/agent/api/test/CheckNetworkAnswerTest.java
View File

@ -16,14 +16,25 @@
// under the License.
package src.com.cloud.agent.api.test;
import com.cloud.agent.api.*;
import com.cloud.host.Status.Event;
import static org.junit.Assert.*;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import com.cloud.agent.api.CheckNetworkAnswer;
import com.cloud.agent.api.CheckNetworkCommand;
public class CheckNetworkAnswerTest {
CheckNetworkCommand cnc = new CheckNetworkCommand();
CheckNetworkAnswer cna = new CheckNetworkAnswer(cnc, true, "details", true);
CheckNetworkCommand cnc;
CheckNetworkAnswer cna;
@Before
public void setUp() {
cnc = Mockito.mock(CheckNetworkCommand.class);
cna = new CheckNetworkAnswer(cnc, true, "details", true);
}
@Test
public void testGetResult() {

26
api/test/src/com/cloud/agent/api/test/CheckNetworkCommandTest.java
View File

@ -16,19 +16,33 @@
// under the License.
package src.com.cloud.agent.api.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.util.List;
import com.cloud.agent.api.*;
import com.cloud.network.PhysicalNetworkSetupInfo;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import com.cloud.agent.api.CheckNetworkCommand;
import com.cloud.network.PhysicalNetworkSetupInfo;
public class CheckNetworkCommandTest {
CheckNetworkCommand cnc = new CheckNetworkCommand();
CheckNetworkCommand cnc;
@Before
public void setUp() {
@SuppressWarnings("unchecked")
List<PhysicalNetworkSetupInfo> net = Mockito.mock(List.class);
cnc = new CheckNetworkCommand(net);
}
@Test
public void testGetPhysicalNetworkInfoList() {
List<PhysicalNetworkSetupInfo> networkInfoList = cnc.getPhysicalNetworkInfoList();
assertNull(networkInfoList);
List<PhysicalNetworkSetupInfo> networkInfoList = cnc
.getPhysicalNetworkInfoList();
assertEquals(0, networkInfoList.size());
}
@Test

229
api/test/src/com/cloud/agent/api/test/CheckOnHostCommandTest.java
View File

@ -16,86 +16,197 @@
// under the License.
package src.com.cloud.agent.api.test;
import java.util.List;
import java.util.Date;
import java.text.SimpleDateFormat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.text.ParseException;
import com.cloud.agent.api.*;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.junit.Test;
import com.cloud.agent.api.CheckOnHostCommand;
import com.cloud.agent.api.to.HostTO;
import com.cloud.host.Host;
import com.cloud.host.Status;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.resource.ResourceState;
import static org.junit.Assert.*;
import org.junit.Test;
public class CheckOnHostCommandTest {
public Host host = new Host() {
public Status getState() {return Status.Up;};
public long getId() {return 101L;};
public String getName() {return "hostName";};
public Type getType() {return Host.Type.Storage;};
public Status getState() {
return Status.Up;
};
public long getId() {
return 101L;
};
public String getName() {
return "hostName";
};
public Type getType() {
return Host.Type.Storage;
};
public Date getCreated() {
Date date = null;
try {
date = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss").parse("01/01/1970 12:12:12");
}
catch (ParseException e) {
date = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss")
.parse("01/01/1970 12:12:12");
} catch (ParseException e) {
e.printStackTrace();
}
return date;
}
public Status getStatus() {return Status.Up;};
public String getPrivateIpAddress() {return "10.1.1.1";};
public String getStorageIpAddress() {return "10.1.1.2";};
public String getGuid() {return "bed9f83e-cac3-11e1-ac8a-0050568b007e";};
public Long getTotalMemory() {return 100000000000L;};
public Integer getCpus() {return 16;};
public Long getSpeed() {return 2000000000L;};
public Integer getProxyPort() {return 22;};
public Long getPodId() {return 16L;};
public long getDataCenterId() {return 17L;};
public String getParent() {return "parent";};
public String getStorageIpAddressDeux() {return "10.1.1.3";};
public HypervisorType getHypervisorType() {return HypervisorType.XenServer;};
public Status getStatus() {
return Status.Up;
};
public String getPrivateIpAddress() {
return "10.1.1.1";
};
public String getStorageIpAddress() {
return "10.1.1.2";
};
public String getGuid() {
return "bed9f83e-cac3-11e1-ac8a-0050568b007e";
};
public Long getTotalMemory() {
return 100000000000L;
};
public Integer getCpus() {
return 16;
};
public Long getSpeed() {
return 2000000000L;
};
public Integer getProxyPort() {
return 22;
};
public Long getPodId() {
return 16L;
};
public long getDataCenterId() {
return 17L;
};
public String getParent() {
return "parent";
};
public String getStorageIpAddressDeux() {
return "10.1.1.3";
};
public HypervisorType getHypervisorType() {
return HypervisorType.XenServer;
};
public Date getDisconnectedOn() {
Date date = null;
try {
date = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss").parse("01/01/2012 12:12:12");
}
catch (ParseException e) {
date = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss")
.parse("01/01/2012 12:12:12");
} catch (ParseException e) {
e.printStackTrace();
}
return date;
}
public String getVersion() {return "4.0.1";};
public long getTotalSize() {return 100000000000L;};
public String getCapabilities() {return "capabilities";};
public long getLastPinged() {return 1L;};
public Long getManagementServerId() {return 2L;};
public String getVersion() {
return "4.0.1";
};
public long getTotalSize() {
return 100000000000L;
};
public String getCapabilities() {
return "capabilities";
};
public long getLastPinged() {
return 1L;
};
public Long getManagementServerId() {
return 2L;
};
public Date getRemoved() {
Date date = null;
try {
date = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss").parse("02/01/2012 12:12:12");
}
catch (ParseException e) {
date = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss")
.parse("02/01/2012 12:12:12");
} catch (ParseException e) {
e.printStackTrace();
}
return date;
};
public Long getClusterId() {return 3L;};
public String getPublicIpAddress() {return "10.1.1.4";};
public String getPublicNetmask() {return "255.255.255.8";};
public String getPrivateNetmask() {return "255.255.255.16";};
public String getStorageNetmask() {return "255.255.255.24";};
public String getStorageMacAddress() {return "01:f4:17:38:0e:26";};
public String getPublicMacAddress() {return "02:f4:17:38:0e:26";};
public String getPrivateMacAddress() {return "03:f4:17:38:0e:26";};
public String getStorageNetmaskDeux() {return "255.255.255.25";};
public String getStorageMacAddressDeux() {return "01:f4:17:38:0e:27";};
public String getHypervisorVersion() {return "1.2.3.0";};
public boolean isInMaintenanceStates() {return false;};
public ResourceState getResourceState() {return ResourceState.Enabled;};
public Long getClusterId() {
return 3L;
};
public String getPublicIpAddress() {
return "10.1.1.4";
};
public String getPublicNetmask() {
return "255.255.255.8";
};
public String getPrivateNetmask() {
return "255.255.255.16";
};
public String getStorageNetmask() {
return "255.255.255.24";
};
public String getStorageMacAddress() {
return "01:f4:17:38:0e:26";
};
public String getPublicMacAddress() {
return "02:f4:17:38:0e:26";
};
public String getPrivateMacAddress() {
return "03:f4:17:38:0e:26";
};
public String getStorageNetmaskDeux() {
return "255.255.255.25";
};
public String getStorageMacAddressDeux() {
return "01:f4:17:38:0e:27";
};
public String getHypervisorVersion() {
return "1.2.3.0";
};
public boolean isInMaintenanceStates() {
return false;
};
public ResourceState getResourceState() {
return ResourceState.Enabled;
};
};
CheckOnHostCommand cohc = new CheckOnHostCommand(host);
@ -133,11 +244,11 @@ public class CheckOnHostCommandTest {
@Test
public void testGetCreated() {
try {
Date date = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss").parse("01/01/1970 12:12:12");
Date date = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss")
.parse("01/01/1970 12:12:12");
Date d = host.getCreated();
assertTrue(d.compareTo(date) == 0);
}
catch (ParseException e) {
} catch (ParseException e) {
e.printStackTrace();
}
}
@ -223,11 +334,11 @@ public class CheckOnHostCommandTest {
@Test
public void testGetDisconnectedOn() {
try {
Date date = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss").parse("01/01/2012 12:12:12");
Date date = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss")
.parse("01/01/2012 12:12:12");
Date d = host.getDisconnectedOn();
assertTrue(d.compareTo(date) == 0);
}
catch (ParseException e) {
} catch (ParseException e) {
e.printStackTrace();
}
}
@ -265,11 +376,11 @@ public class CheckOnHostCommandTest {
@Test
public void testGetRemoved() {
try {
Date date = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss").parse("02/01/2012 12:12:12");
Date date = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss")
.parse("02/01/2012 12:12:12");
Date d = host.getRemoved();
assertTrue(d.compareTo(date) == 0);
}
catch (ParseException e) {
} catch (ParseException e) {
e.printStackTrace();
}
}

23
api/test/src/com/cloud/agent/api/test/SnapshotCommandTest.java
View File

@ -16,20 +16,29 @@
// under the License.
package src.com.cloud.agent.api.test;
import com.cloud.agent.api.*;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
import com.cloud.agent.api.SnapshotCommand;
public class SnapshotCommandTest {
SnapshotCommand ssc = new SnapshotCommand("primaryStoragePoolNameLabel",
"http://secondary.Storage.Url",
"420fa39c-4ef1-a83c-fd93-46dc1ff515ae",
"snapshotName",
101L,
102L,
"420fa39c-4ef1-a83c-fd93-46dc1ff515ae", "snapshotName", 101L, 102L,
103L);
SnapshotCommand ssc1 = new SnapshotCommand();
SnapshotCommand ssc1;
@Before
public void setUp() {
ssc1 = new SnapshotCommand("primaryStoragePoolNameLabel",
"secondaryStorageUrl", "snapshotUuid", "snapshotName", 101L,
102L, 103L);
}
@Test
public void testGetPrimaryStoragePoolNameLabel() {

17
api/test/src/com/cloud/api/commands/test/ActivateProjectCmdTest.java
View File

@ -25,13 +25,11 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.mockito.Mockito;
import com.cloud.api.ResponseGenerator;
import com.cloud.api.response.ProjectResponse;
import com.cloud.api.commands.ActivateProjectCmd;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.projects.Project;
import com.cloud.projects.ProjectService;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
public class ActivateProjectCmdTest extends TestCase {
@ -53,17 +51,18 @@ public class ActivateProjectCmdTest extends TestCase {
};
}
@Test
public void testGetEntityOwnerIdForNullProject() {
ProjectService projectService = Mockito.mock(ProjectService.class);
Mockito.when(projectService.getProject(Mockito.anyLong())).thenReturn(null);
Mockito.when(projectService.getProject(Mockito.anyLong())).thenReturn(
null);
activateProjectCmd._projectService = projectService;
try {
activateProjectCmd.getEntityOwnerId();
} catch (InvalidParameterValueException exception) {
Assert.assertEquals("Unable to find project by id 2", exception.getLocalizedMessage());
Assert.assertEquals("Unable to find project by id 2",
exception.getLocalizedMessage());
}
}
@ -74,9 +73,11 @@ public class ActivateProjectCmdTest extends TestCase {
ProjectService projectService = Mockito.mock(ProjectService.class);
Account account = Mockito.mock(Account.class);
Mockito.when(account.getId()).thenReturn(2L);
Mockito.when(projectService.getProject(Mockito.anyLong())).thenReturn(project);
Mockito.when(projectService.getProject(Mockito.anyLong())).thenReturn(
project);
Mockito.when(projectService.getProjectOwner(Mockito.anyLong())).thenReturn(account);
Mockito.when(projectService.getProjectOwner(Mockito.anyLong()))
.thenReturn(account);
activateProjectCmd._projectService = projectService;
Assert.assertEquals(2L, activateProjectCmd.getEntityOwnerId());

120
api/test/src/com/cloud/api/commands/test/AddAccountToProjectCmdTest.java
View File

@ -29,10 +29,10 @@ import com.cloud.exception.InvalidParameterValueException;
import com.cloud.projects.Project;
import com.cloud.projects.ProjectService;
import com.cloud.user.Account;
import com.cloud.api.commands.AddAccountToProjectCmd;
public class AddAccountToProjectCmdTest extends TestCase {
private AddAccountToProjectCmd addAccountToProjectCmd;
@Rule
@ -50,9 +50,11 @@ public class AddAccountToProjectCmdTest extends TestCase {
@Override
public String getAccountName() {
// to run the test testGetEventDescriptionForAccount set the accountName
// to run the test testGetEventDescriptionForAccount set the
// accountName
// return "accountName";
// to run the test the testGetEventDescriptionForNullAccount return accountname as null
// to run the test the testGetEventDescriptionForNullAccount
// return accountname as null
return null;
}
@ -65,27 +67,26 @@ public class AddAccountToProjectCmdTest extends TestCase {
};
}
/****
* Condition not handled in the code
*
*****/
/*@Test
public void testGetEntityOwnerIdForNullProject() {
ProjectService projectService = Mockito.mock(ProjectService.class);
Mockito.when(projectService.getProject(Mockito.anyLong())).thenReturn(null);
addAccountToProjectCmd._projectService = projectService;
try {
addAccountToProjectCmd.getEntityOwnerId();
} catch(InvalidParameterValueException exception) {
Assert.assertEquals("Unable to find project by id 2", exception.getLocalizedMessage());
}
}*/
/*
* @Test public void testGetEntityOwnerIdForNullProject() {
*
* ProjectService projectService = Mockito.mock(ProjectService.class);
* Mockito
* .when(projectService.getProject(Mockito.anyLong())).thenReturn(null);
* addAccountToProjectCmd._projectService = projectService;
*
* try { addAccountToProjectCmd.getEntityOwnerId(); }
* catch(InvalidParameterValueException exception) {
* Assert.assertEquals("Unable to find project by id 2",
* exception.getLocalizedMessage()); }
*
* }
*/
@Test
public void testGetEntityOwnerIdForProject() {
@ -109,19 +110,20 @@ public class AddAccountToProjectCmdTest extends TestCase {
}
/**
* To run the test uncomment the return statement for getAccountName() in setup() and return null
* To run the test uncomment the return statement for getAccountName() in
* setup() and return null
*
* **/
/*@Test
public void testGetEventDescriptionForNullAccount() {
String result = addAccountToProjectCmd.getEventDescription();
String expected = "Sending invitation to email null to join project: 2";
Assert.assertEquals(expected, result);
}*/
/*
* @Test public void testGetEventDescriptionForNullAccount() {
*
* String result = addAccountToProjectCmd.getEventDescription(); String
* expected = "Sending invitation to email null to join project: 2";
* Assert.assertEquals(expected, result);
*
* }
*/
/***
*
@ -129,16 +131,15 @@ public class AddAccountToProjectCmdTest extends TestCase {
*
* ***/
/*@Test
public void testGetEventDescriptionForAccount() {
String result = addAccountToProjectCmd.getEventDescription();
String expected = "Adding account accountName to project: 2";
Assert.assertEquals(expected, result);
}*/
/*
* @Test public void testGetEventDescriptionForAccount() {
*
* String result = addAccountToProjectCmd.getEventDescription(); String
* expected = "Adding account accountName to project: 2";
* Assert.assertEquals(expected, result);
*
* }
*/
@Test
public void testExecuteForNullAccountNameEmail() {
@ -146,30 +147,29 @@ public class AddAccountToProjectCmdTest extends TestCase {
try {
addAccountToProjectCmd.execute();
} catch (InvalidParameterValueException exception) {
Assert.assertEquals("Either accountName or email is required", exception.getLocalizedMessage());
Assert.assertEquals("Either accountName or email is required",
exception.getLocalizedMessage());
}
}
/*@Test
public void testExecuteForAccountNameEmail() {
try {
ComponentLocator c = Mockito.mock(ComponentLocator.class);
UserContext userContext = Mockito.mock(UserContext.class);
// Mockito.when(userContext.current()).thenReturn(userContext);
addAccountToProjectCmd.execute();
} catch(InvalidParameterValueException exception) {
Assert.assertEquals("Either accountName or email is required", exception.getLocalizedMessage());
}
}*/
/*
* @Test public void testExecuteForAccountNameEmail() {
*
* try {
*
* ComponentLocator c = Mockito.mock(ComponentLocator.class); UserContext
* userContext = Mockito.mock(UserContext.class);
*
* // Mockito.when(userContext.current()).thenReturn(userContext);
*
*
* addAccountToProjectCmd.execute(); } catch(InvalidParameterValueException
* exception) {
* Assert.assertEquals("Either accountName or email is required",
* exception.getLocalizedMessage()); }
*
* }
*/
}

27
api/test/src/com/cloud/api/commands/test/AddClusterCmdTest.java
View File

@ -27,7 +27,7 @@ import org.mockito.Mockito;
import com.cloud.api.ResponseGenerator;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ClusterResponse;
import com.cloud.api.commands.AddClusterCmd;
import com.cloud.exception.DiscoveryException;
import com.cloud.exception.ResourceInUseException;
import com.cloud.org.Cluster;
@ -41,27 +41,26 @@ public class AddClusterCmdTest extends TestCase {
private ResourceService resourceService;
private ResponseGenerator responseGenerator;
@Rule
public ExpectedException expectedException = ExpectedException.none();
@Before
public void setUp() {
/* resourceService = Mockito.mock(ResourceService.class);
responseGenerator = Mockito.mock(ResponseGenerator.class);
/*
* resourceService = Mockito.mock(ResourceService.class);
* responseGenerator = Mockito.mock(ResponseGenerator.class);
*/addClusterCmd = new AddClusterCmd() {
};
}
@Test
public void testExecuteForNullResult() {
ResourceService resourceService = Mockito.mock(ResourceService.class);
try {
Mockito.when(resourceService.discoverCluster(addClusterCmd)).thenReturn(null);
Mockito.when(resourceService.discoverCluster(addClusterCmd))
.thenReturn(null);
} catch (ResourceInUseException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@ -78,12 +77,12 @@ public class AddClusterCmdTest extends TestCase {
try {
addClusterCmd.execute();
} catch (ServerApiException exception) {
Assert.assertEquals("Failed to add cluster", exception.getDescription());
Assert.assertEquals("Failed to add cluster",
exception.getDescription());
}
}
@Test
public void testExecuteForEmptyResult() {
@ -93,12 +92,12 @@ public class AddClusterCmdTest extends TestCase {
try {
addClusterCmd.execute();
} catch (ServerApiException exception) {
Assert.assertEquals("Failed to add cluster", exception.getDescription());
Assert.assertEquals("Failed to add cluster",
exception.getDescription());
}
}
@Test
public void testExecuteForResult() throws Exception {
@ -111,13 +110,11 @@ public class AddClusterCmdTest extends TestCase {
Cluster cluster = Mockito.mock(Cluster.class);
Cluster[] clusterArray = new Cluster[] { cluster };
Mockito.when(resourceService.discoverCluster(addClusterCmd)).thenReturn(Arrays.asList(clusterArray));
Mockito.when(resourceService.discoverCluster(addClusterCmd))
.thenReturn(Arrays.asList(clusterArray));
addClusterCmd.execute();
}
}

70
api/test/src/com/cloud/api/commands/test/AddHostCmdTest.java
View File

@ -16,11 +16,6 @@
// under the License.
package src.com.cloud.api.commands.test;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import junit.framework.Assert;
import junit.framework.TestCase;
@ -32,15 +27,13 @@ import org.mockito.Mockito;
import com.cloud.api.ResponseGenerator;
import com.cloud.api.ServerApiException;
import com.cloud.api.commands.AddHostCmd;
import com.cloud.api.response.HostResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.exception.DiscoveryException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.host.Host;
import com.cloud.host.Status;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.resource.ResourceService;
import com.cloud.resource.ResourceState;
import edu.emory.mathcs.backport.java.util.Arrays;
@ -68,12 +61,12 @@ public class AddHostCmdTest extends TestCase {
try {
addHostCmd.execute();
} catch (ServerApiException exception) {
Assert.assertEquals("Failed to add host", exception.getDescription());
Assert.assertEquals("Failed to add host",
exception.getDescription());
}
}
@Test
public void testExecuteForNullResult() {
@ -81,7 +74,8 @@ public class AddHostCmdTest extends TestCase {
addHostCmd._resourceService = resourceService;
try {
Mockito.when(resourceService.discoverHosts(addHostCmd)).thenReturn(null);
Mockito.when(resourceService.discoverHosts(addHostCmd)).thenReturn(
null);
} catch (InvalidParameterValueException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@ -96,29 +90,30 @@ public class AddHostCmdTest extends TestCase {
try {
addHostCmd.execute();
} catch (ServerApiException exception) {
Assert.assertEquals("Failed to add host", exception.getDescription());
Assert.assertEquals("Failed to add host",
exception.getDescription());
}
}
/* @Test
public void testExecuteForResult() throws Exception {
addHostCmd._resourceService = resourceService;
addHostCmd._responseGenerator = responseGenerator;
MockHost mockInstance = new MockHost();
MockHost[] mockArray = new MockHost[]{mockInstance};
HostResponse responseHost = new HostResponse();
responseHost.setName("Test");
Mockito.when(resourceService.discoverHosts(addHostCmd)).thenReturn(Arrays.asList(mockArray));
Mockito.when(responseGenerator.createHostResponse(mockInstance)).thenReturn(responseHost);
addHostCmd.execute();
Mockito.verify(responseGenerator).createHostResponse(mockInstance);
ListResponse<HostResponse> actualResponse = ((ListResponse<HostResponse>)addHostCmd.getResponseObject());
Assert.assertEquals(responseHost, actualResponse.getResponses().get(0));
Assert.assertEquals("addhostresponse", actualResponse.getResponseName());
}
/*
* @Test public void testExecuteForResult() throws Exception {
*
* addHostCmd._resourceService = resourceService;
* addHostCmd._responseGenerator = responseGenerator; MockHost mockInstance
* = new MockHost(); MockHost[] mockArray = new MockHost[]{mockInstance};
* HostResponse responseHost = new HostResponse();
* responseHost.setName("Test");
* Mockito.when(resourceService.discoverHosts(addHostCmd
* )).thenReturn(Arrays.asList(mockArray));
* Mockito.when(responseGenerator.createHostResponse
* (mockInstance)).thenReturn(responseHost); addHostCmd.execute();
* Mockito.verify(responseGenerator).createHostResponse(mockInstance);
* ListResponse<HostResponse> actualResponse =
* ((ListResponse<HostResponse>)addHostCmd.getResponseObject());
* Assert.assertEquals(responseHost, actualResponse.getResponses().get(0));
* Assert.assertEquals("addhostresponse", actualResponse.getResponseName());
* }
*/
@Test
public void testExecuteForResult() throws Exception {
@ -130,24 +125,27 @@ public class AddHostCmdTest extends TestCase {
HostResponse responseHost = new HostResponse();
responseHost.setName("Test");
Mockito.when(resourceService.discoverHosts(addHostCmd)).thenReturn(Arrays.asList(mockArray));
Mockito.when(responseGenerator.createHostResponse(host)).thenReturn(responseHost);
Mockito.when(resourceService.discoverHosts(addHostCmd)).thenReturn(
Arrays.asList(mockArray));
Mockito.when(responseGenerator.createHostResponse(host)).thenReturn(
responseHost);
addHostCmd.execute();
Mockito.verify(responseGenerator).createHostResponse(host);
ListResponse<HostResponse> actualResponse = ((ListResponse<HostResponse>)addHostCmd.getResponseObject());
ListResponse<HostResponse> actualResponse = ((ListResponse<HostResponse>) addHostCmd
.getResponseObject());
Assert.assertEquals(responseHost, actualResponse.getResponses().get(0));
Assert.assertEquals("addhostresponse", actualResponse.getResponseName());
}
@Test
public void testExecuteForDiscoveryException() {
addHostCmd._resourceService = resourceService;
try {
Mockito.when(resourceService.discoverHosts(addHostCmd)).thenThrow(DiscoveryException.class);
Mockito.when(resourceService.discoverHosts(addHostCmd)).thenThrow(
DiscoveryException.class);
} catch (InvalidParameterValueException e) {
e.printStackTrace();
} catch (IllegalArgumentException e) {
@ -164,6 +162,4 @@ public class AddHostCmdTest extends TestCase {
}
}

20
api/test/src/com/cloud/api/commands/test/AddNetworkServiceProviderCmdTest.java
View File

@ -29,6 +29,7 @@ import org.junit.rules.ExpectedException;
import org.mockito.Mockito;
import com.cloud.api.ServerApiException;
import com.cloud.api.commands.AddNetworkServiceProviderCmd;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.network.NetworkService;
import com.cloud.network.PhysicalNetworkServiceProvider;
@ -80,8 +81,10 @@ public class AddNetworkServiceProviderCmdTest extends TestCase {
NetworkService networkService = Mockito.mock(NetworkService.class);
addNetworkServiceProviderCmd._networkService = networkService;
PhysicalNetworkServiceProvider physicalNetworkServiceProvider = Mockito.mock(PhysicalNetworkServiceProvider.class);
Mockito.when(networkService.addProviderToPhysicalNetwork(Mockito.anyLong(),
PhysicalNetworkServiceProvider physicalNetworkServiceProvider = Mockito
.mock(PhysicalNetworkServiceProvider.class);
Mockito.when(
networkService.addProviderToPhysicalNetwork(Mockito.anyLong(),
Mockito.anyString(), Mockito.anyLong(),
Mockito.anyList())).thenReturn(
physicalNetworkServiceProvider);
@ -94,25 +97,26 @@ public class AddNetworkServiceProviderCmdTest extends TestCase {
}
@Test
public void testCreateProviderToPhysicalNetworkFailure() throws ResourceAllocationException {
public void testCreateProviderToPhysicalNetworkFailure()
throws ResourceAllocationException {
NetworkService networkService = Mockito.mock(NetworkService.class);
addNetworkServiceProviderCmd._networkService = networkService;
Mockito.when(networkService.addProviderToPhysicalNetwork(Mockito.anyLong(),
Mockito.when(
networkService.addProviderToPhysicalNetwork(Mockito.anyLong(),
Mockito.anyString(), Mockito.anyLong(),
Mockito.anyList())).thenReturn(null);
try {
addNetworkServiceProviderCmd.create();
} catch (ServerApiException exception) {
Assert.assertEquals("Failed to add service provider entity to physical network", exception.getDescription());
Assert.assertEquals(
"Failed to add service provider entity to physical network",
exception.getDescription());
}
}
}

34
api/test/src/com/cloud/api/commands/test/AddSecondaryStorageCmdTest.java
View File

@ -27,10 +27,8 @@ import org.mockito.Mockito;
import com.cloud.api.ResponseGenerator;
import com.cloud.api.ServerApiException;
import com.cloud.api.commands.AddSecondaryStorageCmd;
import com.cloud.api.response.HostResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.exception.DiscoveryException;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.host.Host;
import com.cloud.resource.ResourceService;
@ -50,7 +48,6 @@ public class AddSecondaryStorageCmdTest extends TestCase {
}
@Test
public void testExecuteForResult() throws Exception {
@ -60,25 +57,29 @@ public class AddSecondaryStorageCmdTest extends TestCase {
Host host = Mockito.mock(Host.class);
Host[] mockHosts = new Host[] { host };
Mockito.when(resourceService.discoverHosts(addSecondaryStorageCmd)).thenReturn(Arrays.asList(mockHosts));
Mockito.when(resourceService.discoverHosts(addSecondaryStorageCmd))
.thenReturn(Arrays.asList(mockHosts));
ResponseGenerator responseGenerator = Mockito.mock(ResponseGenerator.class);
ResponseGenerator responseGenerator = Mockito
.mock(ResponseGenerator.class);
addSecondaryStorageCmd._responseGenerator = responseGenerator;
HostResponse responseHost = new HostResponse();
responseHost.setName("Test");
Mockito.when(responseGenerator.createHostResponse(host)).thenReturn(responseHost);
Mockito.when(responseGenerator.createHostResponse(host)).thenReturn(
responseHost);
addSecondaryStorageCmd.execute();
Mockito.verify(responseGenerator).createHostResponse(host);
HostResponse actualResponse = (HostResponse)addSecondaryStorageCmd.getResponseObject();
HostResponse actualResponse = (HostResponse) addSecondaryStorageCmd
.getResponseObject();
Assert.assertEquals(responseHost, actualResponse);
Assert.assertEquals("addsecondarystorageresponse", actualResponse.getResponseName());
Assert.assertEquals("addsecondarystorageresponse",
actualResponse.getResponseName());
}
@ -90,12 +91,14 @@ public class AddSecondaryStorageCmdTest extends TestCase {
Host[] mockHosts = new Host[] {};
Mockito.when(resourceService.discoverHosts(addSecondaryStorageCmd)).thenReturn(Arrays.asList(mockHosts));
Mockito.when(resourceService.discoverHosts(addSecondaryStorageCmd))
.thenReturn(Arrays.asList(mockHosts));
try {
addSecondaryStorageCmd.execute();
} catch (ServerApiException exception) {
Assert.assertEquals("Failed to add secondary storage", exception.getDescription());
Assert.assertEquals("Failed to add secondary storage",
exception.getDescription());
}
}
@ -106,15 +109,16 @@ public class AddSecondaryStorageCmdTest extends TestCase {
ResourceService resourceService = Mockito.mock(ResourceService.class);
addSecondaryStorageCmd._resourceService = resourceService;
Mockito.when(resourceService.discoverHosts(addSecondaryStorageCmd)).thenReturn(null);
Mockito.when(resourceService.discoverHosts(addSecondaryStorageCmd))
.thenReturn(null);
try {
addSecondaryStorageCmd.execute();
} catch (ServerApiException exception) {
Assert.assertEquals("Failed to add secondary storage", exception.getDescription());
Assert.assertEquals("Failed to add secondary storage",
exception.getDescription());
}
}
}

23
api/test/src/com/cloud/api/commands/test/AddSwiftCmdTest.java
View File

@ -16,6 +16,9 @@
// under the License.
package src.com.cloud.api.commands.test;
import junit.framework.Assert;
import junit.framework.TestCase;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@ -24,14 +27,12 @@ import org.mockito.Mockito;
import com.cloud.api.ResponseGenerator;
import com.cloud.api.ServerApiException;
import com.cloud.api.commands.AddSwiftCmd;
import com.cloud.api.response.SwiftResponse;
import com.cloud.exception.DiscoveryException;
import com.cloud.resource.ResourceService;
import com.cloud.storage.Swift;
import junit.framework.Assert;
import junit.framework.TestCase;
public class AddSwiftCmdTest extends TestCase {
private AddSwiftCmd addSwiftCmd;
@ -53,30 +54,33 @@ public class AddSwiftCmdTest extends TestCase {
Swift swift = Mockito.mock(Swift.class);
try {
Mockito.when(resourceService.discoverSwift(addSwiftCmd)).thenReturn(swift);
Mockito.when(resourceService.discoverSwift(addSwiftCmd))
.thenReturn(swift);
} catch (DiscoveryException e) {
e.printStackTrace();
}
ResponseGenerator responseGenerator = Mockito.mock(ResponseGenerator.class);
ResponseGenerator responseGenerator = Mockito
.mock(ResponseGenerator.class);
addSwiftCmd._responseGenerator = responseGenerator;
SwiftResponse swiftResponse = Mockito.mock(SwiftResponse.class);
Mockito.when(responseGenerator.createSwiftResponse(swift)).thenReturn(swiftResponse);
Mockito.when(responseGenerator.createSwiftResponse(swift)).thenReturn(
swiftResponse);
addSwiftCmd.execute();
}
@Test
public void testExecuteFailure() {
ResourceService resourceService = Mockito.mock(ResourceService.class);
addSwiftCmd._resourceService = resourceService;
try {
Mockito.when(resourceService.discoverSwift(addSwiftCmd)).thenReturn(null);
Mockito.when(resourceService.discoverSwift(addSwiftCmd))
.thenReturn(null);
} catch (DiscoveryException e) {
e.printStackTrace();
}
@ -84,7 +88,8 @@ public class AddSwiftCmdTest extends TestCase {
try {
addSwiftCmd.execute();
} catch (ServerApiException exception) {
Assert.assertEquals("Failed to add Swift", exception.getDescription());
Assert.assertEquals("Failed to add Swift",
exception.getDescription());
}
}

79
api/test/src/com/cloud/api/commands/test/AddVpnUserCmdTest.java
View File

@ -26,6 +26,7 @@ import org.junit.rules.ExpectedException;
import org.mockito.Mockito;
import com.cloud.api.ServerApiException;
import com.cloud.api.commands.AddVpnUserCmd;
import com.cloud.network.VpnUser;
import com.cloud.network.vpn.RemoteAccessVpnService;
import com.cloud.user.Account;
@ -33,7 +34,6 @@ import com.cloud.user.AccountService;
public class AddVpnUserCmdTest extends TestCase {
private AddVpnUserCmd addVpnUserCmd;
@Rule
@ -67,49 +67,50 @@ public class AddVpnUserCmdTest extends TestCase {
};
}
/*@Test
public void testExecuteVpnUserNotFound() {
EntityManager entityManager = Mockito.mock(EntityManager.class);
Mockito.when(entityManager.findById(VpnUser.class, Mockito.anyLong())).thenReturn(null);
addVpnUserCmd._entityMgr = entityManager;
try {
addVpnUserCmd.execute();
} catch (Exception e) {
}
}
@Test
public void testExecuteVpnUserFound() {
EntityManager entityManager = Mockito.mock(EntityManager.class);
addVpnUserCmd._entityMgr = entityManager;
VpnUser vpnUser = Mockito.mock(VpnUser.class);
Mockito.when(entityManager.findById(VpnUser.class, Mockito.anyLong())).thenReturn(vpnUser);
addVpnUserCmd.execute();
}*/
/*
* @Test public void testExecuteVpnUserNotFound() {
*
* EntityManager entityManager = Mockito.mock(EntityManager.class);
*
* Mockito.when(entityManager.findById(VpnUser.class,
* Mockito.anyLong())).thenReturn(null);
*
* addVpnUserCmd._entityMgr = entityManager; try { addVpnUserCmd.execute();
* } catch (Exception e) { }
*
* }
*
*
* @Test public void testExecuteVpnUserFound() {
*
* EntityManager entityManager = Mockito.mock(EntityManager.class);
* addVpnUserCmd._entityMgr = entityManager;
*
* VpnUser vpnUser = Mockito.mock(VpnUser.class);
* Mockito.when(entityManager.findById(VpnUser.class,
* Mockito.anyLong())).thenReturn(vpnUser); addVpnUserCmd.execute();
*
* }
*/
@Test
public void testCreateSuccess() {
AccountService accountService = Mockito.mock(AccountService.class);
Account account = Mockito.mock(Account.class);
Mockito.when(accountService.getAccount(Mockito.anyLong())).thenReturn(account);
Mockito.when(accountService.getAccount(Mockito.anyLong())).thenReturn(
account);
addVpnUserCmd._accountService = accountService;
RemoteAccessVpnService ravService = Mockito.mock(RemoteAccessVpnService.class);
RemoteAccessVpnService ravService = Mockito
.mock(RemoteAccessVpnService.class);
VpnUser vpnUser = Mockito.mock(VpnUser.class);
Mockito.when(ravService.addVpnUser(Mockito.anyLong(), Mockito.anyString(), Mockito.anyString())).thenReturn(vpnUser);
Mockito.when(
ravService.addVpnUser(Mockito.anyLong(), Mockito.anyString(),
Mockito.anyString())).thenReturn(vpnUser);
addVpnUserCmd._ravService = ravService;
@ -117,25 +118,29 @@ public class AddVpnUserCmdTest extends TestCase {
}
@Test
public void testCreateFailure() {
AccountService accountService = Mockito.mock(AccountService.class);
Account account = Mockito.mock(Account.class);
Mockito.when(accountService.getAccount(Mockito.anyLong())).thenReturn(account);
Mockito.when(accountService.getAccount(Mockito.anyLong())).thenReturn(
account);
addVpnUserCmd._accountService = accountService;
RemoteAccessVpnService ravService = Mockito.mock(RemoteAccessVpnService.class);
Mockito.when(ravService.addVpnUser(Mockito.anyLong(), Mockito.anyString(), Mockito.anyString())).thenReturn(null);
RemoteAccessVpnService ravService = Mockito
.mock(RemoteAccessVpnService.class);
Mockito.when(
ravService.addVpnUser(Mockito.anyLong(), Mockito.anyString(),
Mockito.anyString())).thenReturn(null);
addVpnUserCmd._ravService = ravService;
try {
addVpnUserCmd.create();
} catch (ServerApiException exception) {
Assert.assertEquals("Failed to add vpn user", exception.getDescription());
Assert.assertEquals("Failed to add vpn user",
exception.getDescription());
}
}