ACS-5506 Test fixes

This commit is contained in:
MichalKinas
2023-07-05 16:19:54 +02:00
parent da7f1877fd
commit 7a8cf67c2e
3 changed files with 5 additions and 4 deletions

View File

@@ -105,7 +105,7 @@ public class GroupsTests extends RestTest
JsonObject groupMembershipBody = Json.createObjectBuilder().add("id", userModel.getUsername()).add("memberType", "PERSON").build();
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();
//MembershipCreation:

View File

@@ -661,7 +661,6 @@ public class GroupsTest extends AbstractSingleNetworkSiteTest
assertNotNull(group);
assertNotNull(group.getId());
assertNotNull(group.getDisplayName());
assertNotNull(group.getDescription());
assertNotNull(group.getIsRoot());
assertNotNull(group.getHasSubgroups());

View File

@@ -95,6 +95,7 @@ public class Group extends org.alfresco.rest.api.model.Group implements Serializ
{
String id = (String) jsonObject.get("id");
String displayName = (String) jsonObject.get("displayName");
String description = (String) jsonObject.get("description");
Boolean isRoot = (Boolean) jsonObject.get("isRoot");
List<String> parentIds = (List<String>) jsonObject.get("parentIds");
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.setId(id);
group.setDisplayName(displayName);
group.setDescription(description);
group.setIsRoot(isRoot);
group.setParentIds(parentIds != null ? new HashSet<String>(parentIds) : null);
group.setZones(zones != null ? new HashSet<String>(zones) : null);
group.setParentIds(parentIds != null ? new HashSet<>(parentIds) : null);
group.setZones(zones != null ? new HashSet<>(zones) : null);
return group;
}