From 23c338e5ff7ee749784882bf0584e442d7df5ba9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Thu, 28 May 2015 16:11:15 +0200 Subject: [PATCH] SONAR-6589 remove ComputationContext from ComputationStep.execute method and also remove the ComputationContext completely --- .../benchmark/PersistFileSourcesStepTest.java | 5 +-- .../computation/ComputationContext.java | 36 ------------------- .../computation/ComputationService.java | 10 ++---- .../step/ApplyPermissionsStep.java | 11 +++--- .../step/BuildComponentTreeStep.java | 3 +- .../computation/step/ComputationStep.java | 4 +-- .../computation/step/IndexComponentsStep.java | 3 +- .../computation/step/IndexIssuesStep.java | 3 +- .../step/IndexSourceLinesStep.java | 3 +- .../computation/step/IndexTestsStep.java | 3 +- .../computation/step/ParseReportStep.java | 3 +- .../step/PersistComponentsStep.java | 3 +- .../step/PersistDuplicationsStep.java | 3 +- .../computation/step/PersistEventsStep.java | 3 +- .../step/PersistFileSourcesStep.java | 3 +- .../computation/step/PersistIssuesStep.java | 3 +- .../computation/step/PersistMeasuresStep.java | 3 +- ...ersistNumberOfDaysSinceLastCommitStep.java | 7 ++-- .../step/PersistProjectLinksStep.java | 3 +- .../computation/step/PersistTestsStep.java | 3 +- .../PopulateComponentsUuidAndKeyStep.java | 3 +- .../computation/step/PurgeDatastoresStep.java | 3 +- .../step/QualityProfileEventsStep.java | 3 +- .../step/SendIssueNotificationsStep.java | 3 +- .../computation/step/SwitchSnapshotStep.java | 3 +- .../computation/ComputationServiceTest.java | 27 +++----------- .../issue/IssueComputationTest.java | 3 -- .../step/ApplyPermissionsStepTest.java | 16 +++++---- .../step/BuildComponentTreeStepTest.java | 7 ++-- .../step/IndexComponentsStepTest.java | 6 +--- .../computation/step/IndexIssuesStepTest.java | 3 +- .../step/IndexSourceLinesStepTest.java | 5 +-- .../computation/step/IndexTestsStepTest.java | 5 +-- .../computation/step/ParseReportStepTest.java | 3 +- .../step/PersistComponentsStepTest.java | 23 ++++++------ .../step/PersistDuplicationsStepTest.java | 23 ++++-------- .../step/PersistEventsStepTest.java | 13 +++---- .../step/PersistFileSourcesStepTest.java | 27 +++++++------- .../step/PersistIssuesStepTest.java | 8 ++--- .../step/PersistMeasuresStepTest.java | 5 +-- ...stNumberOfDaysSinceLastCommitStepTest.java | 12 ++----- .../step/PersistProjectLinksStepTest.java | 17 ++++----- .../step/PersistTestsStepTest.java | 15 ++++---- .../PopulateComponentsUuidAndKeyStepTest.java | 14 ++++---- .../step/PurgeDatastoresStepTest.java | 7 +--- .../step/QualityProfileEventsStepTest.java | 21 ++++++----- .../step/SendIssueNotificationsStepTest.java | 8 ++--- .../step/SwitchSnapshotStepTest.java | 3 +- 48 files changed, 132 insertions(+), 269 deletions(-) delete mode 100644 server/sonar-server/src/main/java/org/sonar/server/computation/ComputationContext.java diff --git a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java index 2e3955b6694..4919aa890d4 100644 --- a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java +++ b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/PersistFileSourcesStepTest.java @@ -32,12 +32,9 @@ import org.sonar.api.utils.internal.Uuids; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.persistence.DbTester; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.component.ComponentTreeBuilders; import org.sonar.server.computation.component.DbComponentsRefCache; import org.sonar.server.computation.component.DbComponentsRefCache.DbComponent; -import org.sonar.server.computation.component.DumbComponent; import org.sonar.server.computation.step.PersistFileSourcesStep; import org.sonar.server.db.DbClient; import org.sonar.server.source.db.FileSourceDao; @@ -74,7 +71,7 @@ public class PersistFileSourcesStepTest { long start = System.currentTimeMillis(); PersistFileSourcesStep step = new PersistFileSourcesStep(dbClient, System2.INSTANCE, dbComponentsRefCache, reportReader); - step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + step.execute(); long end = System.currentTimeMillis(); long duration = end - start; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationContext.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationContext.java deleted file mode 100644 index 27fd4debf36..00000000000 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationContext.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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.server.computation.component.Component; -import org.sonar.server.computation.component.ComponentTreeBuilder; - -public class ComputationContext { - private final Component component; - - public ComputationContext(ComponentTreeBuilder componentTreeBuilder) { - this.component = componentTreeBuilder.build(); - } - - public Component getRoot() { - return component; - } - -} 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 1720b9f65ba..174e8886312 100644 --- 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 @@ -26,8 +26,6 @@ import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.api.utils.log.Profiler; import org.sonar.server.computation.activity.ActivityManager; -import org.sonar.server.computation.batch.BatchReportReader; -import org.sonar.server.computation.component.ComponentTreeBuilders; import org.sonar.server.computation.step.ComputationStep; import org.sonar.server.computation.step.ComputationSteps; @@ -41,14 +39,12 @@ public class ComputationService { private final ReportQueue.Item item; private final ComputationSteps steps; - private final BatchReportReader reportReader; private final ActivityManager activityManager; private final System2 system; - public ComputationService(ReportQueue.Item item, ComputationSteps steps, ActivityManager activityManager, System2 system, BatchReportReader reportReader) { + public ComputationService(ReportQueue.Item item, ComputationSteps steps, ActivityManager activityManager, System2 system) { this.item = item; this.steps = steps; - this.reportReader = reportReader; this.activityManager = activityManager; this.system = system; } @@ -60,11 +56,9 @@ public class ComputationService { ); try { - ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(reportReader)); - for (ComputationStep step : steps.instances()) { Profiler stepProfiler = Profiler.createIfDebug(LOG).startDebug(step.getDescription()); - step.execute(context); + step.execute(); stepProfiler.stopDebug(); } item.dto.setStatus(SUCCESS); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java index 313089c804b..e67e6b15809 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java @@ -24,8 +24,8 @@ import org.sonar.api.resources.Qualifiers; import org.sonar.core.permission.PermissionFacade; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.component.DbComponentsRefCache; +import org.sonar.server.computation.component.TreeRootHolder; import org.sonar.server.db.DbClient; import org.sonar.server.issue.index.IssueAuthorizationIndexer; @@ -38,19 +38,22 @@ public class ApplyPermissionsStep implements ComputationStep { private final DbComponentsRefCache dbComponentsRefCache; private final IssueAuthorizationIndexer indexer; private final PermissionFacade permissionFacade; + private final TreeRootHolder treeRootHolder; - public ApplyPermissionsStep(DbClient dbClient, DbComponentsRefCache dbComponentsRefCache, IssueAuthorizationIndexer indexer, PermissionFacade permissionFacade) { + public ApplyPermissionsStep(DbClient dbClient, DbComponentsRefCache dbComponentsRefCache, IssueAuthorizationIndexer indexer, + PermissionFacade permissionFacade, TreeRootHolder treeRootHolder) { this.dbClient = dbClient; this.dbComponentsRefCache = dbComponentsRefCache; this.indexer = indexer; this.permissionFacade = permissionFacade; + this.treeRootHolder = treeRootHolder; } @Override - public void execute(ComputationContext context) { + public void execute() { DbSession session = dbClient.openSession(false); try { - long projectId = dbComponentsRefCache.getByRef(context.getRoot().getRef()).getId(); + long projectId = dbComponentsRefCache.getByRef(treeRootHolder.getRoot().getRef()).getId(); if (permissionFacade.countComponentPermissions(session, projectId) == 0) { permissionFacade.grantDefaultRoles(session, projectId, Qualifiers.PROJECT); session.commit(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/BuildComponentTreeStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/BuildComponentTreeStep.java index b97b66c095f..9c30fd8bfea 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/BuildComponentTreeStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/BuildComponentTreeStep.java @@ -23,7 +23,6 @@ import com.google.common.base.Function; import com.google.common.collect.Iterables; import javax.annotation.Nonnull; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.ComponentImpl; @@ -42,7 +41,7 @@ public class BuildComponentTreeStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { mutableTreeRootHolder.setRoot(buildComponentRoot()); } 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 69e13111896..a941485bf8c 100644 --- 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 @@ -20,14 +20,12 @@ package org.sonar.server.computation.step; -import org.sonar.server.computation.ComputationContext; - /** * Implementations must be declared into {@link org.sonar.server.computation.step.ComputationSteps#orderedStepClasses()} */ public interface ComputationStep { - void execute(ComputationContext context); + void execute(); String getDescription(); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java index 88d72279910..75b8d6acb2b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java @@ -21,7 +21,6 @@ package org.sonar.server.computation.step; import org.sonar.core.resource.ResourceIndexerDao; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.DbComponentsRefCache; @@ -40,7 +39,7 @@ public class IndexComponentsStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { resourceIndexerDao.indexProject(dbComponentsRefCache.getByRef(reportReader.readMetadata().getRootComponentRef()).getId()); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexIssuesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexIssuesStep.java index fc8af3c9d6f..860eb1dc544 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexIssuesStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexIssuesStep.java @@ -20,7 +20,6 @@ package org.sonar.server.computation.step; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.issue.index.IssueIndexer; public class IndexIssuesStep implements ComputationStep { @@ -32,7 +31,7 @@ public class IndexIssuesStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { indexer.index(); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexSourceLinesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexSourceLinesStep.java index ae6fbe0afb3..ee709b8e154 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexSourceLinesStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexSourceLinesStep.java @@ -19,7 +19,6 @@ */ package org.sonar.server.computation.step; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.DbComponentsRefCache; import org.sonar.server.source.index.SourceLineIndexer; @@ -37,7 +36,7 @@ public class IndexSourceLinesStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { indexer.index(dbComponentsRefCache.getByRef(reportReader.readMetadata().getRootComponentRef()).getUuid()); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexTestsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexTestsStep.java index 37bc3c59dc6..bd5666e539a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexTestsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexTestsStep.java @@ -20,7 +20,6 @@ package org.sonar.server.computation.step; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.DbComponentsRefCache; import org.sonar.server.test.index.TestIndexer; @@ -38,7 +37,7 @@ public class IndexTestsStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { indexer.index(dbComponentsRefCache.getByRef(reportReader.readMetadata().getRootComponentRef()).getUuid()); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ParseReportStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ParseReportStep.java index 5bd66a86445..8170712bc6b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ParseReportStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ParseReportStep.java @@ -22,7 +22,6 @@ package org.sonar.server.computation.step; import java.util.List; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor; @@ -42,7 +41,7 @@ public class ParseReportStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { IssueDepthTraversalTypeAwareVisitor visitor = new IssueDepthTraversalTypeAwareVisitor(); visitor.visit(treeRootHolder.getRoot()); processDeletedComponents(visitor); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java index 1e714fa0166..629b883697b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistComponentsStep.java @@ -32,7 +32,6 @@ import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.component.ComponentDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.util.NonNullInputFunction; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DbComponentsRefCache; @@ -54,7 +53,7 @@ public class PersistComponentsStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { DbSession session = dbClient.openSession(false); try { Component root = treeRootHolder.getRoot(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java index bab1dd86c28..b77c55704f7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java @@ -29,7 +29,6 @@ import org.sonar.core.measure.db.MeasureDto; import org.sonar.core.metric.db.MetricDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.DbComponentsRefCache; import org.sonar.server.db.DbClient; @@ -50,7 +49,7 @@ public class PersistDuplicationsStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { DbSession session = dbClient.openSession(true); try { MetricDto duplicationMetric = dbClient.metricDao().selectByKey(session, CoreMetrics.DUPLICATIONS_DATA_KEY); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java index a5fec0b4531..45c9aef8f3b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java @@ -27,7 +27,6 @@ import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.event.EventDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.DbComponentsRefCache; import org.sonar.server.db.DbClient; @@ -47,7 +46,7 @@ public class PersistEventsStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { DbSession session = dbClient.openSession(false); try { int rootComponentRef = reportReader.readMetadata().getRootComponentRef(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java index c6c8fe6f205..e988b39d41b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java @@ -35,7 +35,6 @@ import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; import org.sonar.core.source.db.FileSourceDto; import org.sonar.core.source.db.FileSourceDto.Type; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.DbComponentsRefCache; import org.sonar.server.computation.source.ComputeFileSourceData; @@ -64,7 +63,7 @@ public class PersistFileSourcesStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { int rootComponentRef = reportReader.readMetadata().getRootComponentRef(); // Don't use batch insert for file_sources since keeping all data in memory can produce OOM for big files DbSession session = dbClient.openSession(false); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java index f7b790cf497..fb9c8287772 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java @@ -32,7 +32,6 @@ import org.sonar.core.issue.db.IssueMapper; import org.sonar.core.issue.db.UpdateConflictResolver; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.issue.IssueCache; import org.sonar.server.computation.issue.RuleCache; import org.sonar.server.db.DbClient; @@ -56,7 +55,7 @@ public class PersistIssuesStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { DbSession session = dbClient.openSession(true); IssueMapper mapper = session.getMapper(IssueMapper.class); IssueChangeMapper changeMapper = session.getMapper(IssueChangeMapper.class); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java index fe4d804bde6..b9e4129ff7a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java @@ -28,7 +28,6 @@ import org.sonar.api.rule.RuleKey; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.measure.db.MeasureDto; import org.sonar.core.persistence.DbSession; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.DbComponentsRefCache; import org.sonar.server.computation.issue.RuleCache; @@ -65,7 +64,7 @@ public class PersistMeasuresStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { int rootComponentRef = reportReader.readMetadata().getRootComponentRef(); try (DbSession dbSession = dbClient.openSession(true)) { recursivelyProcessComponent(dbSession, rootComponentRef); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStep.java index 1e041c0d328..8b1262c3af0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStep.java @@ -29,7 +29,6 @@ import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.measure.db.MeasureDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.DbComponentsRefCache; import org.sonar.server.computation.measure.MetricCache; @@ -68,7 +67,7 @@ public class PersistNumberOfDaysSinceLastCommitStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { int rootComponentRef = reportReader.readMetadata().getRootComponentRef(); recursivelyProcessComponent(rootComponentRef); @@ -78,7 +77,7 @@ public class PersistNumberOfDaysSinceLastCommitStep implements ComputationStep { } if (commitFound()) { - persistNumberOfDaysSinceLastCommit(context); + persistNumberOfDaysSinceLastCommit(); } } @@ -110,7 +109,7 @@ public class PersistNumberOfDaysSinceLastCommitStep implements ComputationStep { return lastCommitDate == null ? null : lastCommitDate.getTime(); } - private void persistNumberOfDaysSinceLastCommit(ComputationContext context) { + private void persistNumberOfDaysSinceLastCommit() { checkState(commitFound(), "The last commit time should exist"); long numberOfDaysSinceLastCommit = (system.now() - lastCommitTimestamp) / MILLISECONDS_PER_DAY; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java index 3ccbe83d9cf..fa446ef3ea4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java @@ -34,7 +34,6 @@ import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.component.ComponentLinkDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.DbComponentsRefCache; import org.sonar.server.db.DbClient; @@ -67,7 +66,7 @@ public class PersistProjectLinksStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { DbSession session = dbClient.openSession(false); try { int rootComponentRef = reportReader.readMetadata().getRootComponentRef(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java index afc35022814..aee6d513529 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java @@ -44,7 +44,6 @@ import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; import org.sonar.core.source.db.FileSourceDto; import org.sonar.core.source.db.FileSourceDto.Type; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DbComponentsRefCache; @@ -74,7 +73,7 @@ public class PersistTestsStep implements ComputationStep { } @Override - public void execute(final ComputationContext context) { + public void execute() { DbSession session = dbClient.openSession(true); try { TestDepthTraversalTypeAwareVisitor visitor = new TestDepthTraversalTypeAwareVisitor(session, dbComponentsRefCache); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PopulateComponentsUuidAndKeyStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PopulateComponentsUuidAndKeyStep.java index e67d28f72cb..84d521f6fe3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PopulateComponentsUuidAndKeyStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PopulateComponentsUuidAndKeyStep.java @@ -29,7 +29,6 @@ import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.component.ComponentDto; import org.sonar.core.component.ComponentKeys; import org.sonar.core.persistence.DbSession; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.ComponentImpl; @@ -52,7 +51,7 @@ public class PopulateComponentsUuidAndKeyStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { DbSession session = dbClient.openSession(false); try { BatchReport.Metadata metadata = reportReader.readMetadata(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java index 731d4947c89..b5928672a23 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java @@ -24,7 +24,6 @@ import org.sonar.core.computation.dbcleaner.ProjectCleaner; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; import org.sonar.core.purge.IdUuidPair; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.DbComponentsRefCache; import org.sonar.server.computation.component.ProjectSettingsRepository; @@ -47,7 +46,7 @@ public class PurgeDatastoresStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { DbSession session = dbClient.openSession(true); try { DbComponentsRefCache.DbComponent project = dbComponentsRefCache.getByRef(reportReader.readMetadata().getRootComponentRef()); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java index ffc212081c6..6064899b711 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityProfileEventsStep.java @@ -31,7 +31,6 @@ import org.sonar.api.utils.KeyValueFormat; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.UtcDateUtils; import org.sonar.core.measure.db.MeasureDto; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor; import org.sonar.server.computation.component.TreeRootHolder; @@ -59,7 +58,7 @@ public class QualityProfileEventsStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { new DepthTraversalTypeAwareVisitor(Component.Type.PROJECT, POST_ORDER) { @Override public void visitProject(Component tree) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SendIssueNotificationsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SendIssueNotificationsStep.java index 79aee785e96..f5ec9173f2f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SendIssueNotificationsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SendIssueNotificationsStep.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.Map; import java.util.Set; import org.sonar.api.issue.internal.DefaultIssue; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.DbComponentsRefCache; import org.sonar.server.computation.component.DbComponentsRefCache.DbComponent; @@ -67,7 +66,7 @@ public class SendIssueNotificationsStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { DbComponent project = dbComponentsRefCache.getByRef(reportReader.readMetadata().getRootComponentRef()); if (service.hasProjectSubscribersForTypes(project.getUuid(), NOTIF_TYPES)) { doExecute(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 912c32ebf27..8d180552170 100644 --- 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 @@ -24,7 +24,6 @@ import org.sonar.core.component.SnapshotDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.MyBatis; import org.sonar.server.component.db.SnapshotDao; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.db.DbClient; @@ -41,7 +40,7 @@ public class SwitchSnapshotStep implements ComputationStep { } @Override - public void execute(ComputationContext context) { + public void execute() { DbSession session = dbClient.openSession(true); try { long snapshotId = reportReader.readMetadata().getSnapshotId(); 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 c51be1d529b..22cdb93d282 100644 --- 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 @@ -31,18 +31,14 @@ import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; -import org.sonar.batch.protocol.Constants; -import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.computation.db.AnalysisReportDto; import org.sonar.core.computation.db.AnalysisReportDto.Status; import org.sonar.server.computation.activity.ActivityManager; -import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.step.ComputationStep; import org.sonar.server.computation.step.ComputationSteps; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; -import static org.mockito.Mockito.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -50,8 +46,6 @@ import static org.mockito.Mockito.when; public class ComputationServiceTest { - @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); @Rule public LogTester logTester = new LogTester(); @@ -65,18 +59,7 @@ public class ComputationServiceTest { @Before public void setUp() throws IOException { - reportReader.setMetadata(BatchReport.Metadata.newBuilder() - .setRootComponentRef(1) - .build()); - reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(1) - .setType(Constants.ComponentType.PROJECT) - .setKey("project key") - .setName("Project name") - .build()); - - sut = new ComputationService(new ReportQueue.Item(dto, new File("Do_not_care")), steps, activityManager, system, - reportReader); + sut = new ComputationService(new ReportQueue.Item(dto, new File("Do_not_care")), steps, activityManager, system); } @Test @@ -96,8 +79,8 @@ public class ComputationServiceTest { assertThat(logTester.logs(LoggerLevel.INFO).get(0)).startsWith("Analysis of project P1 (report 1) (done) | time="); // execute only the steps supporting the project qualifier - verify(projectStep1).execute(any(ComputationContext.class)); - verify(projectStep2).execute(any(ComputationContext.class)); + verify(projectStep1).execute(); + verify(projectStep2).execute(); verify(activityManager).saveActivity(dto); } @@ -115,7 +98,7 @@ public class ComputationServiceTest { public void fail_if_step_throws_error() throws Exception { String errorMessage = "Failed to unzip"; when(steps.instances()).thenReturn(ImmutableList.of(projectStep1)); - doThrow(new IllegalStateException(errorMessage)).when(projectStep1).execute(any(ComputationContext.class)); + doThrow(new IllegalStateException(errorMessage)).when(projectStep1).execute(); try { sut.process(); @@ -130,7 +113,7 @@ public class ComputationServiceTest { @Test public void step_error() throws Exception { when(steps.instances()).thenReturn(Arrays.asList(projectStep1)); - doThrow(new IllegalStateException("pb")).when(projectStep1).execute(any(ComputationContext.class)); + doThrow(new IllegalStateException("pb")).when(projectStep1).execute(); try { sut.process(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueComputationTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueComputationTest.java index 2ebea449e71..e84f8688413 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueComputationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueComputationTest.java @@ -28,7 +28,6 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.mockito.Mockito; import org.sonar.api.CoreProperties; import org.sonar.api.config.Settings; import org.sonar.api.issue.Issue; @@ -38,7 +37,6 @@ import org.sonar.api.utils.System2; import org.sonar.api.utils.log.LogTester; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.rule.RuleDto; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.component.ProjectSettingsRepository; import org.sonar.server.user.index.UserDoc; @@ -75,7 +73,6 @@ public class IssueComputationTest { .setStatus(Issue.STATUS_OPEN); Settings projectSettings; ProjectSettingsRepository projectSettingsRepository = mock(ProjectSettingsRepository.class); - ComputationContext context = mock(ComputationContext.class, Mockito.RETURNS_DEEP_STUBS); UserIndex userIndex = mock(UserIndex.class); // output diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java index 74f7b58d7d1..286f58c79cd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java @@ -25,6 +25,7 @@ import org.elasticsearch.search.SearchHit; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.sonar.api.config.Settings; @@ -42,9 +43,8 @@ import org.sonar.core.user.GroupRoleDto; import org.sonar.core.user.RoleDao; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; -import org.sonar.server.computation.ComputationContext; +import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ComponentTreeBuilders; import org.sonar.server.computation.component.DbComponentsRefCache; import org.sonar.server.computation.component.DumbComponent; import org.sonar.server.db.DbClient; @@ -65,6 +65,8 @@ public class ApplyPermissionsStepTest extends BaseStepTest { public static EsTester esTester = new EsTester().addDefinitions(new IssueIndexDefinition(new Settings())); @ClassRule public static DbTester dbTester = new DbTester(); + @Rule + public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); DbSession dbSession; @@ -95,7 +97,7 @@ public class ApplyPermissionsStepTest extends BaseStepTest { dbComponentsRefCache = new DbComponentsRefCache(); step = new ApplyPermissionsStep(dbClient, dbComponentsRefCache, issueAuthorizationIndexer, new PermissionFacade(roleDao, null, - new ResourceDao(dbTester.myBatis(), System2.INSTANCE), permissionTemplateDao, settings)); + new ResourceDao(dbTester.myBatis(), System2.INSTANCE), permissionTemplateDao, settings), treeRootHolder); } @After @@ -115,9 +117,9 @@ public class ApplyPermissionsStepTest extends BaseStepTest { dbSession.commit(); dbComponentsRefCache.addComponent(1, new DbComponentsRefCache.DbComponent(projectDto.getId(), PROJECT_KEY, PROJECT_UUID)); - Component project = new DumbComponent(Component.Type.PROJECT, 1, PROJECT_KEY, PROJECT_UUID); + treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, PROJECT_KEY, PROJECT_UUID)); - step.execute(new ComputationContext(ComponentTreeBuilders.from(project))); + step.execute(); dbSession.commit(); assertThat(dbClient.componentDao().selectByKey(dbSession, PROJECT_KEY).getAuthorizationUpdatedAt()).isNotNull(); @@ -142,9 +144,9 @@ public class ApplyPermissionsStepTest extends BaseStepTest { dbSession.commit(); dbComponentsRefCache.addComponent(1, new DbComponentsRefCache.DbComponent(projectDto.getId(), PROJECT_KEY, PROJECT_UUID)); - Component project = new DumbComponent(Component.Type.PROJECT, 1, PROJECT_KEY, PROJECT_UUID); + treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, PROJECT_KEY, PROJECT_UUID)); - step.execute(new ComputationContext(ComponentTreeBuilders.from(project))); + step.execute(); dbSession.commit(); // Check that authorization updated at has not been changed -> Nothing has been done diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/BuildComponentTreeStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/BuildComponentTreeStepTest.java index 60eb895a58b..953c6482997 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/BuildComponentTreeStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/BuildComponentTreeStepTest.java @@ -25,7 +25,6 @@ import org.junit.Test; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.batch.protocol.output.BatchReport.Metadata; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.MutableTreeRootHolderRule; @@ -60,7 +59,7 @@ public class BuildComponentTreeStepTest { @Test(expected = NullPointerException.class) public void fails_if_root_component_does_not_exist_in_reportReader() { - underTest.execute(mock(ComputationContext.class)); + underTest.execute(); } @Test @@ -69,7 +68,7 @@ public class BuildComponentTreeStepTest { int componentRef = 1; reportReader.putComponent(component(componentRef, componentType)); - underTest.execute(mock(ComputationContext.class)); + underTest.execute(); Component root = treeRootHolder.getRoot(); assertThat(root).isNotNull(); @@ -89,7 +88,7 @@ public class BuildComponentTreeStepTest { reportReader.putComponent(component(DIR_REF_2, DIRECTORY, FILE_3_REF)); reportReader.putComponent(component(FILE_3_REF, FILE)); - underTest.execute(mock(ComputationContext.class)); + underTest.execute(); Component root = treeRootHolder.getRoot(); assertThat(root).isNotNull(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java index 0b3fae9e8c3..c28d1a7a30c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java @@ -26,12 +26,9 @@ import org.junit.Test; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.component.ComponentDto; import org.sonar.core.resource.ResourceIndexerDao; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.component.ComponentTreeBuilders; import org.sonar.server.computation.component.DbComponentsRefCache; import org.sonar.server.computation.component.DbComponentsRefCache.DbComponent; -import org.sonar.server.computation.component.DumbComponent; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -58,9 +55,8 @@ public class IndexComponentsStepTest extends BaseStepTest { ComponentDto project = mock(ComponentDto.class); when(project.getId()).thenReturn(123L); - ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT)); - sut.execute(context); + sut.execute(); verify(resourceIndexerDao).indexProject(123L); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexIssuesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexIssuesStepTest.java index 9477db1ca42..61b0c62e5bd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexIssuesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexIssuesStepTest.java @@ -21,7 +21,6 @@ package org.sonar.server.computation.step; import org.junit.Test; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.issue.index.IssueIndexer; import static org.mockito.Mockito.mock; @@ -36,7 +35,7 @@ public class IndexIssuesStepTest { IssueIndexer issueIndexer = mock(IssueIndexer.class); sut = new IndexIssuesStep(issueIndexer); - sut.execute(mock(ComputationContext.class)); + sut.execute(); verify(issueIndexer).index(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java index 590744d3c90..9ff56d86d8c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java @@ -29,11 +29,8 @@ import org.junit.Test; import org.sonar.api.config.Settings; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.persistence.DbTester; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.component.ComponentTreeBuilders; import org.sonar.server.computation.component.DbComponentsRefCache; -import org.sonar.server.computation.component.DumbComponent; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsTester; import org.sonar.server.source.db.FileSourceDao; @@ -84,7 +81,7 @@ public class IndexSourceLinesStepTest extends BaseStepTest { .setRootComponentRef(1) .build()); - step().execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + step().execute(); List docs = esTester.getDocuments(SourceLineIndexDefinition.INDEX, SourceLineIndexDefinition.TYPE); assertThat(docs).hasSize(1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java index c9906a4e125..3970cbcc031 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java @@ -30,11 +30,8 @@ import org.junit.Test; import org.sonar.api.config.Settings; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.persistence.DbTester; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.component.ComponentTreeBuilders; import org.sonar.server.computation.component.DbComponentsRefCache; -import org.sonar.server.computation.component.DumbComponent; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsTester; import org.sonar.server.source.db.FileSourceDao; @@ -84,7 +81,7 @@ public class IndexTestsStepTest extends BaseStepTest { .setRootComponentRef(1) .build()); - step().execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + step().execute(); List docs = esTester.getDocuments(TestIndexDefinition.INDEX, TestIndexDefinition.TYPE); assertThat(docs).hasSize(1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ParseReportStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ParseReportStepTest.java index 9e1487fcf78..986e7f7dd16 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ParseReportStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ParseReportStepTest.java @@ -30,7 +30,6 @@ import org.junit.rules.TemporaryFolder; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.persistence.DbTester; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; @@ -72,7 +71,7 @@ public class ParseReportStepTest extends BaseStepTest { treeRootHolder.setRoot(root); - sut.execute(mock(ComputationContext.class)); + sut.execute(); assertThat(reportReader.readMetadata().getRootComponentRef()).isEqualTo(1); assertThat(reportReader.readMetadata().getDeletedComponentsCount()).isEqualTo(1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentsStepTest.java index aadd795b9fa..e91e84168f9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistComponentsStepTest.java @@ -33,7 +33,6 @@ import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.DbTester; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; @@ -123,7 +122,7 @@ public class PersistComponentsStepTest extends BaseStepTest { new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_KEY", new DumbComponent(Component.Type.DIRECTORY, 3, "CDEF", "MODULE_KEY:src/main/java/dir", new DumbComponent(Component.Type.FILE, 4, "DEFG", "MODULE_KEY:src/main/java/dir/Foo.java"))))); - sut.execute(mock(ComputationContext.class)); + sut.execute(); assertThat(dbTester.countRowsOfTable("projects")).isEqualTo(4); @@ -214,7 +213,7 @@ public class PersistComponentsStepTest extends BaseStepTest { treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, new DumbComponent(Component.Type.DIRECTORY, 2, "CDEF", PROJECT_KEY + ":/", new DumbComponent(Component.Type.FILE, 3, "DEFG", PROJECT_KEY + ":pom.xml")))); - sut.execute(mock(ComputationContext.class)); + sut.execute(); ComponentDto directory = dbClient.componentDao().selectNullableByKey(session, "PROJECT_KEY:/"); assertThat(directory).isNotNull(); @@ -256,7 +255,7 @@ public class PersistComponentsStepTest extends BaseStepTest { treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, new DumbComponent(Component.Type.DIRECTORY, 2, "CDEF", PROJECT_KEY + ":src/test/java/dir", new DumbComponent(Component.Type.FILE, 3, "DEFG", PROJECT_KEY + ":src/test/java/dir/FooTest.java")))); - sut.execute(mock(ComputationContext.class)); + sut.execute(); ComponentDto file = dbClient.componentDao().selectNullableByKey(session, PROJECT_KEY + ":src/test/java/dir/FooTest.java"); assertThat(file).isNotNull(); @@ -309,7 +308,7 @@ public class PersistComponentsStepTest extends BaseStepTest { new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_KEY", new DumbComponent(Component.Type.DIRECTORY, 3, "CDEF", "MODULE_KEY:src/main/java/dir", new DumbComponent(Component.Type.FILE, 4, "DEFG", "MODULE_KEY:src/main/java/dir/Foo.java"))))); - sut.execute(mock(ComputationContext.class)); + sut.execute(); assertThat(dbTester.countRowsOfTable("projects")).isEqualTo(4); @@ -385,7 +384,7 @@ public class PersistComponentsStepTest extends BaseStepTest { new DumbComponent(Component.Type.MODULE, 3, "CDEF", "SUB_MODULE_1_KEY", new DumbComponent(Component.Type.MODULE, 4, "DEFG", "SUB_MODULE_2_KEY", new DumbComponent(Component.Type.DIRECTORY, 5, "EFGH", "SUB_MODULE_2_KEY:src/main/java/dir")))))); - sut.execute(mock(ComputationContext.class)); + sut.execute(); assertThat(dbTester.countRowsOfTable("projects")).isEqualTo(5); @@ -448,7 +447,7 @@ public class PersistComponentsStepTest extends BaseStepTest { new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_A", new DumbComponent(Component.Type.MODULE, 3, "DEFG", "SUB_MODULE_A")), new DumbComponent(Component.Type.MODULE, 4, "CDEF", "MODULE_B"))); - sut.execute(mock(ComputationContext.class)); + sut.execute(); assertThat(dbTester.countRowsOfTable("projects")).isEqualTo(4); @@ -522,7 +521,7 @@ public class PersistComponentsStepTest extends BaseStepTest { new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_KEY", new DumbComponent(Component.Type.DIRECTORY, 3, "CDEF", "MODULE_KEY:src/main/java/dir", new DumbComponent(Component.Type.FILE, 4, "DEFG", "MODULE_KEY:src/main/java/dir/Foo.java"))))); - sut.execute(mock(ComputationContext.class)); + sut.execute(); assertThat(dbTester.countRowsOfTable("projects")).isEqualTo(4); assertThat(dbClient.componentDao().selectNullableByKey(session, PROJECT_KEY).getId()).isEqualTo(project.getId()); @@ -596,7 +595,7 @@ public class PersistComponentsStepTest extends BaseStepTest { treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_KEY"))); - sut.execute(mock(ComputationContext.class)); + sut.execute(); ComponentDto projectReloaded = dbClient.componentDao().selectNullableByKey(session, PROJECT_KEY); assertThat(projectReloaded.name()).isEqualTo("New project name"); @@ -635,7 +634,7 @@ public class PersistComponentsStepTest extends BaseStepTest { treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_KEY"))); - sut.execute(mock(ComputationContext.class)); + sut.execute(); ComponentDto projectReloaded = dbClient.componentDao().selectNullableByKey(session, PROJECT_KEY); assertThat(projectReloaded.description()).isEqualTo("New project description"); @@ -673,7 +672,7 @@ public class PersistComponentsStepTest extends BaseStepTest { treeRootHolder.setRoot(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_KEY"))); - sut.execute(mock(ComputationContext.class)); + sut.execute(); ComponentDto moduleReloaded = dbClient.componentDao().selectNullableByKey(session, "MODULE_KEY"); assertThat(moduleReloaded.path()).isEqualTo("New path"); @@ -734,7 +733,7 @@ public class PersistComponentsStepTest extends BaseStepTest { new DumbComponent(Component.Type.MODULE, 3, "BCDE", "MODULE_B", new DumbComponent(Component.Type.DIRECTORY, 4, "CDEF", "MODULE_B:src/main/java/dir", new DumbComponent(Component.Type.FILE, 5, "DEFG", "MODULE_B:src/main/java/dir/Foo.java")))))); - sut.execute(mock(ComputationContext.class)); + sut.execute(); assertThat(dbTester.countRowsOfTable("projects")).isEqualTo(5); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java index 7462fe20e24..04b283d6a83 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java @@ -35,12 +35,9 @@ import org.sonar.batch.protocol.output.BatchReport.Range; import org.sonar.core.metric.db.MetricDto; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.DbTester; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.component.ComponentTreeBuilders; import org.sonar.server.computation.component.DbComponentsRefCache; import org.sonar.server.computation.component.DbComponentsRefCache.DbComponent; -import org.sonar.server.computation.component.DumbComponent; import org.sonar.server.computation.language.LanguageRepository; import org.sonar.server.db.DbClient; import org.sonar.server.measure.persistence.MeasureDao; @@ -100,8 +97,7 @@ public class PersistDuplicationsStepTest extends BaseStepTest { saveDuplicationMetric(); initReportWithProjectAndFile(); - sut.execute(new ComputationContext( - ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(0); } @@ -127,8 +123,7 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(2, newArrayList(duplication)); - sut.execute(new ComputationContext( - ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); @@ -186,7 +181,7 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(3, newArrayList(duplication)); - sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); @@ -244,8 +239,7 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(3, newArrayList(duplication)); - sut.execute(new ComputationContext( - ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); @@ -310,8 +304,7 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(10, newArrayList(duplication)); - sut.execute(new ComputationContext( - ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); @@ -347,8 +340,7 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(2, newArrayList(duplication)); - sut.execute(new ComputationContext( - ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); @@ -377,8 +369,7 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(2, newArrayList(duplication)); - sut.execute(new ComputationContext( - ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java index 791d22903f5..d2e0cef4d6c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java @@ -31,12 +31,9 @@ import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.DbTester; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.component.ComponentTreeBuilders; import org.sonar.server.computation.component.DbComponentsRefCache; import org.sonar.server.computation.component.DbComponentsRefCache.DbComponent; -import org.sonar.server.computation.component.DumbComponent; import org.sonar.server.db.DbClient; import org.sonar.server.event.db.EventDao; import org.sonar.test.DbTests; @@ -97,7 +94,7 @@ public class PersistEventsStepTest extends BaseStepTest { .setType(Constants.ComponentType.PROJECT) .build()); - step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + step.execute(); dbTester.assertDbUnit(getClass(), "nothing_to_do_when_no_events_in_report.xml", "events"); } @@ -132,7 +129,7 @@ public class PersistEventsStepTest extends BaseStepTest { ) .build()); - step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + step.execute(); dbTester.assertDbUnit(getClass(), "add_events-result.xml", "events"); } @@ -173,7 +170,7 @@ public class PersistEventsStepTest extends BaseStepTest { .build() ).build()); - step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + step.execute(); dbTester.assertDbUnit(getClass(), "persist_report_events_with_component_children-result.xml", "events"); } @@ -197,7 +194,7 @@ public class PersistEventsStepTest extends BaseStepTest { .setVersion("1.0") .build()); - step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + step.execute(); dbTester.assertDbUnit(getClass(), "add_version_event-result.xml", "events"); } @@ -221,7 +218,7 @@ public class PersistEventsStepTest extends BaseStepTest { .setVersion("1.5-SNAPSHOT") .build()); - step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + step.execute(); dbTester.assertDbUnit(getClass(), "keep_one_event_by_version-result.xml", "events"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java index b7ebb52a55e..fd140226a40 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistFileSourcesStepTest.java @@ -38,11 +38,8 @@ import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.DbTester; import org.sonar.core.source.db.FileSourceDto; import org.sonar.core.source.db.FileSourceDto.Type; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.component.ComponentTreeBuilders; import org.sonar.server.computation.component.DbComponentsRefCache; -import org.sonar.server.computation.component.DumbComponent; import org.sonar.server.computation.language.LanguageRepository; import org.sonar.server.db.DbClient; import org.sonar.server.source.db.FileSourceDao; @@ -105,7 +102,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { public void persist_sources() throws Exception { initBasicReport(2); - sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -147,7 +144,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { .build()); reportReader.putFileSourceLines(FILE_REF, "line1", "line2"); - sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -161,7 +158,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { public void persist_source_hashes() throws Exception { initBasicReport(2); - sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource("FILE"); @@ -183,7 +180,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { .setOverallCoveredConditions(4) .build())); - sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -216,7 +213,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { .addChangesetIndexByLine(0) .build()); - sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -242,7 +239,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { .build() )); - sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -268,7 +265,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { ).build() )); - sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -300,7 +297,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { .build() )); - sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -338,7 +335,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { // Sources from the report initBasicReport(1); - sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -372,7 +369,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { initBasicReport(1); - sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -403,7 +400,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { initBasicReport(1); - sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -428,7 +425,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { )); try { - sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); failBecauseExceptionWasNotThrown(IllegalStateException.class); } catch (IllegalStateException e) { assertThat(e).hasMessage("Cannot persist sources of src/Foo.java").hasCauseInstanceOf(IllegalArgumentException.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java index 0aa8bfa21f6..87294983877 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistIssuesStepTest.java @@ -96,7 +96,7 @@ public class PersistIssuesStepTest extends BaseStepTest { .setNew(true) ).close(); - step.execute(null); + step.execute(); dbTester.assertDbUnit(getClass(), "insert_new_issue-result.xml", new String[]{"id"}, "issues"); } @@ -117,7 +117,7 @@ public class PersistIssuesStepTest extends BaseStepTest { .setChanged(true) ).close(); - step.execute(null); + step.execute(); dbTester.assertDbUnit(getClass(), "close_issue-result.xml", "issues"); } @@ -145,7 +145,7 @@ public class PersistIssuesStepTest extends BaseStepTest { ) ).close(); - step.execute(null); + step.execute(); dbTester.assertDbUnit(getClass(), "add_comment-result.xml", new String[]{"id", "created_at", "updated_at"}, "issue_changes"); } @@ -171,7 +171,7 @@ public class PersistIssuesStepTest extends BaseStepTest { ) ).close(); - step.execute(null); + step.execute(); dbTester.assertDbUnit(getClass(), "add_change-result.xml", new String[]{"id", "created_at", "updated_at"}, "issue_changes"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java index 44589f8b8f1..3f056cd33fd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java @@ -44,11 +44,8 @@ import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.DbTester; import org.sonar.core.rule.RuleDto; import org.sonar.server.component.db.ComponentDao; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.component.ComponentTreeBuilders; import org.sonar.server.computation.component.DbComponentsRefCache; -import org.sonar.server.computation.component.DumbComponent; import org.sonar.server.computation.issue.RuleCache; import org.sonar.server.computation.issue.RuleCacheLoader; import org.sonar.server.computation.measure.MetricCache; @@ -164,7 +161,7 @@ public class PersistMeasuresStepTest extends BaseStepTest { .setCharactericId(123456) .build())); - sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + sut.execute(); session.commit(); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(2); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java index bd4686a6c97..31496f7335d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java @@ -32,11 +32,8 @@ import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.metric.db.MetricDto; import org.sonar.core.persistence.DbTester; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.component.ComponentTreeBuilders; import org.sonar.server.computation.component.DbComponentsRefCache; -import org.sonar.server.computation.component.DumbComponent; import org.sonar.server.computation.language.LanguageRepository; import org.sonar.server.computation.measure.MetricCache; import org.sonar.server.db.DbClient; @@ -96,9 +93,8 @@ public class PersistNumberOfDaysSinceLastCommitStepTest extends BaseStepTest { ) .build() ); - ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT)); - sut.execute(context); + sut.execute(); db.assertDbUnit(getClass(), "insert-from-report-result.xml", new String[] {"id"}, "project_measures"); } @@ -108,9 +104,8 @@ public class PersistNumberOfDaysSinceLastCommitStepTest extends BaseStepTest { Date sixDaysAgo = DateUtils.addDays(new Date(), -6); when(sourceLineIndex.lastCommitDateOnProject("project-uuid")).thenReturn(sixDaysAgo); initReportWithProjectAndFile(); - ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT)); - sut.execute(context); + sut.execute(); db.assertDbUnit(getClass(), "insert-from-index-result.xml", new String[] {"id"}, "project_measures"); } @@ -118,9 +113,8 @@ public class PersistNumberOfDaysSinceLastCommitStepTest extends BaseStepTest { @Test public void no_scm_information_in_report_and_index() { initReportWithProjectAndFile(); - ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT)); - sut.execute(context); + sut.execute(); db.assertDbUnit(getClass(), "empty.xml"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java index 1eadd35e5c5..7f89e57ee36 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java @@ -33,11 +33,8 @@ import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.DbTester; import org.sonar.server.component.db.ComponentLinkDao; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.component.ComponentTreeBuilders; import org.sonar.server.computation.component.DbComponentsRefCache; -import org.sonar.server.computation.component.DumbComponent; import org.sonar.server.db.DbClient; import org.sonar.test.DbTests; @@ -117,7 +114,7 @@ public class PersistProjectLinksStepTest extends BaseStepTest { .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.SCM).setHref("https://github.com/SonarSource/sonar/server").build()) .build()); - step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + step.execute(); dbTester.assertDbUnit(getClass(), "add_links_on_project_and_module-result.xml", "project_links"); } @@ -139,7 +136,7 @@ public class PersistProjectLinksStepTest extends BaseStepTest { .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build()) .build()); - step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + step.execute(); dbTester.assertDbUnit(getClass(), "nothing_to_do_when_link_already_exists.xml", "project_links"); } @@ -161,7 +158,7 @@ public class PersistProjectLinksStepTest extends BaseStepTest { .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build()) .build()); - step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + step.execute(); assertThat(dbTester.countRowsOfTable("project_links")).isEqualTo(0); } @@ -183,7 +180,7 @@ public class PersistProjectLinksStepTest extends BaseStepTest { .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build()) .build()); - step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + step.execute(); dbTester.assertDbUnit(getClass(), "update_link-result.xml", "project_links"); } @@ -204,7 +201,7 @@ public class PersistProjectLinksStepTest extends BaseStepTest { .setType(Constants.ComponentType.PROJECT) .build()); - step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + step.execute(); assertThat(dbTester.countRowsOfTable("project_links")).isEqualTo(0); } @@ -225,7 +222,7 @@ public class PersistProjectLinksStepTest extends BaseStepTest { .setType(Constants.ComponentType.PROJECT) .build()); - step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + step.execute(); dbTester.assertDbUnit(getClass(), "not_delete_custom_link.xml", "project_links"); } @@ -249,7 +246,7 @@ public class PersistProjectLinksStepTest extends BaseStepTest { .build()); try { - step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); + step.execute(); failBecauseExceptionWasNotThrown(IllegalArgumentException.class); } catch (IllegalArgumentException e) { assertThat(e).hasMessage("Link of type 'homepage' has already been declared on component 'ABCD'"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java index 66f396d6622..31afd166b45 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistTestsStepTest.java @@ -37,7 +37,6 @@ import org.sonar.core.persistence.DbSession; import org.sonar.core.persistence.DbTester; import org.sonar.core.persistence.MyBatis; import org.sonar.core.source.db.FileSourceDto; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; @@ -121,7 +120,7 @@ public class PersistTestsStepTest extends BaseStepTest { @Test public void no_test_in_database_and_batch_report() { - sut.execute(mock(ComputationContext.class)); + sut.execute(); assertThat(dbClient.fileSourceDao().selectTest(TEST_FILE_UUID_1)).isNull(); assertThat(log.logs()).isEmpty(); @@ -138,7 +137,7 @@ public class PersistTestsStepTest extends BaseStepTest { ); reportReader.putCoverageDetails(TEST_FILE_REF_1, coverageDetails); - sut.execute(mock(ComputationContext.class)); + sut.execute(); assertThat(db.countRowsOfTable("file_sources")).isEqualTo(1); @@ -161,7 +160,7 @@ public class PersistTestsStepTest extends BaseStepTest { reportReader.putTests(TEST_FILE_REF_1, Arrays.asList(newTest(1))); reportReader.putCoverageDetails(TEST_FILE_REF_1, Arrays.asList(newCoverageDetail(1, MAIN_FILE_REF_1))); - sut.execute(mock(ComputationContext.class)); + sut.execute(); FileSourceDto dto = dbClient.fileSourceDao().selectTest(TEST_FILE_UUID_1); assertThat(dto.getCreatedAt()).isEqualTo(now); @@ -187,7 +186,7 @@ public class PersistTestsStepTest extends BaseStepTest { List batchTests = Arrays.asList(newTest(1)); reportReader.putTests(TEST_FILE_REF_1, batchTests); - sut.execute(mock(ComputationContext.class)); + sut.execute(); FileSourceDto dto = dbClient.fileSourceDao().selectTest(TEST_FILE_UUID_1); assertThat(dto.getFileUuid()).isEqualTo(TEST_FILE_UUID_1); @@ -205,7 +204,7 @@ public class PersistTestsStepTest extends BaseStepTest { reportReader.putCoverageDetails(TEST_FILE_REF_1, coverageDetails); reportReader.putCoverageDetails(TEST_FILE_REF_2, coverageDetails); - sut.execute(mock(ComputationContext.class)); + sut.execute(); assertThat(log.logs(LoggerLevel.WARN)).hasSize(1); assertThat(log.logs(LoggerLevel.WARN).get(0)).isEqualTo("Some coverage tests are not taken into account during analysis of project 'PROJECT_KEY'"); @@ -222,7 +221,7 @@ public class PersistTestsStepTest extends BaseStepTest { newCoverageDetailWithLines(1, MAIN_FILE_REF_1, 1, 3), newCoverageDetailWithLines(1, MAIN_FILE_REF_1, 2, 4))); - sut.execute(mock(ComputationContext.class)); + sut.execute(); FileSourceDto dto = dbClient.fileSourceDao().selectTest(TEST_FILE_UUID_1); List coveredLines = dto.getTestData().get(0).getCoveredFile(0).getCoveredLineList(); @@ -255,7 +254,7 @@ public class PersistTestsStepTest extends BaseStepTest { reportReader.putCoverageDetails(TEST_FILE_REF_1, Arrays.asList(newCoverageDetail)); // ACT - sut.execute(mock(ComputationContext.class)); + sut.execute(); // ASSERT FileSourceDto dto = dbClient.fileSourceDao().selectTest(TEST_FILE_UUID_1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PopulateComponentsUuidAndKeyStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PopulateComponentsUuidAndKeyStepTest.java index 5196d77db7d..790b0d15562 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PopulateComponentsUuidAndKeyStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PopulateComponentsUuidAndKeyStepTest.java @@ -36,7 +36,6 @@ import org.sonar.core.persistence.DbTester; import org.sonar.core.persistence.MyBatis; import org.sonar.server.component.ComponentTesting; import org.sonar.server.component.db.ComponentDao; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; @@ -45,7 +44,6 @@ import org.sonar.server.db.DbClient; import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; @Category(DbTests.class) public class PopulateComponentsUuidAndKeyStepTest extends BaseStepTest { @@ -114,7 +112,7 @@ public class PopulateComponentsUuidAndKeyStepTest extends BaseStepTest { .build()); treeRootHolder.setRoot(ComponentTreeBuilders.from(reportReader).build()); - sut.execute(mock(ComputationContext.class)); + sut.execute(); Map componentsByRef = getComponentsByRef(treeRootHolder.getRoot()); @@ -172,7 +170,7 @@ public class PopulateComponentsUuidAndKeyStepTest extends BaseStepTest { treeRootHolder.setRoot(ComponentTreeBuilders.from(reportReader).build()); - sut.execute(mock(ComputationContext.class)); + sut.execute(); Map componentsByRef = getComponentsByRef(treeRootHolder.getRoot()); @@ -229,7 +227,7 @@ public class PopulateComponentsUuidAndKeyStepTest extends BaseStepTest { .build()); treeRootHolder.setRoot(ComponentTreeBuilders.from(reportReader).build()); - sut.execute(mock(ComputationContext.class)); + sut.execute(); Map componentsByRef = getComponentsByRef(treeRootHolder.getRoot()); @@ -272,7 +270,7 @@ public class PopulateComponentsUuidAndKeyStepTest extends BaseStepTest { .build()); treeRootHolder.setRoot(ComponentTreeBuilders.from(reportReader).build()); - sut.execute(mock(ComputationContext.class)); + sut.execute(); Map componentsByRef = getComponentsByRef(treeRootHolder.getRoot()); @@ -325,7 +323,7 @@ public class PopulateComponentsUuidAndKeyStepTest extends BaseStepTest { .build()); treeRootHolder.setRoot(ComponentTreeBuilders.from(reportReader).build()); - sut.execute(mock(ComputationContext.class)); + sut.execute(); Map componentsByRef = getComponentsByRef(treeRootHolder.getRoot()); @@ -385,7 +383,7 @@ public class PopulateComponentsUuidAndKeyStepTest extends BaseStepTest { .build()); treeRootHolder.setRoot(ComponentTreeBuilders.from(reportReader).build()); - sut.execute(mock(ComputationContext.class)); + sut.execute(); Map componentsByRef = getComponentsByRef(treeRootHolder.getRoot()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java index 3f499752f85..3852abbb4df 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PurgeDatastoresStepTest.java @@ -31,11 +31,8 @@ import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.computation.dbcleaner.ProjectCleaner; import org.sonar.core.persistence.DbSession; import org.sonar.core.purge.IdUuidPair; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.component.ComponentTreeBuilders; import org.sonar.server.computation.component.DbComponentsRefCache; -import org.sonar.server.computation.component.DumbComponent; import org.sonar.server.computation.component.ProjectSettingsRepository; import org.sonar.server.db.DbClient; @@ -71,9 +68,7 @@ public class PurgeDatastoresStepTest extends BaseStepTest { .setRootComponentRef(1) .build()); - ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT)); - - sut.execute(context); + sut.execute(); ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(IdUuidPair.class); verify(projectCleaner).purge(any(DbSession.class), argumentCaptor.capture(), any(Settings.class)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityProfileEventsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityProfileEventsStepTest.java index 1a54ad06338..a72113f7e3f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityProfileEventsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityProfileEventsStepTest.java @@ -39,7 +39,6 @@ import org.sonar.api.resources.Language; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.UtcDateUtils; import org.sonar.core.measure.db.MeasureDto; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.TreeRootHolderRule; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.DumbComponent; @@ -88,7 +87,7 @@ public class QualityProfileEventsStepTest { public void no_effect_if_no_previous_measure() { when(measureRepository.findPrevious(treeRootHolder.getRoot(), CoreMetrics.QUALITY_PROFILES)).thenReturn(Optional.absent()); - underTest.execute(mock(ComputationContext.class)); + underTest.execute(); verifyNoMoreInteractions(eventRepository); } @@ -98,14 +97,14 @@ public class QualityProfileEventsStepTest { when(measureRepository.findPrevious(treeRootHolder.getRoot(), CoreMetrics.QUALITY_PROFILES)).thenReturn(Optional.of(newMeasureDto())); when(measureRepository.findCurrent(treeRootHolder.getRoot(), CoreMetrics.QUALITY_PROFILES)).thenReturn(Optional.absent()); - underTest.execute(mock(ComputationContext.class)); + underTest.execute(); } @Test public void no_event_if_no_qp_now_nor_before() { mockMeasures(treeRootHolder.getRoot(), null, null); - underTest.execute(mock(ComputationContext.class)); + underTest.execute(); verifyNoMoreInteractions(eventRepository); } @@ -117,7 +116,7 @@ public class QualityProfileEventsStepTest { Language language = mockLanguageInRepository(LANGUAGE_KEY_1); mockMeasures(treeRootHolder.getRoot(), null, arrayOf(qp)); - underTest.execute(mock(ComputationContext.class)); + underTest.execute(); verify(eventRepository).add(eq(treeRootHolder.getRoot()), eventArgumentCaptor.capture()); verifyNoMoreInteractions(eventRepository); @@ -131,7 +130,7 @@ public class QualityProfileEventsStepTest { mockLanguageNotInRepository(LANGUAGE_KEY_1); mockMeasures(treeRootHolder.getRoot(), null, arrayOf(qp)); - underTest.execute(mock(ComputationContext.class)); + underTest.execute(); verify(eventRepository).add(eq(treeRootHolder.getRoot()), eventArgumentCaptor.capture()); verifyNoMoreInteractions(eventRepository); @@ -145,7 +144,7 @@ public class QualityProfileEventsStepTest { mockMeasures(treeRootHolder.getRoot(), arrayOf(qp), null); Language language = mockLanguageInRepository(LANGUAGE_KEY_1); - underTest.execute(mock(ComputationContext.class)); + underTest.execute(); verify(eventRepository).add(eq(treeRootHolder.getRoot()), eventArgumentCaptor.capture()); verifyNoMoreInteractions(eventRepository); @@ -159,7 +158,7 @@ public class QualityProfileEventsStepTest { mockMeasures(treeRootHolder.getRoot(), arrayOf(qp), null); mockLanguageNotInRepository(LANGUAGE_KEY_1); - underTest.execute(mock(ComputationContext.class)); + underTest.execute(); verify(eventRepository).add(eq(treeRootHolder.getRoot()), eventArgumentCaptor.capture()); verifyNoMoreInteractions(eventRepository); @@ -172,7 +171,7 @@ public class QualityProfileEventsStepTest { mockMeasures(treeRootHolder.getRoot(), arrayOf(qp), arrayOf(qp)); - underTest.execute(mock(ComputationContext.class)); + underTest.execute(); verify(eventRepository, never()).add(any(Component.class), any(Event.class)); } @@ -185,7 +184,7 @@ public class QualityProfileEventsStepTest { mockMeasures(treeRootHolder.getRoot(), arrayOf(qp1), arrayOf(qp2)); Language language = mockLanguageInRepository(LANGUAGE_KEY_1); - underTest.execute(mock(ComputationContext.class)); + underTest.execute(); verify(eventRepository).add(eq(treeRootHolder.getRoot()), eventArgumentCaptor.capture()); verifyNoMoreInteractions(eventRepository); @@ -219,7 +218,7 @@ public class QualityProfileEventsStepTest { )); mockNoLanguageInRepository(); - underTest.execute(mock(ComputationContext.class)); + underTest.execute(); assertThat(events).extracting("name").containsOnly( "Stop using '" + QP_NAME_2 + "' (" + LANGUAGE_KEY_1 + ")", diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java index 10c9c2364bd..cf1ca6f6a36 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/SendIssueNotificationsStepTest.java @@ -31,12 +31,8 @@ import org.sonar.api.rule.Severity; import org.sonar.api.utils.System2; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; -import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.component.ComponentTreeBuilders; import org.sonar.server.computation.component.DbComponentsRefCache; -import org.sonar.server.computation.component.DumbComponent; import org.sonar.server.computation.issue.IssueCache; import org.sonar.server.computation.issue.RuleCache; import org.sonar.server.issue.notification.IssueChangeNotification; @@ -89,7 +85,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { public void do_not_send_notifications_if_no_subscribers() throws IOException { when(notifService.hasProjectSubscribersForTypes(PROJECT_UUID, SendIssueNotificationsStep.NOTIF_TYPES)).thenReturn(false); - sut.execute(new ComputationContext(ComponentTreeBuilders.from(new DumbComponent(Component.Type.PROJECT, 1, null, null)))); + sut.execute(); verify(notifService, never()).deliver(any(Notification.class)); } @@ -101,7 +97,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { when(notifService.hasProjectSubscribersForTypes(PROJECT_UUID, SendIssueNotificationsStep.NOTIF_TYPES)).thenReturn(true); - sut.execute(new ComputationContext(ComponentTreeBuilders.from(new DumbComponent(Component.Type.PROJECT, 1, null, null)))); + sut.execute(); verify(notifService).deliver(any(NewIssuesNotification.class)); verify(notifService, atLeastOnce()).deliver(any(IssueChangeNotification.class)); 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 63f5209f717..6aea4c825e4 100644 --- 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 @@ -30,7 +30,6 @@ import org.sonar.api.utils.System2; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.persistence.DbTester; import org.sonar.server.component.db.SnapshotDao; -import org.sonar.server.computation.ComputationContext; import org.sonar.server.computation.batch.BatchReportReaderRule; import org.sonar.server.db.DbClient; import org.sonar.test.DbTests; @@ -63,7 +62,7 @@ public class SwitchSnapshotStepTest { reportReader.setMetadata(BatchReport.Metadata.newBuilder() .setSnapshotId(1L).build()); - sut.execute(mock(ComputationContext.class)); + sut.execute(); db.assertDbUnit(getClass(), "snapshots-result.xml", "snapshots"); } -- 2.39.5