Moti Asayag has uploaded a new change for review. Change subject: gluster: Use typed empty list ......................................................................
gluster: Use typed empty list Change-Id: I48f835e1198a1702c00c2d4a0f4e0d6fd5a096e4 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJobTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/StorageDeviceSyncJobTest.java 3 files changed, 5 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/40930/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommandTest.java index e47fa36..bbe7ef1 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommandTest.java @@ -93,7 +93,7 @@ "/gluster-bricks/brick1", RaidType.Raid0, null, - null, Collections.EMPTY_LIST))); + null, Collections.<StorageDevice> emptyList()))); prepareMocks(cmd, VDSStatus.Up); assertFalse(cmd.canDoAction()); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJobTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJobTest.java index 186e388..12b5218 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJobTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJobTest.java @@ -1,6 +1,7 @@ package org.ovirt.engine.core.bll.gluster; import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyMapOf; import static org.mockito.Matchers.argThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doNothing; @@ -10,7 +11,6 @@ import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.List; import org.junit.Before; @@ -58,9 +58,6 @@ new Guid("AAAAAAAA-2222-2222-2222-222222222222"), new Guid("AAAAAAAA-3333-3333-3333-333333333333")}; - private static final Guid[] NEW_HOOK_IDS = {new Guid("BBBBBBBB-1111-1111-1111-111111111111"), - new Guid("BBBBBBBB-2222-2222-2222-222222222222")}; - @Mock private ClusterUtils clusterUtils; @@ -104,12 +101,12 @@ hookSyncJob.setLogUtil(logUtil); doReturn(clusterUtils).when(hookSyncJob).getClusterUtils(); doReturn(getServers()).when(clusterUtils).getAllUpServers(CLUSTER_GUIDS[0]); - doReturn(Collections.EMPTY_LIST).when(clusterUtils).getAllUpServers(CLUSTER_GUIDS[1]); + doReturn(Collections.emptyList()).when(clusterUtils).getAllUpServers(CLUSTER_GUIDS[1]); doNothing().when(logUtil).logAuditMessage(any(Guid.class), any(GlusterVolumeEntity.class), any(VDS.class), any(AuditLogType.class), - any(HashMap.class)); + anyMapOf(String.class, String.class)); mockDaos(); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/StorageDeviceSyncJobTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/StorageDeviceSyncJobTest.java index 43f078e..afc9420 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/StorageDeviceSyncJobTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/StorageDeviceSyncJobTest.java @@ -132,7 +132,7 @@ vdsRetValue.setReturnValue(devices); } else { - vdsRetValue.setReturnValue(Collections.EMPTY_LIST); + vdsRetValue.setReturnValue(Collections.emptyList()); } return vdsRetValue; } -- To view, visit https://gerrit.ovirt.org/40930 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I48f835e1198a1702c00c2d4a0f4e0d6fd5a096e4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
