From 7a8cf67c2e11979442e44e49f7e4b25d3146da05 Mon Sep 17 00:00:00 2001
From: MichalKinas <michal.kinas@hyland.com>
Date: Wed, 5 Jul 2023 16:19:54 +0200
Subject: [PATCH] ACS-5506 Test fixes

---
 .../src/test/java/org/alfresco/rest/groups/GroupsTests.java | 2 +-
 .../test/java/org/alfresco/rest/api/tests/GroupsTest.java   | 1 -
 .../java/org/alfresco/rest/api/tests/client/data/Group.java | 6 ++++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java
index 48755e1393..caf9bc471b 100644
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/groups/GroupsTests.java
@@ -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:
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java
index 1cd05a8d9b..5f1abee2df 100644
--- a/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/GroupsTest.java
@@ -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());
 
diff --git a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Group.java b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Group.java
index f8109d4f75..d8623c397f 100644
--- a/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Group.java
+++ b/remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Group.java
@@ -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;
     }