From 6793f543cc7b6d8a074dfa00d20c5706007d13a7 Mon Sep 17 00:00:00 2001 From: Sébastien Lesaint Date: Mon, 30 Jan 2017 17:36:15 +0100 Subject: SONAR-8651 add and use OrganizationDbTester.setDefaultTemplates with dtos --- .../sonar/db/organization/OrganizationDbTester.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'sonar-db/src') diff --git a/sonar-db/src/test/java/org/sonar/db/organization/OrganizationDbTester.java b/sonar-db/src/test/java/org/sonar/db/organization/OrganizationDbTester.java index 15f8c312626..ee67f83555b 100644 --- a/sonar-db/src/test/java/org/sonar/db/organization/OrganizationDbTester.java +++ b/sonar-db/src/test/java/org/sonar/db/organization/OrganizationDbTester.java @@ -22,6 +22,9 @@ package org.sonar.db.organization; import javax.annotation.Nullable; import org.sonar.db.DbSession; import org.sonar.db.DbTester; +import org.sonar.db.permission.template.PermissionTemplateDto; + +import static com.google.common.base.Preconditions.checkArgument; public class OrganizationDbTester { private final DbTester dbTester; @@ -55,10 +58,24 @@ public class OrganizationDbTester { return dto; } + public void setDefaultTemplates(PermissionTemplateDto projectDefaultTemplate, @Nullable PermissionTemplateDto viewDefaultTemplate) { + checkArgument(viewDefaultTemplate == null + || viewDefaultTemplate.getOrganizationUuid().equals(projectDefaultTemplate.getOrganizationUuid()), + "default template for project and view must belong to the same organization"); + + DbSession dbSession = dbTester.getSession(); + dbTester.getDbClient().organizationDao().setDefaultTemplates(dbSession, projectDefaultTemplate.getOrganizationUuid(), + new DefaultTemplates() + .setProjectUuid(projectDefaultTemplate.getUuid()) + .setViewUuid(viewDefaultTemplate == null ? null : viewDefaultTemplate.getUuid())); + dbSession.commit(); + } + public void setDefaultTemplates(OrganizationDto defaultOrganization, String projectDefaultTemplateUuid, @Nullable String viewDefaultTemplateUuid) { DbSession dbSession = dbTester.getSession(); - dbTester.getDbClient().organizationDao().setDefaultTemplates(dbSession, defaultOrganization.getUuid(), new DefaultTemplates().setProjectUuid(projectDefaultTemplateUuid).setViewUuid(viewDefaultTemplateUuid)); + dbTester.getDbClient().organizationDao().setDefaultTemplates(dbSession, defaultOrganization.getUuid(), + new DefaultTemplates().setProjectUuid(projectDefaultTemplateUuid).setViewUuid(viewDefaultTemplateUuid)); dbSession.commit(); } -- cgit v1.2.3