Allon Mureinik has submitted this change and it was merged. Change subject: core: Remove redundant config mocking ...................................................................... core: Remove redundant config mocking Now that MockConfigRule mocks the ConfigValue's default, many config mockings that just repeated the same default or had no special meaning other than to ensure a null was not returned can be removed in order to clean up the test code and make it easier to read. Change-Id: Id6624b52d79de56d0976d127065bfd00a5588660 Signed-off-by: Allon Mureinik <amureini@redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddClusterCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddQuotaCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddUnmanagedVmsCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTestBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolCommandTestAbstract.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmChangedFieldsForNextRunQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MultipleActionsRunnerBaseTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SearchQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateClusterCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/aaa/SessionDataContainerTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterGeoRepSyncJobTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandTest.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/GlusterServiceSyncJobTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterSnapshotSyncJobTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterSyncJobTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJobTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ManageGlusterServiceCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/StorageDeviceSyncJobTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/hostdeploy/GetoVirtISOsTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/hostdeploy/InstallVdsInternalCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/hostedengine/HostedEngineConfigFetcherTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/NetworkClusterValidatorTestBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/NetworkDeviceHelperImplTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/NetworkMtuValidatorTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/ReportedConfigurationsFillerTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/numa/vm/AbstractVmNumaNodeCommandTestBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/numa/vm/NumaValidatorTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/ConcurrentAgentsFenceActionExecutorTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceAgentExecutorTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/quota/QuotaManagerTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/AffinityRulesEnforcementManagerTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/InternalClusterPoliciesTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/InternalPolicyUnitsTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/QosRangeValidatorTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/BasicWeightSelectorPolicyUnitTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/CPUPolicyUnitTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuOverloadPolicyUnitTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuPinningPolicyUnitTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/EvenDistributionWeightPolicyUnitTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/HostedEngineMemoryReservationFilterPolicyUnitTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/InClusterUpgradeFilterPolicyUnitTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/InClusterUpgradeWeightPolicyUnitTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/LabelFilterPolicyUnitTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/PreferredHostsWeightPolicyUnitTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/RankSelectorPolicyUnitTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/image/RemoveImageCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/domain/AddExistingBlockStorageDomainCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/domain/AddExistingFileStorageDomainCommandTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AuditLogDaoTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/PermissionDaoTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RoleDaoTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmStaticDaoTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendResourceTest.java M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/AbstractInvertibleMappingTest.java M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactoryTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkInSyncWithVdsNetworkInterfaceTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ovf/OvfManagerTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/BaseNetworkImplementationDetailsUtilsTest.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/monitoring/HostMonitoringTest.java M backend/manager/modules/welcome/src/test/java/org/ovirt/engine/core/WelcomeServletTest.java M frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/UserPortalHostPageServletTest.java M frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/WebAdminHostPageServletTest.java 74 files changed, 77 insertions(+), 498 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved; Passed CI tests -- To view, visit https://gerrit.ovirt.org/65033 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id6624b52d79de56d0976d127065bfd00a5588660 Gerrit-PatchSet: 6 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas@redhat.com> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Betak <mbetak@redhat.com> Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: Roy Golan <rgolan@redhat.com> Gerrit-Reviewer: Sahina Bose <sabose@redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>