[Engine-patches] Change in ovirt-engine[master]: core: Use CanDoActionTestUtils in test

[vvolansk]

Vered Volansky has uploaded a new change for review.

Change subject: core: Use CanDoActionTestUtils in test
......................................................................

core: Use CanDoActionTestUtils in test

Use CanDoActionTestUtils instead of execute CDA and them assert false
and check messages in UpdateVmDiskCommandTest.

Change-Id: I99e7be1c20b243da63f9df28ad4e25f580b201eb
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, 6 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/59/35459/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 817de6c..088ec5c 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
@@ -157,20 +157,14 @@
     public void canDoActionFailedVMNotFound() throws Exception {
         initializeCommand(createParameters());
         mockNullVm();
-        assertFalse(command.canDoAction());
-        assertTrue(command.getReturnValue()
-                .getCanDoActionMessages()
-                
.contains(VdcBllMessages.ACTION_TYPE_FAILED_VM_NOT_FOUND.toString()));
+        CanDoActionTestUtils.runAndAssertCanDoActionFailure(command, 
VdcBllMessages.ACTION_TYPE_FAILED_VM_NOT_FOUND);
     }
 
     @Test
     public void canDoActionFailedVMHasNotDisk() throws Exception {
         initializeCommand(createParameters());
         createNullDisk();
-        assertFalse(command.canDoAction());
-        assertTrue(command.getReturnValue()
-                .getCanDoActionMessages()
-                
.contains(VdcBllMessages.ACTION_TYPE_FAILED_DISK_NOT_EXIST.toString()));
+        CanDoActionTestUtils.runAndAssertCanDoActionFailure(command, 
VdcBllMessages.ACTION_TYPE_FAILED_DISK_NOT_EXIST);
     }
 
     @Test
@@ -184,10 +178,7 @@
         
when(storageDomainStaticDao.get(storage.getId())).thenReturn(storage.getStorageStaticData());
         initializeCommand(parameters);
 
-        assertFalse(command.canDoAction());
-        assertTrue(command.getReturnValue()
-                .getCanDoActionMessages()
-                
.contains(VdcBllMessages.SHAREABLE_DISK_IS_NOT_SUPPORTED_BY_VOLUME_FORMAT.toString()));
+        CanDoActionTestUtils.runAndAssertCanDoActionFailure(command, 
VdcBllMessages.SHAREABLE_DISK_IS_NOT_SUPPORTED_BY_VOLUME_FORMAT);
     }
 
     @Test
@@ -254,8 +245,7 @@
         
when(storageDomainStaticDao.get(storage.getId())).thenReturn(storage.getStorageStaticData());
         initializeCommand(parameters);
 
-        assertFalse(command.canDoAction());
-        
assertTrue(command.getReturnValue().getCanDoActionMessages().contains(VdcBllMessages.ACTION_TYPE_FAILED_SHAREABLE_DISKS_NOT_SUPPORTED_ON_GLUSTER_DOMAIN.toString()));
+        CanDoActionTestUtils.runAndAssertCanDoActionFailure(command, 
VdcBllMessages.ACTION_TYPE_FAILED_SHAREABLE_DISKS_NOT_SUPPORTED_ON_GLUSTER_DOMAIN);
     }
 
 
@@ -277,7 +267,7 @@
 
         mockInterfaceList();
 
-        assertTrue(command.canDoAction());
+        CanDoActionTestUtils.runAndAssertCanDoActionSuccess(command);
         command.executeVmCommand();
         assertTrue(oldDisk.getVmSnapshotId() == null);
     }
@@ -457,12 +447,7 @@
         
when(diskValidator.isReadOnlyPropertyCompatibleWithInterface()).thenReturn(ValidationResult.VALID);
         
when(diskValidator.isDiskInterfaceSupported(any(VM.class))).thenReturn(new 
ValidationResult(VdcBllMessages.ACTION_TYPE_DISK_INTERFACE_UNSUPPORTED));
         
when(command.getDiskValidator(any(Disk.class))).thenReturn(diskValidator);
-
-        command.executeVmCommand();
-        assertFalse(command.canDoAction());
-        assertTrue(command.getReturnValue()
-                .getCanDoActionMessages()
-                
.contains(VdcBllMessages.ACTION_TYPE_DISK_INTERFACE_UNSUPPORTED.toString()));
+        CanDoActionTestUtils.runAndAssertCanDoActionFailure(command, 
VdcBllMessages.ACTION_TYPE_DISK_INTERFACE_UNSUPPORTED);
     }
 
     @Test


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I99e7be1c20b243da63f9df28ad4e25f580b201eb
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