SONAR-5910 refactoring to add a ComputeEngineContext with decompressed report directory

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/AnalysisReportService.java b/server/sonar-server/src/main/java/org/sonar/server/computation/AnalysisReportService.java
index 57b342830110c7105c012ccc3b49737ce8b9ba1e..130b0ee8bca2bf3ad16bd407ada46416ea400e7c 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/AnalysisReportService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/AnalysisReportService.java
@@ -20,11 +20,10 @@
 
 package org.sonar.server.computation;
 
+import org.sonar.core.component.ComponentDto;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.server.db.DbClient;
 
-import java.io.File;
-
 public class AnalysisReportService {
 
   private final DbClient dbClient;
@@ -33,7 +32,9 @@ public class AnalysisReportService {
     this.dbClient = dbClient;
   }
 
-  public File decompress(DbSession session, long id) {
-    return dbClient.analysisReportDao().getDecompressedReport(session, id);
+  public void decompress(DbSession session, ComputeEngineContext context) {
+    ComponentDto project = context.getProject();
+
+    context.setReportDirectory(dbClient.analysisReportDao().getDecompressedReport(session, project.getId()));
   }
 }

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 e6f585f751509916f945b8a4b39741785cdac3eb..3a854f6c8137c6343aced1aa4c078e32a64fce5e 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
@@ -63,12 +63,13 @@ public class ComputationService implements ServerComponent {
     DbSession session = dbClient.openSession(true);
 
     ComponentDto project = findProject(report, session);
+    ComputeEngineContext context = new ComputeEngineContext(report, project);
 
     try {
       report.succeed();
       for (ComputationStep step : stepRegistry.steps()) {
         TimeProfiler stepProfiler = new TimeProfiler(LOG).start(step.getDescription());
-        step.execute(session, report, project);
+        step.execute(session, context);
         session.commit();
         stepProfiler.stop();
       }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputeEngineContext.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ComputeEngineContext.java
new file mode 100644 (file)
index 0000000..353f562
--- /dev/null
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ComputeEngineContext.java
@@ -0,0 +1,54 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package org.sonar.server.computation;
+
+import org.sonar.core.component.ComponentDto;
+import org.sonar.core.computation.db.AnalysisReportDto;
+
+import java.io.File;
+
+public class ComputeEngineContext {
+
+  private final AnalysisReportDto reportDto;
+  private final ComponentDto project;
+  private File reportDirectory;
+
+  public ComputeEngineContext(AnalysisReportDto reportDto, ComponentDto project) {
+    this.reportDto = reportDto;
+    this.project = project;
+  }
+
+  public AnalysisReportDto getReportDto() {
+    return reportDto;
+  }
+
+  public ComponentDto getProject() {
+    return project;
+  }
+
+  public File getReportDirectory() {
+    return reportDirectory;
+  }
+
+  public void setReportDirectory(File reportDirectory) {
+    this.reportDirectory = reportDirectory;
+  }
+}

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComponentIndexationInDatabaseStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComponentIndexationInDatabaseStep.java
index 20e5fc40eb7d1ee9e9d67ed18c2ef199be397e86..a9f61127b942973c5bc7d77a90dcf0ae940d14e6 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComponentIndexationInDatabaseStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComponentIndexationInDatabaseStep.java
@@ -20,10 +20,9 @@
 
 package org.sonar.server.computation.step;
 
-import org.sonar.core.component.ComponentDto;
-import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.resource.ResourceIndexerDao;
+import org.sonar.server.computation.ComputeEngineContext;
 
 public class ComponentIndexationInDatabaseStep implements ComputationStep {
   private final ResourceIndexerDao resourceIndexerDao;
@@ -33,8 +32,8 @@ public class ComponentIndexationInDatabaseStep implements ComputationStep {
   }
 
   @Override
-  public void execute(DbSession session, AnalysisReportDto report, ComponentDto project) {
-    resourceIndexerDao.indexProject(project.getId().intValue(), session);
+  public void execute(DbSession session, ComputeEngineContext context) {
+    resourceIndexerDao.indexProject(context.getProject().getId().intValue(), session);
   }
 
   @Override

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStep.java
index 81ae5030257d926d25255a6c7793ee4d59a90aeb..f13503fac0ec533f5c44c2c3bbc6b9fec14ad15c 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStep.java
@@ -21,13 +21,12 @@
 package org.sonar.server.computation.step;
 
 import org.sonar.api.ServerComponent;
-import org.sonar.core.component.ComponentDto;
-import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.persistence.DbSession;
+import org.sonar.server.computation.ComputeEngineContext;
 
 public interface ComputationStep extends ServerComponent {
 
-  void execute(DbSession session, AnalysisReportDto report, ComponentDto project);
+  void execute(DbSession session, ComputeEngineContext context);
 
   String getDescription();
 }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/DataCleanerStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/DataCleanerStep.java
index 3badf6497353fa89b215aeca643b523b6cd6a161..7020e6294ee61f455aeee68f3a4e3b25de904ded 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/DataCleanerStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/DataCleanerStep.java
@@ -20,11 +20,10 @@
 
 package org.sonar.server.computation.step;
 
-import org.sonar.core.component.ComponentDto;
-import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.purge.IdUuidPair;
 import org.sonar.core.computation.dbcleaner.ProjectCleaner;
+import org.sonar.server.computation.ComputeEngineContext;
 
 public class DataCleanerStep implements ComputationStep {
   private final ProjectCleaner projectCleaner;
@@ -34,8 +33,8 @@ public class DataCleanerStep implements ComputationStep {
   }
 
   @Override
-  public void execute(DbSession session, AnalysisReportDto report, ComponentDto project) {
-    projectCleaner.purge(session, new IdUuidPair(project.getId(), project.uuid()));
+  public void execute(DbSession session, ComputeEngineContext context) {
+    projectCleaner.purge(session, new IdUuidPair(context.getProject().getId(), context.getProject().uuid()));
   }
 
   @Override

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/DigestReportStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/DigestReportStep.java
index bf7b548f03ca1208d21244e5c4ae231f1e9e932e..b48a6caaf5ce0a0685303d4b8f4e7fc1ee141d2e 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/DigestReportStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/DigestReportStep.java
@@ -20,10 +20,9 @@
 
 package org.sonar.server.computation.step;
 
-import org.sonar.core.component.ComponentDto;
-import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.server.computation.AnalysisReportService;
+import org.sonar.server.computation.ComputeEngineContext;
 
 public class DigestReportStep implements ComputationStep {
   private final AnalysisReportService reportService;
@@ -33,8 +32,8 @@ public class DigestReportStep implements ComputationStep {
   }
 
   @Override
-  public void execute(DbSession session, AnalysisReportDto report, ComponentDto project) {
-    reportService.decompress(session, report.getId());
+  public void execute(DbSession session, ComputeEngineContext context) {
+    reportService.decompress(session, context);
   }
 
   @Override

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexProjectIssuesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexProjectIssuesStep.java
index f35471ccc1b9be194d4236f73c339dc49269b85e..95c7353e06a84b3eeab077e7274653cda4443f99 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexProjectIssuesStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexProjectIssuesStep.java
@@ -20,9 +20,8 @@
 
 package org.sonar.server.computation.step;
 
-import org.sonar.core.component.ComponentDto;
-import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.persistence.DbSession;
+import org.sonar.server.computation.ComputeEngineContext;
 import org.sonar.server.issue.index.IssueAuthorizationIndexer;
 import org.sonar.server.issue.index.IssueIndexer;
 
@@ -38,7 +37,7 @@ public class IndexProjectIssuesStep implements ComputationStep {
   }
 
   @Override
-  public void execute(DbSession session, AnalysisReportDto report, ComponentDto project) {
+  public void execute(DbSession session, ComputeEngineContext context) {
     authorizationIndexer.index();
     indexer.index();
   }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/InvalidatePreviewCacheStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/InvalidatePreviewCacheStep.java
index fce06a49868b3d9140c4a6790252431cede51a73..670dd138287d732c8969397e4f843e86e695d37e 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/InvalidatePreviewCacheStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/InvalidatePreviewCacheStep.java
@@ -21,11 +21,11 @@
 package org.sonar.server.computation.step;
 
 import org.sonar.core.component.ComponentDto;
-import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.preview.PreviewCache;
 import org.sonar.core.properties.PropertiesDao;
 import org.sonar.core.properties.PropertyDto;
+import org.sonar.server.computation.ComputeEngineContext;
 
 public class InvalidatePreviewCacheStep implements ComputationStep {
   private final PropertiesDao propertiesDao;
@@ -35,8 +35,8 @@ public class InvalidatePreviewCacheStep implements ComputationStep {
   }
 
   @Override
-  public void execute(DbSession session, AnalysisReportDto report, ComponentDto project) {
-    propertiesDao.setProperty(newProjectPreviewCacheProperty(project), session);
+  public void execute(DbSession session, ComputeEngineContext context) {
+    propertiesDao.setProperty(newProjectPreviewCacheProperty(context.getProject()), session);
   }
 
   private PropertyDto newProjectPreviewCacheProperty(ComponentDto project) {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java
index 10530494ee331ea1bd26efe06dcb8ed19053d979..0fbe7df3fdb3b08d4e6c7d4d90febdff3e208120 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java
@@ -20,11 +20,11 @@
 
 package org.sonar.server.computation.step;
 
-import org.sonar.core.component.ComponentDto;
 import org.sonar.core.component.SnapshotDto;
 import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.server.component.db.SnapshotDao;
+import org.sonar.server.computation.ComputeEngineContext;
 
 import java.util.List;
 
@@ -37,9 +37,9 @@ public class SwitchSnapshotStep implements ComputationStep {
   }
 
   @Override
-  public void execute(DbSession session, AnalysisReportDto report, ComponentDto project) {
-    disablePreviousSnapshot(session, report);
-    enableCurrentSnapshot(session, report);
+  public void execute(DbSession session, ComputeEngineContext context) {
+    disablePreviousSnapshot(session, context.getReportDto());
+    enableCurrentSnapshot(session, context.getReportDto());
   }
 
   @Override

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SynchronizeProjectPermissionsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SynchronizeProjectPermissionsStep.java
index 1b5151fdd73ccaa180ff5cc29ae88192c186ff63..769e3928a0f7a1aacca931b168c513d9dd3c30aa 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SynchronizeProjectPermissionsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SynchronizeProjectPermissionsStep.java
@@ -20,9 +20,8 @@
 
 package org.sonar.server.computation.step;
 
-import org.sonar.core.component.ComponentDto;
-import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.persistence.DbSession;
+import org.sonar.server.computation.ComputeEngineContext;
 import org.sonar.server.issue.index.IssueAuthorizationIndexer;
 
 public class SynchronizeProjectPermissionsStep implements ComputationStep {
@@ -34,7 +33,7 @@ public class SynchronizeProjectPermissionsStep implements ComputationStep {
   }
 
   @Override
-  public void execute(DbSession session, AnalysisReportDto report, ComponentDto project) {
+  public void execute(DbSession session, ComputeEngineContext context) {
     indexer.index();
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/IndexSourceLinesStep.java b/server/sonar-server/src/main/java/org/sonar/server/source/IndexSourceLinesStep.java
index 480077709484e10448efe97344a0f84ad8dc76a8..774eb3fbe668cc2ee718a0eae17c33b4ebf6850a 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/source/IndexSourceLinesStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/source/IndexSourceLinesStep.java
@@ -19,9 +19,8 @@
  */
 package org.sonar.server.source;
 
-import org.sonar.core.component.ComponentDto;
-import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.persistence.DbSession;
+import org.sonar.server.computation.ComputeEngineContext;
 import org.sonar.server.computation.step.ComputationStep;
 import org.sonar.server.source.index.SourceLineIndexer;
 
@@ -34,7 +33,7 @@ public class IndexSourceLinesStep implements ComputationStep {
   }
 
   @Override
-  public void execute(DbSession session, AnalysisReportDto report, ComponentDto project) {
+  public void execute(DbSession session, ComputeEngineContext context) {
     indexer.index();
   }
 

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/AnalysisReportServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/AnalysisReportServiceTest.java
index e8789dfd04bb4079fcfb0eb8ab3c6e2256d9a624..387c67a55040770771afaa2624a35d76d5a5a927 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/AnalysisReportServiceTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/AnalysisReportServiceTest.java
@@ -39,7 +39,7 @@ public class AnalysisReportServiceTest {
     when(dbClient.analysisReportDao()).thenReturn(dao);
     sut = new AnalysisReportService(dbClient);
 
-    sut.decompress(mock(DbSession.class), 123L);
+    sut.decompress(mock(DbSession.class), , 123L);
 
     verify(dao).getDecompressedReport(any(DbSession.class), eq(123L));
   }

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 1d835f7d1fa1d8bb6f8d2dc23322d5a9efe2e244..799f487c35b582f29cc76effc4d9019d40aeeb0e 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
@@ -24,7 +24,6 @@ import com.google.common.collect.Lists;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InOrder;
-import org.sonar.core.component.ComponentDto;
 import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.server.activity.ActivityService;
@@ -70,8 +69,8 @@ public class ComputationServiceTest {
 
     InOrder order = inOrder(firstStep, secondStep, thirdStep);
 
-    order.verify(firstStep).execute(any(DbSession.class), any(AnalysisReportDto.class), any(ComponentDto.class));
-    order.verify(secondStep).execute(any(DbSession.class), any(AnalysisReportDto.class), any(ComponentDto.class));
-    order.verify(thirdStep).execute(any(DbSession.class), any(AnalysisReportDto.class), any(ComponentDto.class));
+    order.verify(firstStep).execute(any(DbSession.class), any(ComputeEngineContext.class));
+    order.verify(secondStep).execute(any(DbSession.class), any(ComputeEngineContext.class));
+    order.verify(thirdStep).execute(any(DbSession.class), any(ComputeEngineContext.class));
   }
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComponentIndexationInDatabaseStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComponentIndexationInDatabaseStepTest.java
index c690a8db37ef376ff302da76912c603b2b141572..1d7c586f559643ccec891622296013466bd1c8e3 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComponentIndexationInDatabaseStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ComponentIndexationInDatabaseStepTest.java
@@ -26,6 +26,7 @@ import org.sonar.core.component.ComponentDto;
 import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.resource.ResourceIndexerDao;
+import org.sonar.server.computation.ComputeEngineContext;
 
 import static org.mockito.Mockito.*;
 
@@ -44,9 +45,10 @@ public class ComponentIndexationInDatabaseStepTest {
   public void call_indexProject_of_dao() {
     ComponentDto project = mock(ComponentDto.class);
     when(project.getId()).thenReturn(123L);
-
     DbSession session = mock(DbSession.class);
-    sut.execute(session, mock(AnalysisReportDto.class), project);
+    ComputeEngineContext context = new ComputeEngineContext(mock(AnalysisReportDto.class), project);
+
+    sut.execute(session, context);
 
     verify(resourceIndexerDao).indexProject(123, session);
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/DataCleanerStepMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/DataCleanerStepMediumTest.java
index 69793cb18153b5d6dfb2ddb96cd7ca3d976009c4..ffbd0b7c47678f9d38dc2eba65e3f0410308d57c 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/DataCleanerStepMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/DataCleanerStepMediumTest.java
@@ -36,6 +36,7 @@ import org.sonar.core.persistence.MyBatis;
 import org.sonar.core.properties.PropertyDto;
 import org.sonar.server.component.ComponentTesting;
 import org.sonar.server.component.SnapshotTesting;
+import org.sonar.server.computation.ComputeEngineContext;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.properties.ProjectSettingsFactory;
 import org.sonar.server.search.IndexClient;
@@ -103,9 +104,10 @@ public class DataCleanerStepMediumTest {
 
     dbClient.propertiesDao().setProperty(new PropertyDto().setKey(DbCleanerConstants.WEEKS_BEFORE_DELETING_ALL_SNAPSHOTS).setValue("52"));
     dbSession.commit();
+    ComputeEngineContext context = new ComputeEngineContext(report, project);
 
     // ACT
-    sut.execute(dbSession, report, project);
+    sut.execute(dbSession, context);
     dbSession.commit();
 
     // ASSERT
@@ -142,9 +144,10 @@ public class DataCleanerStepMediumTest {
     dbClient.propertiesDao().setProperty(new PropertyDto().setKey(DbCleanerConstants.WEEKS_BEFORE_DELETING_ALL_SNAPSHOTS).setValue("4"));
     dbClient.propertiesDao().setProperty(new PropertyDto().setKey(DbCleanerConstants.WEEKS_BEFORE_DELETING_ALL_SNAPSHOTS).setValue("1").setResourceId(project.getId()));
     dbSession.commit();
+    ComputeEngineContext context = new ComputeEngineContext(report, project);
 
     // ACT
-    sut.execute(dbSession, report, project);
+    sut.execute(dbSession, context);
     dbSession.commit();
 
     // ASSERT

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/DataCleanerStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/DataCleanerStepTest.java
index 72442f3f91254dbed6ecc03c662493bea1690fc0..c0b60752e654001d25110d4b2748182d56677a1b 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/DataCleanerStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/DataCleanerStepTest.java
@@ -24,14 +24,13 @@ import org.junit.Before;
 import org.junit.Test;
 import org.sonar.core.component.ComponentDto;
 import org.sonar.core.computation.db.AnalysisReportDto;
+import org.sonar.core.computation.dbcleaner.ProjectCleaner;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.purge.IdUuidPair;
-import org.sonar.core.computation.dbcleaner.ProjectCleaner;
+import org.sonar.server.computation.ComputeEngineContext;
 
 import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 public class DataCleanerStepTest {
 
@@ -50,8 +49,9 @@ public class DataCleanerStepTest {
     ComponentDto project = mock(ComponentDto.class);
     when(project.getId()).thenReturn(123L);
     when(project.uuid()).thenReturn("UUID-1234");
+    ComputeEngineContext context = new ComputeEngineContext(mock(AnalysisReportDto.class), project);
 
-    sut.execute(mock(DbSession.class), mock(AnalysisReportDto.class), project);
+    sut.execute(mock(DbSession.class), context);
 
     verify(projectCleaner).purge(any(DbSession.class), any(IdUuidPair.class));
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/DigestReportStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/DigestReportStepTest.java
index ee7f652b1dd0b3b44035fbd0d62535956571def1..bc28affc6d6ba83f9284530cad43b261c48e595f 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/DigestReportStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/DigestReportStepTest.java
@@ -25,6 +25,7 @@ import org.sonar.core.component.ComponentDto;
 import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.server.computation.AnalysisReportService;
+import org.sonar.server.computation.ComputeEngineContext;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
@@ -40,9 +41,10 @@ public class DigestReportStepTest {
     AnalysisReportService service = mock(AnalysisReportService.class);
     AnalysisReportDto report = AnalysisReportDto.newForTests(123L);
     sut = new DigestReportStep(service);
+    ComputeEngineContext context = new ComputeEngineContext(report, mock(ComponentDto.class));
 
-    sut.execute(mock(DbSession.class), report, mock(ComponentDto.class));
+    sut.execute(mock(DbSession.class), context);
 
-    verify(service).decompress(any(DbSession.class), eq(123L));
+    verify(service).decompress(any(DbSession.class), , eq(123L));
   }
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/InvalidatePreviewCacheStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/InvalidatePreviewCacheStepTest.java
index 8b2aca126091776cefcac5448d956e636396e120..87d6ed0dbb8d691e806ac393ab3ebe43588b9e6f 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/InvalidatePreviewCacheStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/InvalidatePreviewCacheStepTest.java
@@ -27,7 +27,7 @@ import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.properties.PropertiesDao;
 import org.sonar.core.properties.PropertyDto;
-import org.sonar.server.computation.step.InvalidatePreviewCacheStep;
+import org.sonar.server.computation.ComputeEngineContext;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
@@ -47,7 +47,9 @@ public class InvalidatePreviewCacheStepTest {
   @Test
   public void update_property_calling_propertiesDao() {
     DbSession session = mock(DbSession.class);
-    sut.execute(session, mock(AnalysisReportDto.class), mock(ComponentDto.class));
+    ComputeEngineContext context = new ComputeEngineContext(mock(AnalysisReportDto.class), mock(ComponentDto.class));
+
+    sut.execute(session, context);
 
     verify(propertiesDao).setProperty(any(PropertyDto.class), eq(session));
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SwitchSnapshotStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SwitchSnapshotStepTest.java
index eb7288fcbc280333ba0718f1ce7b44d78330b268..96dd4aa6b890ed8a0e1612588feaadcecc1ac152 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SwitchSnapshotStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SwitchSnapshotStepTest.java
@@ -29,11 +29,11 @@ import org.sonar.api.utils.DateUtils;
 import org.sonar.api.utils.System2;
 import org.sonar.core.computation.db.AnalysisReportDto;
 import org.sonar.core.persistence.DbSession;
-import org.sonar.core.persistence.MyBatis;
 import org.sonar.core.persistence.DbTester;
+import org.sonar.core.persistence.MyBatis;
 import org.sonar.server.component.ComponentTesting;
 import org.sonar.server.component.db.SnapshotDao;
-import org.sonar.server.computation.step.SwitchSnapshotStep;
+import org.sonar.server.computation.ComputeEngineContext;
 import org.sonar.test.DbTests;
 
 import static org.mockito.Mockito.mock;
@@ -64,8 +64,9 @@ public class SwitchSnapshotStepTest {
   @Test
   public void one_switch_with_a_snapshot_and_his_children() {
     db.prepareDbUnit(getClass(), "snapshots.xml");
+    ComputeEngineContext context = new ComputeEngineContext(AnalysisReportDto.newForTests(1L).setSnapshotId(1L), ComponentTesting.newProjectDto());
 
-    sut.execute(session, AnalysisReportDto.newForTests(1L).setSnapshotId(1L), ComponentTesting.newProjectDto());
+    sut.execute(session, context);
     session.commit();
 
     db.assertDbUnit(getClass(), "snapshots-result.xml", "snapshots");
@@ -74,7 +75,8 @@ public class SwitchSnapshotStepTest {
   @Test(expected = IllegalStateException.class)
   public void throw_IllegalStateException_when_not_finding_snapshot() {
     db.prepareDbUnit(getClass(), "empty.xml");
+    ComputeEngineContext context = new ComputeEngineContext(AnalysisReportDto.newForTests(1L).setSnapshotId(1L), ComponentTesting.newProjectDto());
 
-    sut.execute(session, AnalysisReportDto.newForTests(1L).setSnapshotId(1L), ComponentTesting.newProjectDto());
+    sut.execute(session, context);
   }
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SynchronizeProjectPermissionsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SynchronizeProjectPermissionsStepTest.java
index dc75cf5dafa12db30e84eefa9f956a3890f89749..eff04c24aba24efeeff08422ea939051bbbdf752 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SynchronizeProjectPermissionsStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SynchronizeProjectPermissionsStepTest.java
@@ -20,7 +20,6 @@
 package org.sonar.server.computation.step;
 
 import org.junit.Test;
-import org.sonar.server.computation.step.SynchronizeProjectPermissionsStep;
 import org.sonar.server.issue.index.IssueAuthorizationIndexer;
 
 import static org.mockito.Mockito.mock;
@@ -31,7 +30,7 @@ public class SynchronizeProjectPermissionsStepTest {
   @Test
   public void index_issue_permissions() throws Exception {
     IssueAuthorizationIndexer indexer = mock(IssueAuthorizationIndexer.class);
-    new SynchronizeProjectPermissionsStep(indexer).execute(null, null, null);
+    new SynchronizeProjectPermissionsStep(indexer).execute(null, null);
     verify(indexer).index();
   }
 }