Allon Mureinik has uploaded a new change for review. Change subject: core: Fix and enable GetWatchdogQuery ignored test ......................................................................
core: Fix and enable GetWatchdogQuery ignored test Fixed GetWatchdofQueryTest.executeQueryCommandWithWatchdog() and removed the @Ignore annotation from it now that it's functioning. This patch includes: 1. Using the infrastructure provided by AbstractQueryTest. 2. Moving general initializations (e.g., the DAO) to the setUp() method, where they belong. 3. Removing unneeded Mockito calls. 4. Asserting the result from getQueryReturnValue() as queries are supposed to instead of getReturnValue() which will always return null for queries. Change-Id: I0aefd1d95cfefc4ab8391b318844dfb815f33ea5 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetWatchdogQueryTest.java 1 file changed, 16 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/23350/1 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 2c1166f..8000694 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 @@ -5,7 +5,6 @@ import java.util.List; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -26,42 +25,40 @@ @Mock VmDeviceDAO vmDeviceDAO; + @Override + public void setUp() throws Exception { + super.setUp(); + Mockito.when(getDbFacadeMockInstance().getVmDeviceDao()).thenReturn(vmDeviceDAO); + } + @Test public void executeQueryCommandWithNull() { - Mockito.when(getDbFacadeMockInstance().getVmDeviceDao()).thenReturn(vmDeviceDAO); Mockito.when(getQueryParameters().getId()).thenReturn(new Guid("ee655a4d-effc-4aab-be2b-2f80ff40cd1c")); getQuery().executeQueryCommand(); Assert.assertTrue(((List<?>) getQuery().getQueryReturnValue().getReturnValue()).isEmpty()); } @Test - @Ignore public void executeQueryCommandWithWatchdog() { final Guid vmId = new Guid("ee655a4d-effc-4aab-be2b-2f80ff40cd1c"); - VmDeviceDAO vmDeviceDaoMock = Mockito.mock(VmDeviceDAO.class); HashMap<String, Object> watchdogSpecParams = new HashMap<String, Object>(); watchdogSpecParams.put("model", "i6300esb"); watchdogSpecParams.put("action", "reset"); VmDevice vmDevice = new VmDevice(new VmDeviceId(new Guid("6f86b8a4-e721-4149-b2df-056eb621b16a"), vmId), VmDeviceGeneralType.WATCHDOG, VmDeviceType.WATCHDOG.getName(), "", 1, watchdogSpecParams, true, true, true, "", null, null); - Mockito.when(vmDeviceDaoMock.getVmDeviceByVmIdAndType(vmId, VmDeviceGeneralType.WATCHDOG)) + Mockito.when(vmDeviceDAO.getVmDeviceByVmIdAndType(vmId, VmDeviceGeneralType.WATCHDOG)) .thenReturn(Arrays.asList(vmDevice)); - GetWatchdogQuery<IdQueryParameters> query = - new GetWatchdogQuery<IdQueryParameters>(new IdQueryParameters(vmId)); - query = Mockito.spy(query); - Mockito.when(query.getVmDeviceDAO()).thenReturn(vmDeviceDaoMock); - 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).setReturnValue(Mockito.any(Object.class)); + Mockito.when(getQueryParameters().getId()).thenReturn(vmId); - query.executeQueryCommand(); - Assert.assertNotNull(query.getReturnValue()); - Assert.assertEquals((((VmWatchdog)query.getReturnValue()).getAction()).name().toLowerCase(), "reset"); - Assert.assertEquals((((VmWatchdog)query.getReturnValue()).getModel()).name().toLowerCase(), "i6300esb"); + getQuery().executeQueryCommand(); + + List<VmWatchdog> result = getQuery().getQueryReturnValue().getReturnValue(); + Assert.assertNotNull(result); + Assert.assertFalse(result.isEmpty()); + VmWatchdog watchdog = result.get(0); + Assert.assertEquals(watchdog.getAction().name().toLowerCase(), "reset"); + Assert.assertEquals(watchdog.getModel().name().toLowerCase(), "i6300esb"); } } -- To view, visit http://gerrit.ovirt.org/23350 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0aefd1d95cfefc4ab8391b318844dfb815f33ea5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
