From 16f5cd83d454d7287068f1518ff12b1aff81d5df Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Thu, 11 Sep 2014 15:59:01 +0200 Subject: [PATCH] SONAR-5566 Fix test on MySQL 5.6 --- .../org/sonar/core/resource/DefaultResourcePermissions.java | 6 +++++- .../sonar/core/resource/DefaultResourcePermissionsTest.java | 6 ++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourcePermissions.java b/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourcePermissions.java index c0e7b7cf71b..314545e3cff 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourcePermissions.java +++ b/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourcePermissions.java @@ -82,10 +82,14 @@ public class DefaultResourcePermissions implements ResourcePermissions { } } + public void grantDefaultRoles(DbSession session, Resource resource) { + permissionFacade.grantDefaultRoles(session, Long.valueOf(resource.getId()), resource.getQualifier()); + } + public void grantDefaultRoles(Resource resource) { DbSession session = myBatis.openSession(false); try { - permissionFacade.grantDefaultRoles(session, Long.valueOf(resource.getId()), resource.getQualifier()); + grantDefaultRoles(session, resource); session.commit(); } finally { MyBatis.closeQuietly(session); diff --git a/sonar-core/src/test/java/org/sonar/core/resource/DefaultResourcePermissionsTest.java b/sonar-core/src/test/java/org/sonar/core/resource/DefaultResourcePermissionsTest.java index 8ed1cf598e0..4aca389e807 100644 --- a/sonar-core/src/test/java/org/sonar/core/resource/DefaultResourcePermissionsTest.java +++ b/sonar-core/src/test/java/org/sonar/core/resource/DefaultResourcePermissionsTest.java @@ -129,8 +129,7 @@ public class DefaultResourcePermissionsTest extends AbstractDaoTestCase { assertThat(permissionFacade.selectGroupPermissions(session, "Anyone", PROJECT_ID)).isEmpty(); assertThat(permissionFacade.selectUserPermissions(session, "marius", PROJECT_ID)).isEmpty(); - permissions.grantDefaultRoles(project); - session.commit(); + permissions.grantDefaultRoles(session, project); assertThat(permissionFacade.selectGroupPermissions(session, "sonar-administrators", PROJECT_ID)).containsOnly("admin"); assertThat(permissionFacade.selectGroupPermissions(session, "sonar-users", PROJECT_ID)).containsOnly("user", "codeviewer"); @@ -175,8 +174,7 @@ public class DefaultResourcePermissionsTest extends AbstractDaoTestCase { assertThat(permissionFacade.selectGroupPermissions(session, "Anyone", PROJECT_ID)).isEmpty(); assertThat(permissionFacade.selectUserPermissions(session, "marius", PROJECT_ID)).isEmpty(); - permissions.grantDefaultRoles(project); - session.commit(); + permissions.grantDefaultRoles(session, project); assertThat(permissionFacade.selectGroupPermissions(session, "sonar-administrators", PROJECT_ID)).containsOnly("admin", "user", "codeviewer"); assertThat(permissionFacade.selectGroupPermissions(session, "sonar-users", PROJECT_ID)).containsOnly("admin"); -- 2.39.5