SONAR-5614 Fix Medium test

3 files changed, 13 insertions, 17 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/UploadReportAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/UploadReportAction.java
index a35ffcb46ad..ad50c942bd3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/batch/UploadReportAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/batch/UploadReportAction.java
@@ -94,11 +94,7 @@ public class UploadReportAction implements RequestHandler {
         index.get(IssueIndex.class).getLastSynchronization(),
         ImmutableMap.of("project", projectKey));
 
-      // Index project's permissions indexes
-      permissionService.synchronizePermissions(session, project.key());
-
       session.commit();
-
     } finally {
       MyBatis.closeQuietly(session);
     }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/UploadReportActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/UploadReportActionMediumTest.java
index 0e39c7af09e..650a522efcc 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/batch/UploadReportActionMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/batch/UploadReportActionMediumTest.java
@@ -182,7 +182,7 @@ public class UploadReportActionMediumTest {
 
   private void clearIssueIndex(){
     tester.get(SearchClient.class).prepareDeleteByQuery(tester.get(SearchClient.class).admin().cluster().prepareState().get()
-      .getState().getMetaData().concreteIndices(new String[]{IndexDefinition.ISSUES.getIndexName()}))
+      .getState().getMetaData().concreteIndices(new String[]{IndexDefinition.ISSUES.getIndexName()})).setTypes(new String[]{IndexDefinition.ISSUES.getIndexType()})
       .setQuery(QueryBuilders.matchAllQuery())
       .get();
   }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexMediumTest.java
index fe9bd465261..0fdc78077e7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexMediumTest.java
@@ -199,10 +199,6 @@ public class IssueIndexMediumTest {
       .setKey("project2");
     tester.get(ComponentDao.class).insert(session, project1, project2);
 
-    IssueDto issue1 = createIssue().setRootComponent(project1);
-    IssueDto issue2 = createIssue().setRootComponent(project2);
-    db.issueDao().insert(session, issue1, issue2);
-
     // project1 can be seen by sonar-users
     GroupDto groupDto = new GroupDto().setName("sonar-users");
     db.groupDao().insert(session, groupDto);
@@ -215,6 +211,10 @@ public class IssueIndexMediumTest {
 
     db.issueAuthorizationDao().synchronizeAfter(session, new Date(0));
 
+    IssueDto issue1 = createIssue().setRootComponent(project1);
+    IssueDto issue2 = createIssue().setRootComponent(project2);
+    db.issueDao().insert(session, issue1, issue2);
+
     session.commit();
     session.clearCache();
 
@@ -243,10 +243,6 @@ public class IssueIndexMediumTest {
       .setKey("project2");
     tester.get(ComponentDao.class).insert(session, project1, project2);
 
-    IssueDto issue1 = createIssue().setRootComponent(project1);
-    IssueDto issue2 = createIssue().setRootComponent(project2);
-    db.issueDao().insert(session, issue1, issue2);
-
     // project1 can be seen by john
     UserDto john = new UserDto().setLogin("john").setName("john").setActive(true);
     db.userDao().insert(session, john);
@@ -259,6 +255,10 @@ public class IssueIndexMediumTest {
 
     db.issueAuthorizationDao().synchronizeAfter(session, new Date(0));
 
+    IssueDto issue1 = createIssue().setRootComponent(project1);
+    IssueDto issue2 = createIssue().setRootComponent(project2);
+    db.issueDao().insert(session, issue1, issue2);
+
     session.commit();
     session.clearCache();
 
@@ -284,10 +284,6 @@ public class IssueIndexMediumTest {
       .setKey("project2");
     tester.get(ComponentDao.class).insert(session, project1, project2);
 
-    IssueDto issue1 = createIssue().setRootComponent(project1);
-    IssueDto issue2 = createIssue().setRootComponent(project2);
-    db.issueDao().insert(session, issue1, issue2);
-
     // project1 can be seen by john
     UserDto john = new UserDto().setLogin("john").setName("john").setActive(true);
     db.userDao().insert(session, john);
@@ -300,6 +296,10 @@ public class IssueIndexMediumTest {
 
     db.issueAuthorizationDao().synchronizeAfter(session, new Date(0));
 
+    IssueDto issue1 = createIssue().setRootComponent(project1);
+    IssueDto issue2 = createIssue().setRootComponent(project2);
+    db.issueDao().insert(session, issue1, issue2);
+
     session.commit();
     session.clearCache();