Sahina Bose has uploaded a new change for review. Change subject: gluster: Refactored gluster hook command tests ......................................................................
gluster: Refactored gluster hook command tests Refactored tests so that it can be reused by all hook related commands. Change-Id: I5fbcdd1858b5910b03dd8e710f4368b7b4d4ceb9 Signed-off-by: Sahina Bose <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookStatusChangeCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/DisableGlusterHookCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/EnableGlusterHookCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandTest.java 5 files changed, 32 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/14921/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandBase.java index 87bea25..328354e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandBase.java @@ -2,6 +2,7 @@ import java.util.List; +import org.ovirt.engine.core.bll.interfaces.BackendInternal; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.gluster.GlusterHookEntity; @@ -18,6 +19,11 @@ super(params); } + @Override + protected BackendInternal getBackend() { + return super.getBackend(); + } + protected List<VDS> getAllUpServers(Guid clusterId) { return getClusterUtils().getAllUpServers(clusterId); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookStatusChangeCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookStatusChangeCommand.java index 355ee2a..f0ee5b7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookStatusChangeCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookStatusChangeCommand.java @@ -9,7 +9,6 @@ import org.apache.commons.lang.SystemUtils; import org.ovirt.engine.core.bll.LockIdNameAttribute; import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; -import org.ovirt.engine.core.bll.interfaces.BackendInternal; import org.ovirt.engine.core.common.action.gluster.GlusterHookParameters; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.gluster.GlusterHookEntity; @@ -36,11 +35,6 @@ public GlusterHookStatusChangeCommand(GlusterHookParameters params) { super(params); setVdsGroupId(params.getClusterId()); - } - - @Override - protected BackendInternal getBackend() { - return super.getBackend(); } protected GlusterHookEntity getGlusterHook() { diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/DisableGlusterHookCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/DisableGlusterHookCommandTest.java index a79e353..acb94ae 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/DisableGlusterHookCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/DisableGlusterHookCommandTest.java @@ -58,7 +58,7 @@ public void executeCommand() { cmd = spy(new DisableGlusterHookCommand(new GlusterHookParameters(CLUSTER_ID, HOOK_ID))); setupMocks(cmd); - mockBackend(cmd,true); + mockBackendStatusChange(cmd,true); cmd.executeCommand(); assertTrue(cmd.getReturnValue().getSucceeded()); assertEquals(cmd.getAuditLogTypeValue(), AuditLogType.GLUSTER_HOOK_DISABLE); @@ -68,7 +68,7 @@ public void executeCommandWhenFailed() { cmd = spy(new DisableGlusterHookCommand(new GlusterHookParameters(CLUSTER_ID, HOOK_ID))); setupMocks(cmd); - mockBackend(cmd,false); + mockBackendStatusChange(cmd,false); cmd.executeCommand(); assertFalse(cmd.getReturnValue().getSucceeded()); assertEquals(cmd.getAuditLogTypeValue(), AuditLogType.GLUSTER_HOOK_DISABLE_FAILED); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/EnableGlusterHookCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/EnableGlusterHookCommandTest.java index 9e504a9..e6b396d 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/EnableGlusterHookCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/EnableGlusterHookCommandTest.java @@ -30,7 +30,7 @@ public void executeCommand() { cmd = spy(new EnableGlusterHookCommand(new GlusterHookParameters(CLUSTER_ID, HOOK_ID))); setupMocks(cmd); - mockBackend(cmd,true); + mockBackendStatusChange(cmd,true); cmd.executeCommand(); verify(cmd, atLeast(1)).addServerHookInDb(any(GlusterServerHook.class)); assertEquals(cmd.getAuditLogTypeValue(), AuditLogType.GLUSTER_HOOK_ENABLE); @@ -40,7 +40,7 @@ public void executeCommandWhenFailed() { cmd = spy(new EnableGlusterHookCommand(new GlusterHookParameters(CLUSTER_ID, HOOK_ID))); setupMocks(cmd); - mockBackend(cmd,false); + mockBackendStatusChange(cmd,false); cmd.executeCommand(); verify(cmd, never()).addServerHookInDb(any(GlusterServerHook.class)); assertEquals(cmd.getAuditLogTypeValue(), AuditLogType.GLUSTER_HOOK_ENABLE_FAILED); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandTest.java index a5f6948..06c24e2 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandTest.java @@ -16,6 +16,7 @@ import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.common.businessentities.gluster.GlusterHookEntity; +import org.ovirt.engine.core.common.businessentities.gluster.GlusterHookStatus; import org.ovirt.engine.core.common.businessentities.gluster.GlusterServerHook; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.errors.VDSError; @@ -30,7 +31,7 @@ import org.ovirt.engine.core.utils.MockConfigRule; -public class GlusterHookCommandTest<T extends GlusterHookStatusChangeCommand> { +public class GlusterHookCommandTest<T extends GlusterHookCommandBase> { private static final Guid[] GUIDS = {Guid.createGuidFromString("afce7a39-8e8c-4819-ba9c-796d316592e6"), Guid.createGuidFromString("afce7a39-8e8c-4819-ba9c-796d316592e7"), @@ -38,6 +39,7 @@ Guid.createGuidFromString("2001751e-549b-4e7a-aff6-32d36856c125")}; protected static final Guid CLUSTER_ID = new Guid("b399944a-81ab-4ec5-8266-e19ba7c3c9d1"); protected static final Guid HOOK_ID = Guid.createGuidFromString("d2cb2f73-fab3-4a42-93f0-d5e4c069a43e"); + protected static final Guid HOOK_ID2 = Guid.createGuidFromString("d222f73-fa22-4a42-93f0-d5e4c069a43e"); @ClassRule public static MockConfigRule mcr = new MockConfigRule( @@ -45,13 +47,13 @@ mockConfig(ConfigValues.DefaultMaxThreadPoolSize, 20)); @Mock - private GlusterHooksDao hooksDao; + protected GlusterHooksDao hooksDao; @Mock private VdsGroupDAO vdsGroupDao; @Mock - private BackendInternal backend; + protected BackendInternal backend; @Mock - private VDSBrokerFrontend vdsBrokerFrontend; + protected VDSBrokerFrontend vdsBrokerFrontend; @Mock private ClusterUtils clusterUtils; @@ -64,12 +66,16 @@ } public void setupMocks(T cmd,boolean hookFound) { + setupMocks(cmd, hookFound, getHookEntity()); + } + + public void setupMocks(T cmd,boolean hookFound, GlusterHookEntity hookEntity) { when(clusterUtils.getAllUpServers(CLUSTER_ID)).thenReturn(getGlusterServers()); doReturn(clusterUtils).when(cmd).getClusterUtils(); if (hookFound) { - when(hooksDao.getById(HOOK_ID)).thenReturn(getHookEntity()); - when(hooksDao.getById(HOOK_ID,true)).thenReturn(getHookEntity()); + when(hooksDao.getById(HOOK_ID)).thenReturn(hookEntity); + when(hooksDao.getById(HOOK_ID,true)).thenReturn(hookEntity); } doReturn(hooksDao).when(cmd).getGlusterHooksDao(); when(vdsGroupDao.get(CLUSTER_ID)).thenReturn(getVdsGroup()); @@ -77,11 +83,11 @@ doReturn(getGlusterServers().get(0)).when(cmd).getUpServer(); } - protected void mockBackend(T cmd, boolean succeeded) { - mockBackend(cmd, succeeded,VdcBllErrors.GlusterHookEnableFailed); + protected void mockBackendStatusChange(T cmd, boolean succeeded) { + mockBackendStatusChange(cmd, succeeded,VdcBllErrors.GlusterHookEnableFailed); } - protected void mockBackend(T cmd, boolean succeeded, VdcBllErrors errorCode) { + protected void mockBackendStatusChange(T cmd, boolean succeeded, VdcBllErrors errorCode) { when(cmd.getBackend()).thenReturn(backend); VDSReturnValue vdsReturnValue = new VDSReturnValue(); @@ -96,7 +102,7 @@ - private GlusterHookEntity getHookEntity() { + protected GlusterHookEntity getHookEntity() { GlusterHookEntity hook = new GlusterHookEntity(); hook.setClusterId(CLUSTER_ID); hook.setId(HOOK_ID); @@ -115,9 +121,9 @@ private List<GlusterServerHook> getGlusterServerHooks() { List<GlusterServerHook> serverHooks = new ArrayList<GlusterServerHook>(); - serverHooks.add(getGlusterServerHook(0)); - serverHooks.add(getGlusterServerHook(1)); - serverHooks.add(getGlusterServerHook(2)); + serverHooks.add(getGlusterServerHook(0, GlusterHookStatus.ENABLED)); + serverHooks.add(getGlusterServerHook(1, GlusterHookStatus.ENABLED)); + serverHooks.add(getGlusterServerHook(2, GlusterHookStatus.ENABLED)); return serverHooks; } @@ -138,9 +144,11 @@ } - private GlusterServerHook getGlusterServerHook(int index) { + protected GlusterServerHook getGlusterServerHook(int index, GlusterHookStatus status) { GlusterServerHook serverHook = new GlusterServerHook(); serverHook.setServerId(GUIDS[index]); + serverHook.setStatus(status); + serverHook.setChecksum("CHECKSUM"); return serverHook; } } -- To view, visit http://gerrit.ovirt.org/14921 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5fbcdd1858b5910b03dd8e710f4368b7b4d4ceb9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sahina Bose <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
