@@ -19,6 +19,12 @@ | |||
*/ | |||
package org.sonar.server.computation.task.projectanalysis.duplication; | |||
import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; | |||
import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; | |||
import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; | |||
import static com.google.common.base.Preconditions.checkArgument; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.guava.api.Assertions.assertThat; | |||
@@ -43,12 +49,6 @@ import static org.sonar.server.computation.task.projectanalysis.component.Compon | |||
import static org.sonar.server.computation.task.projectanalysis.component.ReportComponent.builder; | |||
import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; | |||
import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; | |||
import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; | |||
import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; | |||
public class ReportDuplicationMeasuresTest { | |||
private static final int ROOT_REF = 1; | |||
private static final int MODULE_REF = 12; | |||
@@ -97,7 +97,7 @@ public class ReportDuplicationMeasuresTest { | |||
@Rule | |||
public DuplicationRepositoryRule duplicationRepository = DuplicationRepositoryRule.create(treeRootHolder); | |||
DuplicationMeasures underTest = new DuplicationMeasures(treeRootHolder, metricRepository, measureRepository, duplicationRepository); | |||
private DuplicationMeasures underTest = new DuplicationMeasures(treeRootHolder, metricRepository, measureRepository, duplicationRepository); | |||
@Test | |||
public void compute_duplicated_blocks_one_for_original_one_for_each_InnerDuplicate() { |
@@ -19,6 +19,12 @@ | |||
*/ | |||
package org.sonar.server.computation.task.projectanalysis.duplication; | |||
import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; | |||
import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; | |||
import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.guava.api.Assertions.assertThat; | |||
import static org.sonar.api.measures.CoreMetrics.COMMENT_LINES; | |||
@@ -41,12 +47,6 @@ import static org.sonar.server.computation.task.projectanalysis.component.Compon | |||
import static org.sonar.server.computation.task.projectanalysis.component.ViewsComponent.builder; | |||
import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; | |||
import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; | |||
import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; | |||
import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; | |||
public class ViewsDuplicationMeasuresTest { | |||
private static final int ROOT_REF = 1; | |||
@@ -82,7 +82,7 @@ public class ViewsDuplicationMeasuresTest { | |||
@Rule | |||
public MeasureRepositoryRule measureRepository = MeasureRepositoryRule.create(treeRootHolder, metricRepository); | |||
DuplicationMeasures underTest = new DuplicationMeasures(treeRootHolder, metricRepository, measureRepository); | |||
private DuplicationMeasures underTest = new DuplicationMeasures(treeRootHolder, metricRepository, measureRepository); | |||
@Test | |||
public void aggregate_duplicated_blocks() { |
@@ -54,28 +54,28 @@ public class HighlightingLineReaderTest { | |||
@Rule | |||
public LogTester logTester = new LogTester(); | |||
static final Component FILE = builder(Component.Type.FILE, 1).setUuid("FILE_UUID").setKey("FILE_KEY").build(); | |||
private static final Component FILE = builder(Component.Type.FILE, 1).setUuid("FILE_UUID").setKey("FILE_KEY").build(); | |||
static final int DEFAULT_LINE_LENGTH = 5; | |||
private static final int DEFAULT_LINE_LENGTH = 5; | |||
static final int LINE_1 = 1; | |||
static final int LINE_2 = 2; | |||
static final int LINE_3 = 3; | |||
static final int LINE_4 = 4; | |||
private static final int LINE_1 = 1; | |||
private static final int LINE_2 = 2; | |||
private static final int LINE_3 = 3; | |||
private static final int LINE_4 = 4; | |||
static final String RANGE_LABEL_1 = "1,2"; | |||
static final String RANGE_LABEL_2 = "2,3"; | |||
static final String RANGE_LABEL_3 = "3,4"; | |||
static final String RANGE_LABEL_4 = "0,2"; | |||
static final String RANGE_LABEL_5 = "0,3"; | |||
private static final String RANGE_LABEL_1 = "1,2"; | |||
private static final String RANGE_LABEL_2 = "2,3"; | |||
private static final String RANGE_LABEL_3 = "3,4"; | |||
private static final String RANGE_LABEL_4 = "0,2"; | |||
private static final String RANGE_LABEL_5 = "0,3"; | |||
RangeOffsetConverter rangeOffsetConverter = mock(RangeOffsetConverter.class); | |||
private RangeOffsetConverter rangeOffsetConverter = mock(RangeOffsetConverter.class); | |||
DbFileSources.Data.Builder sourceData = newBuilder(); | |||
DbFileSources.Line.Builder line1 = sourceData.addLinesBuilder().setSource("line1").setLine(1); | |||
DbFileSources.Line.Builder line2 = sourceData.addLinesBuilder().setSource("line2").setLine(2); | |||
DbFileSources.Line.Builder line3 = sourceData.addLinesBuilder().setSource("line3").setLine(3); | |||
DbFileSources.Line.Builder line4 = sourceData.addLinesBuilder().setSource("line4").setLine(4); | |||
private DbFileSources.Data.Builder sourceData = newBuilder(); | |||
private DbFileSources.Line.Builder line1 = sourceData.addLinesBuilder().setSource("line1").setLine(1); | |||
private DbFileSources.Line.Builder line2 = sourceData.addLinesBuilder().setSource("line2").setLine(2); | |||
private DbFileSources.Line.Builder line3 = sourceData.addLinesBuilder().setSource("line3").setLine(3); | |||
private DbFileSources.Line.Builder line4 = sourceData.addLinesBuilder().setSource("line4").setLine(4); | |||
@Test | |||
public void nothing_to_read() { |
@@ -25,7 +25,6 @@ import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.sonar.api.measures.CoreMetrics; | |||
import org.sonar.server.computation.task.projectanalysis.component.Component; | |||
import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor; | |||
import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; | |||
import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; | |||
import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; | |||
@@ -51,13 +50,13 @@ import static org.sonar.server.computation.task.projectanalysis.measure.Measure. | |||
public class LastCommitVisitorTest { | |||
public static final int PROJECT_REF = 1; | |||
public static final int MODULE_REF = 2; | |||
public static final int FILE_1_REF = 1_111; | |||
public static final int FILE_2_REF = 1_112; | |||
public static final int FILE_3_REF = 1_121; | |||
public static final int DIR_1_REF = 3; | |||
public static final int DIR_2_REF = 4; | |||
private static final int PROJECT_REF = 1; | |||
private static final int MODULE_REF = 2; | |||
private static final int FILE_1_REF = 1_111; | |||
private static final int FILE_2_REF = 1_112; | |||
private static final int FILE_3_REF = 1_121; | |||
private static final int DIR_1_REF = 3; | |||
private static final int DIR_2_REF = 4; | |||
@Rule | |||
public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); | |||
@@ -202,8 +201,7 @@ public class LastCommitVisitorTest { | |||
.setAuthor("john") | |||
.setDate(1_500_000_000_000L) | |||
.setRevision("rev-1") | |||
.build() | |||
); | |||
.build()); | |||
ReportComponent file = createFileComponent(FILE_1_REF); | |||
treeRootHolder.setRoot(file); |
@@ -38,9 +38,8 @@ public class ReportIteratorTest { | |||
@Rule | |||
public TemporaryFolder temp = new TemporaryFolder(); | |||
File file; | |||
ReportIterator<ScannerReport.LineCoverage> underTest; | |||
private File file; | |||
private ReportIterator<ScannerReport.LineCoverage> underTest; | |||
@Before | |||
public void setUp() throws Exception { |
@@ -37,7 +37,7 @@ public class ScmLineReaderTest { | |||
ScmInfo scmInfo = new ScmInfoImpl(newArrayList( | |||
Changeset.newChangesetBuilder() | |||
.setAuthor("john") | |||
.setDate(123456789L) | |||
.setDate(123_456_789L) | |||
.setRevision("rev-1") | |||
.build() | |||
)); | |||
@@ -48,7 +48,7 @@ public class ScmLineReaderTest { | |||
lineScm.read(lineBuilder); | |||
assertThat(lineBuilder.getScmAuthor()).isEqualTo("john"); | |||
assertThat(lineBuilder.getScmDate()).isEqualTo(123456789L); | |||
assertThat(lineBuilder.getScmDate()).isEqualTo(123_456_789L); | |||
assertThat(lineBuilder.getScmRevision()).isEqualTo("rev-1"); | |||
} | |||
@@ -56,7 +56,7 @@ public class ScmLineReaderTest { | |||
public void set_scm_with_minim_fields() { | |||
ScmInfo scmInfo = new ScmInfoImpl(newArrayList( | |||
Changeset.newChangesetBuilder() | |||
.setDate(123456789L) | |||
.setDate(123_456_789L) | |||
.setRevision("rev-1") | |||
.build() | |||
)); | |||
@@ -73,7 +73,7 @@ public class ScmLineReaderTest { | |||
@Test | |||
public void getLatestChange_returns_changeset_with_highest_date_of_read_lines() { | |||
long refDate = 123456789L; | |||
long refDate = 123_456_789L; | |||
Changeset changeset0 = Changeset.newChangesetBuilder().setDate(refDate - 636).setRevision("rev-1").build(); | |||
Changeset changeset1 = Changeset.newChangesetBuilder().setDate(refDate + 1).setRevision("rev-2").build(); | |||
Changeset changeset2 = Changeset.newChangesetBuilder().setDate(refDate + 2).setRevision("rev-3").build(); |
@@ -32,9 +32,9 @@ import static org.sonar.server.computation.task.projectanalysis.component.Report | |||
public class SourceLinesRepositoryImplTest { | |||
static final String FILE_UUID = "FILE_UUID"; | |||
static final String FILE_KEY = "FILE_KEY"; | |||
static final int FILE_REF = 2; | |||
private static final String FILE_UUID = "FILE_UUID"; | |||
private static final String FILE_KEY = "FILE_KEY"; | |||
private static final int FILE_REF = 2; | |||
@Rule | |||
public ExpectedException thrown = ExpectedException.none(); | |||
@@ -42,7 +42,7 @@ public class SourceLinesRepositoryImplTest { | |||
@Rule | |||
public BatchReportReaderRule reportReader = new BatchReportReaderRule(); | |||
SourceLinesRepositoryImpl underTest = new SourceLinesRepositoryImpl(reportReader); | |||
private SourceLinesRepositoryImpl underTest = new SourceLinesRepositoryImpl(reportReader); | |||
@Test | |||
public void read_lines_from_report() { |
@@ -40,33 +40,33 @@ public class SymbolsLineReaderTest { | |||
@Rule | |||
public LogTester logTester = new LogTester(); | |||
static final Component FILE = builder(Component.Type.FILE, 1).setUuid("FILE_UUID").setKey("FILE_KEY").build(); | |||
private static final Component FILE = builder(Component.Type.FILE, 1).setUuid("FILE_UUID").setKey("FILE_KEY").build(); | |||
static final int DEFAULT_LINE_LENGTH = 5; | |||
private static final int DEFAULT_LINE_LENGTH = 5; | |||
static final int LINE_1 = 1; | |||
static final int LINE_2 = 2; | |||
static final int LINE_3 = 3; | |||
static final int LINE_4 = 4; | |||
private static final int LINE_1 = 1; | |||
private static final int LINE_2 = 2; | |||
private static final int LINE_3 = 3; | |||
private static final int LINE_4 = 4; | |||
static final int OFFSET_0 = 0; | |||
static final int OFFSET_1 = 1; | |||
static final int OFFSET_2 = 2; | |||
static final int OFFSET_3 = 3; | |||
static final int OFFSET_4 = 4; | |||
private static final int OFFSET_0 = 0; | |||
private static final int OFFSET_1 = 1; | |||
private static final int OFFSET_2 = 2; | |||
private static final int OFFSET_3 = 3; | |||
private static final int OFFSET_4 = 4; | |||
static final String RANGE_LABEL_1 = "1,2"; | |||
static final String RANGE_LABEL_2 = "2,3"; | |||
static final String RANGE_LABEL_3 = "3,4"; | |||
static final String RANGE_LABEL_4 = "0,2"; | |||
private static final String RANGE_LABEL_1 = "1,2"; | |||
private static final String RANGE_LABEL_2 = "2,3"; | |||
private static final String RANGE_LABEL_3 = "3,4"; | |||
private static final String RANGE_LABEL_4 = "0,2"; | |||
RangeOffsetConverter rangeOffsetConverter = mock(RangeOffsetConverter.class); | |||
private RangeOffsetConverter rangeOffsetConverter = mock(RangeOffsetConverter.class); | |||
DbFileSources.Data.Builder sourceData = DbFileSources.Data.newBuilder(); | |||
DbFileSources.Line.Builder line1 = sourceData.addLinesBuilder().setSource("line1").setLine(1); | |||
DbFileSources.Line.Builder line2 = sourceData.addLinesBuilder().setSource("line2").setLine(2); | |||
DbFileSources.Line.Builder line3 = sourceData.addLinesBuilder().setSource("line3").setLine(3); | |||
DbFileSources.Line.Builder line4 = sourceData.addLinesBuilder().setSource("line4").setLine(4); | |||
private DbFileSources.Data.Builder sourceData = DbFileSources.Data.newBuilder(); | |||
private DbFileSources.Line.Builder line1 = sourceData.addLinesBuilder().setSource("line1").setLine(1); | |||
private DbFileSources.Line.Builder line2 = sourceData.addLinesBuilder().setSource("line2").setLine(2); | |||
private DbFileSources.Line.Builder line3 = sourceData.addLinesBuilder().setSource("line3").setLine(3); | |||
private DbFileSources.Line.Builder line4 = sourceData.addLinesBuilder().setSource("line4").setLine(4); | |||
@Test | |||
public void read_nothing() { |
@@ -68,22 +68,22 @@ import static org.sonar.scanner.protocol.output.ScannerReport.Component.Componen | |||
@RunWith(DataProviderRunner.class) | |||
public class BuildComponentTreeStepTest { | |||
static final int ROOT_REF = 1; | |||
static final int MODULE_REF = 2; | |||
static final int DIR_REF_1 = 3; | |||
static final int FILE_1_REF = 4; | |||
static final int FILE_2_REF = 5; | |||
static final int DIR_REF_2 = 6; | |||
static final int FILE_3_REF = 7; | |||
static final String REPORT_PROJECT_KEY = "REPORT_PROJECT_KEY"; | |||
static final String REPORT_MODULE_KEY = "MODULE_KEY"; | |||
static final String REPORT_DIR_KEY_1 = "src/main/java/dir1"; | |||
static final String REPORT_FILE_KEY_1 = "src/main/java/dir1/File1.java"; | |||
static final String REPORT_DIR_KEY_2 = "src/main/java/dir2"; | |||
static final String REPORT_FILE_KEY_2 = "src/main/java/dir2/File2.java"; | |||
static final long ANALYSIS_DATE = 123456789L; | |||
private static final int ROOT_REF = 1; | |||
private static final int MODULE_REF = 2; | |||
private static final int DIR_REF_1 = 3; | |||
private static final int FILE_1_REF = 4; | |||
private static final int FILE_2_REF = 5; | |||
private static final int DIR_REF_2 = 6; | |||
private static final int FILE_3_REF = 7; | |||
private static final String REPORT_PROJECT_KEY = "REPORT_PROJECT_KEY"; | |||
private static final String REPORT_MODULE_KEY = "MODULE_KEY"; | |||
private static final String REPORT_DIR_KEY_1 = "src/main/java/dir1"; | |||
private static final String REPORT_FILE_KEY_1 = "src/main/java/dir1/File1.java"; | |||
private static final String REPORT_DIR_KEY_2 = "src/main/java/dir2"; | |||
private static final String REPORT_FILE_KEY_2 = "src/main/java/dir2/File2.java"; | |||
private static final long ANALYSIS_DATE = 123456789L; | |||
@Rule | |||
public DbTester dbTester = DbTester.create(System2.INSTANCE); |
@@ -23,7 +23,6 @@ import com.google.common.collect.ImmutableMap; | |||
import java.util.Arrays; | |||
import java.util.Date; | |||
import java.util.List; | |||
import org.junit.Before; | |||
import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.junit.rules.ExpectedException; | |||
@@ -32,7 +31,6 @@ import org.sonar.server.computation.task.projectanalysis.component.Component; | |||
import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; | |||
import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; | |||
import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; | |||
import org.sonar.server.computation.task.projectanalysis.measure.Measure; | |||
import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; | |||
import org.sonar.server.computation.task.projectanalysis.metric.MetricRepositoryRule; | |||
import org.sonar.server.qualityprofile.QPMeasureData; | |||
@@ -47,7 +45,6 @@ import static org.sonar.server.computation.task.projectanalysis.component.Compon | |||
import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.FILE; | |||
import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.MODULE; | |||
import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; | |||
import static org.sonar.server.computation.task.projectanalysis.measure.Measure.newMeasureBuilder; | |||
public class ComputeQProfileMeasureStepTest { | |||
@@ -101,12 +98,7 @@ public class ComputeQProfileMeasureStepTest { | |||
@Rule | |||
public AnalysisMetadataHolderRule analysisMetadataHolder = new AnalysisMetadataHolderRule(); | |||
ComputeQProfileMeasureStep underTest; | |||
@Before | |||
public void setUp() throws Exception { | |||
underTest = new ComputeQProfileMeasureStep(treeRootHolder, measureRepository, metricRepository, analysisMetadataHolder); | |||
} | |||
private ComputeQProfileMeasureStep underTest = new ComputeQProfileMeasureStep(treeRootHolder, measureRepository, metricRepository, analysisMetadataHolder); | |||
@Test | |||
public void add_quality_profile_measure_on_project() { | |||
@@ -132,7 +124,7 @@ public class ComputeQProfileMeasureStepTest { | |||
} | |||
@Test | |||
public void fail_if_report_inconsistant() { | |||
public void fail_if_report_inconsistent() { | |||
treeRootHolder.setRoot(MULTI_MODULE_PROJECT); | |||
QualityProfile qpJava = createQProfile(QP_NAME_1, LANGUAGE_KEY_1); | |||
analysisMetadataHolder.setQProfilesByLanguage(ImmutableMap.of(LANGUAGE_KEY_1, qpJava)); | |||
@@ -150,11 +142,6 @@ public class ComputeQProfileMeasureStepTest { | |||
return new QualityProfile(qpName + "-" + languageKey, qpName, languageKey, new Date()); | |||
} | |||
private void addMeasure(int componentRef, QualityProfile... qps) { | |||
Measure qualityProfileMeasure = newMeasureBuilder().create(toJson(qps)); | |||
measureRepository.addRawMeasure(componentRef, QUALITY_PROFILES_KEY, qualityProfileMeasure); | |||
} | |||
private static String toJson(QualityProfile... qps) { | |||
List<QualityProfile> qualityProfiles = Arrays.asList(qps); | |||
return QPMeasureData.toJson(new QPMeasureData(qualityProfiles)); |
@@ -68,7 +68,7 @@ public class DuplicationDataMeasuresStepTest extends BaseStepTest { | |||
@Rule | |||
public MeasureRepositoryRule measureRepository = MeasureRepositoryRule.create(treeRootHolder, metricRepository); | |||
DuplicationDataMeasuresStep underTest = new DuplicationDataMeasuresStep(treeRootHolder, metricRepository, measureRepository, duplicationRepository); | |||
private DuplicationDataMeasuresStep underTest = new DuplicationDataMeasuresStep(treeRootHolder, metricRepository, measureRepository, duplicationRepository); | |||
@Override | |||
protected ComputationStep step() { |
@@ -19,27 +19,18 @@ | |||
*/ | |||
package org.sonar.server.computation.task.projectanalysis.step; | |||
import org.junit.Before; | |||
import org.junit.Test; | |||
import org.mockito.Mock; | |||
import org.mockito.MockitoAnnotations; | |||
import org.sonar.server.computation.task.projectanalysis.duplication.DuplicationMeasures; | |||
import org.sonar.server.computation.task.step.ComputationStep; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.verify; | |||
public class DuplicationMeasuresStepTest extends BaseStepTest { | |||
@Mock | |||
private DuplicationMeasures defaultDuplicationMeasures; | |||
private DuplicationMeasuresStep underTest; | |||
@Before | |||
public void before() { | |||
MockitoAnnotations.initMocks(this); | |||
underTest = new DuplicationMeasuresStep(defaultDuplicationMeasures); | |||
} | |||
private DuplicationMeasures defaultDuplicationMeasures = mock(DuplicationMeasures.class); | |||
private DuplicationMeasuresStep underTest = new DuplicationMeasuresStep(defaultDuplicationMeasures); | |||
@Test | |||
public void full_analysis_mode() { | |||
underTest.execute(); |
@@ -51,7 +51,7 @@ public class EnableAnalysisStepTest { | |||
@Rule | |||
public MutableAnalysisMetadataHolderRule analysisMetadataHolder = new MutableAnalysisMetadataHolderRule(); | |||
EnableAnalysisStep underTest = new EnableAnalysisStep(db.getDbClient(), treeRootHolder, analysisMetadataHolder); | |||
private EnableAnalysisStep underTest = new EnableAnalysisStep(db.getDbClient(), treeRootHolder, analysisMetadataHolder); | |||
@Test | |||
public void switch_islast_flag_and_mark_analysis_as_processed() { |
@@ -144,26 +144,26 @@ public class ExecuteVisitorsStepTest { | |||
} | |||
private static class VisitorA extends TypeAwareVisitorAdapter { | |||
public VisitorA() { | |||
VisitorA() { | |||
super(CrawlerDepthLimit.PROJECT, Order.PRE_ORDER); | |||
} | |||
} | |||
private static class VisitorB extends TypeAwareVisitorAdapter { | |||
public VisitorB() { | |||
VisitorB() { | |||
super(CrawlerDepthLimit.PROJECT, Order.PRE_ORDER); | |||
} | |||
} | |||
private static class VisitorC extends TypeAwareVisitorAdapter { | |||
public VisitorC() { | |||
VisitorC() { | |||
super(CrawlerDepthLimit.PROJECT, Order.PRE_ORDER); | |||
} | |||
} | |||
private class TestTypeAwareVisitor extends TypeAwareVisitorAdapter { | |||
public TestTypeAwareVisitor() { | |||
TestTypeAwareVisitor() { | |||
super(CrawlerDepthLimit.FILE, ComponentVisitor.Order.POST_ORDER); | |||
} | |||
@@ -176,7 +176,7 @@ public class ExecuteVisitorsStepTest { | |||
private class TestPathAwareVisitor extends PathAwareVisitorAdapter<Counter> { | |||
public TestPathAwareVisitor() { | |||
TestPathAwareVisitor() { | |||
super(CrawlerDepthLimit.FILE, ComponentVisitor.Order.POST_ORDER, new SimpleStackElementFactory<Counter>() { | |||
@Override | |||
public Counter createForAny(Component component) { |
@@ -20,7 +20,6 @@ | |||
package org.sonar.server.computation.task.projectanalysis.step; | |||
import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import java.util.Collections; | |||
import java.util.HashMap; | |||
import java.util.List; | |||
@@ -68,13 +67,12 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest { | |||
@Rule | |||
public ExpectedException thrown = ExpectedException.none(); | |||
static final String XOO_LANGUAGE = "xoo"; | |||
private static final String XOO_LANGUAGE = "xoo"; | |||
private static final int PROJECT_REF = 1; | |||
private static final int FILE_REF = 2; | |||
private static final String CURRENT_FILE_KEY = "FILE_KEY"; | |||
static final int PROJECT_REF = 1; | |||
static final int FILE_REF = 2; | |||
static final String CURRENT_FILE_KEY = "FILE_KEY"; | |||
static final Component CURRENT_FILE = ReportComponent.builder(FILE, FILE_REF) | |||
private static final Component CURRENT_FILE = ReportComponent.builder(FILE, FILE_REF) | |||
.setKey(CURRENT_FILE_KEY) | |||
.setFileAttributes(new FileAttributes(false, XOO_LANGUAGE, 1)) | |||
.build(); | |||
@@ -90,20 +88,17 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest { | |||
@Rule | |||
public AnalysisMetadataHolderRule analysisMetadataHolder = new AnalysisMetadataHolderRule(); | |||
CrossProjectDuplicationStatusHolder crossProjectDuplicationStatusHolder = mock(CrossProjectDuplicationStatusHolder.class); | |||
private CrossProjectDuplicationStatusHolder crossProjectDuplicationStatusHolder = mock(CrossProjectDuplicationStatusHolder.class); | |||
@Rule | |||
public DbTester dbTester = DbTester.create(System2.INSTANCE); | |||
DbClient dbClient = dbTester.getDbClient(); | |||
DbSession dbSession = dbTester.getSession(); | |||
IntegrateCrossProjectDuplications integrateCrossProjectDuplications = mock(IntegrateCrossProjectDuplications.class); | |||
Analysis baseProjectAnalysis; | |||
private DbClient dbClient = dbTester.getDbClient(); | |||
private DbSession dbSession = dbTester.getSession(); | |||
private IntegrateCrossProjectDuplications integrateCrossProjectDuplications = mock(IntegrateCrossProjectDuplications.class); | |||
private Analysis baseProjectAnalysis; | |||
ComputationStep underTest = new LoadCrossProjectDuplicationsRepositoryStep(treeRootHolder, batchReportReader, analysisMetadataHolder, crossProjectDuplicationStatusHolder, | |||
private ComputationStep underTest = new LoadCrossProjectDuplicationsRepositoryStep(treeRootHolder, batchReportReader, analysisMetadataHolder, crossProjectDuplicationStatusHolder, | |||
integrateCrossProjectDuplications, dbClient); | |||
@Before | |||
@@ -154,7 +149,7 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest { | |||
underTest.execute(); | |||
verify(integrateCrossProjectDuplications).computeCpd(CURRENT_FILE, | |||
Arrays.asList( | |||
asList( | |||
new Block.Builder() | |||
.setResourceId(CURRENT_FILE_KEY) | |||
.setBlockHash(new ByteArray(hash)) | |||
@@ -162,7 +157,7 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest { | |||
.setLines(originBlock.getStartLine(), originBlock.getEndLine()) | |||
.setUnit(originBlock.getStartTokenIndex(), originBlock.getEndTokenIndex()) | |||
.build()), | |||
Arrays.asList( | |||
asList( | |||
new Block.Builder() | |||
.setResourceId(otherFile.getDbKey()) | |||
.setBlockHash(new ByteArray(hash)) |
@@ -54,7 +54,7 @@ public class LoadMeasureComputersStepTest { | |||
private static final String NEW_METRIC_3 = "metric3"; | |||
private static final String NEW_METRIC_4 = "metric4"; | |||
MeasureComputersHolderImpl holder = new MeasureComputersHolderImpl(); | |||
private MeasureComputersHolderImpl holder = new MeasureComputersHolderImpl(); | |||
@Test | |||
public void support_core_metrics_as_input_metrics() { |
@@ -46,8 +46,8 @@ public class LoadQualityProfilesStepTest { | |||
@Rule | |||
public RuleRepositoryRule ruleRepository = new RuleRepositoryRule(); | |||
ActiveRulesHolderImpl activeRulesHolder = new ActiveRulesHolderImpl(); | |||
LoadQualityProfilesStep underTest = new LoadQualityProfilesStep(batchReportReader, activeRulesHolder, ruleRepository); | |||
private ActiveRulesHolderImpl activeRulesHolder = new ActiveRulesHolderImpl(); | |||
private LoadQualityProfilesStep underTest = new LoadQualityProfilesStep(batchReportReader, activeRulesHolder, ruleRepository); | |||
@Test | |||
public void feed_active_rules() { |
@@ -111,7 +111,7 @@ public class NewSizeMeasuresStepTest { | |||
@Rule | |||
public DuplicationRepositoryRule duplicationRepository = DuplicationRepositoryRule.create(treeRootHolder); | |||
NewSizeMeasuresStep underTest = new NewSizeMeasuresStep(treeRootHolder, periodsHolder, metricRepository, measureRepository, scmInfoRepository, | |||
private NewSizeMeasuresStep underTest = new NewSizeMeasuresStep(treeRootHolder, periodsHolder, metricRepository, measureRepository, scmInfoRepository, | |||
duplicationRepository); | |||
@Test |
@@ -26,8 +26,6 @@ import java.util.Map; | |||
import org.junit.Before; | |||
import org.junit.Rule; | |||
import org.junit.Test; | |||
import org.mockito.Mock; | |||
import org.mockito.MockitoAnnotations; | |||
import org.sonar.api.utils.System2; | |||
import org.sonar.db.DbClient; | |||
import org.sonar.db.DbTester; | |||
@@ -44,6 +42,7 @@ import org.sonar.server.computation.task.step.ComputationStep; | |||
import static java.util.Collections.singletonList; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.when; | |||
public class PersistCrossProjectDuplicationIndexStepTest { | |||
@@ -78,18 +77,14 @@ public class PersistCrossProjectDuplicationIndexStepTest { | |||
@Rule | |||
public AnalysisMetadataHolderRule analysisMetadataHolder = new AnalysisMetadataHolderRule(); | |||
@Mock | |||
CrossProjectDuplicationStatusHolder crossProjectDuplicationStatusHolder; | |||
@Mock | |||
Analysis baseAnalysis; | |||
private CrossProjectDuplicationStatusHolder crossProjectDuplicationStatusHolder = mock(CrossProjectDuplicationStatusHolder.class); | |||
private Analysis baseAnalysis = mock(Analysis.class); | |||
private DbClient dbClient = dbTester.getDbClient(); | |||
DbClient dbClient = dbTester.getDbClient(); | |||
ComputationStep underTest; | |||
private ComputationStep underTest; | |||
@Before | |||
public void setUp() throws Exception { | |||
MockitoAnnotations.initMocks(this); | |||
when(baseAnalysis.getUuid()).thenReturn(BASE_ANALYSIS_UUID); | |||
analysisMetadataHolder.setUuid(ANALYSIS_UUID); | |||
analysisMetadataHolder.setBaseAnalysis(baseAnalysis); |
@@ -39,7 +39,6 @@ import org.sonar.server.computation.task.projectanalysis.component.Component; | |||
import org.sonar.server.computation.task.projectanalysis.component.FileAttributes; | |||
import org.sonar.server.computation.task.projectanalysis.component.ReportComponent; | |||
import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; | |||
import org.sonar.server.computation.task.projectanalysis.duplication.Duplicate; | |||
import org.sonar.server.computation.task.projectanalysis.duplication.Duplication; | |||
import org.sonar.server.computation.task.projectanalysis.duplication.DuplicationRepositoryRule; | |||
import org.sonar.server.computation.task.projectanalysis.duplication.InnerDuplicate; | |||
@@ -487,5 +486,4 @@ public class PersistFileSourcesStepTest extends BaseStepTest { | |||
fileSourceRepository.addLine(FILE1_REF, "line" + i); | |||
} | |||
} | |||
} |
@@ -64,7 +64,7 @@ import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
public class PersistIssuesStepTest extends BaseStepTest { | |||
public static final long NOW = 1400000000000L; | |||
public static final long NOW = 1_400_000_000_000L; | |||
@Rule | |||
public TemporaryFolder temp = new TemporaryFolder(); |
@@ -96,7 +96,6 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest { | |||
private ComponentDbTester componentDbTester = new ComponentDbTester(dbTester); | |||
private MutableDisabledComponentsHolder disabledComponentsHolder = mock(MutableDisabledComponentsHolder.class, RETURNS_DEEP_STUBS); | |||
private PersistComponentsStep underTest; | |||
private BranchPersister branchPersister; | |||
@Before | |||
public void setup() throws Exception { | |||
@@ -105,7 +104,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest { | |||
dbTester.organizations().insertForUuid(ORGANIZATION_UUID); | |||
analysisMetadataHolder.setBranch(new DefaultBranchImpl()); | |||
branchPersister = mock(BranchPersister.class); | |||
BranchPersister branchPersister = mock(BranchPersister.class); | |||
underTest = new PersistComponentsStep(dbClient, treeRootHolder, dbIdsRepository, system2, disabledComponentsHolder, analysisMetadataHolder, branchPersister); | |||
} | |||