mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
ACS-5506 Test fixes
This commit is contained in:
@@ -105,7 +105,7 @@ public class GroupsTests extends RestTest
|
|||||||
|
|
||||||
JsonObject groupMembershipBody = Json.createObjectBuilder().add("id", userModel.getUsername()).add("memberType", "PERSON").build();
|
JsonObject groupMembershipBody = Json.createObjectBuilder().add("id", userModel.getUsername()).add("memberType", "PERSON").build();
|
||||||
String groupMembershipBodyCreate = groupMembershipBody.toString();
|
String groupMembershipBodyCreate = groupMembershipBody.toString();
|
||||||
JsonObject groupMembershipGroupBody = Json.createObjectBuilder().add("id", subGroupName).add("memberType", "GROUP").build();
|
JsonObject groupMembershipGroupBody = Json.createObjectBuilder().add("id", "GROUP_"+subGroupName).add("memberType", "GROUP").build();
|
||||||
String groupMembershipGroupBodyCreate = groupMembershipGroupBody.toString();
|
String groupMembershipGroupBodyCreate = groupMembershipGroupBody.toString();
|
||||||
|
|
||||||
//MembershipCreation:
|
//MembershipCreation:
|
||||||
|
@@ -661,7 +661,6 @@ public class GroupsTest extends AbstractSingleNetworkSiteTest
|
|||||||
assertNotNull(group);
|
assertNotNull(group);
|
||||||
assertNotNull(group.getId());
|
assertNotNull(group.getId());
|
||||||
assertNotNull(group.getDisplayName());
|
assertNotNull(group.getDisplayName());
|
||||||
assertNotNull(group.getDescription());
|
|
||||||
assertNotNull(group.getIsRoot());
|
assertNotNull(group.getIsRoot());
|
||||||
assertNotNull(group.getHasSubgroups());
|
assertNotNull(group.getHasSubgroups());
|
||||||
|
|
||||||
|
@@ -95,6 +95,7 @@ public class Group extends org.alfresco.rest.api.model.Group implements Serializ
|
|||||||
{
|
{
|
||||||
String id = (String) jsonObject.get("id");
|
String id = (String) jsonObject.get("id");
|
||||||
String displayName = (String) jsonObject.get("displayName");
|
String displayName = (String) jsonObject.get("displayName");
|
||||||
|
String description = (String) jsonObject.get("description");
|
||||||
Boolean isRoot = (Boolean) jsonObject.get("isRoot");
|
Boolean isRoot = (Boolean) jsonObject.get("isRoot");
|
||||||
List<String> parentIds = (List<String>) jsonObject.get("parentIds");
|
List<String> parentIds = (List<String>) jsonObject.get("parentIds");
|
||||||
List<String> zones = (List<String>) jsonObject.get("zones");
|
List<String> zones = (List<String>) jsonObject.get("zones");
|
||||||
@@ -102,9 +103,10 @@ public class Group extends org.alfresco.rest.api.model.Group implements Serializ
|
|||||||
Group group = new Group();
|
Group group = new Group();
|
||||||
group.setId(id);
|
group.setId(id);
|
||||||
group.setDisplayName(displayName);
|
group.setDisplayName(displayName);
|
||||||
|
group.setDescription(description);
|
||||||
group.setIsRoot(isRoot);
|
group.setIsRoot(isRoot);
|
||||||
group.setParentIds(parentIds != null ? new HashSet<String>(parentIds) : null);
|
group.setParentIds(parentIds != null ? new HashSet<>(parentIds) : null);
|
||||||
group.setZones(zones != null ? new HashSet<String>(zones) : null);
|
group.setZones(zones != null ? new HashSet<>(zones) : null);
|
||||||
|
|
||||||
return group;
|
return group;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user