[Engine-patches] Change in ovirt-engine[master]: core: Fix Coverity issues in FenceProxyLocatorTest

[mperina]

Martin Peřina has uploaded a new change for review.

Change subject: core: Fix Coverity issues in FenceProxyLocatorTest
......................................................................

core: Fix Coverity issues in FenceProxyLocatorTest

Fixes Coverity issues found in FenceProxyLocatorTest.

Change-Id: I50a82eb0cd52c72e8ad0871fd1a218bd0a50bc8a
Signed-off-by: Martin Perina <mper...@redhat.com>
---
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceProxyLocatorTest.java
1 file changed, 10 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/39951/1

diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceProxyLocatorTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceProxyLocatorTest.java
index f422e5a..bb28794 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceProxyLocatorTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceProxyLocatorTest.java
@@ -60,7 +60,7 @@
 
     @Before
     public void setup() {
-        doReturn(vdsDao).when(dbFacade).getVdsDao();
+        when(dbFacade.getVdsDao()).thenReturn(vdsDao);
 
         mockVdsFenceOptions(true);
         mockFencedHost();
@@ -291,16 +291,15 @@
 
     private void mockFencedHost() {
         fencedHost = mock(VDS.class);
-        doReturn(FENCECD_HOST_ID).when(fencedHost).getId();
-        doReturn(FENCED_HOST_CLUSTER_ID).when(fencedHost).getVdsGroupId();
-        
doReturn(FENCED_HOST_DATACENTER_ID).when(fencedHost).getStoragePoolId();
-        doReturn("fencedHost").when(fencedHost).getHostName();
-        doReturn(Arrays.asList(createFenceAgent(FENCECD_HOST_ID, "ipmilan")))
-                .when(fencedHost).getFenceAgents();
+        when(fencedHost.getId()).thenReturn(FENCECD_HOST_ID);
+        when(fencedHost.getVdsGroupId()).thenReturn(FENCED_HOST_CLUSTER_ID);
+        
when(fencedHost.getStoragePoolId()).thenReturn(FENCED_HOST_DATACENTER_ID);
+        when(fencedHost.getHostName()).thenReturn("fencedHost");
+        
when(fencedHost.getFenceAgents()).thenReturn(Arrays.asList(createFenceAgent(FENCECD_HOST_ID,
 "ipmilan")));
     }
 
     private void mockProxySourcesForFencedHost(List<FenceProxySourceType> 
fenceProxySources) {
-        doReturn(fenceProxySources).when(fencedHost).getFenceProxySources();
+        when(fencedHost.getFenceProxySources()).thenReturn(fenceProxySources);
     }
 
     private FenceAgent createFenceAgent(Guid hostId, String type) {
@@ -317,7 +316,7 @@
 
     private FenceProxyLocator setupLocator(FencingPolicy fencingPolicy) {
         FenceProxyLocator fenceProxyLocator = spy(new 
FenceProxyLocator(fencedHost, fencingPolicy));
-        doReturn(dbFacade).when(fenceProxyLocator).getDbFacade();
+        when(fenceProxyLocator.getDbFacade()).thenReturn(dbFacade);
         
doReturn(vdsFenceOptions).when(fenceProxyLocator).createVdsFenceOptions(any(String.class));
         doReturn(0L).when(fenceProxyLocator).getDelayBetweenRetries();
         doReturn(1).when(fenceProxyLocator).getFindFenceProxyRetries();
@@ -329,7 +328,7 @@
     }
 
     private void setMinSupportedVersionForFencingPolicy(FenceProxyLocator 
locator, Version version) {
-        
doReturn(version).when(locator).getMinSupportedVersionForFencingPolicy();
+        
when(locator.getMinSupportedVersionForFencingPolicy()).thenReturn(version);
     }
 
     private VDS createHost() {
@@ -371,7 +370,7 @@
 
     private void mockVdsFenceOptions(boolean agentsCompatibleWithProxy) {
         vdsFenceOptions = mock(VdsFenceOptions.class);
-        
doReturn(agentsCompatibleWithProxy).when(vdsFenceOptions).isAgentSupported(any(String.class));
+        
when(vdsFenceOptions.isAgentSupported(any(String.class))).thenReturn(agentsCompatibleWithProxy);
     }
 
     private boolean shouldHostBeUnreachable(VDSStatus status) {


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50a82eb0cd52c72e8ad0871fd1a218bd0a50bc8a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Peřina <mper...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches