Allon Mureinik has uploaded a new change for review. Change subject: restapi: duplicate code in export domain tests ......................................................................
restapi: duplicate code in export domain tests Removed duplicated code where the if and else branches are identical. Change-Id: I22c496c8957a86d8fc5d915c552218c9fe5943a6 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java 2 files changed, 8 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/30764/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java index dbf26b6..45a7b65 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java @@ -21,7 +21,6 @@ import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters; -import org.ovirt.engine.core.common.queries.GetPermissionsForObjectParameters; import org.ovirt.engine.core.common.queries.GetVmTemplateParameters; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; @@ -153,17 +152,10 @@ expect(queryResult.getExceptionString()).andThrow((Exception) failure).anyTimes(); } } - if(queryClass == GetPermissionsForObjectParameters.class) { - expect(backend.runQuery(eq(query), - eqQueryParams(queryClass, - addSession(queryNames), - addSession(queryValues)))).andReturn(queryResult).anyTimes(); - } else { - expect(backend.runQuery(eq(query), - eqQueryParams(queryClass, - addSession(queryNames), - addSession(queryValues)))).andReturn(queryResult).anyTimes(); - } + expect(backend.runQuery(eq(query), + eqQueryParams(queryClass, + addSession(queryNames), + addSession(queryValues)))).andReturn(queryResult).anyTimes(); } protected HashMap<VmTemplate, List<DiskImage>> setUpTemplates(boolean notFound) { diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java index b3a3aed..136d52c 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java @@ -29,7 +29,6 @@ import org.ovirt.engine.core.common.businessentities.VolumeType; import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters; -import org.ovirt.engine.core.common.queries.GetPermissionsForObjectParameters; import org.ovirt.engine.core.common.queries.GetVmTemplateParameters; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; @@ -229,17 +228,10 @@ expect(queryResult.getExceptionString()).andThrow((Exception) failure).anyTimes(); } } - if(queryClass == GetPermissionsForObjectParameters.class) { - expect(backend.runQuery(eq(query), - eqQueryParams(queryClass, - addSession(queryNames), - addSession(queryValues)))).andReturn(queryResult).anyTimes(); - } else { - expect(backend.runQuery(eq(query), - eqQueryParams(queryClass, - addSession(queryNames), - addSession(queryValues)))).andReturn(queryResult).anyTimes(); - } + expect(backend.runQuery(eq(query), + eqQueryParams(queryClass, + addSession(queryNames), + addSession(queryValues)))).andReturn(queryResult).anyTimes(); } protected HashMap<VmTemplate, List<DiskImage>> setUpTemplates(boolean notFound) { -- To view, visit http://gerrit.ovirt.org/30764 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22c496c8957a86d8fc5d915c552218c9fe5943a6 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
