From 9b89bdee3205dce09f3ccd413d1e8ef0333be49b Mon Sep 17 00:00:00 2001 From: Tom Page Date: Thu, 15 Nov 2018 11:13:28 +0000 Subject: [PATCH] RM-6141 Update SQL tests to use correct users. Also hardcode the site id of the RM site to be "rm", so that we can use this when adding site members. (cherry picked from commit 92a6dcf8ae04151699b0b5a4bad79bc82f36ae71) # Conflicts: # rm-enterprise/pom.xml --- .../java/org/alfresco/rest/rm/community/model/site/RMSite.java | 3 ++- .../java/org/alfresco/rest/rm/community/utils/RMSiteUtil.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSite.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSite.java index 7abae8755d..3fa3518be0 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSite.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSite.java @@ -53,8 +53,9 @@ public class RMSite extends RestSiteModel /** Private constructor allowing Lombok to include superclass fields in the builder. */ @Builder - private RMSite(String title, String description, RMSiteCompliance compliance) + private RMSite(String id, String title, String description, RMSiteCompliance compliance) { + this.setId(id); this.setTitle(title); this.setDescription(description); this.compliance = compliance; diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/utils/RMSiteUtil.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/utils/RMSiteUtil.java index b3574a0fcb..bbea049fbb 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/utils/RMSiteUtil.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/utils/RMSiteUtil.java @@ -60,7 +60,7 @@ public class RMSiteUtil */ public static RMSite createRMSiteModel(RMSiteCompliance compliance, String title, String description) { - return RMSite.builder().compliance(compliance).title(title).description(description).build(); + return RMSite.builder().id(RM_ID).compliance(compliance).title(title).description(description).build(); } /**