also clean unit tests that uses a ComputationContext (removed uneccessary properties, mostly)
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;
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 {
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;
*/
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);
}
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;
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() {
);
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());
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;
.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
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;
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;
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;
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
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();
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
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;
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;
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);
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;
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 {
public BatchReportReaderRule reportReader = new BatchReportReaderRule();
DbClient dbClient;
-
DbComponentsRefCache dbComponentsRefCache;
@Before
.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<SearchHit> docs = esTester.getDocuments(SourceLineIndexDefinition.INDEX, SourceLineIndexDefinition.TYPE);
assertThat(docs).hasSize(1);
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;
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 {
public BatchReportReaderRule reportReader = new BatchReportReaderRule();
DbClient dbClient;
-
DbComponentsRefCache dbComponentsRefCache;
@Before
.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<SearchHit> docs = esTester.getDocuments(TestIndexDefinition.INDEX, TestIndexDefinition.TYPE);
assertThat(docs).hasSize(1);
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;
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;
public static DbTester dbTester = new DbTester();
IssueComputation issueComputation = mock(IssueComputation.class);
-
ParseReportStep sut = new ParseReportStep(issueComputation, reportReader);
@Test
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);
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.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 {
public BatchReportReaderRule reportReader = new BatchReportReaderRule();
DbSession session;
-
DbClient dbClient;
-
- Settings projectSettings;
- LanguageRepository languageRepository;
DbComponentsRefCache dbComponentsRefCache;
PersistComponentsStep sut;
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);
}
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);
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();
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();
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);
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);
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);
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());
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");
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");
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");
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);
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);
}
.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);
.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);
.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);
.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);
.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);
.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);
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;
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;
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);
}
.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");
}
)
.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");
}
.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");
}
.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");
}
.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");
}
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;
public TemporaryFolder temp = new TemporaryFolder();
DbSession session;
-
DbClient dbClient;
-
- Settings projectSettings;
- LanguageRepository languageRepository;
-
- System2 system2;
-
DbComponentsRefCache dbComponentsRefCache;
-
PersistFileSourcesStep sut;
long now = 123456789L;
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);
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);
.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);
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");
.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);
.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);
.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);
).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);
.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);
// 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);
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);
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);
));
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);
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;
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;
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 {
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;
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);
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);
.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);
)
.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);
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);
@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);
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;
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;
@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;
@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");
// 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");
}
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");
}
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);
}
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");
}
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);
}
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");
}
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'");
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;
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;
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();
@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();
);
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);
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);
List<BatchReport.Test> 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);
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'");
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<Integer> coveredLines = dto.getTestData().get(0).getCoveredFile(0).getCoveredLineList();
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);
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 {
@Rule
public BatchReportReaderRule reportReader = new BatchReportReaderRule();
- DbSession session;
-
DbClient dbClient;
-
- Settings projectSettings;
-
- LanguageRepository languageRepository = mock(LanguageRepository.class);
+ DbSession session;
PopulateComponentsUuidAndKeyStep sut;
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
.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<Integer, Component> componentsByRef = getComponentsByRef(context.getRoot());
.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<Integer, Component> componentsByRef = getComponentsByRef(context.getRoot());
.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<Integer, Component> componentsByRef = getComponentsByRef(context.getRoot());
.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<Integer, Component> componentsByRef = getComponentsByRef(context.getRoot());
.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<Integer, Component> componentsByRef = getComponentsByRef(context.getRoot());
.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<Integer, Component> componentsByRef = getComponentsByRef(context.getRoot());
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;
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
.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);
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;
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;
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;
}
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");
});
}
- private ComputationContext newContext(ComponentTreeBuilder builder) {
- return new ComputationContext(mock(BatchReportReader.class), "COMPONENT_KEY", new Settings(), mock(DbClient.class),
- builder, languageRepository);
- }
-
}
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;
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;
@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));
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));
}
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));
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
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
" 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
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
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);
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
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);
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
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);
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)));
}
}
projects / sonarqube.git / commitdiff