From cf4c5fe91ce78cc4cba28c8fa342e1edf7e0cf76 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Thu, 25 Apr 2013 09:04:27 +0200 Subject: Revert Rename PropertyDefinitions to PropertyDefs and PropertyFieldDefinition to PropertyFieldDef --- .../src/test/java/org/sonar/plugins/cpd/CpdSensorTest.java | 4 ++-- .../test/java/org/sonar/plugins/dbcleaner/DefaultPurgeTaskTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins') diff --git a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/CpdSensorTest.java b/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/CpdSensorTest.java index ed3038909ea..26d5637373f 100644 --- a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/CpdSensorTest.java +++ b/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/CpdSensorTest.java @@ -22,7 +22,7 @@ package org.sonar.plugins.cpd; import org.apache.commons.configuration.PropertiesConfiguration; import org.junit.Before; import org.junit.Test; -import org.sonar.api.config.PropertyDefs; +import org.sonar.api.config.PropertyDefinitions; import org.sonar.api.config.Settings; import org.sonar.api.resources.Java; import org.sonar.api.resources.Language; @@ -44,7 +44,7 @@ public class CpdSensorTest { IndexFactory indexFactory = mock(IndexFactory.class); sonarEngine = new SonarEngine(indexFactory, null, null, null); sonarBridgeEngine = new SonarBridgeEngine(indexFactory, null, null); - settings = new Settings(new PropertyDefs(CpdPlugin.class)); + settings = new Settings(new PropertyDefinitions(CpdPlugin.class)); sensor = new CpdSensor(sonarEngine, sonarBridgeEngine, settings); } diff --git a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/DefaultPurgeTaskTest.java b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/DefaultPurgeTaskTest.java index 38443e3097a..1afad9051d8 100644 --- a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/DefaultPurgeTaskTest.java +++ b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/DefaultPurgeTaskTest.java @@ -21,7 +21,7 @@ package org.sonar.plugins.dbcleaner; import org.junit.Test; import org.sonar.api.CoreProperties; -import org.sonar.api.config.PropertyDefs; +import org.sonar.api.config.PropertyDefinitions; import org.sonar.api.config.Settings; import org.sonar.api.resources.Scopes; import org.sonar.core.purge.PurgeDao; @@ -37,7 +37,7 @@ public class DefaultPurgeTaskTest { @Test public void shouldNotDeleteHistoricalDataOfDirectories() { PurgeDao purgeDao = mock(PurgeDao.class); - Settings settings = new Settings(new PropertyDefs(DefaultPurgeTask.class)); + Settings settings = new Settings(new PropertyDefinitions(DefaultPurgeTask.class)); settings.setProperty(DbCleanerConstants.PROPERTY_CLEAN_DIRECTORY, "false"); DefaultPurgeTask task = new DefaultPurgeTask(purgeDao, settings, mock(DefaultPeriodCleaner.class), mock(PurgeProfiler.class)); @@ -49,7 +49,7 @@ public class DefaultPurgeTaskTest { @Test public void shouldDeleteHistoricalDataOfDirectoriesByDefault() { PurgeDao purgeDao = mock(PurgeDao.class); - Settings settings = new Settings(new PropertyDefs(DefaultPurgeTask.class)); + Settings settings = new Settings(new PropertyDefinitions(DefaultPurgeTask.class)); DefaultPurgeTask task = new DefaultPurgeTask(purgeDao, settings, mock(DefaultPeriodCleaner.class), mock(PurgeProfiler.class)); task.purge(1L); -- cgit v1.2.3