From 23c63879bf5b848d9911e31ff6dce4ea2490432e Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Thu, 28 May 2015 10:31:25 +0200 Subject: [PATCH] SONAR-6589 remove unused parameter of ComputationContext constructor also clean unit tests that uses a ComputationContext (removed uneccessary properties, mostly) --- .../benchmark/PersistFileSourcesStepTest.java | 6 +- .../computation/ComputationContext.java | 7 +- .../computation/ComputationService.java | 11 +- .../computation/ComputationServiceTest.java | 4 +- .../step/ApplyPermissionsStepTest.java | 12 +- .../step/IndexComponentsStepTest.java | 6 +- .../step/IndexSourceLinesStepTest.java | 6 +- .../computation/step/IndexTestsStepTest.java | 6 +- .../computation/step/ParseReportStepTest.java | 7 +- .../step/PersistComponentsStepTest.java | 43 ++--- .../step/PersistDuplicationsStepTest.java | 26 +-- .../step/PersistEventsStepTest.java | 35 +--- .../step/PersistFileSourcesStepTest.java | 49 ++---- .../step/PersistMeasuresStepTest.java | 21 +-- ...stNumberOfDaysSinceLastCommitStepTest.java | 9 +- .../step/PersistProjectLinksStepTest.java | 148 ++++++++--------- .../step/PersistTestsStepTest.java | 29 ++-- .../PopulateComponentsUuidAndKeyStepTest.java | 32 ++-- .../step/PurgeDatastoresStepTest.java | 10 +- .../step/QualityProfileEventsStepTest.java | 10 +- .../step/SendIssueNotificationsStepTest.java | 18 +-- .../step/ValidateProjectStepTest.java | 151 +++++++++--------- 22 files changed, 233 insertions(+), 413 deletions(-) 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 637a1b692e9..2e3955b6694 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 @@ -27,7 +27,6 @@ import org.junit.Rule; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.sonar.api.config.Settings; import org.sonar.api.utils.System2; import org.sonar.api.utils.internal.Uuids; import org.sonar.batch.protocol.Constants; @@ -39,13 +38,11 @@ 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.computation.step.PersistFileSourcesStep; import org.sonar.server.db.DbClient; import org.sonar.server.source.db.FileSourceDao; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; public class PersistFileSourcesStepTest { @@ -77,8 +74,7 @@ public class PersistFileSourcesStepTest { long start = System.currentTimeMillis(); PersistFileSourcesStep step = new PersistFileSourcesStep(dbClient, System2.INSTANCE, dbComponentsRefCache, reportReader); - step.execute(new ComputationContext(reportReader, "PROJECT_KEY", new Settings(), dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), - mock(LanguageRepository.class))); + step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); 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 index f650404172c..5a1f77daaf2 100644 --- 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 @@ -19,18 +19,13 @@ */ package org.sonar.server.computation; -import org.sonar.api.config.Settings; -import org.sonar.server.computation.batch.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.ComponentTreeBuilder; -import org.sonar.server.computation.language.LanguageRepository; -import org.sonar.server.db.DbClient; public class ComputationContext implements org.sonar.server.computation.context.ComputationContext { private final Component component; - public ComputationContext(BatchReportReader reportReader, String projectKey, Settings projectSettings, DbClient dbClient, - ComponentTreeBuilder componentTreeBuilder, LanguageRepository languageRepository) { + public ComputationContext(ComponentTreeBuilder componentTreeBuilder) { this.component = componentTreeBuilder.build(this); } 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 a984fe2c1bd..1720b9f65ba 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 @@ -28,10 +28,8 @@ 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.language.LanguageRepository; import org.sonar.server.computation.step.ComputationStep; import org.sonar.server.computation.step.ComputationSteps; -import org.sonar.server.db.DbClient; import static org.sonar.core.computation.db.AnalysisReportDto.Status.FAILED; import static org.sonar.core.computation.db.AnalysisReportDto.Status.SUCCESS; @@ -46,18 +44,13 @@ public class ComputationService { private final BatchReportReader reportReader; private final ActivityManager activityManager; private final System2 system; - private final DbClient dbClient; - private final LanguageRepository languageRepository; - public ComputationService(ReportQueue.Item item, ComputationSteps steps, ActivityManager activityManager, System2 system, - BatchReportReader reportReader, DbClient dbClient, LanguageRepository languageRepository) { + public ComputationService(ReportQueue.Item item, ComputationSteps steps, ActivityManager activityManager, System2 system, BatchReportReader reportReader) { this.item = item; this.steps = steps; this.reportReader = reportReader; this.activityManager = activityManager; this.system = system; - this.dbClient = dbClient; - this.languageRepository = languageRepository; } public void process() { @@ -67,7 +60,7 @@ public class ComputationService { ); try { - ComputationContext context = new ComputationContext(reportReader, null, null, dbClient, ComponentTreeBuilders.from(reportReader), languageRepository); + ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(reportReader)); for (ComputationStep step : steps.instances()) { Profiler stepProfiler = Profiler.createIfDebug(LOG).startDebug(step.getDescription()); 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 41155fee14d..c51be1d529b 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 @@ -37,10 +37,8 @@ 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.language.LanguageRepository; import org.sonar.server.computation.step.ComputationStep; import org.sonar.server.computation.step.ComputationSteps; -import org.sonar.server.db.DbClient; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; @@ -78,7 +76,7 @@ public class ComputationServiceTest { .build()); sut = new ComputationService(new ReportQueue.Item(dto, new File("Do_not_care")), steps, activityManager, system, - reportReader, mock(DbClient.class), mock(LanguageRepository.class)); + reportReader); } @Test 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 3878596d250..74f7b58d7d1 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,14 +25,12 @@ 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; import org.sonar.api.security.DefaultGroups; import org.sonar.api.utils.System2; import org.sonar.api.web.UserRole; -import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.component.ComponentDto; import org.sonar.core.permission.PermissionFacade; import org.sonar.core.permission.PermissionTemplateDao; @@ -45,7 +43,6 @@ 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.BatchReportReaderRule; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.ComponentTreeBuilders; import org.sonar.server.computation.component.DbComponentsRefCache; @@ -64,13 +61,10 @@ public class ApplyPermissionsStepTest extends BaseStepTest { private static final String PROJECT_KEY = "PROJECT_KEY"; private static final String PROJECT_UUID = "PROJECT_UUID"; - @ClassRule public static EsTester esTester = new EsTester().addDefinitions(new IssueIndexDefinition(new Settings())); @ClassRule public static DbTester dbTester = new DbTester(); - @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); DbSession dbSession; @@ -102,8 +96,6 @@ public class ApplyPermissionsStepTest extends BaseStepTest { step = new ApplyPermissionsStep(dbClient, dbComponentsRefCache, issueAuthorizationIndexer, new PermissionFacade(roleDao, null, new ResourceDao(dbTester.myBatis(), System2.INSTANCE), permissionTemplateDao, settings)); - - reportReader.setMetadata(BatchReport.Metadata.newBuilder() .build()); } @After @@ -125,7 +117,7 @@ public class ApplyPermissionsStepTest extends BaseStepTest { dbComponentsRefCache.addComponent(1, new DbComponentsRefCache.DbComponent(projectDto.getId(), PROJECT_KEY, PROJECT_UUID)); Component project = new DumbComponent(Component.Type.PROJECT, 1, PROJECT_KEY, PROJECT_UUID); - step.execute(new ComputationContext(reportReader, null, null, null, ComponentTreeBuilders.from(project), null)); + step.execute(new ComputationContext(ComponentTreeBuilders.from(project))); dbSession.commit(); assertThat(dbClient.componentDao().selectByKey(dbSession, PROJECT_KEY).getAuthorizationUpdatedAt()).isNotNull(); @@ -152,7 +144,7 @@ public class ApplyPermissionsStepTest extends BaseStepTest { dbComponentsRefCache.addComponent(1, new DbComponentsRefCache.DbComponent(projectDto.getId(), PROJECT_KEY, PROJECT_UUID)); Component project = new DumbComponent(Component.Type.PROJECT, 1, PROJECT_KEY, PROJECT_UUID); - step.execute(new ComputationContext(reportReader, null, null, null, ComponentTreeBuilders.from(project), null)); + step.execute(new ComputationContext(ComponentTreeBuilders.from(project))); 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/IndexComponentsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexComponentsStepTest.java index 36031d1b3f8..0b3fae9e8c3 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 @@ -23,7 +23,6 @@ package org.sonar.server.computation.step; import java.io.IOException; import org.junit.Rule; import org.junit.Test; -import org.sonar.api.config.Settings; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.component.ComponentDto; import org.sonar.core.resource.ResourceIndexerDao; @@ -33,8 +32,6 @@ 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 static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -61,8 +58,7 @@ public class IndexComponentsStepTest extends BaseStepTest { ComponentDto project = mock(ComponentDto.class); when(project.getId()).thenReturn(123L); - ComputationContext context = new ComputationContext(reportReader, PROJECT_KEY, new Settings(), mock(DbClient.class), ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), - mock(LanguageRepository.class)); + ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT)); sut.execute(context); 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 1b452ceaf7b..590744d3c90 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 @@ -34,7 +34,6 @@ 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.es.EsTester; import org.sonar.server.source.db.FileSourceDao; @@ -44,7 +43,6 @@ import org.sonar.server.source.index.SourceLineIndexDefinition; import org.sonar.server.source.index.SourceLineIndexer; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; public class IndexSourceLinesStepTest extends BaseStepTest { @@ -58,7 +56,6 @@ public class IndexSourceLinesStepTest extends BaseStepTest { public BatchReportReaderRule reportReader = new BatchReportReaderRule(); DbClient dbClient; - DbComponentsRefCache dbComponentsRefCache; @Before @@ -87,8 +84,7 @@ public class IndexSourceLinesStepTest extends BaseStepTest { .setRootComponentRef(1) .build()); - step().execute(new ComputationContext(reportReader, PROJECT_KEY, new Settings(), dbClient, - ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), mock(LanguageRepository.class))); + step().execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); 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 eaabcea7bba..c9906a4e125 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 @@ -35,7 +35,6 @@ 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.es.EsTester; import org.sonar.server.source.db.FileSourceDao; @@ -45,7 +44,6 @@ import org.sonar.server.test.index.TestIndexDefinition; import org.sonar.server.test.index.TestIndexer; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; public class IndexTestsStepTest extends BaseStepTest { @@ -57,7 +55,6 @@ public class IndexTestsStepTest extends BaseStepTest { public BatchReportReaderRule reportReader = new BatchReportReaderRule(); DbClient dbClient; - DbComponentsRefCache dbComponentsRefCache; @Before @@ -87,8 +84,7 @@ public class IndexTestsStepTest extends BaseStepTest { .setRootComponentRef(1) .build()); - step().execute(new ComputationContext(reportReader, "PROJECT_KEY", new Settings(), dbClient, - ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), mock(LanguageRepository.class))); + step().execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); 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 7b5a665a212..abedf2cac87 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 @@ -27,7 +27,6 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.sonar.api.config.Settings; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.persistence.DbTester; @@ -37,8 +36,6 @@ import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.ComponentTreeBuilders; import org.sonar.server.computation.component.DumbComponent; import org.sonar.server.computation.issue.IssueComputation; -import org.sonar.server.computation.language.LanguageRepository; -import org.sonar.server.db.DbClient; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -61,7 +58,6 @@ public class ParseReportStepTest extends BaseStepTest { public static DbTester dbTester = new DbTester(); IssueComputation issueComputation = mock(IssueComputation.class); - ParseReportStep sut = new ParseReportStep(issueComputation, reportReader); @Test @@ -72,8 +68,7 @@ public class ParseReportStepTest extends BaseStepTest { generateReport(); - ComputationContext context = new ComputationContext(reportReader, PROJECT_KEY, new Settings(), - mock(DbClient.class), ComponentTreeBuilders.from(root), mock(LanguageRepository.class)); + ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(root)); sut.execute(context); 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 cbe6093a88d..332114db14d 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 @@ -26,7 +26,6 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.api.config.Settings; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.component.ComponentDto; @@ -40,12 +39,10 @@ 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.language.LanguageRepository; 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 PersistComponentsStepTest extends BaseStepTest { @@ -58,11 +55,7 @@ public class PersistComponentsStepTest extends BaseStepTest { public BatchReportReaderRule reportReader = new BatchReportReaderRule(); DbSession session; - DbClient dbClient; - - Settings projectSettings; - LanguageRepository languageRepository; DbComponentsRefCache dbComponentsRefCache; PersistComponentsStep sut; @@ -73,8 +66,6 @@ public class PersistComponentsStepTest extends BaseStepTest { session = dbTester.myBatis().openSession(false); dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new ComponentDao()); - projectSettings = new Settings(); - languageRepository = mock(LanguageRepository.class); dbComponentsRefCache = new DbComponentsRefCache(); sut = new PersistComponentsStep(dbClient, dbComponentsRefCache, reportReader); } @@ -129,8 +120,8 @@ 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(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext( + ComponentTreeBuilders.from(root))); assertThat(dbTester.countRowsOfTable("projects")).isEqualTo(4); @@ -221,8 +212,7 @@ public class PersistComponentsStepTest extends BaseStepTest { DumbComponent root = 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(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); ComponentDto directory = dbClient.componentDao().selectNullableByKey(session, "PROJECT_KEY:/"); assertThat(directory).isNotNull(); @@ -264,8 +254,7 @@ public class PersistComponentsStepTest extends BaseStepTest { DumbComponent root = 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(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); ComponentDto file = dbClient.componentDao().selectNullableByKey(session, PROJECT_KEY + ":src/test/java/dir/FooTest.java"); assertThat(file).isNotNull(); @@ -318,8 +307,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(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); assertThat(dbTester.countRowsOfTable("projects")).isEqualTo(4); @@ -395,8 +383,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(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); assertThat(dbTester.countRowsOfTable("projects")).isEqualTo(5); @@ -459,8 +446,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(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); assertThat(dbTester.countRowsOfTable("projects")).isEqualTo(4); @@ -534,8 +520,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(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); assertThat(dbTester.countRowsOfTable("projects")).isEqualTo(4); assertThat(dbClient.componentDao().selectNullableByKey(session, PROJECT_KEY).getId()).isEqualTo(project.getId()); @@ -609,8 +594,7 @@ public class PersistComponentsStepTest extends BaseStepTest { DumbComponent root = new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_KEY")); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); ComponentDto projectReloaded = dbClient.componentDao().selectNullableByKey(session, PROJECT_KEY); assertThat(projectReloaded.name()).isEqualTo("New project name"); @@ -649,8 +633,7 @@ public class PersistComponentsStepTest extends BaseStepTest { DumbComponent root = new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_KEY")); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); ComponentDto projectReloaded = dbClient.componentDao().selectNullableByKey(session, PROJECT_KEY); assertThat(projectReloaded.description()).isEqualTo("New project description"); @@ -688,8 +671,7 @@ public class PersistComponentsStepTest extends BaseStepTest { DumbComponent root = new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, new DumbComponent(Component.Type.MODULE, 2, "BCDE", "MODULE_KEY")); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); ComponentDto moduleReloaded = dbClient.componentDao().selectNullableByKey(session, "MODULE_KEY"); assertThat(moduleReloaded.path()).isEqualTo("New path"); @@ -750,8 +732,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(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); 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 28cca616ef2..7462fe20e24 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 @@ -100,8 +100,8 @@ public class PersistDuplicationsStepTest extends BaseStepTest { saveDuplicationMetric(); initReportWithProjectAndFile(); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext( + ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(0); } @@ -127,8 +127,8 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(2, newArrayList(duplication)); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext( + ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); @@ -186,7 +186,7 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(3, newArrayList(duplication)); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); @@ -244,8 +244,8 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(3, newArrayList(duplication)); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext( + ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); @@ -310,8 +310,8 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(10, newArrayList(duplication)); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext( + ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); @@ -347,8 +347,8 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(2, newArrayList(duplication)); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext( + ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("project_measures")).isEqualTo(1); @@ -377,8 +377,8 @@ public class PersistDuplicationsStepTest extends BaseStepTest { .build(); reportReader.putDuplications(2, newArrayList(duplication)); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext( + ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); 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 b7aa3f9228c..791d22903f5 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 @@ -26,7 +26,6 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.api.config.Settings; import org.sonar.api.utils.System2; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; @@ -38,7 +37,6 @@ 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.event.db.EventDao; import org.sonar.test.DbTests; @@ -57,31 +55,17 @@ public class PersistEventsStepTest extends BaseStepTest { public BatchReportReaderRule reportReader = new BatchReportReaderRule(); DbSession session; - DbClient dbClient; - LanguageRepository languageRepository; - - EventDao dao; - - System2 system2; - - Settings projectSettings; - DbComponentsRefCache dbComponentsRefCache; - PersistEventsStep step; @Before public void setup() { session = dbTester.myBatis().openSession(false); - dao = new EventDao(); - DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), dao); + DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new EventDao()); - system2 = mock(System2.class); + System2 system2 = mock(System2.class); when(system2.now()).thenReturn(1225630680000L); - projectSettings = new Settings(); - languageRepository = mock(LanguageRepository.class); - dbComponentsRefCache = new DbComponentsRefCache(); step = new PersistEventsStep(dbClient, system2, dbComponentsRefCache, reportReader); } @@ -113,8 +97,7 @@ public class PersistEventsStepTest extends BaseStepTest { .setType(Constants.ComponentType.PROJECT) .build()); - step.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); dbTester.assertDbUnit(getClass(), "nothing_to_do_when_no_events_in_report.xml", "events"); } @@ -149,8 +132,7 @@ public class PersistEventsStepTest extends BaseStepTest { ) .build()); - step.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); dbTester.assertDbUnit(getClass(), "add_events-result.xml", "events"); } @@ -191,8 +173,7 @@ public class PersistEventsStepTest extends BaseStepTest { .build() ).build()); - step.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); dbTester.assertDbUnit(getClass(), "persist_report_events_with_component_children-result.xml", "events"); } @@ -216,8 +197,7 @@ public class PersistEventsStepTest extends BaseStepTest { .setVersion("1.0") .build()); - step.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); dbTester.assertDbUnit(getClass(), "add_version_event-result.xml", "events"); } @@ -241,8 +221,7 @@ public class PersistEventsStepTest extends BaseStepTest { .setVersion("1.5-SNAPSHOT") .build()); - step.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); 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 3e07b59a062..b7ebb52a55e 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 @@ -30,7 +30,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TemporaryFolder; -import org.sonar.api.config.Settings; import org.sonar.api.resources.Language; import org.sonar.api.utils.System2; import org.sonar.batch.protocol.Constants; @@ -74,16 +73,8 @@ public class PersistFileSourcesStepTest extends BaseStepTest { public TemporaryFolder temp = new TemporaryFolder(); DbSession session; - DbClient dbClient; - - Settings projectSettings; - LanguageRepository languageRepository; - - System2 system2; - DbComponentsRefCache dbComponentsRefCache; - PersistFileSourcesStep sut; long now = 123456789L; @@ -93,10 +84,8 @@ public class PersistFileSourcesStepTest extends BaseStepTest { dbTester.truncateTables(); session = dbTester.myBatis().openSession(false); dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new FileSourceDao(dbTester.myBatis())); - projectSettings = new Settings(); - languageRepository = mock(LanguageRepository.class); - system2 = mock(System2.class); + System2 system2 = mock(System2.class); when(system2.now()).thenReturn(now); dbComponentsRefCache = new DbComponentsRefCache(); sut = new PersistFileSourcesStep(dbClient, system2, dbComponentsRefCache, reportReader); @@ -116,8 +105,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { public void persist_sources() throws Exception { initBasicReport(2); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), new EmptyLanguageRepository())); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -159,8 +147,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { .build()); reportReader.putFileSourceLines(FILE_REF, "line1", "line2"); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -174,8 +161,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { public void persist_source_hashes() throws Exception { initBasicReport(2); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource("FILE"); @@ -197,8 +183,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { .setOverallCoveredConditions(4) .build())); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -231,8 +216,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { .addChangesetIndexByLine(0) .build()); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -258,8 +242,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { .build() )); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -285,8 +268,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { ).build() )); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -318,8 +300,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { .build() )); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -357,8 +338,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { // Sources from the report initBasicReport(1); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -392,8 +372,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { initBasicReport(1); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -424,8 +403,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { initBasicReport(1); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("file_sources")).isEqualTo(1); FileSourceDto fileSourceDto = dbClient.fileSourceDao().selectSource(FILE_UUID); @@ -450,8 +428,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { )); try { - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); 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/PersistMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java index 49429676dcc..44589f8b8f1 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 @@ -30,7 +30,6 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.api.config.Settings; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; import org.sonar.api.utils.System2; @@ -52,7 +51,6 @@ 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.language.LanguageRepository; import org.sonar.server.computation.measure.MetricCache; import org.sonar.server.db.DbClient; import org.sonar.server.measure.persistence.MeasureDao; @@ -62,7 +60,6 @@ import org.sonar.server.rule.db.RuleDao; import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; @Category(DbTests.class) public class PersistMeasuresStepTest extends BaseStepTest { @@ -71,20 +68,14 @@ public class PersistMeasuresStepTest extends BaseStepTest { private static final String METRIC_KEY = "metric-key"; private static final RuleKey RULE_KEY = RuleKey.of("repo", "rule-key"); - DbSession session; - @ClassRule public static DbTester dbTester = new DbTester(); - @Rule public BatchReportReaderRule reportReader = new BatchReportReaderRule(); DbClient dbClient; - RuleCache ruleCache; - MetricCache metricCache; - MeasureDao measureDao; + DbSession session; DbComponentsRefCache dbComponentsRefCache; - MetricDto metric; RuleDto rule; @@ -96,8 +87,7 @@ public class PersistMeasuresStepTest extends BaseStepTest { dbComponentsRefCache = new DbComponentsRefCache(); - measureDao = new MeasureDao(); - dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), measureDao, new ComponentDao(), new MetricDao(), new RuleDao(System2.INSTANCE)); + dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new MeasureDao(), new ComponentDao(), new MetricDao(), new RuleDao(System2.INSTANCE)); session = dbClient.openSession(false); metric = new MetricDto().setKey(METRIC_KEY).setEnabled(true).setOptimizedBestValue(false).setHidden(false).setDeleteHistoricalData(false); @@ -106,8 +96,8 @@ public class PersistMeasuresStepTest extends BaseStepTest { dbClient.ruleDao().insert(session, rule); session.commit(); - ruleCache = new RuleCache(new RuleCacheLoader(dbClient)); - metricCache = new MetricCache(dbClient); + RuleCache ruleCache = new RuleCache(new RuleCacheLoader(dbClient)); + MetricCache metricCache = new MetricCache(dbClient); session.commit(); sut = new PersistMeasuresStep(dbClient, ruleCache, metricCache, dbComponentsRefCache, reportReader); @@ -174,8 +164,7 @@ public class PersistMeasuresStepTest extends BaseStepTest { .setCharactericId(123456) .build())); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, new Settings(), - dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), mock(LanguageRepository.class))); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); 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 16a16f913a4..bd4686a6c97 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 @@ -96,8 +96,7 @@ public class PersistNumberOfDaysSinceLastCommitStepTest extends BaseStepTest { ) .build() ); - ComputationContext context = new ComputationContext(reportReader, "PROJECT_KEY", projectSettings, dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), - languageRepository); + ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT)); sut.execute(context); @@ -109,8 +108,7 @@ public class PersistNumberOfDaysSinceLastCommitStepTest extends BaseStepTest { Date sixDaysAgo = DateUtils.addDays(new Date(), -6); when(sourceLineIndex.lastCommitDateOnProject("project-uuid")).thenReturn(sixDaysAgo); initReportWithProjectAndFile(); - ComputationContext context = new ComputationContext(reportReader, "PROJECT_KEY", projectSettings, dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), - languageRepository); + ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT)); sut.execute(context); @@ -120,8 +118,7 @@ public class PersistNumberOfDaysSinceLastCommitStepTest extends BaseStepTest { @Test public void no_scm_information_in_report_and_index() { initReportWithProjectAndFile(); - ComputationContext context = new ComputationContext(reportReader, "PROJECT_KEY", projectSettings, dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), - languageRepository); + ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT)); sut.execute(context); 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 d273b04c686..1eadd35e5c5 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 @@ -27,7 +27,6 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.api.config.Settings; import org.sonar.api.i18n.I18n; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; @@ -39,7 +38,6 @@ 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.test.DbTests; @@ -55,19 +53,10 @@ public class PersistProjectLinksStepTest extends BaseStepTest { @ClassRule public static DbTester dbTester = new DbTester(); - @Rule public BatchReportReaderRule reportReader = new BatchReportReaderRule(); DbSession session; - DbClient dbClient; - Settings projectSettings; - LanguageRepository languageRepository; - - ComponentLinkDao dao; - - I18n i18n; - DbComponentsRefCache dbComponentsRefCache; PersistProjectLinksStep step; @@ -75,12 +64,9 @@ public class PersistProjectLinksStepTest extends BaseStepTest { @Before public void setup() { session = dbTester.myBatis().openSession(false); - dao = new ComponentLinkDao(); - projectSettings = new Settings(); - languageRepository = mock(LanguageRepository.class); - dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), dao); + DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new ComponentLinkDao()); - i18n = mock(I18n.class); + I18n i18n = mock(I18n.class); when(i18n.message(Locale.ENGLISH, "project_links.homepage", null)).thenReturn("Home"); when(i18n.message(Locale.ENGLISH, "project_links.scm", null)).thenReturn("Sources"); when(i18n.message(Locale.ENGLISH, "project_links.scm_dev", null)).thenReturn("Developer connection"); @@ -110,28 +96,28 @@ public class PersistProjectLinksStepTest extends BaseStepTest { // project and 1 module reportReader.setMetadata(BatchReport.Metadata.newBuilder() - .setRootComponentRef(1) - .setProjectKey(PROJECT_KEY) - .setAnalysisDate(150000000L) - .build()); + .setRootComponentRef(1) + .setProjectKey(PROJECT_KEY) + .setAnalysisDate(150000000L) + .build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(1) - .setType(Constants.ComponentType.PROJECT) - .addChildRef(2) - .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build()) - .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.SCM).setHref("https://github.com/SonarSource/sonar").build()) - .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.SCM_DEV).setHref("scm:git:git@github.com:SonarSource/sonar.git/sonar").build()) - .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.ISSUE).setHref("http://jira.sonarsource.com/").build()) - .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.CI).setHref("http://bamboo.ci.codehaus.org/browse/SONAR").build()) - .build()); + .setRef(1) + .setType(Constants.ComponentType.PROJECT) + .addChildRef(2) + .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build()) + .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.SCM).setHref("https://github.com/SonarSource/sonar").build()) + .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.SCM_DEV).setHref("scm:git:git@github.com:SonarSource/sonar.git/sonar").build()) + .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.ISSUE).setHref("http://jira.sonarsource.com/").build()) + .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.CI).setHref("http://bamboo.ci.codehaus.org/browse/SONAR").build()) + .build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(2) - .setType(Constants.ComponentType.MODULE) - .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.SCM).setHref("https://github.com/SonarSource/sonar/server").build()) - .build()); + .setRef(2) + .setType(Constants.ComponentType.MODULE) + .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.SCM).setHref("https://github.com/SonarSource/sonar/server").build()) + .build()); - step.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); dbTester.assertDbUnit(getClass(), "add_links_on_project_and_module-result.xml", "project_links"); } @@ -143,17 +129,17 @@ public class PersistProjectLinksStepTest extends BaseStepTest { dbComponentsRefCache.addComponent(1, new DbComponentsRefCache.DbComponent(1L, PROJECT_KEY, "ABCD")); reportReader.setMetadata(BatchReport.Metadata.newBuilder() - .setRootComponentRef(1) - .setProjectKey(PROJECT_KEY) - .build()); + .setRootComponentRef(1) + .setProjectKey(PROJECT_KEY) + .build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(1) - .setType(Constants.ComponentType.PROJECT) - .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build()) - .build()); + .setRef(1) + .setType(Constants.ComponentType.PROJECT) + .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build()) + .build()); - step.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); dbTester.assertDbUnit(getClass(), "nothing_to_do_when_link_already_exists.xml", "project_links"); } @@ -165,17 +151,17 @@ public class PersistProjectLinksStepTest extends BaseStepTest { dbComponentsRefCache.addComponent(1, new DbComponentsRefCache.DbComponent(1L, PROJECT_KEY, "ABCD")); reportReader.setMetadata(BatchReport.Metadata.newBuilder() - .setRootComponentRef(1) - .setProjectKey(PROJECT_KEY) - .build()); + .setRootComponentRef(1) + .setProjectKey(PROJECT_KEY) + .build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(1) - .setType(Constants.ComponentType.FILE) - .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build()) - .build()); + .setRef(1) + .setType(Constants.ComponentType.FILE) + .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build()) + .build()); - step.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("project_links")).isEqualTo(0); } @@ -187,17 +173,17 @@ public class PersistProjectLinksStepTest extends BaseStepTest { dbComponentsRefCache.addComponent(1, new DbComponentsRefCache.DbComponent(1L, PROJECT_KEY, "ABCD")); reportReader.setMetadata(BatchReport.Metadata.newBuilder() - .setRootComponentRef(1) - .setProjectKey(PROJECT_KEY) - .build()); + .setRootComponentRef(1) + .setProjectKey(PROJECT_KEY) + .build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(1) - .setType(Constants.ComponentType.PROJECT) - .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build()) - .build()); + .setRef(1) + .setType(Constants.ComponentType.PROJECT) + .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build()) + .build()); - step.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); dbTester.assertDbUnit(getClass(), "update_link-result.xml", "project_links"); } @@ -209,16 +195,16 @@ public class PersistProjectLinksStepTest extends BaseStepTest { dbComponentsRefCache.addComponent(1, new DbComponentsRefCache.DbComponent(1L, PROJECT_KEY, "ABCD")); reportReader.setMetadata(BatchReport.Metadata.newBuilder() - .setRootComponentRef(1) - .setProjectKey(PROJECT_KEY) - .build()); + .setRootComponentRef(1) + .setProjectKey(PROJECT_KEY) + .build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(1) - .setType(Constants.ComponentType.PROJECT) - .build()); + .setRef(1) + .setType(Constants.ComponentType.PROJECT) + .build()); - step.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); assertThat(dbTester.countRowsOfTable("project_links")).isEqualTo(0); } @@ -230,16 +216,16 @@ public class PersistProjectLinksStepTest extends BaseStepTest { dbComponentsRefCache.addComponent(1, new DbComponentsRefCache.DbComponent(1L, PROJECT_KEY, "ABCD")); reportReader.setMetadata(BatchReport.Metadata.newBuilder() - .setRootComponentRef(1) - .setProjectKey(PROJECT_KEY) - .build()); + .setRootComponentRef(1) + .setProjectKey(PROJECT_KEY) + .build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(1) - .setType(Constants.ComponentType.PROJECT) - .build()); + .setRef(1) + .setType(Constants.ComponentType.PROJECT) + .build()); - step.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); dbTester.assertDbUnit(getClass(), "not_delete_custom_link.xml", "project_links"); } @@ -251,19 +237,19 @@ public class PersistProjectLinksStepTest extends BaseStepTest { dbComponentsRefCache.addComponent(1, new DbComponentsRefCache.DbComponent(1L, PROJECT_KEY, "ABCD")); reportReader.setMetadata(BatchReport.Metadata.newBuilder() - .setRootComponentRef(1) - .setProjectKey(PROJECT_KEY) - .build()); + .setRootComponentRef(1) + .setProjectKey(PROJECT_KEY) + .build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(1) - .setType(Constants.ComponentType.PROJECT) - .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build()) - .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build()) - .build()); + .setRef(1) + .setType(Constants.ComponentType.PROJECT) + .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build()) + .addLink(BatchReport.ComponentLink.newBuilder().setType(Constants.ComponentLinkType.HOME).setHref("http://www.sonarqube.org").build()) + .build()); try { - step.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, dbClient, ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), languageRepository)); + step.execute(new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT))); 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 259d740444d..9b274c7ac05 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 @@ -27,7 +27,6 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; -import org.sonar.api.config.Settings; import org.sonar.api.utils.System2; import org.sonar.api.utils.log.LogTester; import org.sonar.api.utils.log.LoggerLevel; @@ -45,7 +44,6 @@ 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.source.db.FileSourceDao; import org.sonar.server.source.db.FileSourceDb; @@ -80,27 +78,20 @@ public class PersistTestsStepTest extends BaseStepTest { DbSession session; DbClient dbClient; - System2 system2; - Settings projectSettings; - LanguageRepository languageRepository; - - long now = 123456789L; - DbComponentsRefCache dbComponentsRefCache; + Component root; PersistTestsStep sut; - Component root; + long now = 123456789L; @Before public void setup() throws Exception { db.truncateTables(); session = db.myBatis().openSession(false); dbClient = new DbClient(db.database(), db.myBatis(), new FileSourceDao(db.myBatis())); - projectSettings = new Settings(); - languageRepository = mock(LanguageRepository.class); - system2 = mock(System2.class); + System2 system2 = mock(System2.class); when(system2.now()).thenReturn(now); dbComponentsRefCache = new DbComponentsRefCache(); @@ -129,7 +120,7 @@ public class PersistTestsStepTest extends BaseStepTest { @Test public void no_test_in_database_and_batch_report() { - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); assertThat(dbClient.fileSourceDao().selectTest(TEST_FILE_UUID_1)).isNull(); assertThat(log.logs()).isEmpty(); @@ -146,7 +137,7 @@ public class PersistTestsStepTest extends BaseStepTest { ); reportReader.putCoverageDetails(TEST_FILE_REF_1, coverageDetails); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); assertThat(db.countRowsOfTable("file_sources")).isEqualTo(1); @@ -169,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(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); FileSourceDto dto = dbClient.fileSourceDao().selectTest(TEST_FILE_UUID_1); assertThat(dto.getCreatedAt()).isEqualTo(now); @@ -195,7 +186,7 @@ public class PersistTestsStepTest extends BaseStepTest { List batchTests = Arrays.asList(newTest(1)); reportReader.putTests(TEST_FILE_REF_1, batchTests); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); FileSourceDto dto = dbClient.fileSourceDao().selectTest(TEST_FILE_UUID_1); assertThat(dto.getFileUuid()).isEqualTo(TEST_FILE_UUID_1); @@ -213,7 +204,7 @@ public class PersistTestsStepTest extends BaseStepTest { reportReader.putCoverageDetails(TEST_FILE_REF_1, coverageDetails); reportReader.putCoverageDetails(TEST_FILE_REF_2, coverageDetails); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); 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'"); @@ -230,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(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); FileSourceDto dto = dbClient.fileSourceDao().selectTest(TEST_FILE_UUID_1); List coveredLines = dto.getTestData().get(0).getCoveredFile(0).getCoveredLineList(); @@ -263,7 +254,7 @@ public class PersistTestsStepTest extends BaseStepTest { reportReader.putCoverageDetails(TEST_FILE_REF_1, Arrays.asList(newCoverageDetail)); // ACT - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, dbClient, ComponentTreeBuilders.from(root), languageRepository)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); // 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 c279f784df6..c91f974c6ce 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 @@ -28,24 +28,22 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.sonar.api.config.Settings; import org.sonar.batch.protocol.Constants; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.core.component.ComponentDto; import org.sonar.core.persistence.DbSession; 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.component.Component; import org.sonar.server.computation.component.ComponentTreeBuilders; -import org.sonar.server.computation.language.LanguageRepository; 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 { @@ -57,13 +55,8 @@ public class PopulateComponentsUuidAndKeyStepTest extends BaseStepTest { @Rule public BatchReportReaderRule reportReader = new BatchReportReaderRule(); - DbSession session; - DbClient dbClient; - - Settings projectSettings; - - LanguageRepository languageRepository = mock(LanguageRepository.class); + DbSession session; PopulateComponentsUuidAndKeyStep sut; @@ -73,13 +66,12 @@ public class PopulateComponentsUuidAndKeyStepTest extends BaseStepTest { session = dbTester.myBatis().openSession(false); dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new ComponentDao()); - projectSettings = new Settings(); sut = new PopulateComponentsUuidAndKeyStep(dbClient, reportReader); } @After public void tearDown() throws Exception { - session.close(); + MyBatis.closeQuietly(session); } @Override @@ -117,8 +109,7 @@ public class PopulateComponentsUuidAndKeyStepTest extends BaseStepTest { .setPath("src/main/java/dir/Foo.java") .build()); - ComputationContext context = new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(reportReader), languageRepository); + ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(reportReader)); sut.execute(context); Map componentsByRef = getComponentsByRef(context.getRoot()); @@ -175,8 +166,7 @@ public class PopulateComponentsUuidAndKeyStepTest extends BaseStepTest { .setPath("src/main/java/dir/Foo.java") .build()); - ComputationContext context = new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(reportReader), languageRepository); + ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(reportReader)); sut.execute(context); Map componentsByRef = getComponentsByRef(context.getRoot()); @@ -233,8 +223,7 @@ public class PopulateComponentsUuidAndKeyStepTest extends BaseStepTest { .setPath("src/main/java/dir/Foo.java") .build()); - ComputationContext context = new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(reportReader), languageRepository); + ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(reportReader)); sut.execute(context); Map componentsByRef = getComponentsByRef(context.getRoot()); @@ -277,8 +266,7 @@ public class PopulateComponentsUuidAndKeyStepTest extends BaseStepTest { .setPath("src/main/java/dir/Foo.java") .build()); - ComputationContext context = new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(reportReader), languageRepository); + ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(reportReader)); sut.execute(context); Map componentsByRef = getComponentsByRef(context.getRoot()); @@ -331,8 +319,7 @@ public class PopulateComponentsUuidAndKeyStepTest extends BaseStepTest { .setPath("pom.xml") .build()); - ComputationContext context = new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(reportReader), languageRepository); + ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(reportReader)); sut.execute(context); Map componentsByRef = getComponentsByRef(context.getRoot()); @@ -392,8 +379,7 @@ public class PopulateComponentsUuidAndKeyStepTest extends BaseStepTest { .setPath("src/main/java/dir/Foo.java") .build()); - ComputationContext context = new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - dbClient, ComponentTreeBuilders.from(reportReader), languageRepository); + ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(reportReader)); sut.execute(context); Map componentsByRef = getComponentsByRef(context.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 df09612b639..3f499752f85 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 @@ -37,7 +37,6 @@ 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.computation.language.LanguageRepository; import org.sonar.server.db.DbClient; import static org.assertj.core.api.Assertions.assertThat; @@ -56,14 +55,12 @@ public class PurgeDatastoresStepTest extends BaseStepTest { ProjectCleaner projectCleaner = mock(ProjectCleaner.class); DbComponentsRefCache dbComponentsRefCache = new DbComponentsRefCache(); ProjectSettingsRepository projectSettingsRepository = mock(ProjectSettingsRepository.class); - PurgeDatastoresStep sut = new PurgeDatastoresStep(mock(DbClient.class, Mockito.RETURNS_DEEP_STUBS), projectCleaner, dbComponentsRefCache, projectSettingsRepository, reportReader); - Settings projectSettings; + PurgeDatastoresStep sut = new PurgeDatastoresStep(mock(DbClient.class, Mockito.RETURNS_DEEP_STUBS), projectCleaner, dbComponentsRefCache, projectSettingsRepository, reportReader); @Before public void setUp() throws Exception { - projectSettings = new Settings(); - when(projectSettingsRepository.getProjectSettings(PROJECT_KEY)).thenReturn(projectSettings); + when(projectSettingsRepository.getProjectSettings(PROJECT_KEY)).thenReturn(new Settings()); } @Test @@ -74,8 +71,7 @@ public class PurgeDatastoresStepTest extends BaseStepTest { .setRootComponentRef(1) .build()); - ComputationContext context = new ComputationContext(reportReader, PROJECT_KEY, new Settings(), - mock(DbClient.class), ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT), mock(LanguageRepository.class)); + ComputationContext context = new ComputationContext(ComponentTreeBuilders.from(DumbComponent.DUMB_PROJECT)); sut.execute(context); 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 2812600334e..08816b98030 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 @@ -31,7 +31,6 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.sonar.api.config.Settings; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.resources.AbstractLanguage; import org.sonar.api.resources.Language; @@ -39,7 +38,6 @@ 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.BatchReportReader; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.ComponentTreeBuilder; import org.sonar.server.computation.component.DumbComponent; @@ -49,7 +47,6 @@ import org.sonar.server.computation.language.LanguageRepository; import org.sonar.server.computation.measure.MeasureRepository; import org.sonar.server.computation.qualityprofile.QPMeasureData; import org.sonar.server.computation.qualityprofile.QualityProfile; -import org.sonar.server.db.DbClient; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.any; @@ -296,7 +293,7 @@ public class QualityProfileEventsStepTest { } private ComputationContext newNoChildRootContext() { - return newContext(new ComponentTreeBuilder() { + return new ComputationContext(new ComponentTreeBuilder() { @Override public Component build(ComputationContext context) { return new DumbComponent(context, Component.Type.PROJECT, 1, "uuid", "key"); @@ -304,9 +301,4 @@ public class QualityProfileEventsStepTest { }); } - private ComputationContext newContext(ComponentTreeBuilder builder) { - return new ComputationContext(mock(BatchReportReader.class), "COMPONENT_KEY", new Settings(), mock(DbClient.class), - builder, languageRepository); - } - } 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 8e2c17c2d9c..10c9c2364bd 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 @@ -25,7 +25,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.mockito.Mockito; -import org.sonar.api.config.Settings; import org.sonar.api.issue.internal.DefaultIssue; import org.sonar.api.notifications.Notification; import org.sonar.api.rule.Severity; @@ -40,8 +39,6 @@ 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.computation.language.LanguageRepository; -import org.sonar.server.db.DbClient; import org.sonar.server.issue.notification.IssueChangeNotification; import org.sonar.server.issue.notification.NewIssuesNotification; import org.sonar.server.issue.notification.NewIssuesNotificationFactory; @@ -64,19 +61,16 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { @Rule public TemporaryFolder temp = new TemporaryFolder(); - RuleCache ruleCache = mock(RuleCache.class); NotificationService notifService = mock(NotificationService.class); IssueCache issueCache; - DbComponentsRefCache dbComponentsRefCache; - NewIssuesNotificationFactory newIssuesNotificationFactory = mock(NewIssuesNotificationFactory.class, Mockito.RETURNS_DEEP_STUBS); - Settings projectSettings = new Settings(); SendIssueNotificationsStep sut; @Before public void setUp() throws Exception { issueCache = new IssueCache(temp.newFile(), System2.INSTANCE); - dbComponentsRefCache = new DbComponentsRefCache(); - sut = new SendIssueNotificationsStep(issueCache, ruleCache, dbComponentsRefCache, notifService, reportReader, newIssuesNotificationFactory); + DbComponentsRefCache dbComponentsRefCache = new DbComponentsRefCache(); + NewIssuesNotificationFactory newIssuesNotificationFactory = mock(NewIssuesNotificationFactory.class, Mockito.RETURNS_DEEP_STUBS); + sut = new SendIssueNotificationsStep(issueCache, mock(RuleCache.class), dbComponentsRefCache, notifService, reportReader, newIssuesNotificationFactory); dbComponentsRefCache.addComponent(1, new DbComponentsRefCache.DbComponent(1L, PROJECT_KEY, PROJECT_UUID)); @@ -95,8 +89,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(reportReader, PROJECT_KEY, projectSettings, - mock(DbClient.class), ComponentTreeBuilders.from(new DumbComponent(Component.Type.PROJECT, 1, null, null)), mock(LanguageRepository.class))); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(new DumbComponent(Component.Type.PROJECT, 1, null, null)))); verify(notifService, never()).deliver(any(Notification.class)); } @@ -108,8 +101,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { when(notifService.hasProjectSubscribersForTypes(PROJECT_UUID, SendIssueNotificationsStep.NOTIF_TYPES)).thenReturn(true); - sut.execute(new ComputationContext(reportReader, PROJECT_KEY, projectSettings, - mock(DbClient.class), ComponentTreeBuilders.from(new DumbComponent(Component.Type.PROJECT, 1, null, null)), mock(LanguageRepository.class))); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(new DumbComponent(Component.Type.PROJECT, 1, null, null)))); 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/ValidateProjectStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java index 8b83fb10c93..3c775d5b11e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ValidateProjectStepTest.java @@ -81,17 +81,16 @@ public class ValidateProjectStepTest { public void not_fail_if_provisioning_enforced_and_project_exists() throws Exception { reportReader.setMetadata(BatchReport.Metadata.newBuilder().build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(1) - .setType(Constants.ComponentType.PROJECT) - .setKey(PROJECT_KEY) - .build()); + .setRef(1) + .setType(Constants.ComponentType.PROJECT) + .setKey(PROJECT_KEY) + .build()); settings.appendProperty(CoreProperties.CORE_PREVENT_AUTOMATIC_PROJECT_CREATION, "true"); dbClient.componentDao().insert(dbSession, ComponentTesting.newProjectDto("ABCD").setKey(PROJECT_KEY)); dbSession.commit(); - sut.execute(new ComputationContext(reportReader, null, null, null, - ComponentTreeBuilders.from(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY)), null)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY)))); } @Test @@ -101,45 +100,43 @@ public class ValidateProjectStepTest { reportReader.setMetadata(BatchReport.Metadata.newBuilder().build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(1) - .setType(Constants.ComponentType.PROJECT) - .setKey(PROJECT_KEY) - .build()); + .setRef(1) + .setType(Constants.ComponentType.PROJECT) + .setKey(PROJECT_KEY) + .build()); settings.appendProperty(CoreProperties.CORE_PREVENT_AUTOMATIC_PROJECT_CREATION, "true"); - sut.execute(new ComputationContext(reportReader, null, null, null, - ComponentTreeBuilders.from(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY)), null)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY)))); } @Test public void fail_if_provisioning_not_enforced_and_project_does_not_exists() throws Exception { reportReader.setMetadata(BatchReport.Metadata.newBuilder().build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(1) - .setType(Constants.ComponentType.PROJECT) - .setKey(PROJECT_KEY) - .build()); + .setRef(1) + .setType(Constants.ComponentType.PROJECT) + .setKey(PROJECT_KEY) + .build()); settings.appendProperty(CoreProperties.CORE_PREVENT_AUTOMATIC_PROJECT_CREATION, "false"); - sut.execute(new ComputationContext(reportReader, null, null, null, - ComponentTreeBuilders.from(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY)), null)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY)))); } @Test public void not_fail_on_valid_branch() throws Exception { reportReader.setMetadata(BatchReport.Metadata.newBuilder() - .setBranch("origin/master") - .build()); + .setBranch("origin/master") + .build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(1) - .setType(Constants.ComponentType.PROJECT) - .setKey(PROJECT_KEY) - .build()); + .setRef(1) + .setType(Constants.ComponentType.PROJECT) + .setKey(PROJECT_KEY) + .build()); - sut.execute(new ComputationContext(reportReader, null, null, null, - ComponentTreeBuilders.from(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY + ":origin/master")), null)); + sut.execute(new ComputationContext( + ComponentTreeBuilders.from(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY + ":origin/master")))); } @Test @@ -149,16 +146,16 @@ public class ValidateProjectStepTest { " o \"bran#ch\" is not a valid branch name. Allowed characters are alphanumeric, '-', '_', '.' and '/'."); reportReader.setMetadata(BatchReport.Metadata.newBuilder() - .setBranch("bran#ch") - .build()); + .setBranch("bran#ch") + .build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(1) - .setType(Constants.ComponentType.PROJECT) - .setKey(PROJECT_KEY) - .build()); + .setRef(1) + .setType(Constants.ComponentType.PROJECT) + .setKey(PROJECT_KEY) + .build()); - sut.execute(new ComputationContext(reportReader, null, null, null, - ComponentTreeBuilders.from(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY + ":bran#ch")), null)); + sut.execute(new ComputationContext( + ComponentTreeBuilders.from(new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY + ":bran#ch")))); } @Test @@ -172,20 +169,20 @@ public class ValidateProjectStepTest { reportReader.setMetadata(BatchReport.Metadata.newBuilder().build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(1) - .setType(Constants.ComponentType.PROJECT) - .setKey(invalidProjectKey) - .addChildRef(2) - .build()); + .setRef(1) + .setType(Constants.ComponentType.PROJECT) + .setKey(invalidProjectKey) + .addChildRef(2) + .build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(2) - .setType(Constants.ComponentType.MODULE) - .setKey("Module$Key") - .build()); + .setRef(2) + .setType(Constants.ComponentType.MODULE) + .setKey("Module$Key") + .build()); DumbComponent root = new DumbComponent(Component.Type.PROJECT, 1, "ABCD", invalidProjectKey, new DumbComponent(Component.Type.MODULE, 2, "BCDE", "Module$Key")); - sut.execute(new ComputationContext(reportReader, null, null, null, ComponentTreeBuilders.from(root), null)); + sut.execute(new ComputationContext(ComponentTreeBuilders.from(root))); } @Test @@ -198,16 +195,16 @@ public class ValidateProjectStepTest { reportReader.setMetadata(BatchReport.Metadata.newBuilder().build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(1) - .setType(Constants.ComponentType.PROJECT) - .setKey(PROJECT_KEY) - .addChildRef(2) - .build()); + .setRef(1) + .setType(Constants.ComponentType.PROJECT) + .setKey(PROJECT_KEY) + .addChildRef(2) + .build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(2) - .setType(Constants.ComponentType.MODULE) - .setKey(MODULE_KEY) - .build()); + .setRef(2) + .setType(Constants.ComponentType.MODULE) + .setKey(MODULE_KEY) + .build()); ComponentDto project = ComponentTesting.newProjectDto("ABCD").setKey(MODULE_KEY); dbClient.componentDao().insert(dbSession, project); @@ -215,8 +212,8 @@ public class ValidateProjectStepTest { DumbComponent root = new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, new DumbComponent(Component.Type.MODULE, 2, "BCDE", MODULE_KEY)); - sut.execute(new ComputationContext(reportReader, null, null, null, - ComponentTreeBuilders.from(root), null)); + sut.execute(new ComputationContext( + ComponentTreeBuilders.from(root))); } @Test @@ -228,16 +225,16 @@ public class ValidateProjectStepTest { reportReader.setMetadata(BatchReport.Metadata.newBuilder().build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(1) - .setType(Constants.ComponentType.PROJECT) - .setKey(PROJECT_KEY) - .addChildRef(2) - .build()); + .setRef(1) + .setType(Constants.ComponentType.PROJECT) + .setKey(PROJECT_KEY) + .addChildRef(2) + .build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(2) - .setType(Constants.ComponentType.MODULE) - .setKey(MODULE_KEY) - .build()); + .setRef(2) + .setType(Constants.ComponentType.MODULE) + .setKey(MODULE_KEY) + .build()); ComponentDto project = ComponentTesting.newProjectDto("ABCD").setKey(PROJECT_KEY); ComponentDto anotherProject = ComponentTesting.newProjectDto().setKey(anotherProjectKey); @@ -248,8 +245,8 @@ public class ValidateProjectStepTest { DumbComponent root = new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, new DumbComponent(Component.Type.MODULE, 2, "BCDE", MODULE_KEY)); - sut.execute(new ComputationContext(reportReader, null, null, null, - ComponentTreeBuilders.from(root), null)); + sut.execute(new ComputationContext( + ComponentTreeBuilders.from(root))); } @Test @@ -263,16 +260,16 @@ public class ValidateProjectStepTest { reportReader.setMetadata(BatchReport.Metadata.newBuilder().build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(1) - .setType(Constants.ComponentType.PROJECT) - .setKey(PROJECT_KEY) - .addChildRef(2) - .build()); + .setRef(1) + .setType(Constants.ComponentType.PROJECT) + .setKey(PROJECT_KEY) + .addChildRef(2) + .build()); reportReader.putComponent(BatchReport.Component.newBuilder() - .setRef(2) - .setType(Constants.ComponentType.MODULE) - .setKey(MODULE_KEY) - .build()); + .setRef(2) + .setType(Constants.ComponentType.MODULE) + .setKey(MODULE_KEY) + .build()); ComponentDto anotherProject = ComponentTesting.newProjectDto().setKey(anotherProjectKey); dbClient.componentDao().insert(dbSession, anotherProject); @@ -282,8 +279,8 @@ public class ValidateProjectStepTest { DumbComponent root = new DumbComponent(Component.Type.PROJECT, 1, "ABCD", PROJECT_KEY, new DumbComponent(Component.Type.MODULE, 2, "BCDE", MODULE_KEY)); - sut.execute(new ComputationContext(reportReader, null, null, null, - ComponentTreeBuilders.from(root), null)); + sut.execute(new ComputationContext( + ComponentTreeBuilders.from(root))); } } -- 2.39.5