From a6b89586c85dcb6520fba609279d91aba0ca9a14 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Wed, 25 Jun 2014 23:43:15 +0200 Subject: [PATCH] Ignore sonar.dynamicAnalysis in core coverage decorators --- .../core/sensors/AbstractCoverageDecorator.java | 2 +- .../plugins/core/sensors/CoverageDecoratorTest.java | 12 ------------ .../core/sensors/ItCoverageDecoratorTest.java | 12 ------------ .../core/sensors/ItLineCoverageDecoratorTest.java | 12 ------------ .../core/sensors/LineCoverageDecoratorTest.java | 12 ------------ .../core/sensors/OverallCoverageDecoratorTest.java | 12 ------------ .../sensors/OverallLineCoverageDecoratorTest.java | 12 ------------ 7 files changed, 1 insertion(+), 73 deletions(-) diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AbstractCoverageDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AbstractCoverageDecorator.java index e4153b67b16..41973ea7239 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AbstractCoverageDecorator.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AbstractCoverageDecorator.java @@ -34,7 +34,7 @@ import java.util.Collection; public abstract class AbstractCoverageDecorator implements Decorator { public boolean shouldExecuteOnProject(Project project) { - return project.getAnalysisType().isDynamic(true); + return true; } @DependedUpon diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CoverageDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CoverageDecoratorTest.java index 2a3c3ead33c..4ca1bd15a5e 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CoverageDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CoverageDecoratorTest.java @@ -56,18 +56,6 @@ public class CoverageDecoratorTest { CoreMetrics.NEW_CONDITIONS_TO_COVER, CoreMetrics.NEW_UNCOVERED_CONDITIONS); } - @Test - public void noCoverageWhenStaticAnalysis() { - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.STATIC); - assertThat(new CoverageDecorator().shouldExecuteOnProject(project)).isFalse(); - - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.REUSE_REPORTS); - assertThat(new CoverageDecorator().shouldExecuteOnProject(project)).isTrue(); - - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.DYNAMIC); - assertThat(new CoverageDecorator().shouldExecuteOnProject(project)).isTrue(); - } - @Test public void coverage() { DecoratorContext context = mockContext(50, 40, 10, 8); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ItCoverageDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ItCoverageDecoratorTest.java index 2ed500d0d70..3ceb343672a 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ItCoverageDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ItCoverageDecoratorTest.java @@ -56,18 +56,6 @@ public class ItCoverageDecoratorTest { CoreMetrics.NEW_IT_CONDITIONS_TO_COVER, CoreMetrics.NEW_IT_UNCOVERED_CONDITIONS); } - @Test - public void noCoverageWhenStaticAnalysis() { - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.STATIC); - assertThat(new CoverageDecorator().shouldExecuteOnProject(project)).isFalse(); - - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.REUSE_REPORTS); - assertThat(new CoverageDecorator().shouldExecuteOnProject(project)).isTrue(); - - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.DYNAMIC); - assertThat(new CoverageDecorator().shouldExecuteOnProject(project)).isTrue(); - } - @Test public void coverage() { DecoratorContext context = mockContext(50, 40, 10, 8); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ItLineCoverageDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ItLineCoverageDecoratorTest.java index 3bbf5352e2c..ccb7abcf907 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ItLineCoverageDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ItLineCoverageDecoratorTest.java @@ -54,18 +54,6 @@ public class ItLineCoverageDecoratorTest { assertThat(metrics).containsOnly(CoreMetrics.IT_UNCOVERED_LINES, CoreMetrics.IT_LINES_TO_COVER, CoreMetrics.NEW_IT_UNCOVERED_LINES, CoreMetrics.NEW_IT_LINES_TO_COVER); } - @Test - public void noCoverageWhenStaticAnalysis() { - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.STATIC); - assertThat(decorator.shouldExecuteOnProject(project)).isFalse(); - - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.REUSE_REPORTS); - assertThat(decorator.shouldExecuteOnProject(project)).isTrue(); - - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.DYNAMIC); - assertThat(decorator.shouldExecuteOnProject(project)).isTrue(); - } - @Test public void lineCoverage() { DecoratorContext context = mockContext(50, 10); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/LineCoverageDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/LineCoverageDecoratorTest.java index a0c12521f86..4b89904efee 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/LineCoverageDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/LineCoverageDecoratorTest.java @@ -54,18 +54,6 @@ public class LineCoverageDecoratorTest { assertThat(metrics).containsOnly(CoreMetrics.UNCOVERED_LINES, CoreMetrics.LINES_TO_COVER, CoreMetrics.NEW_UNCOVERED_LINES, CoreMetrics.NEW_LINES_TO_COVER); } - @Test - public void noCoverageWhenStaticAnalysis() { - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.STATIC); - assertThat(decorator.shouldExecuteOnProject(project)).isFalse(); - - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.REUSE_REPORTS); - assertThat(decorator.shouldExecuteOnProject(project)).isTrue(); - - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.DYNAMIC); - assertThat(decorator.shouldExecuteOnProject(project)).isTrue(); - } - @Test public void lineCoverage() { DecoratorContext context = mockContext(50, 10); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallCoverageDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallCoverageDecoratorTest.java index 4dfdfd504fc..e4dbb3dbc94 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallCoverageDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallCoverageDecoratorTest.java @@ -56,18 +56,6 @@ public class OverallCoverageDecoratorTest { CoreMetrics.NEW_OVERALL_CONDITIONS_TO_COVER, CoreMetrics.NEW_OVERALL_UNCOVERED_CONDITIONS); } - @Test - public void noCoverageWhenStaticAnalysis() { - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.STATIC); - assertThat(new CoverageDecorator().shouldExecuteOnProject(project)).isFalse(); - - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.REUSE_REPORTS); - assertThat(new CoverageDecorator().shouldExecuteOnProject(project)).isTrue(); - - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.DYNAMIC); - assertThat(new CoverageDecorator().shouldExecuteOnProject(project)).isTrue(); - } - @Test public void coverage() { DecoratorContext context = mockContext(50, 40, 10, 8); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallLineCoverageDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallLineCoverageDecoratorTest.java index f761dc11e80..1b3c0db8a18 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallLineCoverageDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/OverallLineCoverageDecoratorTest.java @@ -55,18 +55,6 @@ public class OverallLineCoverageDecoratorTest { CoreMetrics.NEW_OVERALL_LINES_TO_COVER); } - @Test - public void noCoverageWhenStaticAnalysis() { - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.STATIC); - assertThat(decorator.shouldExecuteOnProject(project)).isFalse(); - - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.REUSE_REPORTS); - assertThat(decorator.shouldExecuteOnProject(project)).isTrue(); - - when(project.getAnalysisType()).thenReturn(Project.AnalysisType.DYNAMIC); - assertThat(decorator.shouldExecuteOnProject(project)).isTrue(); - } - @Test public void lineCoverage() { DecoratorContext context = mockContext(50, 10); -- 2.39.5