Ori Liel has uploaded a new change for review. Change subject: restapi: #920483 - Group Wrongly Displayed as User (within permission) ......................................................................
restapi: #920483 - Group Wrongly Displayed as User (within permission) Change-Id: I08ad600d9b8af6dc8628a8ea9677d9c37fe89928 Signed-off-by: Ori Liel <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendEntityAssignedPermissionsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserAssignedPermissionsResourceTest.java 4 files changed, 25 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/13123/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java index d838cd2..013d046 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java @@ -168,11 +168,11 @@ */ public Permission map(permissions entity, DbUser user) { Permission template = new Permission(); - if (entity.getad_element_id() != null && user != null) { + if (entity.getad_element_id() != null) { if (isUser(user)) { template.setUser(new User()); template.getUser().setId(entity.getad_element_id().toString()); - } else if (entity.getad_element_id() != null) { + } else { template.setGroup(new Group()); template.getGroup().setId(entity.getad_element_id().toString()); } @@ -182,7 +182,7 @@ //REVISIT: fix once BE can distinguish between the user and group private boolean isUser(DbUser user) { - return StringHelper.isNullOrEmpty(user.getusername()) ? false : true; + return user != null && !StringHelper.isNullOrEmpty(user.getusername()); } /** diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java index 0cf7cdd..386645a 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java @@ -171,15 +171,21 @@ } protected <E> void setUpGetEntityExpectations(VdcQueryType query, - Class<? extends VdcQueryParametersBase> clz, String[] names, Object[] values, E entity) + Class<? extends VdcQueryParametersBase> clz, String[] names, Object[] values, E entity, int times) throws Exception { VdcQueryReturnValue queryResult = control.createMock(VdcQueryReturnValue.class); expect(backend.RunQuery(eq(query), eqQueryParams(clz, addSession(names), addSession(values)))).andReturn( - queryResult); + queryResult).times(times); expect(queryResult.getSucceeded()).andReturn(true).anyTimes(); expect(queryResult.getReturnValue()).andReturn(entity).anyTimes(); } + protected <E> void setUpGetEntityExpectations(VdcQueryType query, + Class<? extends VdcQueryParametersBase> clz, String[] names, Object[] values, E entity) + throws Exception { + setUpGetEntityExpectations(query, clz, names, values, entity, 1); + } + protected <E> void setUpGetEntityExpectations(String query, SearchType type, E entity) throws Exception { diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendEntityAssignedPermissionsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendEntityAssignedPermissionsResourceTest.java index 1eba0ba..7eae6a3 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendEntityAssignedPermissionsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendEntityAssignedPermissionsResourceTest.java @@ -83,10 +83,11 @@ UriInfo uriInfo = setUpUriExpectations(null); setUpGetEntityExpectations(VdcQueryType.GetDbUserByUserId, - GetDbUserByUserIdParameters.class, - new String[] {"UserId"}, - new Object[] {GUIDS[1]}, - getUserByIdx(1)); + GetDbUserByUserIdParameters.class, + new String[] { "UserId" }, + new Object[] { GUIDS[1] }, + getUserByIdx(1), + 3); setUpQueryExpectations(""); collection.setUriInfo(uriInfo); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserAssignedPermissionsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserAssignedPermissionsResourceTest.java index 3b14555..33f12fc 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserAssignedPermissionsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserAssignedPermissionsResourceTest.java @@ -51,9 +51,10 @@ UriInfo uriInfo = setUpUriExpectations(null); setUpGetEntityExpectations(VdcQueryType.GetDbUserByUserId, GetDbUserByUserIdParameters.class, - new String[] {"UserId"}, - new Object[] {GUIDS[1]}, - getUserByIdx(1)); + new String[] { "UserId" }, + new Object[] { GUIDS[1] }, + getUserByIdx(1), + 3); setUpQueryExpectations(""); collection.setUriInfo(uriInfo); verifyCollection(getCollection()); @@ -64,10 +65,11 @@ UriInfo uriInfo = setUpUriExpectations(null); setUpGetEntityExpectations(VdcQueryType.GetDbUserByUserId, - GetDbUserByUserIdParameters.class, - new String[] {"UserId"}, - new Object[] {GUIDS[1]}, - getUserByIdx(1)); + GetDbUserByUserIdParameters.class, + new String[] { "UserId" }, + new Object[] { GUIDS[1] }, + getUserByIdx(1), + 3); setUpQueryExpectations("", null, EVERYONE); collection.setUriInfo(uriInfo); -- To view, visit http://gerrit.ovirt.org/13123 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I08ad600d9b8af6dc8628a8ea9677d9c37fe89928 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ori Liel <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
