Allon Mureinik has uploaded a new change for review. Change subject: core: Fixed mocking in GetWatchdogQueryTest ......................................................................
core: Fixed mocking in GetWatchdogQueryTest Fixed the use of Mockito and AbstractQueryTest's methods. Change-Id: I452a91d64fa139fbd532f0fee65a25344673f52d 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, 7 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/23348/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 6b4cb18..104a6e1 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 @@ -6,8 +6,10 @@ import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; +import org.mockito.runners.MockitoJUnitRunner; import org.ovirt.engine.core.common.businessentities.VmDevice; import org.ovirt.engine.core.common.businessentities.VmDeviceGeneralType; import org.ovirt.engine.core.common.businessentities.VmDeviceId; @@ -17,6 +19,7 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dao.VmDeviceDAO; +@RunWith(MockitoJUnitRunner.class) public class GetWatchdogQueryTest extends AbstractQueryTest<IdQueryParameters, GetWatchdogQuery<IdQueryParameters>> { @Mock @@ -24,17 +27,10 @@ @Test public void executeQueryCommandWithNull() { - @SuppressWarnings("unchecked") - GetWatchdogQuery<IdQueryParameters> query = - Mockito.mock(GetWatchdogQuery.class); - VmDeviceDAO vmDeviceDaoMock = Mockito.mock(VmDeviceDAO.class); - Mockito.when(query.getVmDeviceDAO()).thenReturn(vmDeviceDaoMock); - IdQueryParameters params = new IdQueryParameters(new Guid("ee655a4d-effc-4aab-be2b-2f80ff40cd1c")); - Mockito.when(query.getParameters()) - .thenReturn(params); - Mockito.doCallRealMethod().when(query).executeQueryCommand(); - query.executeQueryCommand(); - Assert.assertNull(query.getReturnValue()); + Mockito.when(getDbFacadeMockInstance().getVmDeviceDao()).thenReturn(vmDeviceDAO); + Mockito.when(getQueryParameters().getId()).thenReturn(new Guid("ee655a4d-effc-4aab-be2b-2f80ff40cd1c")); + getQuery().executeQueryCommand(); + Assert.assertNull(getQuery().getReturnValue()); } @Test -- To view, visit http://gerrit.ovirt.org/23348 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I452a91d64fa139fbd532f0fee65a25344673f52d 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
