You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2012/11/21 15:57:47 UTC
[1/5] git commit: Reworked the formatting and structure of the api
project's unit tests. Signed-off-by: Chip Childers
Updated Branches:
refs/heads/master 3e8655b58 -> b1c063298
Reworked the formatting and structure of the api project's unit tests.
Signed-off-by: Chip Childers <ch...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b1c06329
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b1c06329
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b1c06329
Branch: refs/heads/master
Commit: b1c063298df263df8b1b54d4ecdac07ffd7fa142
Parents: e953b77
Author: Chip Childers <ch...@gmail.com>
Authored: Wed Nov 21 09:56:22 2012 -0500
Committer: Chip Childers <ch...@gmail.com>
Committed: Wed Nov 21 09:56:22 2012 -0500
----------------------------------------------------------------------
.../com/cloud/agent/api/CheckNetworkCommand.java | 8 +-
api/src/com/cloud/agent/api/SnapshotCommand.java | 54 +-
.../agent/api/test/AgentControlAnswerTest.java | 21 +-
.../agent/api/test/AgentControlCommandTest.java | 18 +-
.../src/com/cloud/agent/api/test/AnswerTest.java | 82 +-
.../cloud/agent/api/test/AttachIsoCommandTest.java | 105 +-
.../agent/api/test/AttachVolumeAnswerTest.java | 80 +-
.../agent/api/test/AttachVolumeCommandTest.java | 190 ++--
.../agent/api/test/BackupSnapshotAnswerTest.java | 87 +-
.../agent/api/test/BackupSnapshotCommandTest.java | 437 +++++----
.../agent/api/test/BumpUpPriorityCommandTest.java | 112 ++-
.../cloud/agent/api/test/CancelCommandTest.java | 45 +-
.../agent/api/test/ChangeAgentAnswerTest.java | 37 +-
.../agent/api/test/ChangeAgentCommandTest.java | 50 +-
.../agent/api/test/CheckHealthAnswerTest.java | 46 +-
.../agent/api/test/CheckHealthCommandTest.java | 33 +-
.../agent/api/test/CheckNetworkAnswerTest.java | 69 +-
.../agent/api/test/CheckNetworkCommandTest.java | 46 +-
.../agent/api/test/CheckOnHostCommandTest.java | 789 ++++++++-------
.../cloud/agent/api/test/SnapshotCommandTest.java | 161 ++--
.../api/commands/test/ActivateProjectCmdTest.java | 105 +-
.../commands/test/AddAccountToProjectCmdTest.java | 272 +++---
.../cloud/api/commands/test/AddClusterCmdTest.java | 167 ++--
.../cloud/api/commands/test/AddHostCmdTest.java | 250 +++---
.../test/AddNetworkServiceProviderCmdTest.java | 164 ++--
.../commands/test/AddSecondaryStorageCmdTest.java | 168 ++--
.../cloud/api/commands/test/AddSwiftCmdTest.java | 121 ++--
.../cloud/api/commands/test/AddVpnUserCmdTest.java | 219 ++--
28 files changed, 2109 insertions(+), 1827 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/src/com/cloud/agent/api/CheckNetworkCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckNetworkCommand.java b/api/src/com/cloud/agent/api/CheckNetworkCommand.java
index b994614..8e1be56 100644
--- a/api/src/com/cloud/agent/api/CheckNetworkCommand.java
+++ b/api/src/com/cloud/agent/api/CheckNetworkCommand.java
@@ -23,18 +23,18 @@ import com.cloud.network.PhysicalNetworkSetupInfo;
public class CheckNetworkCommand extends Command {
List<PhysicalNetworkSetupInfo> networkInfoList;
-
+
public CheckNetworkCommand(List<PhysicalNetworkSetupInfo> networkInfoList) {
this.networkInfoList = networkInfoList;
}
-
+
public List<PhysicalNetworkSetupInfo> getPhysicalNetworkInfoList() {
return networkInfoList;
}
-
+
protected CheckNetworkCommand() {
}
-
+
@Override
public boolean executeInSequence() {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/src/com/cloud/agent/api/SnapshotCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/SnapshotCommand.java b/api/src/com/cloud/agent/api/SnapshotCommand.java
index 90eae8e..892db37 100644
--- a/api/src/com/cloud/agent/api/SnapshotCommand.java
+++ b/api/src/com/cloud/agent/api/SnapshotCommand.java
@@ -17,37 +17,38 @@
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;
private String snapshotUuid;
private String snapshotName;
private String secondaryStorageUrl;
- private Long dcId;
- private Long accountId;
- private Long volumeId;
+ private Long dcId;
+ private Long accountId;
+ private Long volumeId;
private String volumePath;
-
+
protected SnapshotCommand() {
-
+
}
-
+
/**
- * @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;
@@ -70,11 +71,11 @@ public class SnapshotCommand extends Command {
public String getSnapshotUuid() {
return snapshotUuid;
}
-
+
public String getSnapshotName() {
- return snapshotName;
+ return snapshotName;
}
-
+
/**
* @return the secondaryStoragePoolURL
*/
@@ -82,7 +83,6 @@ public class SnapshotCommand extends Command {
return secondaryStorageUrl;
}
-
public Long getDataCenterId() {
return dcId;
}
@@ -94,13 +94,13 @@ public class SnapshotCommand extends Command {
public Long getVolumeId() {
return volumeId;
}
-
+
public String getVolumePath() {
- return volumePath;
+ return volumePath;
}
-
+
public void setVolumePath(String path) {
- volumePath = path;
+ volumePath = path;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/AgentControlAnswerTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/AgentControlAnswerTest.java b/api/test/src/com/cloud/agent/api/test/AgentControlAnswerTest.java
index 5507409..f8aaa4b 100644
--- a/api/test/src/com/cloud/agent/api/test/AgentControlAnswerTest.java
+++ b/api/test/src/com/cloud/agent/api/test/AgentControlAnswerTest.java
@@ -16,17 +16,20 @@
// 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);
+ AgentControlCommand acc = new AgentControlCommand();
+ AgentControlAnswer aca = new AgentControlAnswer(acc);
- @Test
- public void testExecuteInSequence() {
- boolean b = acc.executeInSequence();
- assertFalse(b);
- }
+ @Test
+ public void testExecuteInSequence() {
+ boolean b = acc.executeInSequence();
+ assertFalse(b);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/AgentControlCommandTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/AgentControlCommandTest.java b/api/test/src/com/cloud/agent/api/test/AgentControlCommandTest.java
index 358a607..6df0edf 100644
--- a/api/test/src/com/cloud/agent/api/test/AgentControlCommandTest.java
+++ b/api/test/src/com/cloud/agent/api/test/AgentControlCommandTest.java
@@ -16,16 +16,18 @@
// 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();
+ AgentControlCommand acc = new AgentControlCommand();
- @Test
- public void testExecuteInSequence() {
- boolean b = acc.executeInSequence();
- assertFalse(b);
- }
+ @Test
+ public void testExecuteInSequence() {
+ boolean b = acc.executeInSequence();
+ assertFalse(b);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/AnswerTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/AnswerTest.java b/api/test/src/com/cloud/agent/api/test/AnswerTest.java
index 3d716c3..c79db56 100644
--- a/api/test/src/com/cloud/agent/api/test/AnswerTest.java
+++ b/api/test/src/com/cloud/agent/api/test/AnswerTest.java
@@ -16,52 +16,58 @@
// 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");
+ AgentControlCommand acc = new AgentControlCommand();
+ Answer a = new Answer(acc, true, "details");
+
+ @Test
+ public void testExecuteInSequence() {
+ boolean b = a.executeInSequence();
+ assertFalse(b);
+ }
+
+ @Test
+ public void testGetResult() {
+ boolean b = a.getResult();
+ assertTrue(b);
+ }
- @Test
- public void testExecuteInSequence() {
- boolean b = a.executeInSequence();
- assertFalse(b);
- }
+ @Test
+ public void testGetDetails() {
+ String d = a.getDetails();
+ assertTrue(d.equals("details"));
+ }
- @Test
- public void testGetResult() {
- boolean b = a.getResult();
- assertTrue(b);
- }
+ @Test
+ public void testCreateUnsupportedCommandAnswer() {
+ UnsupportedAnswer usa = Answer.createUnsupportedCommandAnswer(acc);
+ boolean b = usa.executeInSequence();
+ assertFalse(b);
- @Test
- public void testGetDetails() {
- String d = a.getDetails();
- assertTrue(d.equals("details"));
- }
+ b = usa.getResult();
+ assertFalse(b);
- @Test
- public void testCreateUnsupportedCommandAnswer() {
- UnsupportedAnswer usa = Answer.createUnsupportedCommandAnswer(acc);
- boolean b = usa.executeInSequence();
- assertFalse(b);
-
- b = usa.getResult();
- assertFalse(b);
+ String d = usa.getDetails();
+ assertTrue(d.equals("Unsupported command issued:" + acc.toString()
+ + ". Are you sure you got the right type of server?"));
- String d = usa.getDetails();
- 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();
+ assertFalse(b);
- usa = Answer.createUnsupportedVersionAnswer(acc);
- b = usa.executeInSequence();
- assertFalse(b);
-
- b = usa.getResult();
- assertFalse(b);
+ b = usa.getResult();
+ assertFalse(b);
- d = usa.getDetails();
- assertTrue(d.equals("Unsuppored Version."));
- }
+ d = usa.getDetails();
+ assertTrue(d.equals("Unsuppored Version."));
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/AttachIsoCommandTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/AttachIsoCommandTest.java b/api/test/src/com/cloud/agent/api/test/AttachIsoCommandTest.java
index c9d71b0..7fec7f2 100644
--- a/api/test/src/com/cloud/agent/api/test/AttachIsoCommandTest.java
+++ b/api/test/src/com/cloud/agent/api/test/AttachIsoCommandTest.java
@@ -16,62 +16,65 @@
// 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);
+ AttachIsoCommand aic = new AttachIsoCommand("vmname", "isopath", false);
+
+ @Test
+ public void testGetVmName() {
+ String vmName = aic.getVmName();
+ assertTrue(vmName.equals("vmname"));
+ }
+
+ @Test
+ public void testGetIsoPath() {
+ String isoPath = aic.getIsoPath();
+ assertTrue(isoPath.equals("isopath"));
+ }
+
+ @Test
+ public void testIsAttach() {
+ boolean b = aic.isAttach();
+ assertFalse(b);
+ }
+
+ @Test
+ public void testGetStoreUrl() {
+ aic.setStoreUrl("http://incubator.apache.org/cloudstack/");
+ String url = aic.getStoreUrl();
+ assertTrue(url.equals("http://incubator.apache.org/cloudstack/"));
+ }
- @Test
- public void testGetVmName() {
- String vmName = aic.getVmName();
- assertTrue(vmName.equals("vmname"));
- }
+ @Test
+ public void testExecuteInSequence() {
+ boolean b = aic.executeInSequence();
+ assertTrue(b);
+ }
- @Test
- public void testGetIsoPath() {
- String isoPath = aic.getIsoPath();
- assertTrue(isoPath.equals("isopath"));
- }
-
- @Test
- public void testIsAttach() {
- boolean b = aic.isAttach();
- assertFalse(b);
- }
+ @Test
+ public void testAllowCaching() {
+ boolean b = aic.allowCaching();
+ assertTrue(b);
+ }
- @Test
- public void testGetStoreUrl() {
- aic.setStoreUrl("http://incubator.apache.org/cloudstack/");
- String url = aic.getStoreUrl();
- assertTrue(url.equals("http://incubator.apache.org/cloudstack/"));
- }
-
- @Test
- public void testExecuteInSequence() {
- boolean b = aic.executeInSequence();
- assertTrue(b);
- }
-
- @Test
- public void testAllowCaching() {
- boolean b = aic.allowCaching();
- assertTrue(b);
- }
-
- @Test
- public void testGetWait() {
- int b;
- aic.setWait(5);
- b = aic.getWait();
- assertEquals(b, 5);
- aic.setWait(-3);
- b = aic.getWait();
- assertEquals(b, -3);
- aic.setWait(0);
- b = aic.getWait();
- assertEquals(b, 0);
- }
+ @Test
+ public void testGetWait() {
+ int b;
+ aic.setWait(5);
+ b = aic.getWait();
+ assertEquals(b, 5);
+ aic.setWait(-3);
+ b = aic.getWait();
+ assertEquals(b, -3);
+ aic.setWait(0);
+ b = aic.getWait();
+ assertEquals(b, 0);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/AttachVolumeAnswerTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/AttachVolumeAnswerTest.java b/api/test/src/com/cloud/agent/api/test/AttachVolumeAnswerTest.java
index ed27ed1..e7ec7d9 100644
--- a/api/test/src/com/cloud/agent/api/test/AttachVolumeAnswerTest.java
+++ b/api/test/src/com/cloud/agent/api/test/AttachVolumeAnswerTest.java
@@ -16,44 +16,50 @@
// 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");
- AttachVolumeAnswer ava1 = new AttachVolumeAnswer(avc);
- String results = "";
- AttachVolumeAnswer ava2 = new AttachVolumeAnswer(avc, results);
- Long deviceId = 10L;
- AttachVolumeAnswer ava3 = new AttachVolumeAnswer(avc, deviceId);
-
- @Test
- public void testGetDeviceId() {
- Long dId = ava1.getDeviceId();
- assertTrue(dId == null);
-
- dId = ava2.getDeviceId();
- assertTrue(dId == null);
-
- dId = ava3.getDeviceId();
- Long expected = 10L;
- assertEquals(expected, dId);
- }
-
- @Test
- public void testGetChainInfo() {
- ava1.setChainInfo("chainInfo");
- String chainInfo = ava1.getChainInfo();
- assertTrue(chainInfo.equals("chainInfo"));
-
- ava2.setChainInfo("chainInfo");
- chainInfo = ava2.getChainInfo();
- assertTrue(chainInfo.equals("chainInfo"));
-
- ava3.setChainInfo("chainInfo");
- chainInfo = ava3.getChainInfo();
- assertTrue(chainInfo.equals("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);
+ Long deviceId = 10L;
+ AttachVolumeAnswer ava3 = new AttachVolumeAnswer(avc, deviceId);
+
+ @Test
+ public void testGetDeviceId() {
+ Long dId = ava1.getDeviceId();
+ assertTrue(dId == null);
+
+ dId = ava2.getDeviceId();
+ assertTrue(dId == null);
+
+ dId = ava3.getDeviceId();
+ Long expected = 10L;
+ assertEquals(expected, dId);
+ }
+
+ @Test
+ public void testGetChainInfo() {
+ ava1.setChainInfo("chainInfo");
+ String chainInfo = ava1.getChainInfo();
+ assertTrue(chainInfo.equals("chainInfo"));
+
+ ava2.setChainInfo("chainInfo");
+ chainInfo = ava2.getChainInfo();
+ assertTrue(chainInfo.equals("chainInfo"));
+
+ ava3.setChainInfo("chainInfo");
+ chainInfo = ava3.getChainInfo();
+ assertTrue(chainInfo.equals("chainInfo"));
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/AttachVolumeCommandTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/AttachVolumeCommandTest.java b/api/test/src/com/cloud/agent/api/test/AttachVolumeCommandTest.java
index 4a09371..6fcd8c1 100644
--- a/api/test/src/com/cloud/agent/api/test/AttachVolumeCommandTest.java
+++ b/api/test/src/com/cloud/agent/api/test/AttachVolumeCommandTest.java
@@ -16,101 +16,105 @@
// 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");
-
- @Test
- public void testExecuteInSequence() {
- boolean b = avc.executeInSequence();
- assertTrue(b);
- }
-
- @Test
- public void testGetAttach() {
- boolean b = avc.getAttach();
- assertTrue(b);
- }
-
- @Test
- public void testGetVmName() {
- String vmName = avc.getVmName();
- assertTrue(vmName.equals("vmname"));
- }
-
- @Test
- public void testGetPooltype() {
- StoragePoolType pt = avc.getPooltype();
- assertTrue(pt.equals(StoragePoolType.Filesystem));
-
- avc.setPooltype(StoragePoolType.NetworkFilesystem);
- pt = avc.getPooltype();
- assertTrue(pt.equals(StoragePoolType.NetworkFilesystem));
-
- avc.setPooltype(StoragePoolType.IscsiLUN);
- pt = avc.getPooltype();
- assertTrue(pt.equals(StoragePoolType.IscsiLUN));
-
- avc.setPooltype(StoragePoolType.Iscsi);
- pt = avc.getPooltype();
- assertTrue(pt.equals(StoragePoolType.Iscsi));
- }
-
- @Test
- public void testGetVolumeFolder() {
- String vFolder = avc.getVolumeFolder();
- assertTrue(vFolder.equals("vFolder"));
- }
-
- @Test
- public void testGetVolumePath() {
- String vPath = avc.getVolumePath();
- assertTrue(vPath.equals("vPath"));
- }
-
- @Test
- public void testGetVolumeName() {
- String vName = avc.getVolumeName();
- assertTrue(vName.equals("vName"));
- }
-
- @Test
- public void testGetDeviceId() {
- Long dId = avc.getDeviceId();
- Long expected = 123456789L;
- assertEquals(expected, dId);
-
- avc.setDeviceId(5L);
- dId = avc.getDeviceId();
- expected = 5L;
- assertEquals(expected, dId);
-
- avc.setDeviceId(0L);
- dId = avc.getDeviceId();
- expected = 0L;
- assertEquals(expected, dId);
-
- avc.setDeviceId(-5L);
- dId = avc.getDeviceId();
- expected = -5L;
- assertEquals(expected, dId);
- }
-
- @Test
- public void testGetPoolUuid() {
- avc.setPoolUuid("420fa39c-4ef1-a83c-fd93-46dc1ff515ae");
- String pUuid = avc.getPoolUuid();
- assertTrue(pUuid.equals("420fa39c-4ef1-a83c-fd93-46dc1ff515ae"));
- }
-
- @Test
- public void testGetWait() {
- String cInfo = avc.getChainInfo();
- assertTrue(cInfo.equals("chainInfo"));
- }
+ AttachVolumeCommand avc = new AttachVolumeCommand(true, "vmname",
+ StoragePoolType.Filesystem, "vFolder", "vPath", "vName",
+ 123456789L, "chainInfo");
+
+ @Test
+ public void testExecuteInSequence() {
+ boolean b = avc.executeInSequence();
+ assertTrue(b);
+ }
+
+ @Test
+ public void testGetAttach() {
+ boolean b = avc.getAttach();
+ assertTrue(b);
+ }
+
+ @Test
+ public void testGetVmName() {
+ String vmName = avc.getVmName();
+ assertTrue(vmName.equals("vmname"));
+ }
+
+ @Test
+ public void testGetPooltype() {
+ StoragePoolType pt = avc.getPooltype();
+ assertTrue(pt.equals(StoragePoolType.Filesystem));
+
+ avc.setPooltype(StoragePoolType.NetworkFilesystem);
+ pt = avc.getPooltype();
+ assertTrue(pt.equals(StoragePoolType.NetworkFilesystem));
+
+ avc.setPooltype(StoragePoolType.IscsiLUN);
+ pt = avc.getPooltype();
+ assertTrue(pt.equals(StoragePoolType.IscsiLUN));
+
+ avc.setPooltype(StoragePoolType.Iscsi);
+ pt = avc.getPooltype();
+ assertTrue(pt.equals(StoragePoolType.Iscsi));
+ }
+
+ @Test
+ public void testGetVolumeFolder() {
+ String vFolder = avc.getVolumeFolder();
+ assertTrue(vFolder.equals("vFolder"));
+ }
+
+ @Test
+ public void testGetVolumePath() {
+ String vPath = avc.getVolumePath();
+ assertTrue(vPath.equals("vPath"));
+ }
+
+ @Test
+ public void testGetVolumeName() {
+ String vName = avc.getVolumeName();
+ assertTrue(vName.equals("vName"));
+ }
+
+ @Test
+ public void testGetDeviceId() {
+ Long dId = avc.getDeviceId();
+ Long expected = 123456789L;
+ assertEquals(expected, dId);
+
+ avc.setDeviceId(5L);
+ dId = avc.getDeviceId();
+ expected = 5L;
+ assertEquals(expected, dId);
+
+ avc.setDeviceId(0L);
+ dId = avc.getDeviceId();
+ expected = 0L;
+ assertEquals(expected, dId);
+
+ avc.setDeviceId(-5L);
+ dId = avc.getDeviceId();
+ expected = -5L;
+ assertEquals(expected, dId);
+ }
+
+ @Test
+ public void testGetPoolUuid() {
+ avc.setPoolUuid("420fa39c-4ef1-a83c-fd93-46dc1ff515ae");
+ String pUuid = avc.getPoolUuid();
+ assertTrue(pUuid.equals("420fa39c-4ef1-a83c-fd93-46dc1ff515ae"));
+ }
+
+ @Test
+ public void testGetWait() {
+ String cInfo = avc.getChainInfo();
+ assertTrue(cInfo.equals("chainInfo"));
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/BackupSnapshotAnswerTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/BackupSnapshotAnswerTest.java b/api/test/src/com/cloud/agent/api/test/BackupSnapshotAnswerTest.java
index f03410a..aa1c0fb 100644
--- a/api/test/src/com/cloud/agent/api/test/BackupSnapshotAnswerTest.java
+++ b/api/test/src/com/cloud/agent/api/test/BackupSnapshotAnswerTest.java
@@ -16,41 +16,60 @@
// 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);
-
- @Test
- public void testExecuteInSequence() {
- boolean b = bsa.executeInSequence();
- assertFalse(b);
- }
-
- @Test
- public void testIsFull() {
- boolean b = bsa.isFull();
- assertFalse(b);
- }
-
- @Test
- public void testGetBackupSnapshotName() {
- String name = bsa.getBackupSnapshotName();
- assertTrue(name.equals("bussname"));
- }
-
- @Test
- public void testGetResult() {
- boolean b = bsa.getResult();
- assertTrue(b);
- }
-
- @Test
- public void testDetails() {
- String details = bsa.getDetails();
- assertTrue(details.equals("results"));
- }
+ 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() {
+ boolean b = bsa.executeInSequence();
+ assertFalse(b);
+ }
+
+ @Test
+ public void testIsFull() {
+ boolean b = bsa.isFull();
+ assertFalse(b);
+ }
+
+ @Test
+ public void testGetBackupSnapshotName() {
+ String name = bsa.getBackupSnapshotName();
+ assertTrue(name.equals("bussname"));
+ }
+
+ @Test
+ public void testGetResult() {
+ boolean b = bsa.getResult();
+ assertTrue(b);
+ }
+
+ @Test
+ public void testDetails() {
+ String details = bsa.getDetails();
+ assertTrue(details.equals("results"));
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/BackupSnapshotCommandTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/BackupSnapshotCommandTest.java b/api/test/src/com/cloud/agent/api/test/BackupSnapshotCommandTest.java
index c84e24b..baeed55 100644
--- a/api/test/src/com/cloud/agent/api/test/BackupSnapshotCommandTest.java
+++ b/api/test/src/com/cloud/agent/api/test/BackupSnapshotCommandTest.java
@@ -16,205 +16,256 @@
// 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 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) {
- 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;};
- };
-
- BackupSnapshotCommand bsc = 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
- );
-
- BackupSnapshotCommand bsc1 = new BackupSnapshotCommand();
-
- @Test
- public void testGetPrimaryStoragePoolNameLabel() {
- String label = bsc.getPrimaryStoragePoolNameLabel();
- assertTrue(label.equals("primaryStoragePoolNameLabel"));
- }
-
- @Test
- public void testGetSecondaryStorageUrl() {
- String url = bsc.getSecondaryStorageUrl();
- assertTrue(url.equals("http://secondary.Storage.Url"));
- }
-
- @Test
- public void testGetDataCenterId() {
- Long dcId = bsc.getDataCenterId();
- Long expected = 101L;
- assertEquals(expected, dcId);
- }
-
- @Test
- public void testGetAccountId() {
- Long aId = bsc.getAccountId();
- Long expected = 102L;
- assertEquals(expected, aId);
- }
-
- @Test
- public void testGetVolumeId() {
- Long vId = bsc.getVolumeId();
- Long expected = 103L;
- assertEquals(expected, vId);
- }
-
- @Test
- public void testGetSnapshotId() {
- Long ssId = bsc.getSnapshotId();
- Long expected = 104L;
- assertEquals(expected, ssId);
- }
-
- @Test
- public void testGetPool() {
- StorageFilerTO pool = bsc.getPool();
-
- Long id = pool.getId();
- Long expectedL = 1L;
- assertEquals(expectedL, id);
-
- String uuid = pool.getUuid();
- assertTrue(uuid.equals("bed9f83e-cac3-11e1-ac8a-0050568b007e"));
-
- String host = pool.getHost();
- assertTrue(host.equals("hostAddress"));
-
- String path = pool.getPath();
- assertTrue(path.equals("path"));
-
- String userInfo = pool.getUserInfo();
- assertTrue(userInfo.equals("userInfo"));
-
- Integer port = pool.getPort();
- Integer expectedI = 25;
- assertEquals(expectedI, port);
-
- StoragePoolType type = pool.getType();
- assertEquals(StoragePoolType.Filesystem, type);
-
- String str = pool.toString();
- 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 d = pool.getCreated();
- assertTrue(d.compareTo(date) == 0);
- }
- catch (ParseException e) {
- e.printStackTrace();
- }
- }
-
- @Test
- public void testGetSwift() {
- SwiftTO s1 = new SwiftTO();
- bsc.setSwift(s1);
- SwiftTO s2 = bsc.getSwift();
- assertEquals(s1, s2);
- }
-
- @Test
- public void testGetSnapshotName() {
- String ssName = bsc.getSnapshotName();
- assertTrue(ssName.equals("sName"));
- }
-
- @Test
- public void testGetSnapshotUuid() {
- String uuid = bsc.getSnapshotUuid();
- assertTrue(uuid.equals("420fa39c-4ef1-a83c-fd93-46dc1ff515ae"));
- }
-
- @Test
- public void testGetPrevSnapshotUuid() {
- String uuid = bsc.getPrevSnapshotUuid();
- assertTrue(uuid.equals("9012793e-0657-11e2-bebc-0050568b0057"));
- }
-
- @Test
- public void testGetPrevBackupUuid() {
- String uuid = bsc.getPrevBackupUuid();
- assertTrue(uuid.equals("7167e0b2-f5b0-11e1-8414-0050568b0057"));
- }
-
- @Test
- public void testGetVolumePath() {
- String path = bsc.getVolumePath();
- assertTrue(path.equals("vPath"));
-
- bsc.setVolumePath("vPath1");
- path = bsc.getVolumePath();
- assertTrue(path.equals("vPath1"));
-
- bsc1.setVolumePath("vPath2");
- path = bsc1.getVolumePath();
- assertTrue(path.equals("vPath2"));
- }
-
- @Test
- public void testExecuteInSequence() {
- boolean b = bsc.executeInSequence();
- assertFalse(b);
-
- b = bsc1.executeInSequence();
- assertFalse(b);
- }
+ 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 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) {
+ 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;
+ };
+ };
+
+ BackupSnapshotCommand bsc = 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);
+
+ 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() {
+ String label = bsc.getPrimaryStoragePoolNameLabel();
+ assertTrue(label.equals("primaryStoragePoolNameLabel"));
+ }
+
+ @Test
+ public void testGetSecondaryStorageUrl() {
+ String url = bsc.getSecondaryStorageUrl();
+ assertTrue(url.equals("http://secondary.Storage.Url"));
+ }
+
+ @Test
+ public void testGetDataCenterId() {
+ Long dcId = bsc.getDataCenterId();
+ Long expected = 101L;
+ assertEquals(expected, dcId);
+ }
+
+ @Test
+ public void testGetAccountId() {
+ Long aId = bsc.getAccountId();
+ Long expected = 102L;
+ assertEquals(expected, aId);
+ }
+
+ @Test
+ public void testGetVolumeId() {
+ Long vId = bsc.getVolumeId();
+ Long expected = 103L;
+ assertEquals(expected, vId);
+ }
+
+ @Test
+ public void testGetSnapshotId() {
+ Long ssId = bsc.getSnapshotId();
+ Long expected = 104L;
+ assertEquals(expected, ssId);
+ }
+
+ @Test
+ public void testGetPool() {
+ StorageFilerTO pool = bsc.getPool();
+
+ Long id = pool.getId();
+ Long expectedL = 1L;
+ assertEquals(expectedL, id);
+
+ String uuid = pool.getUuid();
+ assertTrue(uuid.equals("bed9f83e-cac3-11e1-ac8a-0050568b007e"));
+
+ String host = pool.getHost();
+ assertTrue(host.equals("hostAddress"));
+
+ String path = pool.getPath();
+ assertTrue(path.equals("path"));
+
+ String userInfo = pool.getUserInfo();
+ assertTrue(userInfo.equals("userInfo"));
+
+ Integer port = pool.getPort();
+ Integer expectedI = 25;
+ assertEquals(expectedI, port);
+
+ StoragePoolType type = pool.getType();
+ assertEquals(StoragePoolType.Filesystem, type);
+
+ String str = pool.toString();
+ 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 d = pool.getCreated();
+ assertTrue(d.compareTo(date) == 0);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void testGetSwift() {
+ SwiftTO s1 = new SwiftTO();
+ bsc.setSwift(s1);
+ SwiftTO s2 = bsc.getSwift();
+ assertEquals(s1, s2);
+ }
+
+ @Test
+ public void testGetSnapshotName() {
+ String ssName = bsc.getSnapshotName();
+ assertTrue(ssName.equals("sName"));
+ }
+
+ @Test
+ public void testGetSnapshotUuid() {
+ String uuid = bsc.getSnapshotUuid();
+ assertTrue(uuid.equals("420fa39c-4ef1-a83c-fd93-46dc1ff515ae"));
+ }
+
+ @Test
+ public void testGetPrevSnapshotUuid() {
+ String uuid = bsc.getPrevSnapshotUuid();
+ assertTrue(uuid.equals("9012793e-0657-11e2-bebc-0050568b0057"));
+ }
+
+ @Test
+ public void testGetPrevBackupUuid() {
+ String uuid = bsc.getPrevBackupUuid();
+ assertTrue(uuid.equals("7167e0b2-f5b0-11e1-8414-0050568b0057"));
+ }
+
+ @Test
+ public void testGetVolumePath() {
+ String path = bsc.getVolumePath();
+ assertTrue(path.equals("vPath"));
+
+ bsc.setVolumePath("vPath1");
+ path = bsc.getVolumePath();
+ assertTrue(path.equals("vPath1"));
+
+ bsc1.setVolumePath("vPath2");
+ path = bsc1.getVolumePath();
+ assertTrue(path.equals("vPath2"));
+ }
+
+ @Test
+ public void testExecuteInSequence() {
+ boolean b = bsc.executeInSequence();
+ assertFalse(b);
+
+ b = bsc1.executeInSequence();
+ assertFalse(b);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/BumpUpPriorityCommandTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/BumpUpPriorityCommandTest.java b/api/test/src/com/cloud/agent/api/test/BumpUpPriorityCommandTest.java
index df31730..17afd5d 100644
--- a/api/test/src/com/cloud/agent/api/test/BumpUpPriorityCommandTest.java
+++ b/api/test/src/com/cloud/agent/api/test/BumpUpPriorityCommandTest.java
@@ -16,58 +16,68 @@
// 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
- @Test
- public void testSuperGetAccessDetail() {
- String value;
- bupc.setAccessDetail(NetworkElementCommand.ACCOUNT_ID, "accountID");
- value = bupc.getAccessDetail(NetworkElementCommand.ACCOUNT_ID);
- assertTrue(value.equals("accountID"));
-
- 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);
- assertTrue(value.equals("GuestNetworkGateway"));
-
- bupc.setAccessDetail(NetworkElementCommand.GUEST_VLAN_TAG, "GuestVlanTag");
- value = bupc.getAccessDetail(NetworkElementCommand.GUEST_VLAN_TAG);
- assertTrue(value.equals("GuestVlanTag"));
-
- bupc.setAccessDetail(NetworkElementCommand.ROUTER_NAME, "RouterName");
- value = bupc.getAccessDetail(NetworkElementCommand.ROUTER_NAME);
- assertTrue(value.equals("RouterName"));
-
- bupc.setAccessDetail(NetworkElementCommand.ROUTER_IP, "RouterIP");
- value = bupc.getAccessDetail(NetworkElementCommand.ROUTER_IP);
- assertTrue(value.equals("RouterIP"));
-
- 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");
- value = bupc.getAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE);
- assertTrue(value.equals("ZoneNetworkType"));
-
- bupc.setAccessDetail(NetworkElementCommand.GUEST_BRIDGE, "GuestBridge");
- value = bupc.getAccessDetail(NetworkElementCommand.GUEST_BRIDGE);
- assertTrue(value.equals("GuestBridge"));
- }
-
- @Test
- public void testExecuteInSequence() {
- boolean b = bupc.executeInSequence();
- assertFalse(b);
- }
+
+ BumpUpPriorityCommand bupc = new BumpUpPriorityCommand();
+
+ // test super class
+ @Test
+ public void testSuperGetAccessDetail() {
+ String value;
+ bupc.setAccessDetail(NetworkElementCommand.ACCOUNT_ID, "accountID");
+ value = bupc.getAccessDetail(NetworkElementCommand.ACCOUNT_ID);
+ assertTrue(value.equals("accountID"));
+
+ 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);
+ assertTrue(value.equals("GuestNetworkGateway"));
+
+ bupc.setAccessDetail(NetworkElementCommand.GUEST_VLAN_TAG,
+ "GuestVlanTag");
+ value = bupc.getAccessDetail(NetworkElementCommand.GUEST_VLAN_TAG);
+ assertTrue(value.equals("GuestVlanTag"));
+
+ bupc.setAccessDetail(NetworkElementCommand.ROUTER_NAME, "RouterName");
+ value = bupc.getAccessDetail(NetworkElementCommand.ROUTER_NAME);
+ assertTrue(value.equals("RouterName"));
+
+ bupc.setAccessDetail(NetworkElementCommand.ROUTER_IP, "RouterIP");
+ value = bupc.getAccessDetail(NetworkElementCommand.ROUTER_IP);
+ assertTrue(value.equals("RouterIP"));
+
+ 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");
+ value = bupc.getAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE);
+ assertTrue(value.equals("ZoneNetworkType"));
+
+ bupc.setAccessDetail(NetworkElementCommand.GUEST_BRIDGE, "GuestBridge");
+ value = bupc.getAccessDetail(NetworkElementCommand.GUEST_BRIDGE);
+ assertTrue(value.equals("GuestBridge"));
+ }
+
+ @Test
+ public void testExecuteInSequence() {
+ boolean b = bupc.executeInSequence();
+ assertFalse(b);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/CancelCommandTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/CancelCommandTest.java b/api/test/src/com/cloud/agent/api/test/CancelCommandTest.java
index f6624ac..0f724c4 100644
--- a/api/test/src/com/cloud/agent/api/test/CancelCommandTest.java
+++ b/api/test/src/com/cloud/agent/api/test/CancelCommandTest.java
@@ -16,28 +16,31 @@
// 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");
-
- @Test
- public void testGetSequence() {
- Long s = cc.getSequence();
- assertTrue(123456789L == s);
- }
-
- @Test
- public void testGetReason() {
- String r = cc.getReason();
- assertTrue(r.equals("goodreason"));
- }
-
- @Test
- public void testExecuteInSequence() {
- boolean b = cc.executeInSequence();
- assertFalse(b);
- }
+ CancelCommand cc = new CancelCommand(123456789L, "goodreason");
+
+ @Test
+ public void testGetSequence() {
+ Long s = cc.getSequence();
+ assertTrue(123456789L == s);
+ }
+
+ @Test
+ public void testGetReason() {
+ String r = cc.getReason();
+ assertTrue(r.equals("goodreason"));
+ }
+
+ @Test
+ public void testExecuteInSequence() {
+ boolean b = cc.executeInSequence();
+ assertFalse(b);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/ChangeAgentAnswerTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/ChangeAgentAnswerTest.java b/api/test/src/com/cloud/agent/api/test/ChangeAgentAnswerTest.java
index ab93648..46ad821 100644
--- a/api/test/src/com/cloud/agent/api/test/ChangeAgentAnswerTest.java
+++ b/api/test/src/com/cloud/agent/api/test/ChangeAgentAnswerTest.java
@@ -16,24 +16,29 @@
// 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);
- ChangeAgentAnswer caa = new ChangeAgentAnswer(cac, true);
-
- @Test
- public void testGetResult() {
- boolean b = caa.getResult();
- assertTrue(b);
- }
+ ChangeAgentCommand cac = new ChangeAgentCommand(123456789L,
+ Event.AgentConnected);
+ ChangeAgentAnswer caa = new ChangeAgentAnswer(cac, true);
+
+ @Test
+ public void testGetResult() {
+ boolean b = caa.getResult();
+ assertTrue(b);
+ }
- @Test
- public void testExecuteInSequence() {
- boolean b = caa.executeInSequence();
- assertFalse(b);
- }
+ @Test
+ public void testExecuteInSequence() {
+ boolean b = caa.executeInSequence();
+ assertFalse(b);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/ChangeAgentCommandTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/ChangeAgentCommandTest.java b/api/test/src/com/cloud/agent/api/test/ChangeAgentCommandTest.java
index 54184ca..c084fef 100644
--- a/api/test/src/com/cloud/agent/api/test/ChangeAgentCommandTest.java
+++ b/api/test/src/com/cloud/agent/api/test/ChangeAgentCommandTest.java
@@ -16,29 +16,35 @@
// 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);
-
- @Test
- public void testGetAgentId() {
- Long aid = cac.getAgentId();
- assertTrue(123456789L == aid);
- }
-
- @Test
- public void testGetEvent() {
- Event e = cac.getEvent();
- assertEquals(Event.AgentConnected, e);
- }
-
- @Test
- public void testExecuteInSequence() {
- boolean b = cac.executeInSequence();
- assertFalse(b);
- }
+
+ ChangeAgentCommand cac = new ChangeAgentCommand(123456789L,
+ Event.AgentConnected);
+
+ @Test
+ public void testGetAgentId() {
+ Long aid = cac.getAgentId();
+ assertTrue(123456789L == aid);
+ }
+
+ @Test
+ public void testGetEvent() {
+ Event e = cac.getEvent();
+ assertEquals(Event.AgentConnected, e);
+ }
+
+ @Test
+ public void testExecuteInSequence() {
+ boolean b = cac.executeInSequence();
+ assertFalse(b);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/CheckHealthAnswerTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/CheckHealthAnswerTest.java b/api/test/src/com/cloud/agent/api/test/CheckHealthAnswerTest.java
index 283ba3c..e07f6f3 100644
--- a/api/test/src/com/cloud/agent/api/test/CheckHealthAnswerTest.java
+++ b/api/test/src/com/cloud/agent/api/test/CheckHealthAnswerTest.java
@@ -16,30 +16,34 @@
// 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);
-
- @Test
- public void testGetResult() {
- boolean r = cha.getResult();
- assertTrue(r);
- }
+ CheckHealthCommand chc = new CheckHealthCommand();
+ CheckHealthAnswer cha = new CheckHealthAnswer(chc, true);
+
+ @Test
+ public void testGetResult() {
+ boolean r = cha.getResult();
+ assertTrue(r);
+ }
- @Test
- public void testGetDetails() {
- String d = cha.getDetails();
- boolean r = cha.getResult();
- assertTrue(d.equals("resource is " + (r? "alive" : "not alive")));
- }
+ @Test
+ public void testGetDetails() {
+ String d = cha.getDetails();
+ boolean r = cha.getResult();
+ assertTrue(d.equals("resource is " + (r ? "alive" : "not alive")));
+ }
- @Test
- public void testExecuteInSequence() {
- boolean b = cha.executeInSequence();
- assertFalse(b);
- }
+ @Test
+ public void testExecuteInSequence() {
+ boolean b = cha.executeInSequence();
+ assertFalse(b);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/CheckHealthCommandTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/CheckHealthCommandTest.java b/api/test/src/com/cloud/agent/api/test/CheckHealthCommandTest.java
index 04e310d..61e985a 100644
--- a/api/test/src/com/cloud/agent/api/test/CheckHealthCommandTest.java
+++ b/api/test/src/com/cloud/agent/api/test/CheckHealthCommandTest.java
@@ -16,22 +16,25 @@
// 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();
-
- @Test
- public void testGetWait() {
- int wait = chc.getWait();
- assertTrue(wait == 50);
- }
-
- @Test
- public void testExecuteInSequence() {
- boolean b = chc.executeInSequence();
- assertFalse(b);
- }
+ CheckHealthCommand chc = new CheckHealthCommand();
+
+ @Test
+ public void testGetWait() {
+ int wait = chc.getWait();
+ assertTrue(wait == 50);
+ }
+
+ @Test
+ public void testExecuteInSequence() {
+ boolean b = chc.executeInSequence();
+ assertFalse(b);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/CheckNetworkAnswerTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/CheckNetworkAnswerTest.java b/api/test/src/com/cloud/agent/api/test/CheckNetworkAnswerTest.java
index 53d4435..cae921a 100644
--- a/api/test/src/com/cloud/agent/api/test/CheckNetworkAnswerTest.java
+++ b/api/test/src/com/cloud/agent/api/test/CheckNetworkAnswerTest.java
@@ -16,36 +16,47 @@
// 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);
-
- @Test
- public void testGetResult() {
- boolean b = cna.getResult();
- assertTrue(b);
- }
-
- @Test
- public void testGetDetails() {
- String d = cna.getDetails();
- assertTrue(d.equals("details"));
- }
-
- @Test
- public void testNeedReconnect() {
- boolean b = cna.needReconnect();
- assertTrue(b);
- }
-
- @Test
- public void testExecuteInSequence() {
- boolean b = cna.executeInSequence();
- assertFalse(b);
- }
+ CheckNetworkCommand cnc;
+ CheckNetworkAnswer cna;
+
+ @Before
+ public void setUp() {
+ cnc = Mockito.mock(CheckNetworkCommand.class);
+ cna = new CheckNetworkAnswer(cnc, true, "details", true);
+ }
+
+ @Test
+ public void testGetResult() {
+ boolean b = cna.getResult();
+ assertTrue(b);
+ }
+
+ @Test
+ public void testGetDetails() {
+ String d = cna.getDetails();
+ assertTrue(d.equals("details"));
+ }
+
+ @Test
+ public void testNeedReconnect() {
+ boolean b = cna.needReconnect();
+ assertTrue(b);
+ }
+
+ @Test
+ public void testExecuteInSequence() {
+ boolean b = cna.executeInSequence();
+ assertFalse(b);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/CheckNetworkCommandTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/CheckNetworkCommandTest.java b/api/test/src/com/cloud/agent/api/test/CheckNetworkCommandTest.java
index c1bdd29..0fbee4a 100644
--- a/api/test/src/com/cloud/agent/api/test/CheckNetworkCommandTest.java
+++ b/api/test/src/com/cloud/agent/api/test/CheckNetworkCommandTest.java
@@ -16,24 +16,38 @@
// 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();
-
- @Test
- public void testGetPhysicalNetworkInfoList() {
- List<PhysicalNetworkSetupInfo> networkInfoList = cnc.getPhysicalNetworkInfoList();
- assertNull(networkInfoList);
- }
-
- @Test
- public void testExecuteInSequence() {
- boolean b = cnc.executeInSequence();
- assertTrue(b);
- }
+ 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();
+ assertEquals(0, networkInfoList.size());
+ }
+
+ @Test
+ public void testExecuteInSequence() {
+ boolean b = cnc.executeInSequence();
+ assertTrue(b);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/CheckOnHostCommandTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/CheckOnHostCommandTest.java b/api/test/src/com/cloud/agent/api/test/CheckOnHostCommandTest.java
index 3b6e01c..a255399 100644
--- a/api/test/src/com/cloud/agent/api/test/CheckOnHostCommandTest.java
+++ b/api/test/src/com/cloud/agent/api/test/CheckOnHostCommandTest.java
@@ -16,351 +16,462 @@
// 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 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) {
- 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 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) {
- 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 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) {
- 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;};
- };
-
- CheckOnHostCommand cohc = new CheckOnHostCommand(host);
-
- @Test
- public void testGetHost() {
- HostTO h = cohc.getHost();
- assertNotNull(h);
- }
-
- @Test
- public void testGetState() {
- Status s = host.getState();
- assertTrue(s == Status.Up);
- }
-
- @Test
- public void testGetId() {
- Long id = host.getId();
- assertTrue(101L == id);
- }
-
- @Test
- public void testGetName() {
- String name = host.getName();
- assertTrue(name.equals("hostName"));
- }
-
- @Test
- public void testGetType() {
- Host.Type t = host.getType();
- assertTrue(t == Host.Type.Storage);
- }
-
- @Test
- public void testGetCreated() {
- try{
- 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) {
- e.printStackTrace();
- }
- }
-
- @Test
- public void testGetStatus() {
- Status s = host.getStatus();
- assertTrue(s == Status.Up);
- }
-
- @Test
- public void testGetPrivateIpAddress() {
- String addr = host.getPrivateIpAddress();
- assertTrue(addr.equals("10.1.1.1"));
- }
-
- @Test
- public void testGetStorageIpAddress() {
- String addr = host.getStorageIpAddress();
- assertTrue(addr.equals("10.1.1.2"));
- }
-
- @Test
- public void testGetGuid() {
- String guid = host.getGuid();
- assertTrue(guid.equals("bed9f83e-cac3-11e1-ac8a-0050568b007e"));
- }
-
- @Test
- public void testGetTotalMemory() {
- Long m = host.getTotalMemory();
- assertTrue(m == 100000000000L);
- }
-
- @Test
- public void testGetCpus() {
- int cpus = host.getCpus();
- assertTrue(cpus == 16);
- }
-
- @Test
- public void testGetSpeed() {
- Long spped = host.getSpeed();
- assertTrue(spped == 2000000000L);
- }
-
- @Test
- public void testGetProxyPort() {
- Integer port = host.getProxyPort();
- assertTrue(port == 22);
- }
-
- @Test
- public void testGetPodId() {
- Long pID = host.getPodId();
- assertTrue(pID == 16L);
- }
-
- @Test
- public void testGetDataCenterId() {
- long dcID = host.getDataCenterId();
- assertTrue(dcID == 17L);
- }
-
- @Test
- public void testGetParent() {
- String p = host.getParent();
- assertTrue(p.equals("parent"));
- }
-
- @Test
- public void testGetStorageIpAddressDeux() {
- String addr = host.getStorageIpAddressDeux();
- assertTrue(addr.equals("10.1.1.3"));
- }
-
- @Test
- public void testGetHypervisorType() {
- HypervisorType type = host.getHypervisorType();
- assertTrue(type == HypervisorType.XenServer);
- }
-
- @Test
- public void testGetDisconnectedOn() {
- try{
- 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) {
- e.printStackTrace();
- }
- }
-
- @Test
- public void testGetVersion() {
- String v = host.getVersion();
- assertTrue(v.equals("4.0.1"));
- }
-
- @Test
- public void testGetTotalSize() {
- long size = host.getTotalSize();
- assertTrue(size == 100000000000L);
- }
-
- @Test
- public void testGetCapabilities() {
- String c = host.getCapabilities();
- assertTrue(c.equals("capabilities"));
- }
-
- @Test
- public void testGetLastPinged() {
- long lp = host.getLastPinged();
- assertTrue(lp == 1L);
- }
-
- @Test
- public void testGetManagementServerId() {
- Long msID = host.getManagementServerId();
- assertTrue(msID == 2L);
- }
-
- @Test
- public void testGetRemoved() {
- try{
- 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) {
- e.printStackTrace();
- }
- }
-
- @Test
- public void testGetClusterId() {
- Long cID = host.getClusterId();
- assertTrue(cID == 3L);
- }
-
- @Test
- public void testGetPublicIpAddress() {
- String pipAddr = host.getPublicIpAddress();
- assertTrue(pipAddr.equals("10.1.1.4"));
- }
-
- @Test
- public void testGetPublicNetmask() {
- String pMask = host.getPublicNetmask();
- assertTrue(pMask.equals("255.255.255.8"));
- }
-
- @Test
- public void testGetPrivateNetmask() {
- String pMask = host.getPrivateNetmask();
- assertTrue(pMask.equals("255.255.255.16"));
- }
-
- @Test
- public void testGetStorageNetmask() {
- String sMask = host.getStorageNetmask();
- assertTrue(sMask.equals("255.255.255.24"));
- }
-
- @Test
- public void testGetStorageMacAddress() {
- String sMac = host.getStorageMacAddress();
- assertTrue(sMac.equals("01:f4:17:38:0e:26"));
- }
-
- @Test
- public void testGetPublicMacAddress() {
- String pMac = host.getPublicMacAddress();
- assertTrue(pMac.equals("02:f4:17:38:0e:26"));
- }
-
- @Test
- public void testGetPrivateMacAddress() {
- String pMac = host.getPrivateMacAddress();
- assertTrue(pMac.equals("03:f4:17:38:0e:26"));
- }
-
- @Test
- public void testGetStorageNetmaskDeux() {
- String sMask = host.getStorageNetmaskDeux();
- assertTrue(sMask.equals("255.255.255.25"));
- }
-
- @Test
- public void testGetStorageMacAddressDeux() {
- String sMac = host.getStorageMacAddressDeux();
- assertTrue(sMac.equals("01:f4:17:38:0e:27"));
- }
-
- @Test
- public void testGetHypervisorVersion() {
- String v = host.getHypervisorVersion();
- assertTrue(v.equals("1.2.3.0"));
- }
-
- @Test
- public void testIsInMaintenanceStates() {
- boolean b = host.isInMaintenanceStates();
- assertFalse(b);
- }
-
- @Test
- public void testGetResourceState() {
- ResourceState r = host.getResourceState();
- assertTrue(r == ResourceState.Enabled);
- }
-
- @Test
- public void testGetWait() {
- int wait = cohc.getWait();
- assertTrue(20 == wait);
- }
-
- @Test
- public void testExecuteInSequence() {
- boolean b = cohc.executeInSequence();
- assertFalse(b);
- }
+ 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 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) {
+ 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 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) {
+ 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 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) {
+ 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;
+ };
+ };
+
+ CheckOnHostCommand cohc = new CheckOnHostCommand(host);
+
+ @Test
+ public void testGetHost() {
+ HostTO h = cohc.getHost();
+ assertNotNull(h);
+ }
+
+ @Test
+ public void testGetState() {
+ Status s = host.getState();
+ assertTrue(s == Status.Up);
+ }
+
+ @Test
+ public void testGetId() {
+ Long id = host.getId();
+ assertTrue(101L == id);
+ }
+
+ @Test
+ public void testGetName() {
+ String name = host.getName();
+ assertTrue(name.equals("hostName"));
+ }
+
+ @Test
+ public void testGetType() {
+ Host.Type t = host.getType();
+ assertTrue(t == Host.Type.Storage);
+ }
+
+ @Test
+ public void testGetCreated() {
+ try {
+ 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) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void testGetStatus() {
+ Status s = host.getStatus();
+ assertTrue(s == Status.Up);
+ }
+
+ @Test
+ public void testGetPrivateIpAddress() {
+ String addr = host.getPrivateIpAddress();
+ assertTrue(addr.equals("10.1.1.1"));
+ }
+
+ @Test
+ public void testGetStorageIpAddress() {
+ String addr = host.getStorageIpAddress();
+ assertTrue(addr.equals("10.1.1.2"));
+ }
+
+ @Test
+ public void testGetGuid() {
+ String guid = host.getGuid();
+ assertTrue(guid.equals("bed9f83e-cac3-11e1-ac8a-0050568b007e"));
+ }
+
+ @Test
+ public void testGetTotalMemory() {
+ Long m = host.getTotalMemory();
+ assertTrue(m == 100000000000L);
+ }
+
+ @Test
+ public void testGetCpus() {
+ int cpus = host.getCpus();
+ assertTrue(cpus == 16);
+ }
+
+ @Test
+ public void testGetSpeed() {
+ Long spped = host.getSpeed();
+ assertTrue(spped == 2000000000L);
+ }
+
+ @Test
+ public void testGetProxyPort() {
+ Integer port = host.getProxyPort();
+ assertTrue(port == 22);
+ }
+
+ @Test
+ public void testGetPodId() {
+ Long pID = host.getPodId();
+ assertTrue(pID == 16L);
+ }
+
+ @Test
+ public void testGetDataCenterId() {
+ long dcID = host.getDataCenterId();
+ assertTrue(dcID == 17L);
+ }
+
+ @Test
+ public void testGetParent() {
+ String p = host.getParent();
+ assertTrue(p.equals("parent"));
+ }
+
+ @Test
+ public void testGetStorageIpAddressDeux() {
+ String addr = host.getStorageIpAddressDeux();
+ assertTrue(addr.equals("10.1.1.3"));
+ }
+
+ @Test
+ public void testGetHypervisorType() {
+ HypervisorType type = host.getHypervisorType();
+ assertTrue(type == HypervisorType.XenServer);
+ }
+
+ @Test
+ public void testGetDisconnectedOn() {
+ try {
+ 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) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void testGetVersion() {
+ String v = host.getVersion();
+ assertTrue(v.equals("4.0.1"));
+ }
+
+ @Test
+ public void testGetTotalSize() {
+ long size = host.getTotalSize();
+ assertTrue(size == 100000000000L);
+ }
+
+ @Test
+ public void testGetCapabilities() {
+ String c = host.getCapabilities();
+ assertTrue(c.equals("capabilities"));
+ }
+
+ @Test
+ public void testGetLastPinged() {
+ long lp = host.getLastPinged();
+ assertTrue(lp == 1L);
+ }
+
+ @Test
+ public void testGetManagementServerId() {
+ Long msID = host.getManagementServerId();
+ assertTrue(msID == 2L);
+ }
+
+ @Test
+ public void testGetRemoved() {
+ try {
+ 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) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void testGetClusterId() {
+ Long cID = host.getClusterId();
+ assertTrue(cID == 3L);
+ }
+
+ @Test
+ public void testGetPublicIpAddress() {
+ String pipAddr = host.getPublicIpAddress();
+ assertTrue(pipAddr.equals("10.1.1.4"));
+ }
+
+ @Test
+ public void testGetPublicNetmask() {
+ String pMask = host.getPublicNetmask();
+ assertTrue(pMask.equals("255.255.255.8"));
+ }
+
+ @Test
+ public void testGetPrivateNetmask() {
+ String pMask = host.getPrivateNetmask();
+ assertTrue(pMask.equals("255.255.255.16"));
+ }
+
+ @Test
+ public void testGetStorageNetmask() {
+ String sMask = host.getStorageNetmask();
+ assertTrue(sMask.equals("255.255.255.24"));
+ }
+
+ @Test
+ public void testGetStorageMacAddress() {
+ String sMac = host.getStorageMacAddress();
+ assertTrue(sMac.equals("01:f4:17:38:0e:26"));
+ }
+
+ @Test
+ public void testGetPublicMacAddress() {
+ String pMac = host.getPublicMacAddress();
+ assertTrue(pMac.equals("02:f4:17:38:0e:26"));
+ }
+
+ @Test
+ public void testGetPrivateMacAddress() {
+ String pMac = host.getPrivateMacAddress();
+ assertTrue(pMac.equals("03:f4:17:38:0e:26"));
+ }
+
+ @Test
+ public void testGetStorageNetmaskDeux() {
+ String sMask = host.getStorageNetmaskDeux();
+ assertTrue(sMask.equals("255.255.255.25"));
+ }
+
+ @Test
+ public void testGetStorageMacAddressDeux() {
+ String sMac = host.getStorageMacAddressDeux();
+ assertTrue(sMac.equals("01:f4:17:38:0e:27"));
+ }
+
+ @Test
+ public void testGetHypervisorVersion() {
+ String v = host.getHypervisorVersion();
+ assertTrue(v.equals("1.2.3.0"));
+ }
+
+ @Test
+ public void testIsInMaintenanceStates() {
+ boolean b = host.isInMaintenanceStates();
+ assertFalse(b);
+ }
+
+ @Test
+ public void testGetResourceState() {
+ ResourceState r = host.getResourceState();
+ assertTrue(r == ResourceState.Enabled);
+ }
+
+ @Test
+ public void testGetWait() {
+ int wait = cohc.getWait();
+ assertTrue(20 == wait);
+ }
+
+ @Test
+ public void testExecuteInSequence() {
+ boolean b = cohc.executeInSequence();
+ assertFalse(b);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1c06329/api/test/src/com/cloud/agent/api/test/SnapshotCommandTest.java
----------------------------------------------------------------------
diff --git a/api/test/src/com/cloud/agent/api/test/SnapshotCommandTest.java b/api/test/src/com/cloud/agent/api/test/SnapshotCommandTest.java
index 005e0a0..3e37eda 100644
--- a/api/test/src/com/cloud/agent/api/test/SnapshotCommandTest.java
+++ b/api/test/src/com/cloud/agent/api/test/SnapshotCommandTest.java
@@ -16,83 +16,92 @@
// 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,
- 103L);
-
- SnapshotCommand ssc1 = new SnapshotCommand();
-
- @Test
- public void testGetPrimaryStoragePoolNameLabel() {
- String label = ssc.getPrimaryStoragePoolNameLabel();
- assertTrue(label.equals("primaryStoragePoolNameLabel"));
- }
-
- @Test
- public void testGetSecondaryStorageUrl() {
- String url = ssc.getSecondaryStorageUrl();
- assertTrue(url.equals("http://secondary.Storage.Url"));
- }
-
- @Test
- public void testGetSnapshotUuid() {
- String uuid = ssc.getSnapshotUuid();
- assertTrue(uuid.equals("420fa39c-4ef1-a83c-fd93-46dc1ff515ae"));
- }
-
- @Test
- public void testGetSnapshotName() {
- String name = ssc.getSnapshotName();
- assertTrue(name.equals("snapshotName"));
- }
-
- @Test
- public void testGetVolumePath() {
- ssc.setVolumePath("vPath");
- String path = ssc.getVolumePath();
- assertTrue(path.equals("vPath"));
-
- ssc1.setVolumePath("vPath1");
- path = ssc1.getVolumePath();
- assertTrue(path.equals("vPath1"));
- }
-
- @Test
- public void testExecuteInSequence() {
- boolean b = ssc.executeInSequence();
- assertFalse(b);
-
- b = ssc1.executeInSequence();
- assertFalse(b);
- }
-
- @Test
- public void testGetDataCenterId() {
- Long dcId = ssc.getDataCenterId();
- Long expected = 101L;
- assertEquals(expected, dcId);
- }
-
- @Test
- public void testGetAccountId() {
- Long aId = ssc.getAccountId();
- Long expected = 102L;
- assertEquals(expected, aId);
- }
-
- @Test
- public void testGetVolumeId() {
- Long vId = ssc.getVolumeId();
- Long expected = 103L;
- assertEquals(expected, vId);
- }
+ SnapshotCommand ssc = new SnapshotCommand("primaryStoragePoolNameLabel",
+ "http://secondary.Storage.Url",
+ "420fa39c-4ef1-a83c-fd93-46dc1ff515ae", "snapshotName", 101L, 102L,
+ 103L);
+
+ SnapshotCommand ssc1;
+
+ @Before
+ public void setUp() {
+ ssc1 = new SnapshotCommand("primaryStoragePoolNameLabel",
+ "secondaryStorageUrl", "snapshotUuid", "snapshotName", 101L,
+ 102L, 103L);
+ }
+
+ @Test
+ public void testGetPrimaryStoragePoolNameLabel() {
+ String label = ssc.getPrimaryStoragePoolNameLabel();
+ assertTrue(label.equals("primaryStoragePoolNameLabel"));
+ }
+
+ @Test
+ public void testGetSecondaryStorageUrl() {
+ String url = ssc.getSecondaryStorageUrl();
+ assertTrue(url.equals("http://secondary.Storage.Url"));
+ }
+
+ @Test
+ public void testGetSnapshotUuid() {
+ String uuid = ssc.getSnapshotUuid();
+ assertTrue(uuid.equals("420fa39c-4ef1-a83c-fd93-46dc1ff515ae"));
+ }
+
+ @Test
+ public void testGetSnapshotName() {
+ String name = ssc.getSnapshotName();
+ assertTrue(name.equals("snapshotName"));
+ }
+
+ @Test
+ public void testGetVolumePath() {
+ ssc.setVolumePath("vPath");
+ String path = ssc.getVolumePath();
+ assertTrue(path.equals("vPath"));
+
+ ssc1.setVolumePath("vPath1");
+ path = ssc1.getVolumePath();
+ assertTrue(path.equals("vPath1"));
+ }
+
+ @Test
+ public void testExecuteInSequence() {
+ boolean b = ssc.executeInSequence();
+ assertFalse(b);
+
+ b = ssc1.executeInSequence();
+ assertFalse(b);
+ }
+
+ @Test
+ public void testGetDataCenterId() {
+ Long dcId = ssc.getDataCenterId();
+ Long expected = 101L;
+ assertEquals(expected, dcId);
+ }
+
+ @Test
+ public void testGetAccountId() {
+ Long aId = ssc.getAccountId();
+ Long expected = 102L;
+ assertEquals(expected, aId);
+ }
+
+ @Test
+ public void testGetVolumeId() {
+ Long vId = ssc.getVolumeId();
+ Long expected = 103L;
+ assertEquals(expected, vId);
+ }
}