SONAR-8100 add PermissionTemplateDbTester to DbTester

diff --git a/sonar-db/src/test/java/org/sonar/db/DbTester.java b/sonar-db/src/test/java/org/sonar/db/DbTester.java
index a8898ae675acd33b881b884d9ab37a1eaf08cd0d..8a475b5de5786dc440365502ce5d116d7427b28f 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/DbTester.java
+++ b/sonar-db/src/test/java/org/sonar/db/DbTester.java
@@ -68,6 +68,7 @@ import org.sonar.db.component.ComponentDbTester;
 import org.sonar.db.organization.OrganizationDbTester;
 import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.organization.OrganizationTesting;
+import org.sonar.db.permission.template.PermissionTemplateDbTester;
 import org.sonar.db.user.RootFlagAssertions;
 import org.sonar.db.user.UserDbTester;
 
@@ -98,6 +99,7 @@ public class DbTester extends ExternalResource {
   private final UserDbTester userTester;
   private final ComponentDbTester componentTester;
   private final OrganizationDbTester organizationTester;
+  private final PermissionTemplateDbTester permissionTemplateTester;
   private final RootFlagAssertions rootFlagAssertions;
 
   private DbTester(System2 system2, @Nullable String schemaPath) {
@@ -107,6 +109,7 @@ public class DbTester extends ExternalResource {
     this.userTester = new UserDbTester(this);
     this.componentTester = new ComponentDbTester(this);
     this.organizationTester = new OrganizationDbTester(this);
+    this.permissionTemplateTester = new PermissionTemplateDbTester(this);
     this.rootFlagAssertions = new RootFlagAssertions(this);
   }
 
@@ -175,6 +178,10 @@ public class DbTester extends ExternalResource {
     return organizationTester;
   }
 
+  public PermissionTemplateDbTester permissionTemplates() {
+    return permissionTemplateTester;
+  }
+
   public RootFlagAssertions rootFlag() {
     return rootFlagAssertions;
   }

diff --git a/sonar-db/src/test/java/org/sonar/db/permission/PermissionRepositoryTest.java b/sonar-db/src/test/java/org/sonar/db/permission/PermissionRepositoryTest.java
index ab0436797c695e7e80d378e5f1277b8b08641dd6..0d2b62332d856f353c4243b29fbe085a9481b435 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/permission/PermissionRepositoryTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/permission/PermissionRepositoryTest.java
@@ -59,7 +59,7 @@ public class PermissionRepositoryTest {
   @Rule
   public DbTester dbTester = DbTester.create(system2);
 
-  private PermissionTemplateDbTester templateDb = new PermissionTemplateDbTester(dbTester);
+  private PermissionTemplateDbTester templateDb = dbTester.permissionTemplates();
   private DbSession session = dbTester.getSession();
   private Settings settings = new MapSettings();
   private PermissionRepository underTest = new PermissionRepository(dbTester.getDbClient(), settings);

diff --git a/sonar-db/src/test/java/org/sonar/db/permission/template/GroupWithPermissionTemplateDaoTest.java b/sonar-db/src/test/java/org/sonar/db/permission/template/GroupWithPermissionTemplateDaoTest.java
index 5fae6e7d84c71e098341e63ffc64bb383e538dc4..6cf5abc3adc6cad7c21398f5d205e395f8783c4a 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/permission/template/GroupWithPermissionTemplateDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/permission/template/GroupWithPermissionTemplateDaoTest.java
@@ -44,7 +44,7 @@ public class GroupWithPermissionTemplateDaoTest {
   @Rule
   public DbTester db = DbTester.create(System2.INSTANCE);
   private DbSession session = db.getSession();
-  private PermissionTemplateDbTester permissionTemplateDbTester = new PermissionTemplateDbTester(db);
+  private PermissionTemplateDbTester permissionTemplateDbTester = db.permissionTemplates();
   private PermissionTemplateDao underTest = db.getDbClient().permissionTemplateDao();
 
   @Test

diff --git a/sonar-db/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java b/sonar-db/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java
index 1805f9f807e7bc866edc1b6a1024ecdcd9609071..b799080d1951ab6a5f45c7701e8e1579c7363ec3 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java
@@ -56,7 +56,7 @@ public class PermissionTemplateDaoTest {
   @Rule
   public DbTester db = DbTester.create(system);
   private DbSession dbSession = db.getSession();
-  private PermissionTemplateDbTester templateDb = new PermissionTemplateDbTester(db);
+  private PermissionTemplateDbTester templateDb = db.permissionTemplates();
 
   private PermissionTemplateDao underTest = new PermissionTemplateDao(system);