Remove DbUnit usage from PermissionTemplateDaoTest

diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java
index 69d0a1399857d86cb78e0f5cbe4d4e396a475922..0cf03541b3e347f5fad3261b592155a15c4e5f1d 100644 (file)
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java
@@ -20,13 +20,13 @@
 package org.sonar.db.permission.template;
 
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import org.apache.ibatis.session.ResultContext;
 import org.apache.ibatis.session.ResultHandler;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -38,7 +38,9 @@ import org.sonar.db.organization.OrganizationDto;
 import org.sonar.db.user.GroupDto;
 import org.sonar.db.user.UserDto;
 
+import static com.google.common.primitives.Longs.asList;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.sonar.api.web.UserRole.ADMIN;
@@ -51,60 +53,83 @@ import static org.sonar.db.user.GroupTesting.newGroupDto;
 
 public class PermissionTemplateDaoTest {
 
-  private System2 system = mock(System2.class);
+  private static final Date PAST = new Date(100_000_000_000L);
+  private static final Date NOW = new Date(500_000_000_000L);
+
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
+
   @Rule
-  public DbTester db = DbTester.create(system);
+  public DbTester db = DbTester.create();
 
+  private System2 system2 = mock(System2.class);
   private DbSession dbSession = db.getSession();
   private PermissionTemplateDbTester templateDb = db.permissionTemplates();
 
-  private PermissionTemplateDao underTest = new PermissionTemplateDao(system);
+  private PermissionTemplateDao underTest = new PermissionTemplateDao(system2);
+
+  @Before
+  public void setUp() throws Exception {
+    when(system2.now()).thenReturn(NOW.getTime());
+  }
 
   @Test
   public void should_create_permission_template() throws ParseException {
-    db.prepareDbUnit(getClass(), "createPermissionTemplate.xml");
-
-    Date now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("2013-01-02 01:04:05");
-    when(system.now()).thenReturn(now.getTime());
-
     PermissionTemplateDto permissionTemplate = underTest.insert(db.getSession(), newPermissionTemplateDto()
+      .setUuid("ABCD")
       .setName("my template")
       .setDescription("my description")
-      .setKeyPattern("myregexp"));
+      .setKeyPattern("myregexp")
+      .setOrganizationUuid("org")
+      .setCreatedAt(PAST)
+      .setUpdatedAt(NOW));
     db.commit();
-    assertThat(permissionTemplate).isNotNull();
-    assertThat(permissionTemplate.getId()).isEqualTo(1L);
 
-    db.assertDbUnitTable(getClass(), "createPermissionTemplate-result.xml", "permission_templates", "id", "name", "description");
+    assertThat(underTest.selectByUuid(db.getSession(), permissionTemplate.getUuid()))
+      .extracting(PermissionTemplateDto::getUuid, PermissionTemplateDto::getName, PermissionTemplateDto::getDescription, PermissionTemplateDto::getKeyPattern,
+        PermissionTemplateDto::getOrganizationUuid, PermissionTemplateDto::getCreatedAt, PermissionTemplateDto::getUpdatedAt)
+      .containsOnly("ABCD", "my template", "my description", "myregexp", "org", PAST, NOW);
   }
 
   @Test
