From bca2f0dbcce393b6dc5029d7aaee9493699ec543 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Tue, 28 Mar 2017 10:39:42 +0200 Subject: [PATCH] Remove DbUnit usage from PermissionTemplateDaoTest --- .../template/PermissionTemplateDaoTest.java | 218 ++++++++++++------ .../addGroupPermissionToTemplate-result.xml | 12 - .../addGroupPermissionToTemplate.xml | 9 - ...ddNullGroupPermissionToTemplate-result.xml | 12 - .../addNullGroupPermissionToTemplate.xml | 9 - .../addUserPermissionToTemplate-result.xml | 12 - .../addUserPermissionToTemplate.xml | 9 - .../createPermissionTemplate-result.xml | 8 - .../createPermissionTemplate.xml | 1 - .../deletePermissionTemplate-result.xml | 26 --- .../deletePermissionTemplate.xml | 64 ----- ...emoveUserPermissionFromTemplate-result.xml | 18 -- .../removeUserPermissionFromTemplate.xml | 22 -- .../remove_by_group-result.xml | 12 - .../remove_by_group.xml | 20 -- .../selectAllPermissionTemplates.xml | 23 -- .../selectEmptyPermissionTemplate.xml | 24 -- .../selectPermissionTemplate.xml | 58 ----- .../updatePermissionTemplate-result.xml | 18 -- .../updatePermissionTemplate.xml | 18 -- 20 files changed, 147 insertions(+), 446 deletions(-) delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addGroupPermissionToTemplate-result.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addGroupPermissionToTemplate.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate-result.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addUserPermissionToTemplate-result.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addUserPermissionToTemplate.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/createPermissionTemplate-result.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/createPermissionTemplate.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/deletePermissionTemplate-result.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/deletePermissionTemplate.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/removeUserPermissionFromTemplate-result.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/removeUserPermissionFromTemplate.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/remove_by_group-result.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/remove_by_group.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectAllPermissionTemplates.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectPermissionTemplate.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/updatePermissionTemplate-result.xml delete mode 100644 server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/updatePermissionTemplate.xml 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 69d0a139985..0cf03541b3e 100644 --- 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 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 index 723b752a4ea..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addGroupPermissionToTemplate-result.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - 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 index 80598facfd8..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addGroupPermissionToTemplate.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - 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 index 0d079b41562..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate-result.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - 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 index 80598facfd8..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addNullGroupPermissionToTemplate.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - 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 index 8872e5085c7..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addUserPermissionToTemplate-result.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - 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 index 80598facfd8..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/addUserPermissionToTemplate.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - 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 index dd74c4392d5..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/createPermissionTemplate-result.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - 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 index 5ed00ba028b..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/createPermissionTemplate.xml +++ /dev/null @@ -1 +0,0 @@ - \ 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 index 1d571ad9b89..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/deletePermissionTemplate-result.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - 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 index 275ba620952..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/deletePermissionTemplate.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - 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 index 364f9814318..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/removeUserPermissionFromTemplate-result.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - 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 index 1f3581fd45a..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/removeUserPermissionFromTemplate.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - 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 index 09f019b2851..00000000000 --- 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 @@ - - - - - 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 index 5c30479a98d..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/remove_by_group.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - 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 index e86a593e447..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectAllPermissionTemplates.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - 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 index daecd0c42eb..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectEmptyPermissionTemplate.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - 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 index ad39eaf134b..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/selectPermissionTemplate.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - name="user1"/> - - - - - - - - - - - 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 index a544f302569..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/updatePermissionTemplate-result.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - 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 index 50174155593..00000000000 --- a/server/sonar-db-dao/src/test/resources/org/sonar/db/permission/template/PermissionTemplateDaoTest/updatePermissionTemplate.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - -- 2.39.5