cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sate...@apache.org
Subject git commit: updated refs/heads/vmware-datamodel to 45d7b9f
Date Wed, 22 May 2013 01:45:17 GMT
Updated Branches:
  refs/heads/vmware-datamodel 96c9937d9 -> 45d7b9fdb


Cleanup


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/45d7b9fd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/45d7b9fd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/45d7b9fd

Branch: refs/heads/vmware-datamodel
Commit: 45d7b9fdb3ccb5f000e6c265f18cfcfefa72afce
Parents: 96c9937
Author: Sateesh Chodapuneedi <sateesh@apache.org>
Authored: Wed May 22 07:13:55 2013 +0530
Committer: Sateesh Chodapuneedi <sateesh@apache.org>
Committed: Wed May 22 07:13:55 2013 +0530

----------------------------------------------------------------------
 .../vmware/VmwareDatacenterApiUnitTest.java        |   56 ---------------
 1 files changed, 0 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/45d7b9fd/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
b/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
index 2d69377..7e68e6e 100644
--- a/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
+++ b/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
@@ -78,62 +78,6 @@ import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.dao.UserVmDao;
 
-/*
-public class VmwareManagerTest {
-
-    @Spy VmwareManagerImpl _mgr = new VmwareManagerImpl() {
-        @Override
-        public VmwareHypervisorHost getHyperHost(VmwareContext context, Command cmd) {
-            return hyperHost;
-        }
-    };
-
-    @Mock VmwareContext context;
-    @Mock ScaleVmCommand cmd;
-    @Mock VirtualMachineTO vmSpec;
-    @Mock
-    VmwareHypervisorHost hyperHost;
-    @Mock VirtualMachineMO vmMo;
-    @Mock VirtualMachineConfigSpec vmConfigSpec;
-
-    @Before
-    public void setup(){
-        MockitoAnnotations.initMocks(this);
-        doReturn(context).when(_resource).getServiceContext(null);
-        when(cmd.getVirtualMachine()).thenReturn(vmSpec);
-    }
-    //Test successful scaling up the vm
-    @Test
-    public void testScaleVMF1() throws Exception {
-        when(_resource.getHyperHost(context, null)).thenReturn(hyperHost);
-        doReturn("i-2-3-VM").when(cmd).getVmName();
-        when(hyperHost.findVmOnHyperHost("i-2-3-VM")).thenReturn(vmMo);
-        doReturn(1024L).when(vmSpec).getMinRam();
-        doReturn(1).when(vmSpec).getCpus();
-        doReturn(1000).when(vmSpec).getSpeed();
-        doReturn(1024L).when(vmSpec).getMaxRam();
-        doReturn(false).when(vmSpec).getLimitCpuUse();
-        when(vmMo.configureVm(vmConfigSpec)).thenReturn(true);
-
-        ScaleVmAnswer answer = _resource.execute(cmd);
-        verify(_resource).execute(cmd);
-    }
-    @Before
-    public void setUp() throws Exception {
-    }
-
-    @After
-    public void tearDown() throws Exception {
-    }
-
-    @Test
-    public void test() {
-        fail("Not yet implemented");
-    }
-
-}
-*/
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(loader = AnnotationConfigContextLoader.class)
 public class VmwareDatacenterApiUnitTest {


Mime
View raw message