Allon Mureinik has uploaded a new change for review. Change subject: restapi: Relax parameter checking for move disk ......................................................................
restapi: Relax parameter checking for move disk Relax the restapi tests to remove the false assumption that VdcActionParameter classes override the equals(Object) method. Change-Id: If982d07ce83a225063c2ba3b8771e0f8384b1ea6 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResourceTest.java 2 files changed, 6 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/22963/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java index 41734d8..7d9e805 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java @@ -2,8 +2,6 @@ import static org.ovirt.engine.api.restapi.resource.AbstractBackendDisksResourceTest.PARENT_ID; -import java.util.Collections; - import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; @@ -12,7 +10,6 @@ import org.ovirt.engine.api.model.Disk; import org.ovirt.engine.api.model.StorageDomain; import org.ovirt.engine.core.common.action.ExportRepoImageParameters; -import org.ovirt.engine.core.common.action.MoveDiskParameters; import org.ovirt.engine.core.common.action.MoveDisksParameters; import org.ovirt.engine.core.common.action.MoveOrCopyImageGroupParameters; import org.ovirt.engine.core.common.action.VdcActionType; @@ -76,8 +73,8 @@ getEntity(1)); setUriInfo(setUpActionExpectations(VdcActionType.MoveDisks, MoveDisksParameters.class, - new String[] {"ParametersList"}, - new Object[] {Collections.singletonList(new MoveDiskParameters(GUIDS[1], Guid.Empty, GUIDS[3]))}, + new String[] {}, + new Object[] {}, true, true, null, null, true)); verifyActionResponse(resource.move(setUpParams(false)), "disks/" + DISK_ID, false); } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResourceTest.java index e101325..bc67929 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResourceTest.java @@ -23,7 +23,6 @@ import org.ovirt.engine.api.resource.VmDiskResource; import org.ovirt.engine.core.common.action.ExportRepoImageParameters; import org.ovirt.engine.core.common.action.HotPlugDiskToVmParameters; -import org.ovirt.engine.core.common.action.MoveDiskParameters; import org.ovirt.engine.core.common.action.MoveDisksParameters; import org.ovirt.engine.core.common.action.UpdateVmDiskParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; @@ -317,8 +316,8 @@ getEntity(1)); setUriInfo(setUpActionExpectations(VdcActionType.MoveDisks, MoveDisksParameters.class, - new String[] { "ParametersList" }, - new Object[] { Collections.singletonList(new MoveDiskParameters(GUIDS[1], Guid.Empty, GUIDS[3])) })); + new String[] {}, + new Object[] {})); verifyActionResponse(((VmDiskResource) resource).move(setUpMoveParams(false))); } @@ -357,8 +356,8 @@ getEntity(1)); setUriInfo(setUpActionExpectations(VdcActionType.MoveDisks, MoveDisksParameters.class, - new String[] { "ParametersList" }, - new Object[] { Collections.singletonList(new MoveDiskParameters(GUIDS[1], Guid.Empty, GUIDS[3])) })); + new String[] { }, + new Object[] { })); verifyActionResponse(((VmDiskResource) resource).move(setUpMoveParams(true))); } -- To view, visit http://gerrit.ovirt.org/22963 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If982d07ce83a225063c2ba3b8771e0f8384b1ea6 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
