SONAR-5566 Fix test on MySQL 5.6

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 c0e7b7cf71ba643724e68eec4980a8f7a358537c..314545e3cffb84f212f396da7f65d2521cb59ea1 100644 (file)
--- 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 8ed1cf598e053c9dc18d25deaf53d81c1747f165..4aca389e80710a3f342ef88021c3a1eed6ca3994 100644 (file)
--- 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");