From 07dbf1697c830277934eed8ddb9cd5df1161ed97 Mon Sep 17 00:00:00 2001 From: Fabrice Bellingard Date: Fri, 25 Nov 2011 10:40:53 +0100 Subject: [PATCH] Fix some violations --- .../CoberturaMavenPluginHandler.java | 19 +++++++++++++---- .../CoberturaMavenInitializerTest.java | 2 +- .../CoberturaMavenPluginHandlerTest.java | 21 +++++++++---------- .../core/sensors/UpdateReviewsDecorator.java | 3 +-- .../sensors/UpdateReviewsDecoratorTest.java | 2 -- 5 files changed, 27 insertions(+), 20 deletions(-) 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 3e46998a784..38dfc27d868 100644 --- 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 @@ -24,11 +24,18 @@ import org.sonar.api.CoreProperties; import org.sonar.api.batch.maven.MavenPlugin; import org.sonar.api.batch.maven.MavenPluginHandler; import org.sonar.api.batch.maven.MavenSurefireUtils; +import org.sonar.api.config.Settings; import org.sonar.api.resources.Project; import org.sonar.plugins.cobertura.api.CoberturaUtils; public class CoberturaMavenPluginHandler implements MavenPluginHandler { + private Settings settings; + + public CoberturaMavenPluginHandler(Settings settings) { + this.settings = settings; + } + public String getGroupId() { return CoberturaUtils.COBERTURA_GROUP_ID; } @@ -65,10 +72,14 @@ public class CoberturaMavenPluginHandler implements MavenPluginHandler { } coberturaPlugin.addParameter("instrumentation/excludes/exclude", pattern); } + String maxmem = ""; // http://jira.codehaus.org/browse/SONAR-2897: there used to be a typo in the parameter name (was "sonar.cobertura.maxmen") - coberturaPlugin.setParameter( - "maxmem", - project.getConfiguration().getString(CoreProperties.COBERTURA_MAXMEM_PROPERTY, - project.getConfiguration().getString("sonar.cobertura.maxmen", CoreProperties.COBERTURA_MAXMEM_DEFAULT_VALUE))); + if (settings.hasKey("sonar.cobertura.maxmen")) { + maxmem = settings.getString("sonar.cobertura.maxmen"); + } else { + // use the "normal" key + maxmem = settings.getString(CoreProperties.COBERTURA_MAXMEM_PROPERTY); + } + coberturaPlugin.setParameter("maxmem", maxmem); } } diff --git a/plugins/sonar-cobertura-plugin/src/test/java/org/sonar/plugins/cobertura/CoberturaMavenInitializerTest.java b/plugins/sonar-cobertura-plugin/src/test/java/org/sonar/plugins/cobertura/CoberturaMavenInitializerTest.java index 01f3fa52479..188b038334b 100644 --- a/plugins/sonar-cobertura-plugin/src/test/java/org/sonar/plugins/cobertura/CoberturaMavenInitializerTest.java +++ b/plugins/sonar-cobertura-plugin/src/test/java/org/sonar/plugins/cobertura/CoberturaMavenInitializerTest.java @@ -49,7 +49,7 @@ public class CoberturaMavenInitializerTest { @Before public void setUp() { project = mock(Project.class); - initializer = new CoberturaMavenInitializer(new CoberturaMavenPluginHandler()); + initializer = new CoberturaMavenInitializer(new CoberturaMavenPluginHandler(null)); } @Test 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 e1351f6aa59..e4fa0fef233 100644 --- 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 @@ -24,13 +24,12 @@ import static org.junit.Assert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.apache.commons.configuration.BaseConfiguration; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.PropertiesConfiguration; import org.apache.maven.project.MavenProject; import org.junit.Before; import org.junit.Test; import org.sonar.api.batch.maven.MavenPlugin; +import org.sonar.api.config.PropertyDefinitions; +import org.sonar.api.config.Settings; import org.sonar.api.resources.Project; import org.sonar.plugins.cobertura.api.CoberturaUtils; @@ -40,20 +39,19 @@ public class CoberturaMavenPluginHandlerTest { @Before public void before() { - handler = new CoberturaMavenPluginHandler(); + handler = new CoberturaMavenPluginHandler(new Settings(new PropertyDefinitions(CoberturaPlugin.class))); } @Test public void notFixedVersion() { // first of all, version was fixed : see http://jira.codehaus.org/browse/SONAR-1055 // but it's more reasonable to let users change the version : see http://jira.codehaus.org/browse/SONAR-1310 - assertThat(new CoberturaMavenPluginHandler().isFixedVersion(), is(false)); + assertThat(new CoberturaMavenPluginHandler(null).isFixedVersion(), is(false)); } @Test public void activateXmlFormat() { Project project = mock(Project.class); - when(project.getConfiguration()).thenReturn(new PropertiesConfiguration()); when(project.getPom()).thenReturn(new MavenProject()); when(project.getExclusionPatterns()).thenReturn(new String[0]); @@ -66,7 +64,6 @@ public class CoberturaMavenPluginHandlerTest { @Test public void setCoberturaExclusions() { Project project = mock(Project.class); - when(project.getConfiguration()).thenReturn(new PropertiesConfiguration()); when(project.getPom()).thenReturn(new MavenProject()); when(project.getExclusionPatterns()).thenReturn(new String[] { "**/Foo.java", "com/*Test.*", "com/*" }); @@ -81,15 +78,17 @@ public class CoberturaMavenPluginHandlerTest { @Test // http://jira.codehaus.org/browse/SONAR-2897: there used to be a typo in the parameter name (was "sonar.cobertura.maxmen") public void checkOldParamNameCompatibility() { - Configuration conf = new BaseConfiguration(); - conf.setProperty("sonar.cobertura.maxmen", "FOO"); + Settings settings = new Settings(new PropertyDefinitions(CoberturaPlugin.class)); + settings.setProperty("sonar.cobertura.maxmen", "FOO"); + CoberturaMavenPluginHandler coberturaMavenPluginHandler = new CoberturaMavenPluginHandler(settings); + Project project = mock(Project.class); - when(project.getConfiguration()).thenReturn(conf); 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); + + coberturaMavenPluginHandler.configure(project, coberturaPlugin); assertThat(coberturaPlugin.getParameter("maxmem"), is("FOO")); } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/UpdateReviewsDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/UpdateReviewsDecorator.java index 4422a1904f7..790f0929511 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/UpdateReviewsDecorator.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/UpdateReviewsDecorator.java @@ -52,7 +52,6 @@ public class UpdateReviewsDecorator implements Decorator { private ResourcePersister resourcePersister; private DatabaseSession databaseSession; private ViolationTrackingDecorator violationTrackingDecorator; - private Query searchReviewsQuery; private Query updateReviewQuery; private Map violationsPerPermanentId; @@ -92,7 +91,7 @@ public class UpdateReviewsDecorator implements Decorator { // prepare the DB native queries updateReviewQuery = databaseSession .createNativeQuery("UPDATE reviews SET title=?, resource_line=?, updated_at=CURRENT_TIMESTAMP WHERE id=?"); - searchReviewsQuery = databaseSession.getEntityManager().createNativeQuery( + Query searchReviewsQuery = databaseSession.getEntityManager().createNativeQuery( "SELECT * FROM reviews WHERE status!='CLOSED' AND resource_id=?", Review.class); // and iterate over the reviews that we find List reviews = searchReviewsQuery.setParameter(1, resourceId).getResultList(); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/UpdateReviewsDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/UpdateReviewsDecoratorTest.java index 82d3da81083..2a8797cf979 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/UpdateReviewsDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/UpdateReviewsDecoratorTest.java @@ -23,8 +23,6 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import java.util.Date; - import org.junit.Before; import org.junit.Test; import org.sonar.api.batch.DecoratorContext; -- 2.39.5