diff options
Diffstat (limited to 'sonar-batch/src/test/java/org')
7 files changed, 30 insertions, 85 deletions
diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalSettingsTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalSettingsTest.java index 34bd571d7ce..da6d442ec39 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalSettingsTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/GlobalSettingsTest.java @@ -19,8 +19,6 @@ */ package org.sonar.batch.bootstrap; -import org.apache.commons.configuration.BaseConfiguration; -import org.apache.commons.configuration.Configuration; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -41,7 +39,6 @@ public class GlobalSettingsTest { GlobalReferentials globalRef; ProjectDefinition project = ProjectDefinition.create().setKey("struts"); - Configuration deprecatedConf = new BaseConfiguration(); BootstrapProperties bootstrapProps; private AnalysisMode mode; @@ -57,7 +54,7 @@ public class GlobalSettingsTest { public void should_load_global_settings() { globalRef.globalSettings().put("sonar.cpd.cross", "true"); - GlobalSettings batchSettings = new GlobalSettings(bootstrapProps, new PropertyDefinitions(), globalRef, deprecatedConf, mode); + GlobalSettings batchSettings = new GlobalSettings(bootstrapProps, new PropertyDefinitions(), globalRef, mode); assertThat(batchSettings.getBoolean("sonar.cpd.cross")).isTrue(); } diff --git a/sonar-batch/src/test/java/org/sonar/batch/components/PastSnapshotFinderTest.java b/sonar-batch/src/test/java/org/sonar/batch/components/PastSnapshotFinderTest.java index 95bfb40be3d..7f914256695 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/components/PastSnapshotFinderTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/components/PastSnapshotFinderTest.java @@ -19,8 +19,6 @@ */ package org.sonar.batch.components; -import org.apache.commons.configuration.BaseConfiguration; -import org.apache.commons.configuration.Configuration; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentMatcher; @@ -96,30 +94,6 @@ public class PastSnapshotFinderTest { } @Test - public void should_find_with_configuration() { - Configuration conf = new BaseConfiguration(); - conf.addProperty("sonar.timemachine.period1", "1.2"); - conf.addProperty("sonar.timemachine.period2", "1.2"); - conf.addProperty("sonar.timemachine.period3", "1.2"); - conf.addProperty("sonar.timemachine.period4", "1.2"); - conf.addProperty("sonar.timemachine.period5", "1.2"); - - when(finderByVersion.findByVersion(null, "1.2")).thenReturn(new PastSnapshot("version", new Date(), new Snapshot())); - - PastSnapshot variationSnapshot = finder.find(null, conf, 1); - - verify(finderByVersion).findByVersion(null, "1.2"); - assertThat(variationSnapshot.getIndex(), is(1)); - assertThat(variationSnapshot.getMode(), is("version")); - assertThat(variationSnapshot.getProjectSnapshot(), not(nullValue())); - - assertThat(finder.find(null, conf, 2).getIndex(), is(2)); - assertThat(finder.find(null, conf, 3).getIndex(), is(3)); - assertThat(finder.find(null, conf, 4).getIndex(), is(4)); - assertThat(finder.find(null, conf, 5).getIndex(), is(5)); - } - - @Test public void should_find_by_number_of_days() { when(finderByDays.findFromDays(null, 30)).thenReturn(new PastSnapshot("days", null).setModeParameter("30")); @@ -144,7 +118,7 @@ public class PastSnapshotFinderTest { public void should_find_by_date() throws ParseException { final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); final Date date = format.parse("2010-05-18"); - when(finderByDate.findByDate((Snapshot)null, date)).thenReturn(new PastSnapshot("date", date, new Snapshot())); + when(finderByDate.findByDate((Snapshot) null, date)).thenReturn(new PastSnapshot("date", date, new Snapshot())); PastSnapshot variationSnapshot = finder.find(null, 2, "2010-05-18"); @@ -247,6 +221,6 @@ public class PastSnapshotFinderTest { Settings settings = new Settings().setProperty("sonar.timemachine.period1", "5"); assertThat(PastSnapshotFinder.getPropertyValue("FIL", settings, 1), is("5")); - assertThat(PastSnapshotFinder.getPropertyValue("FIL",settings, 999), nullValue()); + assertThat(PastSnapshotFinder.getPropertyValue("FIL", settings, 999), nullValue()); } } diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/DefaultResourcePersisterTest.java b/sonar-batch/src/test/java/org/sonar/batch/index/DefaultResourcePersisterTest.java index c9ae930855b..d90d4e1a24c 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/index/DefaultResourcePersisterTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/index/DefaultResourcePersisterTest.java @@ -19,11 +19,12 @@ */ package org.sonar.batch.index; -import org.apache.commons.configuration.PropertiesConfiguration; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.sonar.api.CoreProperties; +import org.sonar.api.config.Settings; import org.sonar.api.database.model.ResourceModel; import org.sonar.api.resources.Directory; import org.sonar.api.resources.File; @@ -39,7 +40,10 @@ import static org.fest.assertions.Assertions.assertThat; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class DefaultResourcePersisterTest extends AbstractDbUnitTestCase { @@ -210,15 +214,15 @@ public class DefaultResourcePersisterTest extends AbstractDbUnitTestCase { } private static Project newProject(String key, String language) { - PropertiesConfiguration configuration = new PropertiesConfiguration(); - configuration.setProperty("sonar.language", language); - return new Project(key).setConfiguration(configuration).setAnalysisType(Project.AnalysisType.DYNAMIC); + Settings settings = new Settings(); + settings.setProperty(CoreProperties.PROJECT_LANGUAGE_PROPERTY, language); + return new Project(key).setSettings(settings).setAnalysisType(Project.AnalysisType.DYNAMIC); } private static Project newCopyProject(String key, String language, int copyResourceId) { - PropertiesConfiguration configuration = new PropertiesConfiguration(); - configuration.setProperty("sonar.language", language); - return new CopyProject(key, copyResourceId).setConfiguration(configuration).setAnalysisType(Project.AnalysisType.DYNAMIC); + Settings settings = new Settings(); + settings.setProperty(CoreProperties.PROJECT_LANGUAGE_PROPERTY, language); + return new CopyProject(key, copyResourceId).setSettings(settings).setAnalysisType(Project.AnalysisType.DYNAMIC); } private static class CopyProject extends Project implements ResourceCopy { diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/ResourceKeyMigrationTest.java b/sonar-batch/src/test/java/org/sonar/batch/index/ResourceKeyMigrationTest.java index d3710e64488..e91b5596101 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/index/ResourceKeyMigrationTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/index/ResourceKeyMigrationTest.java @@ -19,16 +19,17 @@ */ package org.sonar.batch.index; -import org.apache.commons.configuration.PropertiesConfiguration; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; +import org.sonar.api.CoreProperties; import org.sonar.api.batch.fs.InputFile; import org.sonar.api.batch.fs.internal.DefaultInputFile; import org.sonar.api.batch.fs.internal.DeprecatedDefaultInputFile; +import org.sonar.api.config.Settings; import org.sonar.api.resources.Project; import org.sonar.jpa.test.AbstractDbUnitTestCase; @@ -114,9 +115,9 @@ public class ResourceKeyMigrationTest extends AbstractDbUnitTestCase { } private static Project newProject(String key, String language) { - PropertiesConfiguration configuration = new PropertiesConfiguration(); - configuration.setProperty("sonar.language", language); - return new Project(key).setConfiguration(configuration).setAnalysisType(Project.AnalysisType.DYNAMIC); + Settings settings = new Settings(); + settings.setProperty(CoreProperties.PROJECT_LANGUAGE_PROPERTY, language); + return new Project(key).setSettings(settings).setAnalysisType(Project.AnalysisType.DYNAMIC); } } diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/ModuleSettingsTest.java b/sonar-batch/src/test/java/org/sonar/batch/scan/ModuleSettingsTest.java index 3bbed76aa17..a7a12f16e2c 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/scan/ModuleSettingsTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/scan/ModuleSettingsTest.java @@ -20,8 +20,6 @@ package org.sonar.batch.scan; import com.google.common.collect.ImmutableMap; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.PropertiesConfiguration; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -78,17 +76,13 @@ public class ModuleSettingsTest { projectRef.addSettings("struts-core", ImmutableMap.of("on-module", "true", "overridding", "module")); ProjectDefinition module = ProjectDefinition.create().setKey("struts-core"); - Configuration deprecatedConf = new PropertiesConfiguration(); - ModuleSettings moduleSettings = new ModuleSettings(batchSettings, module, deprecatedConf, projectRef, mode); + ModuleSettings moduleSettings = new ModuleSettings(batchSettings, module, projectRef, mode); assertThat(moduleSettings.getString("overridding")).isEqualTo("module"); assertThat(moduleSettings.getString("on-batch")).isEqualTo("true"); assertThat(moduleSettings.getString("on-module")).isEqualTo("true"); - assertThat(deprecatedConf.getString("overridding")).isEqualTo("module"); - assertThat(deprecatedConf.getString("on-batch")).isEqualTo("true"); - assertThat(deprecatedConf.getString("on-module")).isEqualTo("true"); } @Test @@ -101,9 +95,8 @@ public class ModuleSettingsTest { projectRef.addSettings("struts-core", ImmutableMap.of("sonar.foo.license.secured", "bar2")); ProjectDefinition module = ProjectDefinition.create().setKey("struts-core"); - Configuration deprecatedConf = new PropertiesConfiguration(); - ModuleSettings moduleSettings = new ModuleSettings(batchSettings, module, deprecatedConf, projectRef, mode); + ModuleSettings moduleSettings = new ModuleSettings(batchSettings, module, projectRef, mode); assertThat(moduleSettings.getString("sonar.foo.license.secured")).isEqualTo("bar2"); assertThat(moduleSettings.getString("sonar.foo.secured")).isEqualTo("bar"); @@ -121,9 +114,8 @@ public class ModuleSettingsTest { when(mode.isPreview()).thenReturn(true); ProjectDefinition module = ProjectDefinition.create().setKey("struts-core"); - Configuration deprecatedConf = new PropertiesConfiguration(); - ModuleSettings moduleSettings = new ModuleSettings(batchSettings, module, deprecatedConf, projectRef, mode); + ModuleSettings moduleSettings = new ModuleSettings(batchSettings, module, projectRef, mode); assertThat(moduleSettings.getString("sonar.foo.license.secured")).isEqualTo("bar2"); diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectScanContainerTest.java b/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectScanContainerTest.java index c40d9456ce3..a66f7f1378f 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectScanContainerTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectScanContainerTest.java @@ -19,7 +19,6 @@ */ package org.sonar.batch.scan; -import org.apache.commons.configuration.PropertiesConfiguration; import org.junit.Before; import org.junit.Test; import org.sonar.api.BatchExtension; @@ -69,9 +68,8 @@ public class ProjectScanContainerTest { parentContainer.add(System2.INSTANCE); parentContainer.add(bootstrapProperties); parentContainer.add(analysisMode); - parentContainer.add(new PropertiesConfiguration()); GlobalReferentials globalRef = new GlobalReferentials(); - settings = new GlobalSettings(bootstrapProperties, new PropertyDefinitions(), globalRef, new PropertiesConfiguration(), analysisMode); + settings = new GlobalSettings(bootstrapProperties, new PropertyDefinitions(), globalRef, analysisMode); parentContainer.add(settings); ProjectReferentialsLoader projectReferentialsLoader = new ProjectReferentialsLoader() { @Override diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectSettingsTest.java b/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectSettingsTest.java index 4f7726f6695..8cede90928b 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectSettingsTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectSettingsTest.java @@ -20,8 +20,6 @@ package org.sonar.batch.scan; import com.google.common.collect.ImmutableMap; -import org.apache.commons.configuration.BaseConfiguration; -import org.apache.commons.configuration.Configuration; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -50,7 +48,6 @@ public class ProjectSettingsTest { ProjectReferentials projectRef; ProjectDefinition project = ProjectDefinition.create().setKey("struts"); - Configuration deprecatedConf = new BaseConfiguration(); GlobalSettings bootstrapProps; private AnalysisMode mode; @@ -59,14 +56,14 @@ public class ProjectSettingsTest { public void prepare() { projectRef = new ProjectReferentials(); mode = mock(AnalysisMode.class); - bootstrapProps = new GlobalSettings(new BootstrapProperties(Collections.<String, String>emptyMap()), new PropertyDefinitions(), new GlobalReferentials(), deprecatedConf, mode); + bootstrapProps = new GlobalSettings(new BootstrapProperties(Collections.<String, String>emptyMap()), new PropertyDefinitions(), new GlobalReferentials(), mode); } @Test public void should_load_project_props() { project.setProperty("project.prop", "project"); - ProjectSettings batchSettings = new ProjectSettings(new ProjectReactor(project), bootstrapProps, new PropertyDefinitions(), projectRef, deprecatedConf, mode); + ProjectSettings batchSettings = new ProjectSettings(new ProjectReactor(project), bootstrapProps, new PropertyDefinitions(), projectRef, mode); assertThat(batchSettings.getString("project.prop")).isEqualTo("project"); } @@ -75,7 +72,7 @@ public class ProjectSettingsTest { public void should_load_project_root_settings() { projectRef.addSettings("struts", ImmutableMap.of("sonar.cpd.cross", "true", "sonar.java.coveragePlugin", "jacoco")); - ProjectSettings batchSettings = new ProjectSettings(new ProjectReactor(project), bootstrapProps, new PropertyDefinitions(), projectRef, deprecatedConf, mode); + ProjectSettings batchSettings = new ProjectSettings(new ProjectReactor(project), bootstrapProps, new PropertyDefinitions(), projectRef, mode); assertThat(batchSettings.getString("sonar.java.coveragePlugin")).isEqualTo("jacoco"); } @@ -86,7 +83,7 @@ public class ProjectSettingsTest { projectRef.addSettings("struts:mybranch", ImmutableMap.of("sonar.cpd.cross", "true", "sonar.java.coveragePlugin", "jacoco")); - ProjectSettings batchSettings = new ProjectSettings(new ProjectReactor(project), bootstrapProps, new PropertyDefinitions(), projectRef, deprecatedConf, mode); + ProjectSettings batchSettings = new ProjectSettings(new ProjectReactor(project), bootstrapProps, new PropertyDefinitions(), projectRef, mode); assertThat(batchSettings.getString("sonar.java.coveragePlugin")).isEqualTo("jacoco"); } @@ -95,7 +92,7 @@ public class ProjectSettingsTest { public void should_not_fail_when_accessing_secured_properties() { projectRef.addSettings("struts", ImmutableMap.of("sonar.foo.secured", "bar", "sonar.foo.license.secured", "bar2")); - ProjectSettings batchSettings = new ProjectSettings(new ProjectReactor(project), bootstrapProps, new PropertyDefinitions(), projectRef, deprecatedConf, mode); + ProjectSettings batchSettings = new ProjectSettings(new ProjectReactor(project), bootstrapProps, new PropertyDefinitions(), projectRef, mode); assertThat(batchSettings.getString("sonar.foo.license.secured")).isEqualTo("bar2"); assertThat(batchSettings.getString("sonar.foo.secured")).isEqualTo("bar"); @@ -107,7 +104,7 @@ public class ProjectSettingsTest { when(mode.isPreview()).thenReturn(true); - ProjectSettings batchSettings = new ProjectSettings(new ProjectReactor(project), bootstrapProps, new PropertyDefinitions(), projectRef, deprecatedConf, mode); + ProjectSettings batchSettings = new ProjectSettings(new ProjectReactor(project), bootstrapProps, new PropertyDefinitions(), projectRef, mode); assertThat(batchSettings.getString("sonar.foo.license.secured")).isEqualTo("bar2"); thrown.expect(MessageException.class); @@ -116,22 +113,4 @@ public class ProjectSettingsTest { batchSettings.getString("sonar.foo.secured"); } - @Test - public void should_forward_to_deprecated_commons_configuration() { - projectRef.addSettings("struts", ImmutableMap.of("sonar.cpd.cross", "true", "sonar.java.coveragePlugin", "jacoco")); - - ProjectSettings batchSettings = new ProjectSettings(new ProjectReactor(project), bootstrapProps, new PropertyDefinitions(), projectRef, deprecatedConf, mode); - - assertThat(deprecatedConf.getString("sonar.cpd.cross")).isEqualTo("true"); - assertThat(deprecatedConf.getString("sonar.java.coveragePlugin")).isEqualTo("jacoco"); - - batchSettings.removeProperty("sonar.cpd.cross"); - assertThat(deprecatedConf.getString("sonar.cpd.cross")).isNull(); - assertThat(deprecatedConf.getString("sonar.java.coveragePlugin")).isEqualTo("jacoco"); - - batchSettings.clear(); - assertThat(deprecatedConf.getString("sonar.cpd.cross")).isNull(); - assertThat(deprecatedConf.getString("sonar.java.coveragePlugin")).isNull(); - } - } |