Allon Mureinik has uploaded a new change for review. Change subject: core: SnapshotValidatorTest ID generation ......................................................................
core: SnapshotValidatorTest ID generation Changed the vmId and snapshotId used for the tst to be data members and initialized them in the @Before method, as per JUnit best practices. Change-Id: Ibfbc8e41b3505a104bb8b339fec9d7f9f7865b0c Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/SnapshotsValidatorTest.java 1 file changed, 4 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/11178/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/SnapshotsValidatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/SnapshotsValidatorTest.java index 4618e75..a690f0c 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/SnapshotsValidatorTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/SnapshotsValidatorTest.java @@ -28,49 +28,39 @@ @Mock private SnapshotDao snapshotDao; + private Guid vmId; + private Guid snapshotId; @Before public void setUp() { + vmId = Guid.NewGuid(); + snapshotId = Guid.NewGuid(); doReturn(snapshotDao).when(validator).getSnapshotDao(); } @Test public void vmNotDuringSnapshotReturnsInvalidResultWhenInSnapshot() throws Exception { - Guid vmId = new Guid(); - when(snapshotDao.exists(vmId, SnapshotStatus.LOCKED)).thenReturn(true); - validateInvalidResult(validator.vmNotDuringSnapshot(vmId), VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_DURING_SNAPSHOT); } @Test public void vmNotDuringSnapshotReturnsValidForNoSnapshotInProgress() throws Exception { - Guid vmId = new Guid(); - when(snapshotDao.exists(vmId, SnapshotStatus.LOCKED)).thenReturn(false); - validateValidResult(validator.vmNotDuringSnapshot(vmId)); } @Test public void snapshotExistsByGuidReturnsInvalidResultWhenNoSnapshot() throws Exception { - Guid vmId = Guid.NewGuid(); - Guid snapshotId = Guid.NewGuid(); - when(snapshotDao.exists(vmId, snapshotId)).thenReturn(false); - validateInvalidResult(validator.snapshotExists(vmId, snapshotId), VdcBllMessages.ACTION_TYPE_FAILED_VM_SNAPSHOT_DOES_NOT_EXIST); } @Test public void snapshotExistsByGuidReturnsValidResultWhenSnapshotExists() throws Exception { - Guid vmId = Guid.NewGuid(); - Guid snapshotId = Guid.NewGuid(); - when(snapshotDao.exists(vmId, snapshotId)).thenReturn(true); - validateValidResult(validator.snapshotExists(vmId, snapshotId)); } -- To view, visit http://gerrit.ovirt.org/11178 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibfbc8e41b3505a104bb8b339fec9d7f9f7865b0c 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
