diff options
4 files changed, 6 insertions, 3 deletions
diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/CoverageMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/CoverageMeasuresStep.java index 2db3a2d6e13..fd9c5ceb783 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/CoverageMeasuresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/CoverageMeasuresStep.java @@ -112,6 +112,9 @@ public class CoverageMeasuresStep implements ComputationStep { @Override public void visitFile(Component file) { + if (file.getFileAttributes().isUnitTest()) { + return; + } try (CloseableIterator<ScannerReport.LineCoverage> lineCoverage = reportReader.readComponentCoverage(file.getReportAttributes().getRef())) { int linesToCover = 0; int coveredLines = 0; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/NewCoverageMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/NewCoverageMeasuresStep.java index 206dfc91ed8..ae5eb75170c 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/NewCoverageMeasuresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/NewCoverageMeasuresStep.java @@ -199,7 +199,7 @@ public class NewCoverageMeasuresStep implements ComputationStep { @Override public void initialize(CounterInitializationContext context) { Component component = context.getLeaf(); - if (component.getType() != Component.Type.FILE) { + if (component.getType() != Component.Type.FILE || component.getFileAttributes().isUnitTest()) { return; } Optional<Set<Integer>> newLinesSet = newLinesRepository.getNewLines(component); diff --git a/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/sensor/coverage/internal/DefaultCoverage.java b/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/sensor/coverage/internal/DefaultCoverage.java index a921290c057..730be0ea588 100644 --- a/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/sensor/coverage/internal/DefaultCoverage.java +++ b/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/sensor/coverage/internal/DefaultCoverage.java @@ -134,7 +134,7 @@ public class DefaultCoverage extends DefaultStorable implements NewCoverage { @Override public void doSave() { validateFile(); - if (!isExcluded()) { + if (!isExcluded() && inputFile.type() != InputFile.Type.TEST) { storage.store(this); } } diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/genericcoverage/GenericCoverageReportParserTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/genericcoverage/GenericCoverageReportParserTest.java index 2794ef9d74d..5e2ac89c101 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/genericcoverage/GenericCoverageReportParserTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/genericcoverage/GenericCoverageReportParserTest.java @@ -249,7 +249,7 @@ public class GenericCoverageReportParserTest { private DefaultInputFile setupFile(String path) { return new TestInputFileBuilder(context.module().key(), path) .setLanguage("bla") - .setType(InputFile.Type.TEST) + .setType(InputFile.Type.MAIN) .initMetadata("1\n2\n3\n4\n5\n6") .build(); } |