SONAR-3885 Don't exclude files anymore in cobertura's

diff --git a/plugins/sonar-cobertura-plugin/src/main/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandler.java b/plugins/sonar-cobertura-plugin/src/main/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandler.java
index 90628197be7c75a77b302076000388eb77a927ee..20a2aa9fcd0557c3c63862c9d0811841f62a3355 100644 (file)
--- a/plugins/sonar-cobertura-plugin/src/main/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandler.java
+++ b/plugins/sonar-cobertura-plugin/src/main/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandler.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.plugins.cobertura;
 
-import org.apache.commons.lang.StringUtils;
 import org.sonar.api.batch.maven.MavenPlugin;
 import org.sonar.api.batch.maven.MavenPluginHandler;
 import org.sonar.api.batch.maven.MavenSurefireUtils;
@@ -28,7 +27,7 @@ import org.sonar.plugins.cobertura.api.CoberturaUtils;
 
 public class CoberturaMavenPluginHandler implements MavenPluginHandler {
 
-  private CoberturaSettings settings;
+  private final CoberturaSettings settings;
 
   public CoberturaMavenPluginHandler(CoberturaSettings settings) {
     this.settings = settings;
@@ -51,25 +50,16 @@ public class CoberturaMavenPluginHandler implements MavenPluginHandler {
   }
 
   public String[] getGoals() {
-    return new String[] { "cobertura" };
+    return new String[] {"cobertura"};
   }
 
   public void configure(Project project, MavenPlugin coberturaPlugin) {
-    configureCobertura(project, coberturaPlugin);
+    configureCobertura(coberturaPlugin);
     MavenSurefireUtils.configure(project);
   }
 
-  private void configureCobertura(Project project, MavenPlugin coberturaPlugin) {
+  private void configureCobertura(MavenPlugin coberturaPlugin) {
     coberturaPlugin.setParameter("formats/format", "xml");
-    for (String pattern : project.getExclusionPatterns()) {
-      if (pattern.endsWith(".java")) {
-        pattern = StringUtils.substringBeforeLast(pattern, ".") + ".class";
-
-      } else if (StringUtils.substringAfterLast(pattern, "/").indexOf(".") < 0) {
-        pattern = pattern + ".class";
-      }
-      coberturaPlugin.addParameter("instrumentation/excludes/exclude", pattern);
-    }
     coberturaPlugin.setParameter("maxmem", settings.getMaxMemory());
   }
 }

diff --git a/plugins/sonar-cobertura-plugin/src/test/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandlerTest.java b/plugins/sonar-cobertura-plugin/src/test/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandlerTest.java
index 756fc211bdab6df130451915dfc150ebd4a21f79..037bb74919389465f05e7eb97f96401bdeea984a 100644 (file)
--- a/plugins/sonar-cobertura-plugin/src/test/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandlerTest.java
+++ b/plugins/sonar-cobertura-plugin/src/test/java/org/sonar/plugins/cobertura/CoberturaMavenPluginHandlerTest.java
@@ -61,7 +61,6 @@ public class CoberturaMavenPluginHandlerTest {
   public void should_enable_xml_format() {
     Project project = mock(Project.class);
     when(project.getPom()).thenReturn(new MavenProject());
-    when(project.getExclusionPatterns()).thenReturn(new String[0]);
 
     MavenPlugin coberturaPlugin = new MavenPlugin(CoberturaUtils.COBERTURA_GROUP_ID, CoberturaUtils.COBERTURA_ARTIFACT_ID, null);
     handler.configure(project, coberturaPlugin);
@@ -69,20 +68,6 @@ public class CoberturaMavenPluginHandlerTest {
     assertThat(coberturaPlugin.getParameter("formats/format")).isEqualTo("xml");
   }
 
-  @Test
-  public void should_set_cobertura_exclusions() {
-    Project project = mock(Project.class);
-    when(project.getPom()).thenReturn(new MavenProject());
-    when(project.getExclusionPatterns()).thenReturn(new String[]{"**/Foo.java", "com/*Test.*", "com/*"});
-
-    MavenPlugin coberturaPlugin = new MavenPlugin(CoberturaUtils.COBERTURA_GROUP_ID, CoberturaUtils.COBERTURA_ARTIFACT_ID, null);
-    handler.configure(project, coberturaPlugin);
-
-    assertThat(coberturaPlugin.getParameters("instrumentation/excludes/exclude")).isEqualTo(new String[]{
-      "**/Foo.class", "com/*Test.*", "com/*.class"
-    });
-  }
-
   @Test
   public void should_set_max_memory() {
     when(settings.getMaxMemory()).thenReturn("128m");