SONARGROOV-47 Fix ITs coverage results

pmayweg · Nov 27, 2015 · db267ac · db267ac
1 parent 390892a
commit db267ac
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/its/plugin/src/test/java/com/sonar/groovy/it/GroovyTest.java b/its/plugin/src/test/java/com/sonar/groovy/it/GroovyTest.java
@@ -59,7 +59,7 @@ public static void inspect_codenarc() {
       .setGoals("sonar:sonar");
 
     build.setProperty("sonar.dynamicAnalysis", "reuseReports")
-      .setProperty("sonar.groovy.cobertura.reportPath", "target/site/cobertura/coverage.xml");
+    .setProperty("sonar.groovy.cobertura.reportPath", "target/site/cobertura/coverage.xml");
 
     orchestrator.executeBuild(build);
   }
@@ -108,11 +108,16 @@ public void project_duplications() {
 
   @Test
   public void testProjectCoverage() {
-    // We are getting different results for different Java versions : 1.6.0_21 and 1.5.0_16
-    assertThat(getProjectMeasure("coverage").getValue()).isEqualTo(89.5, Delta.delta(0.2));
-    assertThat(getProjectMeasure("line_coverage").getValue()).isEqualTo(98.8, Delta.delta(0.2));
-    assertThat(getProjectMeasure("lines_to_cover").getValue()).isEqualTo(1668.0, Delta.delta(10.0));
-    assertThat(getProjectMeasure("uncovered_lines").getValue()).isEqualTo(20.0, Delta.delta(2.0));
+    // We are getting different results for different Java versions :
+    // - 1.6.0_21 and 1.5.0_16
+    // We are observing different results also for different environments:
+    // - windows 1.7.0_76 oracle jdk and linux 1.7.0_76 oracle jre (Travis)
+    assertThat(getProjectMeasure("coverage").getValue()).isEqualTo(89.5, Delta.delta(0.5));
+    assertThat(getProjectMeasure("line_coverage").getValue()).isEqualTo(98.8, Delta.delta(1.0));
+    assertThat(getProjectMeasure("lines_to_cover").getValue()).isEqualTo(1668.0, Delta.delta(100.0));
+    // when ignoring line outside file...
+    assertThat(getProjectMeasure("uncovered_lines").getValue()).isGreaterThan(5.0);
+    assertThat(getProjectMeasure("uncovered_lines").getValue()).isLessThan(23.0);
 
     assertThat(getProjectMeasure("tests")).isNull();
     assertThat(getProjectMeasure("test_success_density")).isNull();
@@ -149,11 +154,14 @@ public void packagesMetrics() {
 
   @Test
   public void testPackageCoverage() {
-    // We are getting different results for different Java versions : 1.6.0_21 and 1.5.0_16
+    // We are getting different results for different Java versions :
+    // - 1.6.0_21 and 1.5.0_16
+    // We are observing different results also for different environments:
+    // - windows 1.7.0_76 oracle jdk and linux 1.7.0_76 oracle jre (Travis)
     assertThat(getPackageMeasure("coverage").getValue()).isEqualTo(88.3, Delta.delta(0.3));
-    assertThat(getPackageMeasure("line_coverage").getValue()).isEqualTo(99.6, Delta.delta(0.2));
-    assertThat(getPackageMeasure("lines_to_cover").getValue()).isEqualTo(278.0, Delta.delta(2.0));
-    assertThat(getPackageMeasure("uncovered_lines").getValue()).isIn(1.0, 2.0);
+    assertThat(getPackageMeasure("line_coverage").getValue()).isEqualTo(99.6, Delta.delta(0.5));
+    assertThat(getPackageMeasure("lines_to_cover").getValue()).isEqualTo(278.0, Delta.delta(5.0));
+    assertThat(getPackageMeasure("uncovered_lines").getValue()).isIn(0.0, 1.0, 2.0);
 
     assertThat(getPackageMeasure("tests")).isNull();
     assertThat(getPackageMeasure("test_success_density")).isNull();