Allon Mureinik has uploaded a new change for review. Change subject: core: SnapshotValidator modifier cleanup ......................................................................
core: SnapshotValidator modifier cleanup Cleaned up modifiers and annotations in SnaoshotValidator and its test. Change-Id: Ieb3f71aaebd5720e2e00653768c5d70c652d2ced Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsValidator.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/SnapshotsValidatorTest.java 2 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/11177/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsValidator.java index de018e4..022148b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsValidator.java @@ -71,7 +71,7 @@ * Does the snapshot exist? * @return Result that either contains the suitable error or not. */ - private ValidationResult createSnapshotExistsResult(boolean snapshotExists) { + private static ValidationResult createSnapshotExistsResult(boolean snapshotExists) { return snapshotExists ? ValidationResult.VALID : new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_VM_SNAPSHOT_DOES_NOT_EXIST); 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 af2f5eb..4618e75 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 @@ -6,9 +6,10 @@ import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import org.mockito.Spy; +import org.mockito.runners.MockitoJUnitRunner; import org.ovirt.engine.core.bll.ValidationResult; import org.ovirt.engine.core.common.businessentities.Snapshot; import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotStatus; @@ -16,6 +17,7 @@ import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dao.SnapshotDao; +@RunWith(MockitoJUnitRunner.class) public class SnapshotsValidatorTest { /** @@ -29,8 +31,6 @@ @Before public void setUp() { - MockitoAnnotations.initMocks(this); - doReturn(snapshotDao).when(validator).getSnapshotDao(); } @@ -105,7 +105,7 @@ * @param validationResult * The result. */ - private void validateValidResult(ValidationResult validationResult) { + private static void validateValidResult(ValidationResult validationResult) { validateResult(validationResult, true, null); } @@ -117,7 +117,7 @@ * @param message * The error to expect. */ - private void validateInvalidResult(ValidationResult validationResult, VdcBllMessages message) { + private static void validateInvalidResult(ValidationResult validationResult, VdcBllMessages message) { validateResult(validationResult, false, message); } @@ -131,7 +131,7 @@ * @param message * The error to expect. */ - private void validateResult(ValidationResult validationResult, boolean isValid, VdcBllMessages message) { + private static void validateResult(ValidationResult validationResult, boolean isValid, VdcBllMessages message) { assertEquals(isValid, validationResult.isValid()); assertEquals(message, validationResult.getMessage()); } -- To view, visit http://gerrit.ovirt.org/11177 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb3f71aaebd5720e2e00653768c5d70c652d2ced 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
