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
This commit is contained in:
Tom Page
2018-11-15 11:13:28 +00:00
committed by Rodica Sutu
parent 23d1a3f7c1
commit 9b89bdee32
2 changed files with 3 additions and 2 deletions

View File

@@ -53,8 +53,9 @@ public class RMSite extends RestSiteModel
/** Private constructor allowing Lombok to include superclass fields in the builder. */ /** Private constructor allowing Lombok to include superclass fields in the builder. */
@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.setTitle(title);
this.setDescription(description); this.setDescription(description);
this.compliance = compliance; this.compliance = compliance;

View File

@@ -60,7 +60,7 @@ public class RMSiteUtil
*/ */
public static RMSite createRMSiteModel(RMSiteCompliance compliance, String title, String description) 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();
} }
/** /**