Allon Mureinik has uploaded a new change for review. Change subject: core: Config mocking in StoragePoolValidatorTest ......................................................................
core: Config mocking in StoragePoolValidatorTest Used the standard was of mocking Config - MockConfigRule. This refactor enabled removing the useless getConfigValue method from the StoragePoolValidator class, and just call Config.GetValue directly instead. Change-Id: I03c0f2a1c013cd12010be7f84d896c1d1e600c29 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java 2 files changed, 13 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/19/11319/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java index dc3a366..bd48553 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java @@ -23,9 +23,6 @@ this.canDoActionMessages = canDoActionMessages; } - protected <T> T getConfigValue(ConfigValues configValue, String version) { - return Config.<T> GetValue(configValue, version); - } /** * Checks in case the DC is of POSIX type that the compatibility version matches. In case there is mismatch, a * proper canDoAction message will be added @@ -34,9 +31,8 @@ */ public boolean isPosixDcAndMatchingCompatiblityVersion() { if (storagePool.getstorage_pool_type() == StorageType.POSIXFS - && !this.<Boolean> getConfigValue(ConfigValues.PosixStorageEnabled, - storagePool.getcompatibility_version() - .toString())) { + && !Config.<Boolean> GetValue + (ConfigValues.PosixStorageEnabled, storagePool.getcompatibility_version().toString())) { canDoActionMessages.add(VdcBllMessages.DATA_CENTER_POSIX_STORAGE_NOT_SUPPORTED_IN_CURRENT_VERSION.toString()); return false; } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java index c868faf..51202ae 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java @@ -1,13 +1,15 @@ package org.ovirt.engine.core.bll.storage; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; +import static org.ovirt.engine.core.utils.MockConfigRule.mockConfig; import java.util.ArrayList; import org.junit.Before; +import org.junit.ClassRule; import org.junit.Test; import org.ovirt.engine.core.common.businessentities.StoragePoolStatus; import org.ovirt.engine.core.common.businessentities.StorageType; @@ -16,8 +18,16 @@ import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.dal.VdcBllMessages; +import org.ovirt.engine.core.utils.MockConfigRule; public class StoragePoolValidatorTest { + + @ClassRule + public static MockConfigRule mce = new MockConfigRule + (mockConfig(ConfigValues.PosixStorageEnabled, Version.v3_1.toString(), true), + mockConfig(ConfigValues.PosixStorageEnabled, Version.v3_0.toString(), false), + mockConfig(ConfigValues.PosixStorageEnabled, Version.v2_2.toString(), false), + mockConfig(ConfigValues.PosixStorageEnabled, "general", false)); private StoragePoolValidator validator = null; private storage_pool storagePool = null; @@ -31,14 +41,6 @@ StorageType.UNKNOWN.getValue(), StoragePoolStatus.Up.getValue()); validator = spy(new StoragePoolValidator(storagePool, new ArrayList<String>())); - mockPosixStorageEnabledConfigValue(); - } - - protected void mockPosixStorageEnabledConfigValue() { - doReturn(true).when(validator).getConfigValue(ConfigValues.PosixStorageEnabled, Version.v3_1.toString()); - doReturn(false).when(validator).getConfigValue(ConfigValues.PosixStorageEnabled, Version.v3_0.toString()); - doReturn(false).when(validator).getConfigValue(ConfigValues.PosixStorageEnabled, Version.v2_2.toString()); - doReturn(false).when(validator).getConfigValue(ConfigValues.PosixStorageEnabled, "general"); } @Test -- To view, visit http://gerrit.ovirt.org/11319 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I03c0f2a1c013cd12010be7f84d896c1d1e600c29 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
