[Engine-patches] Change in ovirt-engine[master]: core: Removed useless code from test

[vvolansk]

Vered Volansky has uploaded a new change for review.

Change subject: core: Removed useless code from test
......................................................................

core: Removed useless code from test

In UpdateVmDiskCommandTest, there were recurrent mockings to
vmDeviceDao.get, which were never called in the command, therefore the
mock is useless. Now removed.

Change-Id: If1580f66cc5a41583abbc936308946ea3b70939f
Signed-off-by: Vered Volansky <vvola...@redhat.com>
---
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
1 file changed, 0 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/35458/1

diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
index 2c7c4bf..817de6c 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java
@@ -193,13 +193,11 @@
     @Test
     public void canDoActionFailedUpdateReadOnly() {
         VmDevice device = createVmDevice(diskImageGuid, vmId);
-        doReturn(device).when(vmDeviceDAO).get(device.getId());
 
         // make sure that device is plugged
         assertEquals(true, device.getIsPlugged());
 
         when(diskDao.get(diskImageGuid)).thenReturn(createDiskImage());
-
         UpdateVmDiskParameters parameters = createParameters();
         parameters.getDiskInfo().setReadOnly(true);
         initializeCommand(parameters, 
Collections.singletonList(createVm(VMStatus.Up)));
@@ -416,10 +414,7 @@
         });
 
         initializeCommand(parameters);
-
         VmDevice device = createVmDevice(diskImageGuid, vmId);
-        doReturn(device).when(vmDeviceDAO).get(device.getId());
-
         command.executeVmCommand();
 
         // verify that device address was cleared exactly once
@@ -435,8 +430,6 @@
         when(diskDao.get(diskImageGuid)).thenReturn(createDiskImage());
 
         VmDevice device = createVmDevice(diskImageGuid, vmId);
-        doReturn(device).when(vmDeviceDAO).get(device.getId());
-
         initializeCommand(parameters);
         command.executeVmCommand();
 
@@ -465,9 +458,6 @@
         
when(diskValidator.isDiskInterfaceSupported(any(VM.class))).thenReturn(new 
ValidationResult(VdcBllMessages.ACTION_TYPE_DISK_INTERFACE_UNSUPPORTED));
         
when(command.getDiskValidator(any(Disk.class))).thenReturn(diskValidator);
 
-        VmDevice device = createVmDevice(diskImageGuid, vmId);
-        doReturn(device).when(vmDeviceDAO).get(device.getId());
-
         command.executeVmCommand();
         assertFalse(command.canDoAction());
         assertTrue(command.getReturnValue()
@@ -485,7 +475,6 @@
 
         // Disk is already attached to VM as a read write
         VmDevice device = createVmDevice(diskImageGuid, vmId);
-        doReturn(device).when(vmDeviceDAO).get(device.getId());
 
         // To be sure that readOnly property is not changed
         assertEquals(device.getIsReadOnly(), 
parameters.getDiskInfo().getReadOnly());


-- 
To view, visit http://gerrit.ovirt.org/35458
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1580f66cc5a41583abbc936308946ea3b70939f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Vered Volansky <vvola...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches