SONAR-2371 Rework UnitTestDecorator and SurefireSensor

* UnitTestDecorator should not save zero value for tests metric

* SurefireSensor should save zero when no reports and project do not
  contain any modules

2 files changed, 0 insertions, 32 deletions

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/UnitTestDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/UnitTestDecorator.java
index 4229904a924..0658a9733ab 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/UnitTestDecorator.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/UnitTestDecorator.java
@@ -60,9 +60,6 @@ public class UnitTestDecorator implements Decorator {
       if (isPositive(tests, true) && isPositive(errors, false) && isPositive(failures, false)) {
         Double errorsAndFailuresRatio = (errors + failures) * 100.0 / tests;
         context.saveMeasure(CoreMetrics.TEST_SUCCESS_DENSITY, 100.0 - errorsAndFailuresRatio);
-      } else if (tests == null && ResourceUtils.isProject(resource)) {
-        // See http://jira.codehaus.org/browse/SONAR-2371
-        context.saveMeasure(CoreMetrics.TESTS, 0.0);
       }
     }
   }
diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/UnitTestDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/UnitTestDecoratorTest.java
index ad2ca4152a1..0bcd1a5756f 100644
--- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/UnitTestDecoratorTest.java
+++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/UnitTestDecoratorTest.java
@@ -32,7 +32,6 @@ import org.sonar.api.batch.DecoratorContext;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Measure;
 import org.sonar.api.measures.Metric;
-import org.sonar.api.resources.JavaPackage;
 import org.sonar.api.resources.Project;
 
 import java.util.Arrays;
@@ -86,9 +85,6 @@ public class UnitTestDecoratorTest {
     when(context.getChildrenMeasures(metric)).thenReturn(Arrays.asList(new Measure(metric, value), new Measure(metric, value)));
   }
 
-  /**
-   * See http://jira.codehaus.org/browse/SONAR-2371
-   */
   @Test
   public void doNotDecorateIfTestsMeasureAlreadyExists() {
     Project project = mock(Project.class);
@@ -101,29 +97,4 @@ public class UnitTestDecoratorTest {
     verifyNoMoreInteractions(context);
   }
 
-  /**
-   * See http://jira.codehaus.org/browse/SONAR-2371
-   */
-  @Test
-  public void shouldSaveZeroOnProject() {
-    Project project = new Project("").setAnalysisType(Project.AnalysisType.DYNAMIC);
-
-    decorator.decorate(project, context);
-
-    verify(context).saveMeasure(CoreMetrics.TESTS, 0.0);
-  }
-
-  /**
-   * See http://jira.codehaus.org/browse/SONAR-2371
-   */
-  @Test
-  public void shouldNotSaveZeroOnPackage() {
-    JavaPackage pkg = new JavaPackage();
-
-    decorator.decorate(pkg, context);
-
-    assertThat(decorator.shouldDecorateResource(pkg, context), is(true));
-    verify(context, never()).saveMeasure(CoreMetrics.TESTS, 0.0);
-  }
-
 }