Laszlo Hornyak has uploaded a new change for review.
Change subject: engine: watchdog query cleanup
......................................................................
engine: watchdog query cleanup
- sets the success flag
- broken unit tests fixed
Signed-off-by: Laszlo Hornyak <lhorn...@redhat.com>
Change-Id: Ic8ec62119a2e2aeab5c0e5e140cf15e2a68d3b53
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetWatchdogQuery.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetWatchdogQueryTest.java
2 files changed, 24 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/22/16622/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetWatchdogQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetWatchdogQuery.java
index 10e1ee8..96bc507 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetWatchdogQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetWatchdogQuery.java
@@ -29,8 +29,10 @@
watchdog.setVmId(getParameters().getId());
watchdog.setId(device.getDeviceId());
setReturnValue(Collections.singletonList(watchdog));
+ getQueryReturnValue().setSucceeded(true);
} else {
setReturnValue(Collections.emptyList());
+ getQueryReturnValue().setSucceeded(true);
}
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetWatchdogQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetWatchdogQueryTest.java
index f4d9add..daea7b9 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetWatchdogQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetWatchdogQueryTest.java
@@ -2,9 +2,9 @@
import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -13,6 +13,7 @@
import org.ovirt.engine.core.common.businessentities.VmDeviceId;
import org.ovirt.engine.core.common.businessentities.VmWatchdog;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
+import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.utils.VmDeviceType;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dao.VmDeviceDAO;
@@ -24,21 +25,27 @@
@Test
public void executeQueryCommandWithNull() {
- @SuppressWarnings("unchecked")
+ final Guid vmId = new Guid("ee655a4d-effc-4aab-be2b-2f80ff40cd1c");
GetWatchdogQuery<IdQueryParameters> query =
- Mockito.mock(GetWatchdogQuery.class);
+ Mockito.spy(new GetWatchdogQuery<IdQueryParameters>(new
IdQueryParameters(vmId)));
VmDeviceDAO vmDeviceDaoMock = Mockito.mock(VmDeviceDAO.class);
- Mockito.when(query.getVmDeviceDAO()).thenReturn(vmDeviceDaoMock);
+ Mockito.doReturn(vmDeviceDaoMock).when(query).getVmDeviceDAO();
IdQueryParameters params = new IdQueryParameters(new
Guid("ee655a4d-effc-4aab-be2b-2f80ff40cd1c"));
Mockito.when(query.getParameters())
.thenReturn(params);
Mockito.doCallRealMethod().when(query).executeQueryCommand();
+ Mockito.doCallRealMethod().when(query).getReturnValue();
+ Mockito.doCallRealMethod().when(query).getQueryReturnValue();
query.executeQueryCommand();
- Assert.assertNull(query.getReturnValue());
+ VdcQueryReturnValue queryReturnValue = query.getQueryReturnValue();
+ Assert.assertNotNull(queryReturnValue);
+ Assert.assertTrue(queryReturnValue.getSucceeded());
+ @SuppressWarnings("unchecked")
+ List<VmWatchdog> returnValue = (List<VmWatchdog>)
queryReturnValue.getReturnValue();
+ Assert.assertTrue(returnValue.isEmpty());
}
@Test
- @Ignore
public void executeQueryCommandWithWatchdog() {
final Guid vmId = new Guid("ee655a4d-effc-4aab-be2b-2f80ff40cd1c");
VmDeviceDAO vmDeviceDaoMock = Mockito.mock(VmDeviceDAO.class);
@@ -53,18 +60,23 @@
GetWatchdogQuery<IdQueryParameters> query =
new GetWatchdogQuery<IdQueryParameters>(new
IdQueryParameters(vmId));
query = Mockito.spy(query);
- Mockito.when(query.getVmDeviceDAO()).thenReturn(vmDeviceDaoMock);
+ Mockito.doReturn(vmDeviceDaoMock).when(query).getVmDeviceDAO();
IdQueryParameters params = new IdQueryParameters(vmId);
Mockito.when(query.getParameters())
.thenReturn(params);
Mockito.doCallRealMethod().when(query).executeQueryCommand();
Mockito.doCallRealMethod().when(query).getReturnValue();
+ Mockito.doCallRealMethod().when(query).getQueryReturnValue();
Mockito.doCallRealMethod().when(query).setReturnValue(Mockito.any(Object.class));
query.executeQueryCommand();
- Assert.assertNotNull(query.getReturnValue());
-
Assert.assertEquals((((VmWatchdog)query.getReturnValue()).getAction()).name().toLowerCase(),
"reset");
-
Assert.assertEquals((((VmWatchdog)query.getReturnValue()).getModel()).name().toLowerCase(),
"i6300esb");
+ Assert.assertNotNull(query.getQueryReturnValue());
+ @SuppressWarnings("unchecked")
+ List<VmWatchdog> returnValue = (List<VmWatchdog>)
query.getQueryReturnValue().getReturnValue();
+ Assert.assertEquals(1, returnValue.size());
+ VmWatchdog watchdog = returnValue.get(0);
+ Assert.assertEquals((watchdog.getAction()).name().toLowerCase(),
"reset");
+ Assert.assertEquals((watchdog.getModel()).name().toLowerCase(),
"i6300esb");
}
}
--
To view, visit http://gerrit.ovirt.org/16622
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8ec62119a2e2aeab5c0e5e140cf15e2a68d3b53
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Laszlo Hornyak <lhorn...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