-  public void should_select_permission_template_by_key() {
-    db.prepareDbUnit(getClass(), "selectPermissionTemplate.xml");
-
-    PermissionTemplateDto permissionTemplate = underTest.selectByUuid(dbSession, "my_template_20130102_030405");
+  public void should_select_permission_template_by_uuid() {
+    templateDb.insertTemplate(newPermissionTemplateDto()
+      .setUuid("ABCD")
+      .setName("my template")
+      .setDescription("my description")
+      .setKeyPattern("myregexp")
+      .setOrganizationUuid("org"));
 
-    assertThat(permissionTemplate).isNotNull();
-    assertThat(permissionTemplate.getId()).isEqualTo(1L);
-    assertThat(permissionTemplate.getName()).isEqualTo("my template");
-    assertThat(permissionTemplate.getUuid()).isEqualTo("my_template_20130102_030405");
-    assertThat(permissionTemplate.getDescription()).isEqualTo("my description");
+    assertThat(underTest.selectByUuid(db.getSession(), "ABCD"))
+      .extracting(PermissionTemplateDto::getUuid, PermissionTemplateDto::getName, PermissionTemplateDto::getDescription, PermissionTemplateDto::getKeyPattern,
+        PermissionTemplateDto::getOrganizationUuid)
+      .containsOnly("ABCD", "my template", "my description", "myregexp", "org");
   }
 
   @Test
   public void selectAll_without_name_filtering() {
-    db.prepareDbUnit(getClass(), "selectAllPermissionTemplates.xml");
-    commit();
-
-    List<PermissionTemplateDto> permissionTemplates = underTest.selectAll(dbSession, "org1", null);
-    assertThat(permissionTemplates).hasSize(3);
-    assertThat(permissionTemplates).extracting("id").containsOnly(1L, 2L, 3L);
-    assertThat(permissionTemplates).extracting("name").containsOnly("template1", "template2", "template3");
-    assertThat(permissionTemplates).extracting("kee").containsOnly("template1_20130102_030405", "template2_20130102_030405", "template3_20130102_030405");
-    assertThat(permissionTemplates).extracting("description").containsOnly("description1", "description2", "description3");
-
+    templateDb.insertTemplate(newPermissionTemplateDto()
+      .setUuid("tpl1")
+      .setName("template1")
+      .setDescription("description1")
+      .setOrganizationUuid("org"));
+    templateDb.insertTemplate(newPermissionTemplateDto()
+      .setUuid("tpl2")
+      .setName("template2")
+      .setDescription("description2")
+      .setOrganizationUuid("org"));
+    templateDb.insertTemplate(newPermissionTemplateDto()
+      .setUuid("tpl3")
+      .setName("template3")
+      .setDescription("description3")
+      .setOrganizationUuid("org"));
+
+    assertThat(underTest.selectAll(dbSession, "org", null))
+      .extracting(PermissionTemplateDto::getUuid, PermissionTemplateDto::getName, PermissionTemplateDto::getDescription)
+      .containsOnly(
+        tuple("tpl1", "template1", "description1"),
+        tuple("tpl2", "template2", "description2"),
+        tuple("tpl3", "template3", "description3"));
     assertThat(underTest.selectAll(dbSession, "missingOrg", null)).isEmpty();
   }
 
@@ -121,76 +146,137 @@ public class PermissionTemplateDaoTest {
 
   @Test
   public void should_update_permission_template() {
-    db.prepareDbUnit(getClass(), "updatePermissionTemplate.xml");
-
-    PermissionTemplateDto dto = new PermissionTemplateDto()
-      .setId(1L)
+    PermissionTemplateDto permissionTemplateDto = templateDb.insertTemplate(newPermissionTemplateDto()
+      .setUuid("ABCD")
+      .setName("name")
+      .setDescription("description")
+      .setKeyPattern("regexp")
+      .setOrganizationUuid("org")
+      .setCreatedAt(PAST)
+      .setUpdatedAt(PAST));
+
+    underTest.update(dbSession, permissionTemplateDto
       .setName("new_name")
       .setDescription("new_description")
-      .setKeyPattern("new_regexp");
-    underTest.update(dbSession, dto);
+      .setKeyPattern("new_regexp")
+      .setUpdatedAt(NOW)
+      // Invariant fields, should not be updated
+      .setUuid("new UUID")
+      .setOrganizationUuid("new org")
+      .setCreatedAt(NOW));
     db.commit();
 
-    db.assertDbUnitTable(getClass(), "updatePermissionTemplate-result.xml", "permission_templates", "id", "name", "kee", "description");
+    assertThat(underTest.selectByUuid(db.getSession(), "ABCD"))
+      .extracting(PermissionTemplateDto::getUuid, PermissionTemplateDto::getName, PermissionTemplateDto::getDescription, PermissionTemplateDto::getKeyPattern,
+        PermissionTemplateDto::getOrganizationUuid, PermissionTemplateDto::getCreatedAt, PermissionTemplateDto::getUpdatedAt)
+      .containsOnly("ABCD", "new_name", "new_description", "new_regexp", "org", PAST, NOW);
   }
 
   @Test
   public void should_delete_permission_template() {
-    db.prepareDbUnit(getClass(), "deletePermissionTemplate.xml");
-
-    underTest.deleteById(dbSession, 1L);
+    UserDto user1 = db.users().insertUser();
+    UserDto user2 = db.users().insertUser();
+    GroupDto group1 = db.users().insertGroup();
+    GroupDto group2 = db.users().insertGroup();
+    PermissionTemplateDto permissionTemplate1 = templateDb.insertTemplate(db.getDefaultOrganization());
+    PermissionTemplateDto permissionTemplate2 = templateDb.insertTemplate(db.getDefaultOrganization());
+    templateDb.addUserToTemplate(permissionTemplate1, user1, "user");
+    templateDb.addUserToTemplate(permissionTemplate1, user2, "user");
+    templateDb.addUserToTemplate(permissionTemplate1, user2, "admin");
+    templateDb.addUserToTemplate(permissionTemplate2, user2, "admin");
+    templateDb.addGroupToTemplate(permissionTemplate1, group1, "user");
+    templateDb.addGroupToTemplate(permissionTemplate1, group2, "user");
+    templateDb.addAnyoneToTemplate(permissionTemplate1, "admin");
+    templateDb.addAnyoneToTemplate(permissionTemplate2, "admin");
+    templateDb.addProjectCreatorToTemplate(permissionTemplate1.getId(), "user");
+    templateDb.addProjectCreatorToTemplate(permissionTemplate2.getId(), "user");
+
+    underTest.deleteById(dbSession, permissionTemplate1.getId());
     dbSession.commit();
 
-    checkTemplateTables("deletePermissionTemplate-result.xml");
-    db.assertDbUnitTable(getClass(), "deletePermissionTemplate-result.xml", "perm_tpl_characteristics");
+    assertThat(underTest.selectAll(db.getSession(), db.getDefaultOrganization().getUuid(), null))
+      .extracting(PermissionTemplateDto::getUuid)
+      .containsOnly(permissionTemplate2.getUuid());
+    assertThat(db.getDbClient().permissionTemplateDao().selectUserPermissionsByTemplateId(db.getSession(), permissionTemplate1.getId())).isEmpty();
+    assertThat(db.getDbClient().permissionTemplateDao().selectUserPermissionsByTemplateId(db.getSession(), permissionTemplate2.getId())).hasSize(1);
+    assertThat(db.getDbClient().permissionTemplateDao().selectGroupPermissionsByTemplateId(db.getSession(), permissionTemplate1.getId())).isEmpty();
+    assertThat(db.getDbClient().permissionTemplateDao().selectGroupPermissionsByTemplateId(db.getSession(), permissionTemplate2.getId())).hasSize(1);
+    assertThat(db.getDbClient().permissionTemplateCharacteristicDao().selectByTemplateIds(db.getSession(), asList(permissionTemplate1.getId(), permissionTemplate2.getId())))
+      .extracting(PermissionTemplateCharacteristicDto::getTemplateId)
+      .containsOnly(permissionTemplate2.getId());
   }
 
   @Test
   public void should_add_user_permission_to_template() {
-    db.prepareDbUnit(getClass(), "addUserPermissionToTemplate.xml");
+    PermissionTemplateDto permissionTemplate = templateDb.insertTemplate(db.getDefaultOrganization());
+    UserDto user = db.users().insertUser();
 
-    underTest.insertUserPermission(dbSession, 1L, 1, "new_permission");
+    underTest.insertUserPermission(dbSession, permissionTemplate.getId(), user.getId(), "user");
 
-    checkTemplateTables("addUserPermissionToTemplate-result.xml");
+    assertThat(db.getDbClient().permissionTemplateDao().selectUserPermissionsByTemplateId(db.getSession(), permissionTemplate.getId()))
+      .extracting(PermissionTemplateUserDto::getTemplateId, PermissionTemplateUserDto::getUserId, PermissionTemplateUserDto::getPermission, PermissionTemplateUserDto::getCreatedAt,
+        PermissionTemplateUserDto::getUpdatedAt)
+      .containsOnly(tuple(permissionTemplate.getId(), user.getId(), "user", NOW, NOW));
   }
 
   @Test
   public void should_remove_user_permission_from_template() {
-    db.prepareDbUnit(getClass(), "removeUserPermissionFromTemplate.xml");
+    PermissionTemplateDto permissionTemplate = templateDb.insertTemplate(db.getDefaultOrganization());
+    UserDto user1 = db.users().insertUser();
+    UserDto user2 = db.users().insertUser();
+    templateDb.addUserToTemplate(permissionTemplate, user1, "user");
+    templateDb.addUserToTemplate(permissionTemplate, user1, "admin");
+    templateDb.addUserToTemplate(permissionTemplate, user2, "user");
 
-    underTest.deleteUserPermission(dbSession, 1L, 2, "permission_to_remove");
+    underTest.deleteUserPermission(dbSession, permissionTemplate.getId(), user1.getId(), "user");
 
-    checkTemplateTables("removeUserPermissionFromTemplate-result.xml");
+    assertThat(db.getDbClient().permissionTemplateDao().selectUserPermissionsByTemplateId(db.getSession(), permissionTemplate.getId()))
+      .extracting(PermissionTemplateUserDto::getUserId, PermissionTemplateUserDto::getPermission)
+      .containsOnly(tuple(user1.getId(), "admin"), tuple(user2.getId(), "user"));
   }
 
   @Test
   public void should_add_group_permission_to_template() {
-    db.prepareDbUnit(getClass(), "addGroupPermissionToTemplate.xml");
+    PermissionTemplateDto permissionTemplate = templateDb.insertTemplate(db.getDefaultOrganization());
+    GroupDto group = db.users().insertGroup();
 
-    underTest.insertGroupPermission(dbSession, 1L, 1, "new_permission");
+    underTest.insertGroupPermission(dbSession, permissionTemplate.getId(), group.getId(), "user");
     dbSession.commit();
 
-    checkTemplateTables("addGroupPermissionToTemplate-result.xml");
+    assertThat(db.getDbClient().permissionTemplateDao().selectGroupPermissionsByTemplateId(db.getSession(), permissionTemplate.getId()))
+      .extracting(PermissionTemplateGroupDto::getTemplateId, PermissionTemplateGroupDto::getGroupId, PermissionTemplateGroupDto::getPermission,
+        PermissionTemplateGroupDto::getCreatedAt,
+        PermissionTemplateGroupDto::getUpdatedAt)
+      .containsOnly(tuple(permissionTemplate.getId(), group.getId(), "user", NOW, NOW));
   }
 
   @Test
   public void remove_by_group() {
-    db.prepareDbUnit(getClass(), "remove_by_group.xml");
-
-    underTest.deleteByGroup(db.getSession(), 2);
+    PermissionTemplateDto permissionTemplate = templateDb.insertTemplate(db.getDefaultOrganization());
+    GroupDto group1 = db.users().insertGroup();
+    GroupDto group2 = db.users().insertGroup();
+    templateDb.addGroupToTemplate(permissionTemplate, group1, "user");
+    templateDb.addGroupToTemplate(permissionTemplate, group1, "admin");
+    templateDb.addGroupToTemplate(permissionTemplate, group2, "user");
+
+    underTest.deleteByGroup(db.getSession(), group1.getId());
     db.getSession().commit();
 
-    db.assertDbUnitTable(getClass(), "remove_by_group-result.xml", "permission_templates", "id", "name", "kee", "description");
+    assertThat(db.getDbClient().permissionTemplateDao().selectGroupPermissionsByTemplateId(db.getSession(), permissionTemplate.getId()))
+      .extracting(PermissionTemplateGroupDto::getGroupId, PermissionTemplateGroupDto::getPermission)
+      .containsOnly(tuple(group2.getId(), "user"));
   }
 
   @Test
-  public void should_add_group_permission_with_null_name() {
-    db.prepareDbUnit(getClass(), "addNullGroupPermissionToTemplate.xml");
+  public void should_add_group_permission_to_anyone() {
+    PermissionTemplateDto permissionTemplate = templateDb.insertTemplate(db.getDefaultOrganization());
 
-    underTest.insertGroupPermission(dbSession, 1L, null, "new_permission");
+    underTest.insertGroupPermission(dbSession, permissionTemplate.getId(), null, "user");
     dbSession.commit();
 
-    checkTemplateTables("addNullGroupPermissionToTemplate-result.xml");
+    assertThat(db.getDbClient().permissionTemplateDao().selectGroupPermissionsByTemplateId(db.getSession(), permissionTemplate.getId()))
+      .extracting(PermissionTemplateGroupDto::getTemplateId, PermissionTemplateGroupDto::getGroupId, PermissionTemplateGroupDto::getGroupName, PermissionTemplateGroupDto::getPermission)
+      .containsOnly(tuple(permissionTemplate.getId(), 0, "Anyone", "user"));
   }
 
   @Test
@@ -382,14 +468,4 @@ public class PermissionTemplateDaoTest {
       .containsOnly(expectedTemplateIds);
   }
 
-  private void commit() {
-    dbSession.commit();
-  }
-
-  private void checkTemplateTables(String fileName) {
-    db.assertDbUnitTable(getClass(), fileName, "permission_templates", "id", "name", "description");
-    db.assertDbUnitTable(getClass(), fileName, "perm_templates_users", "template_id", "user_id", "permission_reference");
-    db.assertDbUnitTable(getClass(), fileName, "perm_templates_groups", "template_id", "group_id", "permission_reference");
-  }
-
 }

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addGroupPermissionToTemplate-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addGroupPermissionToTemplate-result.xml
deleted file mode 100644 (file)
index 723b752..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addGroupPermissionToTemplate-result.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<dataset>
-  <permission_templates id="1"
-                        name="my template"
-                        kee="my_template_20130102_030405"
-                        description="my description"
-                        organization_uuid="org1"/>
-  <perm_templates_users/>
-  <perm_templates_groups id="1"
-                         template_id="1"
-                         group_id="1"
-                         permission_reference="new_permission"/>
-</dataset>

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addGroupPermissionToTemplate.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addGroupPermissionToTemplate.xml
deleted file mode 100644 (file)
index 80598fa..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addGroupPermissionToTemplate.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<dataset>
-  <permission_templates id="1"
-                        name="my template"
-                        kee="my_template_20130102_030405"
-                        description="my description"
-                        organization_uuid="org1"/>
-  <perm_templates_users/>
-  <perm_templates_groups/>
-</dataset>

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate-result.xml
deleted file mode 100644 (file)
index 0d079b4..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate-result.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<dataset>
-  <permission_templates id="1"
-                        name="my template"
-                        kee="my_template_20130102_030405"
-                        description="my description"
-                        organization_uuid="org1"/>
-  <perm_templates_users/>
-  <perm_templates_groups id="1"
-                         template_id="1"
-                         group_id="[null]"
-                         permission_reference="new_permission"/>
-</dataset>

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate.xml
deleted file mode 100644 (file)
index 80598fa..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<dataset>
-  <permission_templates id="1"
-                        name="my template"
-                        kee="my_template_20130102_030405"
-                        description="my description"
-                        organization_uuid="org1"/>
-  <perm_templates_users/>
-  <perm_templates_groups/>
-</dataset>

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addUserPermissionToTemplate-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addUserPermissionToTemplate-result.xml
deleted file mode 100644 (file)
index 8872e50..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addUserPermissionToTemplate-result.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<dataset>
-  <permission_templates id="1"
-                        name="my template"
-                        kee="my_template_20130102_030405"
-                        description="my description"
-                        organization_uuid="org1"/>
-  <perm_templates_users id="1"
-                        template_id="1"
-                        user_id="1"
-                        permission_reference="new_permission"/>
-  <perm_templates_groups/>
-</dataset>

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addUserPermissionToTemplate.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addUserPermissionToTemplate.xml
deleted file mode 100644 (file)
index 80598fa..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addUserPermissionToTemplate.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<dataset>
-  <permission_templates id="1"
-                        name="my template"
-                        kee="my_template_20130102_030405"
-                        description="my description"
-                        organization_uuid="org1"/>
-  <perm_templates_users/>
-  <perm_templates_groups/>
-</dataset>

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/createPermissionTemplate-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/createPermissionTemplate-result.xml
deleted file mode 100644 (file)
index dd74c43..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/createPermissionTemplate-result.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<dataset>
-  <permission_templates id="1"
-                        name="my template"
-                        kee="my_template_20130102_010405"
-                        description="my description"
-                        key_pattern="myregexp"
-                        organization_uuid="org1"/>
-</dataset>

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/createPermissionTemplate.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/createPermissionTemplate.xml
deleted file mode 100644 (file)
index 5ed00ba..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/createPermissionTemplate.xml
+++ /dev/null
@@ -1 +0,0 @@
-<dataset></dataset>
\ No newline at end of file

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/deletePermissionTemplate-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/deletePermissionTemplate-result.xml
deleted file mode 100644 (file)
index 1d571ad..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/deletePermissionTemplate-result.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<dataset>
-  <permission_templates id="2"
-                        name="other template"
-                        kee="my_template_20130102_030405"
-                        description="other description"
-                        created_at="[null]"
-                        updated_at="[null]"
-                        organization_uuid="org1"/>
-
-  <perm_templates_users id="4"
-                        template_id="2"
-                        user_id="2"
-                        permission_reference="user_permission2"/>
-
-  <perm_templates_groups id="4"
-                         template_id="2"
-                         group_id="[null]"
-                         permission_reference="group_permission2"/>
-
-  <perm_tpl_characteristics id="2"
-                            template_id="2"
-                            permission_key="user"
-                            with_project_creator="[true]"
-                            created_at="1000000"
-                            updated_at="1000000"/>
-</dataset>

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/deletePermissionTemplate.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/deletePermissionTemplate.xml
deleted file mode 100644 (file)
index 275ba62..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/deletePermissionTemplate.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<dataset>
-  <permission_templates id="1"
-                        name="my template"
-                        kee="my_template_20130102_030405"
-                        description="my description"
-                        created_at="[null]"
-                        updated_at="[null]"
-                        organization_uuid="org1"/>
-  <permission_templates id="2"
-                        name="other template"
-                        kee="my_template_20130102_030405"
-                        description="other description"
-                        created_at="[null]"
-                        updated_at="[null]"
-                        organization_uuid="org1"/>
-
-  <perm_templates_users id="1"
-                        template_id="1"
-                        user_id="1"
-                        permission_reference="user_permission1"/>
-  <perm_templates_users id="2"
-                        template_id="1"
-                        user_id="2"
-                        permission_reference="user_permission1"/>
-  <perm_templates_users id="3"
-                        template_id="1"
-                        user_id="2"
-                        permission_reference="user_permission2"/>
-  <perm_templates_users id="4"
-                        template_id="2"
-                        user_id="2"
-                        permission_reference="user_permission2"/>
-
-  <perm_templates_groups id="1"
-                         template_id="1"
-                         group_id="1"
-                         permission_reference="group_permission1"/>
-  <perm_templates_groups id="2"
-                         template_id="1"
-                         group_id="2"
-                         permission_reference="group_permission1"/>
-  <perm_templates_groups id="3"
-                         template_id="1"
-                         group_id="[null]"
-                         permission_reference="group_permission2"/>
-  <perm_templates_groups id="4"
-                         template_id="2"
-                         group_id="[null]"
-                         permission_reference="group_permission2"/>
-
-  <perm_tpl_characteristics id="1"
-                            template_id="1"
-                            permission_key="user"
-                            with_project_creator="[true]"
-                            created_at="1000000"
-                            updated_at="1000000"/>
-  <perm_tpl_characteristics id="2"
-                            template_id="2"
-                            permission_key="user"
-                            with_project_creator="[true]"
-                            created_at="1000000"
-                            updated_at="1000000"/>
-
-</dataset>

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/removeUserPermissionFromTemplate-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/removeUserPermissionFromTemplate-result.xml
deleted file mode 100644 (file)
index 364f981..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/removeUserPermissionFromTemplate-result.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<dataset>
-  <permission_templates id="1"
-                        name="my template"
-                        kee="my_template_20130102_030405"
-                        description="my description"
-                        organization_uuid="org1"/>
-
-  <perm_templates_users id="1"
-                        template_id="1"
-                        user_id="1"
-                        permission_reference="remaining_permission_other_user"/>
-  <perm_templates_users id="3"
-                        template_id="1"
-                        user_id="2"
-                        permission_reference="remaining_permission_same_user"/>
-
-  <perm_templates_groups/>
-</dataset>

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/removeUserPermissionFromTemplate.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/removeUserPermissionFromTemplate.xml
deleted file mode 100644 (file)
index 1f3581f..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/removeUserPermissionFromTemplate.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<dataset>
-  <permission_templates id="1"
-                        name="my template"
-                        kee="my_template_20130102_030405"
-                        description="my description"
-                        organization_uuid="org1"/>
-
-  <perm_templates_users id="1"
-                        template_id="1"
-                        user_id="1"
-                        permission_reference="remaining_permission_other_user"/>
-  <perm_templates_users id="2"
-                        template_id="1"
-                        user_id="2"
-                        permission_reference="permission_to_remove"/>
-  <perm_templates_users id="3"
-                        template_id="1"
-                        user_id="2"
-                        permission_reference="remaining_permission_same_user"/>
-
-  <perm_templates_groups/>
-</dataset>

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/remove_by_group-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/remove_by_group-result.xml
deleted file mode 100644 (file)
index 09f019b..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/remove_by_group-result.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<dataset>
-  <permission_templates id="1"
-                        name="my template"
-                        kee="my_template_20130102_030405"
-                        description="my description"
-                        organization_uuid="org1"/>
-  <perm_templates_users/>
-  <perm_templates_groups id="1"
-                         template_id="1"
-                         group_id="1"
-                         permission_reference="remaining_permission_other_group"/>
-</dataset>

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/remove_by_group.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/remove_by_group.xml
deleted file mode 100644 (file)
index 5c30479..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/remove_by_group.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<dataset>
-  <permission_templates id="1"
-                        name="my template"
-                        kee="my_template_20130102_030405"
-                        description="my description"
-                        organization_uuid="org1"/>
-  <perm_templates_users/>
-  <perm_templates_groups id="1"
-                         template_id="1"
-                         group_id="1"
-                         permission_reference="remaining_permission_other_group"/>
-  <perm_templates_groups id="2"
-                         template_id="1"
-                         group_id="2"
-                         permission_reference="permission_to_remove"/>
-  <perm_templates_groups id="3"
-                         template_id="1"
-                         group_id="2"
-                         permission_reference="permission_to_remove2"/>
-</dataset>

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectAllPermissionTemplates.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectAllPermissionTemplates.xml
deleted file mode 100644 (file)
index e86a593..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectAllPermissionTemplates.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<dataset>
-  <permission_templates id="1"
-                        name="template1"
-                        kee="template1_20130102_030405"
-                        description="description1"
-                        created_at="[null]"
-                        updated_at="[null]"
-                        organization_uuid="org1"/>
-  <permission_templates id="2"
-                        name="template2"
-                        kee="template2_20130102_030405"
-                        description="description2"
-                        created_at="[null]"
-                        updated_at="[null]"
-                        organization_uuid="org1"/>
-  <permission_templates id="3"
-                        name="template3"
-                        kee="template3_20130102_030405"
-                        description="description3"
-                        created_at="[null]"
-                        updated_at="[null]"
-                        organization_uuid="org1"/>
-</dataset>

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml
deleted file mode 100644 (file)
index daecd0c..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<dataset>
-  <permission_templates id="1"
-                        name="my template"
-                        kee="my_template_20130102_030405"
-                        description="my description"
-                        created_at="[null]"
-                        updated_at="[null]"
-                        organization_uuid="org1"/>
-
-  <users id="1"
-         login="user1"
-         name="user1"
-         is_root="[false]"/>
-  <users id="2"
-         login="user2"
-         name="user2"
-         is_root="[false]"/>
-  <groups id="1"
-          name="group1"
-          organization_uuid="org1"/>
-  <groups id="2"
-          name="group2"
-          organization_uuid="org1"/>
-</dataset>

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectPermissionTemplate.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectPermissionTemplate.xml
deleted file mode 100644 (file)
index ad39eaf..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectPermissionTemplate.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<dataset>
-  <permission_templates id="1"
-                        name="my template"
-                        kee="my_template_20130102_030405"
-                        description="my description"
-                        created_at="[null]"
-                        updated_at="[null]"
-                        organization_uuid="org1"/>
-
-  <perm_templates_users id="1"
-                        template_id="1"
-                        user_id="1"
-                        permission_reference="user_permission1"/>
-  <perm_templates_users id="2"
-                        template_id="1"
-                        user_id="2"
-                        permission_reference="user_permission1"/>
-  <perm_templates_users id="3"
-                        template_id="1"
-                        user_id="2"
-                        permission_reference="user_permission2"/>
-
-  <users id="1"
-         login="login1"
-         name="user1"
-         is_root="[false]"/>
-  <users id="2"
-         login="login2"
-         name="user2"
-         is_root="[false]"/>
-         name="user1"/>
-
-  <perm_templates_groups id="1"
-                         template_id="1"
-                         group_id="1"
-                         permission_reference="group_permission1"/>
-  <perm_templates_groups id="2"
-                         template_id="1"
-                         group_id="2"
-                         permission_reference="group_permission1"/>
-  <!-- Anyone group -->
-  <perm_templates_groups id="3"
-                         template_id="1"
-                         group_id="[null]"
-                         permission_reference="group_permission2"/>
-  <!-- Unmatched group -->
-  <perm_templates_groups id="4"
-                         template_id="1"
-                         group_id="999999"
-                         permission_reference="group_permission2"/>
-
-  <groups id="1"
-          name="group1"
-          organization_uuid="org1"/>
-  <groups id="2"
-          name="group2"
-          organization_uuid="org1"/>
-</dataset>

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/updatePermissionTemplate-result.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/updatePermissionTemplate-result.xml
deleted file mode 100644 (file)
index a544f30..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/updatePermissionTemplate-result.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<dataset>
-  <permission_templates id="1"
-                        name="new_name"
-                        kee="template1_20130102_030405"
-                        description="new_description"
-                        key_pattern="new_regexp"
-                        created_at="[null]"
-                        updated_at="[null]"
-                        organization_uuid="org1"/>
-  <permission_templates id="2"
-                        name="template2"
-                        kee="template2_20130102_030405"
-                        description="description2"
-                        key_pattern="barregexp"
-                        created_at="[null]"
-                        updated_at="[null]"
-                        organization_uuid="org1"/>
-</dataset>

diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/updatePermissionTemplate.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/updatePermissionTemplate.xml
deleted file mode 100644 (file)
index 5017415..0000000
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/updatePermissionTemplate.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<dataset>
-  <permission_templates id="1"
-                        name="template1"
-                        kee="template1_20130102_030405"
-                        description="description1"
-                        key_pattern="fooregexp"
-                        created_at="[null]"
-                        updated_at="[null]"
-                        organization_uuid="org1"/>
-  <permission_templates id="2"
-                        name="template2"
-                        kee="template2_20130102_030405"
-                        description="description2"
-                        key_pattern="barregexp"
-                        created_at="[null]"
-                        updated_at="[null]"
-                        organization_uuid="org1"/>
-</dataset>