Allon Mureinik has uploaded a new change for review. Change subject: core: GetWatchdogQueryTest: common set up ......................................................................
core: GetWatchdogQueryTest: common set up Extracted the common set up that all the tests perform to setUp() instead of duplicating it. Change-Id: Icaae22a21f1f3e1fa1c17356e2fc26a0e9b2dc58 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, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/23351/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 8000694..4922f82 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 @@ -22,6 +22,8 @@ @RunWith(MockitoJUnitRunner.class) public class GetWatchdogQueryTest extends AbstractQueryTest<IdQueryParameters, GetWatchdogQuery<IdQueryParameters>> { + private static final Guid TEST_VM_ID = new Guid("ee655a4d-effc-4aab-be2b-2f80ff40cd1c"); + @Mock VmDeviceDAO vmDeviceDAO; @@ -29,27 +31,25 @@ public void setUp() throws Exception { super.setUp(); Mockito.when(getDbFacadeMockInstance().getVmDeviceDao()).thenReturn(vmDeviceDAO); + Mockito.when(getQueryParameters().getId()).thenReturn(TEST_VM_ID); } @Test public void executeQueryCommandWithNull() { - Mockito.when(getQueryParameters().getId()).thenReturn(new Guid("ee655a4d-effc-4aab-be2b-2f80ff40cd1c")); getQuery().executeQueryCommand(); Assert.assertTrue(((List<?>) getQuery().getQueryReturnValue().getReturnValue()).isEmpty()); } @Test public void executeQueryCommandWithWatchdog() { - final Guid vmId = new Guid("ee655a4d-effc-4aab-be2b-2f80ff40cd1c"); 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(vmDeviceDAO.getVmDeviceByVmIdAndType(vmId, VmDeviceGeneralType.WATCHDOG)) + TEST_VM_ID), VmDeviceGeneralType.WATCHDOG, VmDeviceType.WATCHDOG.getName(), "", 1, watchdogSpecParams, + true, true, true, "", null, null); + Mockito.when(vmDeviceDAO.getVmDeviceByVmIdAndType(TEST_VM_ID, VmDeviceGeneralType.WATCHDOG)) .thenReturn(Arrays.asList(vmDevice)); - Mockito.when(getQueryParameters().getId()).thenReturn(vmId); getQuery().executeQueryCommand(); -- To view, visit http://gerrit.ovirt.org/23351 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icaae22a21f1f3e1fa1c17356e2fc26a0e9b2dc58 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
