Compute Engine - commit at each step and delete unimplemented test

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java
index be2499e31a3b343d67b5f1ba6500dd3548a37be2..b13bd049ee75ffb4c7007533cdc32478a95d9d9e 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java
@@ -52,6 +52,7 @@ public class ComputationService implements ServerComponent {
       for (ComputationStep step : stepRegistry.steps()) {
         LOG.info(String.format("# %s step started...", step.description()));
         step.execute(session, report);
+        session.commit();
         LOG.info(String.format("# %s step finished", step.description()));
       }
     } finally {

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java
index 9a99ec197fbd26dcb75bb5017d6ad93165dae190..991f2a240e47946e0783de4590118934d2b08dad 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java
@@ -40,8 +40,9 @@ public class ComputationServiceTest {
 
   @Before
   public void before() {
-    this.dbClient = mock(DbClient.class);
     this.stepRegistry = mock(ComputationStepRegistry.class);
+    this.dbClient = mock(DbClient.class);
+    when(dbClient.openSession(anyBoolean())).thenReturn(mock(DbSession.class));
 
     this.sut = new ComputationService(dbClient, stepRegistry);
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/SynchronizeProjectPermissionsStepMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/SynchronizeProjectPermissionsStepMediumTest.java
index a4f08f5692c224037e202dfc8f5f86c328f97429..c248b93e786719a04593eac55c13d57e791ef602 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/SynchronizeProjectPermissionsStepMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/SynchronizeProjectPermissionsStepMediumTest.java
@@ -109,18 +109,4 @@ public class SynchronizeProjectPermissionsStepMediumTest {
 
     return project;
   }
-
-  @Test
-  public void do_nothing_when_permissions_are_already_set() throws Exception {
-    ComponentDto project = insertPermissionsForProject(DEFAULT_PROJECT_KEY);
-
-    queue.add(DEFAULT_PROJECT_KEY, 123L);
-    List<AnalysisReportDto> reports = queue.findByProjectKey(DEFAULT_PROJECT_KEY);
-    getAndSetProjectStep.execute(session, reports.get(0));
-
-    sut.execute(session, reports.get(0));
-
-    IssueAuthorizationDoc issueAuthorizationIndex = tester.get(IssueAuthorizationIndex.class).getNullableByKey(project.uuid());
-    assertThat(issueAuthorizationIndex).isNotNull();
-  }
 }