[Engine-patches] Change in ovirt-engine[master]: engine: Use type safety any[Set|List]Of matcher

[masayag]

Moti Asayag has uploaded a new change for review.

Change subject: engine: Use type safety any[Set|List]Of matcher
......................................................................

engine: Use type safety any[Set|List]Of matcher

Change-Id: I8c8c5662d1a26d89116d9819bb6c232272705f52
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
1 file changed, 9 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/38342/1

diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
index 09722b4..6224a43 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java
@@ -3,8 +3,8 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyList;
-import static org.mockito.Matchers.anySet;
+import static org.mockito.Matchers.anyListOf;
+import static org.mockito.Matchers.anySetOf;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
@@ -134,20 +134,20 @@
         setupForStorageTests();
         assertTrue(command.checkDestDomains());
         verify(multipleSdValidator).allDomainsWithinThresholds();
-        verify(multipleSdValidator).allDomainsHaveSpaceForNewDisks(anyList());
+        
verify(multipleSdValidator).allDomainsHaveSpaceForNewDisks(anyListOf(DiskImage.class));
     }
 
     @Test
     public void validateInsufficientSpaceOnDomains() {
         setupForStorageTests();
         doReturn(new 
ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_STORAGE_DOMAIN)).
-                
when(multipleSdValidator).allDomainsHaveSpaceForNewDisks(anyList());
+                
when(multipleSdValidator).allDomainsHaveSpaceForNewDisks(anyListOf(DiskImage.class));
         assertFalse(command.canDoAction());
         assertTrue(command.getReturnValue()
                 .getCanDoActionMessages()
                 
.contains(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_STORAGE_DOMAIN.toString()));
         verify(multipleSdValidator).allDomainsWithinThresholds();
-        verify(multipleSdValidator).allDomainsHaveSpaceForNewDisks(anyList());
+        
verify(multipleSdValidator).allDomainsHaveSpaceForNewDisks(anyListOf(DiskImage.class));
     }
 
     @Test
@@ -160,7 +160,7 @@
                 .getCanDoActionMessages()
                 
.contains(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_STORAGE_DOMAIN.toString()));
         verify(multipleSdValidator).allDomainsWithinThresholds();
-        verify(multipleSdValidator, 
never()).allDomainsHaveSpaceForNewDisks(anyList());
+        verify(multipleSdValidator, 
never()).allDomainsHaveSpaceForNewDisks(anyListOf(DiskImage.class));
     }
 
     @Before
@@ -387,8 +387,9 @@
 
 
     protected void setupForStorageTests() {
-        
doReturn(multipleSdValidator).when(command).getStorageDomainsValidator(any(Guid.class),
 anySet());
+        
doReturn(multipleSdValidator).when(command).getStorageDomainsValidator(any(Guid.class),
 anySetOf(Guid.class));
         
doReturn(ValidationResult.VALID).when(multipleSdValidator).allDomainsWithinThresholds();
-        
doReturn(ValidationResult.VALID).when(multipleSdValidator).allDomainsHaveSpaceForNewDisks(anyList());
+        doReturn(ValidationResult.VALID).when(multipleSdValidator)
+                .allDomainsHaveSpaceForNewDisks(anyListOf(DiskImage.class));
     }
 }


-- 
To view, visit https://gerrit.ovirt.org/38342
To unsubscribe, visit https://gerrit.ovirt.org/settings

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