Liron Aravot has uploaded a new change for review. Change subject: core: UpdateStoragePoolCommandTest - Arrays.asList() ......................................................................
core: UpdateStoragePoolCommandTest - Arrays.asList() This patch replaces the creation of lists with Arrays.asList() Change-Id: I03bd7b9fcc8db31b69e17b75fdd5a4c1e1e95493 Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommandTest.java 1 file changed, 8 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/37427/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommandTest.java index a441eda..b37d926 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommandTest.java @@ -10,6 +10,7 @@ import static org.mockito.Mockito.when; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -275,9 +276,7 @@ StorageDomain sdNFS = createStorageDomain(StorageFormatType.V3, StorageType.NFS); setAttachedDomains(sdISCI, sdNFS); - List<StorageType> storageTypes = new ArrayList<>(); - storageTypes.add(sdISCI.getStorageType()); - storageTypes.add(sdNFS.getStorageType()); + List<StorageType> storageTypes = Arrays.asList(sdISCI.getStorageType(), sdNFS.getStorageType()); doReturn(storageTypes).when(spDao).getStorageTypesInPool(any(Guid.class)); canDoActionFailed(VdcBllMessages.ACTION_TYPE_FAILED_MIXED_STORAGE_TYPES_NOT_ALLOWED); @@ -313,8 +312,7 @@ private void newPoolNameIsAlreadyTaken() { when(spDao.get(any(Guid.class))).thenReturn(new StoragePool()); - List<StoragePool> storagePoolList = new ArrayList<StoragePool>(); - storagePoolList.add(createDefaultStoragePool()); + List<StoragePool> storagePoolList = Arrays.asList(createDefaultStoragePool()); when(spDao.getByName(anyString(), anyBoolean())).thenReturn(new ArrayList<StoragePool>(storagePoolList)); } @@ -403,8 +401,7 @@ VDSGroup defaultCluster = new VDSGroup(); defaultCluster.setCompatibilityVersion(VERSION_1_1); defaultCluster.setId(DEFAULT_VDS_GROUP_ID); - List<VDSGroup> clusters = new ArrayList<VDSGroup>(); - clusters.add(defaultCluster); + List<VDSGroup> clusters = Arrays.asList(defaultCluster); when(vdsGroupDao.getAllForStoragePool(any(Guid.class))).thenReturn(clusters); } @@ -412,23 +409,20 @@ VDSGroup defaultCluster = new VDSGroup(); defaultCluster.setCompatibilityVersion(VERSION_1_1); defaultCluster.setId(NON_DEFAULT_VDS_GROUP_ID); - List<VDSGroup> clusters = new ArrayList<VDSGroup>(); - clusters.add(defaultCluster); + List<VDSGroup> clusters = Arrays.asList(defaultCluster); when(vdsGroupDao.getAllForStoragePool(any(Guid.class))).thenReturn(clusters); } private void addHostsToCluster() { VDS host = new VDS(); - List<VDS> hosts = new ArrayList<>(); - hosts.add(host); + List<VDS> hosts = Arrays.asList(host); when(vdsDao.getAllForStoragePool(any(Guid.class))).thenReturn(hosts); } private void addManagementNetworkToPool() { Network network = new Network(); network.setName(Config.<String> getValue(ConfigValues.ManagementNetwork)); - List<Network> networks = new ArrayList<>(); - networks.add(network); + List<Network> networks = Arrays.asList(network); when(networkDao.getAllForDataCenter(any(Guid.class))).thenReturn(networks); } @@ -441,8 +435,7 @@ private void addNetworkToPool() { Network network = new Network(); network.setName(Config.<String> getValue(ConfigValues.ManagementNetwork) + "2"); - List<Network> networks = new ArrayList<>(); - networks.add(network); + List<Network> networks = Arrays.asList(network); when(networkDao.getAllForDataCenter(any(Guid.class))).thenReturn(networks); } -- To view, visit http://gerrit.ovirt.org/37427 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I03bd7b9fcc8db31b69e17b75fdd5a4c1e1e95493 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Aravot <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
